From patchwork Fri Jul 12 04:44:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanley Chu X-Patchwork-Id: 11041431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0BAA7912 for ; Fri, 12 Jul 2019 04:44:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAE6E28BAA for ; Fri, 12 Jul 2019 04:44:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB9DA28BB9; Fri, 12 Jul 2019 04:44:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E5A228BAA for ; Fri, 12 Jul 2019 04:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=n/G9kMmpX9ih51pE4P6xJQ43ZCaVjh6wGKNG9H0Cug0=; b=H0P059nl1D+Wpz P/zQW6LR3o9Kkru27/dEf8pEQV9vrEnu2N1vgaTvGjKxDA8qCqj693kQl3q7qaNAgBAX51doan8bQ PmUUTU0J/F5vYQmXnpKJbx4YhAsbezLr/9Z5jfb5twI6tPPtofawXactLFSk1AGHjQCfQ4Ta/rtNz HNnijuOab8C9wnPQyz1BQyHR9Nvx/vBb9hYsgpLSgXsajeKT4u6DZu+ZXY2vEXhkOjBf2y5qzLKWU MpiDWv/+t1btPyn1LHK7E9EBrl17Y1ICNPbWI0gAjDXck51IbfFmMWdDo88nDw3qZtRMhnrvui00Q 5XSWJRBlSbvHnTMVy37A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hlnQD-00021C-RM; Fri, 12 Jul 2019 04:44:37 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hlnQ9-0001z6-MM; Fri, 12 Jul 2019 04:44:35 +0000 X-UUID: 5441f88642964786bea21d1deb12e5b6-20190711 X-UUID: 5441f88642964786bea21d1deb12e5b6-20190711 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1644855165; Thu, 11 Jul 2019 20:44:20 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 11 Jul 2019 21:44:19 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 12 Jul 2019 12:44:18 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 12 Jul 2019 12:44:17 +0800 From: Stanley Chu To: , , , , Subject: [PATCH v1 1/2] scsi: ufs: Make new function for clearing outstanding task bits Date: Fri, 12 Jul 2019 12:44:15 +0800 Message-ID: <1562906656-27154-2-git-send-email-stanley.chu@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1562906656-27154-1-git-send-email-stanley.chu@mediatek.com> References: <1562906656-27154-1-git-send-email-stanley.chu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190711_214433_737283_03AF11C0 X-CRM114-Status: UNSURE ( 8.07 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.w.gonzalez@free.fr, andy.teng@mediatek.com, chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com, evgreen@chromium.org, linux-mediatek@lists.infradead.org, peter.wang@mediatek.com, matthias.bgg@gmail.com, Stanley Chu , linux-arm-kernel@lists.infradead.org, beanhuo@micron.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Make a new function "ufshcd_outstanding_task_clear()" used to clear bits in hba->outstanding_tasks for future wider usage. Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufshcd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 8f0426a36b0b..a667dbb547f2 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -723,6 +723,17 @@ static inline void ufshcd_outstanding_req_clear(struct ufs_hba *hba, int tag) __clear_bit(tag, &hba->outstanding_reqs); } +/** + * ufshcd_outstanding_task_clear - Clear a bit in outstanding task field + * @hba: per adapter instance + * @tag: position of the bit to be cleared + */ +static inline void ufshcd_outstanding_task_clear(struct ufs_hba *hba, int tag) +{ + __clear_bit(tag, &hba->outstanding_tasks); + dev_info(hba->dev, "clear outstanding_tasks: %d\n", tag); +} + /** * ufshcd_get_lists_status - Check UCRDY, UTRLRDY and UTMRLRDY * @reg: Register value of host controller status @@ -5679,7 +5690,7 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba, ufshcd_add_tm_upiu_trace(hba, task_tag, "tm_complete"); spin_lock_irqsave(hba->host->host_lock, flags); - __clear_bit(free_slot, &hba->outstanding_tasks); + ufshcd_outstanding_task_clear(hba, free_slot); spin_unlock_irqrestore(hba->host->host_lock, flags); } From patchwork Fri Jul 12 04:44:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stanley Chu X-Patchwork-Id: 11041439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E945138B for ; Fri, 12 Jul 2019 04:45:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E40D28BAA for ; Fri, 12 Jul 2019 04:45:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7271628BB9; Fri, 12 Jul 2019 04:45:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0887328BAA for ; Fri, 12 Jul 2019 04:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=l64HFL9PVriWLJsfuk+/Y+poBcP8psh6nkkyOav8h60=; b=Jr7i0ozQUba8Kg K8TEFfBo1iAnm8lRMQQYCEGlxUmbcqj7W1cXyZkz/URCcmL5EmSa3QRy9Bgi8aIebyfX+wqrAniS4 PLpsXqLjziu7Ca5YkoEC6fpbKRweBNYYwIlxrsqWxoRjDKGvTVQcxtIAw5Tmii1KkmPexhlezlN8d ZzUZz3gNNSWEV6cJGdeEYFx2iCVWKM6BdScjXHx195vViSW/45NAthiQtpnZyKthFNuUf5wCE/eZX pWiAzcYhVRDCNlDkXYquqqhoxCYoY7HdBHIRSl17cF9sjVp0PVLA9lcyw3VM/1G1g2iDtlZ8Rb7jP ERezRbASz3i9ZZQreBzw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hlnQt-0003n4-EV; Fri, 12 Jul 2019 04:45:19 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hlnQB-0001z6-81; Fri, 12 Jul 2019 04:44:36 +0000 X-UUID: ca7bbff683534c22a899dcaf6e5fe470-20190711 X-UUID: ca7bbff683534c22a899dcaf6e5fe470-20190711 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1733890252; Thu, 11 Jul 2019 20:44:27 -0800 Received: from mtkmbs08n1.mediatek.inc (172.21.101.55) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 11 Jul 2019 21:44:25 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 12 Jul 2019 12:44:18 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 12 Jul 2019 12:44:18 +0800 From: Stanley Chu To: , , , , Subject: [PATCH v1 2/2] scsi: ufs: Fix broken hba->outstanding_tasks Date: Fri, 12 Jul 2019 12:44:16 +0800 Message-ID: <1562906656-27154-3-git-send-email-stanley.chu@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1562906656-27154-1-git-send-email-stanley.chu@mediatek.com> References: <1562906656-27154-1-git-send-email-stanley.chu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190711_214435_286624_4D9A84CD X-CRM114-Status: GOOD ( 13.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.w.gonzalez@free.fr, andy.teng@mediatek.com, chun-hung.wu@mediatek.com, kuohong.wang@mediatek.com, evgreen@chromium.org, linux-mediatek@lists.infradead.org, peter.wang@mediatek.com, matthias.bgg@gmail.com, Stanley Chu , linux-arm-kernel@lists.infradead.org, beanhuo@micron.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Currently bits in hba->outstanding_tasks are cleared only after their corresponding task management commands are successfully done by __ufshcd_issue_tm_cmd(). If timeout happens in a task management command, its corresponding bit in hba->outstanding_tasks will not be cleared until next task management command with the same tag used successfully finishes.‧ This is wrong and can lead to some issues, like power consumpton issue. For example, ufshcd_release() and ufshcd_gate_work() will do nothing if hba->outstanding_tasks is not zero even if both UFS host and devices are actually idle. Because error handling flow, i.e., ufshcd_reset_and_restore(), will be triggered after any task management command times out, we fix this by clearing corresponding hba->outstanding_tasks bits during this flow. To achieve this, we need a mask to track timed-out commands and thus error handling flow can clear their tags specifically. Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufshcd.c | 38 +++++++++++++++++++++++++++++++------- drivers/scsi/ufs/ufshcd.h | 1 + 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index a667dbb547f2..f780066edf26 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -731,7 +731,6 @@ static inline void ufshcd_outstanding_req_clear(struct ufs_hba *hba, int tag) static inline void ufshcd_outstanding_task_clear(struct ufs_hba *hba, int tag) { __clear_bit(tag, &hba->outstanding_tasks); - dev_info(hba->dev, "clear outstanding_tasks: %d\n", tag); } /** @@ -5540,11 +5539,34 @@ static void ufshcd_check_errors(struct ufs_hba *hba) */ static void ufshcd_tmc_handler(struct ufs_hba *hba) { - u32 tm_doorbell; + u32 tm_doorbell, tag; + unsigned long tm_err_handled = 0; + unsigned long tm_done; tm_doorbell = ufshcd_readl(hba, REG_UTP_TASK_REQ_DOOR_BELL); hba->tm_condition = tm_doorbell ^ hba->outstanding_tasks; - wake_up(&hba->tm_wq); + tm_done = hba->tm_condition; + + /* clean resources for timed-out tasks */ + for_each_set_bit(tag, &hba->tm_condition, hba->nutmrs) { + if (test_and_clear_bit(tag, &hba->tm_slots_err)) { + clear_bit(tag, &hba->tm_condition); + ufshcd_put_tm_slot(hba, tag); + ufshcd_outstanding_task_clear(hba, tag); + __set_bit(tag, &tm_err_handled); + } + } + + /* + * Now tag waiters can get free tags if tags were occupied + * by timed-out tasks + */ + if (tm_err_handled) + wake_up(&hba->tm_tag_wq); + + /* if we have normal tasks, they shall have post-processing */ + if (tm_err_handled != tm_done) + wake_up(&hba->tm_wq); } /** @@ -5682,6 +5704,7 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba, if (ufshcd_clear_tm_cmd(hba, free_slot)) dev_WARN(hba->dev, "%s: unable clear tm cmd (slot %d) after timeout\n", __func__, free_slot); + set_bit(free_slot, &hba->tm_slots_err); err = -ETIMEDOUT; } else { err = 0; @@ -5692,12 +5715,13 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba, spin_lock_irqsave(hba->host->host_lock, flags); ufshcd_outstanding_task_clear(hba, free_slot); spin_unlock_irqrestore(hba->host->host_lock, flags); - } - clear_bit(free_slot, &hba->tm_condition); - ufshcd_put_tm_slot(hba, free_slot); - wake_up(&hba->tm_tag_wq); + if (!(test_bit(free_slot, &hba->tm_slots_err))) { + clear_bit(free_slot, &hba->tm_condition); + ufshcd_put_tm_slot(hba, free_slot); + wake_up(&hba->tm_tag_wq); + } ufshcd_release(hba); return err; diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index a43c7135f33d..4e4dfa6e233c 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -645,6 +645,7 @@ struct ufs_hba { wait_queue_head_t tm_tag_wq; unsigned long tm_condition; unsigned long tm_slots_in_use; + unsigned long tm_slots_err; struct uic_command *active_uic_cmd; struct mutex uic_cmd_mutex;