From patchwork Thu Jul 23 11:46:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Can Guo X-Patchwork-Id: 11680697 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DCC4313A4 for ; Thu, 23 Jul 2020 11:46:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF0DE20825 for ; Thu, 23 Jul 2020 11:46:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726109AbgGWLqf (ORCPT ); Thu, 23 Jul 2020 07:46:35 -0400 Received: from labrats.qualcomm.com ([199.106.110.90]:57998 "EHLO labrats.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728630AbgGWLqf (ORCPT ); Thu, 23 Jul 2020 07:46:35 -0400 IronPort-SDR: eL2/ptdc+lO7mnQ/tJPicX8DsZ1MW8ssIantJ7bsIm06I1MVWzpLesfNiQLr58oyK2mwMsGaoX bauolDaMvlQW3EXnzdGr7tiaCLJshi2e3eTEnDiLNPhDrFhfggLZ1u56cjG13tq6T8nQfwtnr0 wruFyjGdATgrjOhZQh6rG7GcNAq3q8jhV+1eo2ANZcZj4YPdx6Lu3gKkJEaaUUVRrNy6h6sLTZ nDk5nNX2WHe8inAw5InnDBuUxh4ykMRBF2aOHuSRQYkKmUnkeuWiqJ8ewW5rFGjd4duMWkpaFY Z3I= X-IronPort-AV: E=Sophos;i="5.75,386,1589266800"; d="scan'208";a="47229398" Received: from unknown (HELO ironmsg01-sd.qualcomm.com) ([10.53.140.141]) by labrats.qualcomm.com with ESMTP; 23 Jul 2020 04:46:34 -0700 Received: from pacamara-linux.qualcomm.com ([192.168.140.135]) by ironmsg01-sd.qualcomm.com with ESMTP; 23 Jul 2020 04:46:33 -0700 Received: by pacamara-linux.qualcomm.com (Postfix, from userid 359480) id 575C922E23; Thu, 23 Jul 2020 04:46:33 -0700 (PDT) From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, sh425.lee@samsung.com, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Andy Gross , Bjorn Andersson , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 2/8] ufs: ufs-qcom: Fix race conditions caused by func ufs_qcom_testbus_config Date: Thu, 23 Jul 2020 04:46:20 -0700 Message-Id: <1595504787-19429-3-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595504787-19429-1-git-send-email-cang@codeaurora.org> References: <1595504787-19429-1-git-send-email-cang@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org If ufs_qcom_dump_dbg_regs() calls ufs_qcom_testbus_config() from ufshcd_suspend/resume and/or clk gate/ungate context, pm_runtime_get_sync() and ufshcd_hold() will cause racing problems. Fix this by removing the unnecessary calls of pm_runtime_get_sync() and ufshcd_hold(). Signed-off-by: Can Guo Reviewed-by: Hongwu Su Reviewed-by: Avri Altman --- drivers/scsi/ufs/ufs-qcom.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 2e6ddb5..7da27ee 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1604,9 +1604,6 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host) */ } mask <<= offset; - - pm_runtime_get_sync(host->hba->dev); - ufshcd_hold(host->hba, false); ufshcd_rmwl(host->hba, TEST_BUS_SEL, (u32)host->testbus.select_major << 19, REG_UFS_CFG1); @@ -1619,8 +1616,6 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host) * committed before returning. */ mb(); - ufshcd_release(host->hba); - pm_runtime_put_sync(host->hba->dev); return 0; } From patchwork Thu Jul 23 11:46:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Can Guo X-Patchwork-Id: 11680703 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F11D0159A for ; Thu, 23 Jul 2020 11:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA4AA20825 for ; Thu, 23 Jul 2020 11:46:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728665AbgGWLqg (ORCPT ); Thu, 23 Jul 2020 07:46:36 -0400 Received: from labrats.qualcomm.com ([199.106.110.90]:3550 "EHLO labrats.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728635AbgGWLqf (ORCPT ); Thu, 23 Jul 2020 07:46:35 -0400 IronPort-SDR: fZl7Q/x8Rie1wDqtV3QYiYFccdxBT/VaDhHCtxFm93DPiusz0i9MBqthZ8zyRh5KiruAuIf2gI PhwcOOuGe8tRfuFzTaFVyCmr7lInM4LlmKH61UaUfFK+R8tNRHTlDv896zP/GsieOUwk0MdzVI 56baQIuKs1l1uZ728sfnv6EHM9dlf4k/v/1tOk/UWUMwLAocKIoBPcaUxYbQKdffnOLFTfaxkj kSS2TVP9Fxfu0ZJhvw2NGtZTIBigqLi36CuPODmXhBVceNX+dBEio5ku+W8f4EE/VOTPuZZjus x9E= X-IronPort-AV: E=Sophos;i="5.75,386,1589266800"; d="scan'208";a="29048252" Received: from unknown (HELO ironmsg-SD-alpha.qualcomm.com) ([10.53.140.30]) by labrats.qualcomm.com with ESMTP; 23 Jul 2020 04:46:35 -0700 Received: from pacamara-linux.qualcomm.com ([192.168.140.135]) by ironmsg-SD-alpha.qualcomm.com with ESMTP; 23 Jul 2020 04:46:34 -0700 Received: by pacamara-linux.qualcomm.com (Postfix, from userid 359480) id 0834222E23; Thu, 23 Jul 2020 04:46:34 -0700 (PDT) From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, sh425.lee@samsung.com, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Andy Gross , Bjorn Andersson , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 3/8] scsi: ufs-qcom: Fix schedule while atomic error in ufs_qcom_dump_dbg_regs Date: Thu, 23 Jul 2020 04:46:21 -0700 Message-Id: <1595504787-19429-4-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595504787-19429-1-git-send-email-cang@codeaurora.org> References: <1595504787-19429-1-git-send-email-cang@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Dumping testbus registers needs to sleep a bit intermittently as there are too many of them. Skip them for those contexts where sleep is not allowed. Signed-off-by: Can Guo --- drivers/scsi/ufs/ufs-qcom.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 7da27ee..7831b2b 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1651,13 +1651,16 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba) ufshcd_dump_regs(hba, REG_UFS_SYS1CLK_1US, 16 * 4, "HCI Vendor Specific Registers "); - /* sleep a bit intermittently as we are dumping too much data */ ufs_qcom_print_hw_debug_reg_all(hba, NULL, ufs_qcom_dump_regs_wrapper); - udelay(1000); - ufs_qcom_testbus_read(hba); - udelay(1000); - ufs_qcom_print_unipro_testbus(hba); - udelay(1000); + + if (in_task()) { + /* sleep a bit intermittently as we are dumping too much data */ + usleep_range(1000, 1100); + ufs_qcom_testbus_read(hba); + usleep_range(1000, 1100); + ufs_qcom_print_unipro_testbus(hba); + usleep_range(1000, 1100); + } } /**