From patchwork Mon Nov 23 14:11:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 330672 Delivered-To: patch@linaro.org Received: by 2002:a92:ae0b:0:0:0:0:0 with SMTP id s11csp2026409ilh; Mon, 23 Nov 2020 06:04:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiTkYs/lNtPsNW4O5OHpaFuT5FGR/nvQlv4iSccVkYIXK+fTH/PuQv9Gj+P2XvYuCzglkD X-Received: by 2002:a17:906:6091:: with SMTP id t17mr14455543ejj.476.1606140295356; Mon, 23 Nov 2020 06:04:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606140295; cv=none; d=google.com; s=arc-20160816; b=kam1B3mPEXrN6jTJNli2DrRm0gCJyjTNmoiBfrQ6tDJGbDOC4l5HzQhvPn6WAwraPF thPRk6yGl25rN3aNn/feo75EIU9huYtWDM2GU1pzOAA44oIOVty7FhFYuuq9gq8NLsWf JKskMeD9VvL1PKOeaVjy++agzC5yZVbu+xuuaWZJakYrA/aIa/GbMv8Myz8Hbig+5wg1 BVHSvQs75qK96dgt0eZKc/mY/qBW7NqSP5h7VTDdLqZU69f7FOt0ImcyRlKeTjgJpTN9 WRbwVrF5KREliS8buOzSx44DfjN0vTC9+geJtldtr3+tfP7SrCNy7Sho4t7x+oSjleFF FQXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=NI5nyGOY3ERNyQJVul1TRTO9hhACB1gWUuV76MrEk5M=; b=Kldng8Rl34E2TLuK6ztYutiQVmwXSU04CAIha7rIjTK02tUz48KlzZR+5Jg+FUEssw 55h6NePaEL6dw9BtxW8kw6fXN3mXLqz0qD1gP8RBea9vFMjBh4bi7lTN34nw0LzQ2AZd fpQatRFICTRUO8wd0V54HXRj17vRqKxrjJBrSBQw+5RSdtD2gEQHBTpbQI82SovqQZ2j EcdMmoxU1ic1bq+JCnaBHQJKCnh4gNwRPVrNquGsDGWxhAk6pVdRQc1Isex2uoqjGl2l ZAEnMC2eUTUBDqUVjtvmv/OgTy1EMeZf+EIn5G6ZWehYaQmR/jZ3sfO82NbjWHyYkgA6 Jhcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgYlI6LD; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r18si6917042edm.82.2020.11.23.06.04.55; Mon, 23 Nov 2020 06:04:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgYlI6LD; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730224AbgKWOE0 (ORCPT + 15 others); Mon, 23 Nov 2020 09:04:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729293AbgKWOE0 (ORCPT ); Mon, 23 Nov 2020 09:04:26 -0500 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0D6AC0613CF for ; Mon, 23 Nov 2020 06:04:25 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id a3so17350106wmb.5 for ; Mon, 23 Nov 2020 06:04:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NI5nyGOY3ERNyQJVul1TRTO9hhACB1gWUuV76MrEk5M=; b=dgYlI6LDqRVM7KThWpJ5+FLYQtBo6nuDZ7T8auGd3GHIhUqr4aNt6fZD3EA8sDfYf7 AV40fMfieMVo4HuusMAvw1inz+JrVX1eImql0wxwEMcp14i3hp/zZseb8kemlbTFZY3o 7Wc7caAus4zxyyaTtBmwq0DEnzQevquZ3mubraogrjQAnanKHG4sLlwvm2eZSiCxfrMU EIJmL0/7O7ZkOcCmBCALW2/VRMSV1Rfjf8JYGW1EGA+uocIVDpDDXPX4qQGV2B78P+rZ p7+AXV6rhqx6hKq9r00uu2IsfIDgOg95i2hJa9e85JP5MlkDP0L3pUEYwpC5Th1y2Bqf FfXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NI5nyGOY3ERNyQJVul1TRTO9hhACB1gWUuV76MrEk5M=; b=Zrkg5E4MuAD+TDaIWhAvzmGY87NZJGiOaopEo24liHURPuu1wyIrWwBeLQkYcZ1c8t qBgm8r09RGJmRb39AA0Ek/gU26KyZsOtL/Jj88SfgiXF9j3LsC/2Jb7BIEx0FJJ6p/av ly3JbAxe7usg5CwtolPHoXk2xWK4Vqms3Y0erEoL2akONf5l+9nPirzkhf+TTnXkgn7R dRtjD5oTVozjoBDZSk99KU7S3vbR8sAALPlEL/nrjB6qDyQc6I4SEEsqSoJA1EywmB4C uIN4DY0zQHXqpXDirSkZqZIlGCOgloQxGhC1TZcpMFcQwcvDyFGaejPQjXexlN3RVBR1 FNXQ== X-Gm-Message-State: AOAM531NQRNx6hEuYFom/KdajGS26peT598+z3ahR7MgGyKqyar7xiBO 9faQT1geliuABpBlKjl0I5pxN6an9SDV/ceg86I= X-Received: by 2002:a7b:ce0e:: with SMTP id m14mr25154011wmc.17.1606140264658; Mon, 23 Nov 2020 06:04:24 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:490:8730:f5cd:e791:e88b:e3b7]) by smtp.gmail.com with ESMTPSA id m9sm7102727wrx.59.2020.11.23.06.04.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Nov 2020 06:04:23 -0800 (PST) From: Loic Poulain To: manivannan.sadhasivam@linaro.org, hemantk@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, Loic Poulain Subject: [PATCH v2 2/8] mhi: pci-generic: Perform hard reset on remove Date: Mon, 23 Nov 2020 15:11:00 +0100 Message-Id: <1606140666-4986-3-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1606140666-4986-1-git-send-email-loic.poulain@linaro.org> References: <1606140666-4986-1-git-send-email-loic.poulain@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Ensure that the device is hard-reset on remove to restore its initial state and avoid further issues on subsequent probe. This has been tested with Telit FN980m module. Signed-off-by: Loic Poulain --- drivers/bus/mhi/pci_generic.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.7.4 diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 13a7e4f..09c6b26 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -15,6 +15,8 @@ #define MHI_PCI_DEFAULT_BAR_NUM 0 +#define DEV_RESET_REG (0xB0) + /** * struct mhi_pci_dev_info - MHI PCI device specific information * @config: MHI controller configuration @@ -166,6 +168,11 @@ static void mhi_pci_status_cb(struct mhi_controller *mhi_cntrl, /* Nothing to do for now */ } +static inline void mhi_pci_reset(struct mhi_controller *mhi_cntrl) +{ + writel(1, mhi_cntrl->regs + DEV_RESET_REG); +} + static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, unsigned int bar_num, u64 dma_mask) { @@ -329,6 +336,10 @@ static void mhi_pci_remove(struct pci_dev *pdev) mhi_power_down(mhi_cntrl, true); mhi_unprepare_after_power_down(mhi_cntrl); mhi_unregister_controller(mhi_cntrl); + + /* MHI-layer reset could not be enough, always hard-reset the device */ + mhi_pci_reset(mhi_cntrl); + mhi_free_controller(mhi_cntrl); }