From patchwork Fri Jul 29 04:54:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinyoung CHOI X-Patchwork-Id: 594457 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 596A4C00144 for ; Fri, 29 Jul 2022 04:54:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234017AbiG2Eyk (ORCPT ); Fri, 29 Jul 2022 00:54:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233742AbiG2Eyh (ORCPT ); Fri, 29 Jul 2022 00:54:37 -0400 Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7C5F7AB0B for ; Thu, 28 Jul 2022 21:54:36 -0700 (PDT) Received: from epcas2p1.samsung.com (unknown [182.195.41.53]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20220729045435epoutp03af465d29c0617c07f55ed834434afd61~GM86g-A0A1168911689epoutp03t for ; Fri, 29 Jul 2022 04:54:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20220729045435epoutp03af465d29c0617c07f55ed834434afd61~GM86g-A0A1168911689epoutp03t DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1659070475; bh=QDiYBDTeTdIYKBU1cs/MPkuOSczpiCApYohCod9JSmE=; h=Subject:Reply-To:From:To:In-Reply-To:Date:References:From; b=L6GQkFuuu2Ks1BorW32XwQ5GjslGgzzsljtP1K1AtLyXwVpZfLNMmIKOy8bkYt1Xn Ar0y5hzd71PjaVQ0p/Wzp3976C5JnIc0Rs1jOwwdLzZX9OJmGB5f5WmMPmoOZpzXlU dseCpP1fbrrQ0PPcSzAttrqeTVe5ll5l/vxqJDlQ= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20220729045434epcas2p3495ed2b92f2be067dadd9f4c671e2832~GM85hLFnv2727027270epcas2p3t; Fri, 29 Jul 2022 04:54:34 +0000 (GMT) Received: from epsmges2p4.samsung.com (unknown [182.195.36.89]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4LvFYP47kxz4x9QC; Fri, 29 Jul 2022 04:54:33 +0000 (GMT) X-AuditID: b6c32a48-9f7ff700000025be-b9-62e36809031e Received: from epcas2p3.samsung.com ( [182.195.41.55]) by epsmges2p4.samsung.com (Symantec Messaging Gateway) with SMTP id 33.42.09662.90863E26; Fri, 29 Jul 2022 13:54:33 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH v5 2/6] scsi: ufs: wb: Change functions name and modify parameter name Reply-To: j-young.choi@samsung.com Sender: Jinyoung CHOI From: Jinyoung CHOI To: ALIM AKHTAR , "avri.altman@wdc.com" , "bvanassche@acm.org" , "jejb@linux.ibm.com" , "martin.petersen@oracle.com" , "beanhuo@micron.com" , "adrian.hunter@intel.com" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" X-Priority: 3 X-Content-Kind-Code: NORMAL In-Reply-To: <20220729045252epcms2p7fee5c1cdca5e4bef02a833e40f80649b@epcms2p7> X-CPGS-Detection: blocking_info_exchange X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20220729045433epcms2p77ff2cdde6ddffd9ab0b0810ebe84f0e5@epcms2p7> Date: Fri, 29 Jul 2022 13:54:33 +0900 X-CMS-MailID: 20220729045433epcms2p77ff2cdde6ddffd9ab0b0810ebe84f0e5 X-Sendblock-Type: AUTO_CONFIDENTIAL X-CPGSPASS: Y X-CPGSPASS: Y CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDJsWRmVeSWpSXmKPExsWy7bCmuS5nxuMkg4+n5S1OPlnDZvFg3jY2 i5c/r7JZHHzYyWIx7cNPZouXhzQtFt3YxmRxedccNovu6zvYLJYf/8fkwOVx+Yq3x+I9L5k8 Jiw6wOjxfX0Hm8fHp7dYPPq2rGL0+LxJzqP9QDdTAEdUtk1GamJKapFCal5yfkpmXrqtkndw vHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0IlKCmWJOaVAoYDE4mIlfTubovzSklSFjPzi Elul1IKUnALzAr3ixNzi0rx0vbzUEitDAwMjU6DChOyMht0b2Ap+yVScWXKWtYFxvUQXIweH hICJxL2dwV2MXBxCAjsYJdZt3MUEEucVEJT4u0O4i5GTQ1ggQqLjRiMziC0koCRxbs0sRpAS YQEDiVu95iBhNgE9iZ9LZrCBjBEROMsssfDhFCaQhIQAr8SM9qcsELa0xPblWxlBbE4BP4lD 73sZIeIaEj+W9TJD2KISN1e/ZYex3x+bD1UjItF67yxUjaDEg5+7oeKSEocOfWWDeCVfYsOB QIhwjcTb5QegSvQlrnVsBDuBV8BX4tqzBlaQchYBVYnLm2sgOl0kphzmAqlgFpCX2P52DjNI mFlAU2L9Ln2ICmWJI7dYYF5q2PibHZ3NLMAn0XH4L1x8x7wnTBCtahKLmowgwjISXw/PZ5/A qDQLEcazkKydhbB2ASPzKkax1ILi3PTUYqMCE3isJufnbmIEJ1Mtjx2Ms99+0DvEyMTBeIhR goNZSYRXIOBxkhBvSmJlVWpRfnxRaU5q8SFGU6B3JzJLiSbnA9N5Xkm8oYmlgYmZmaG5kamB uZI4r1fKhkQhgfTEktTs1NSC1CKYPiYOTqkGJnmDwC/Swp4ritp/zsm20GWxsrnLphNurLot Ju+3xZemA/cPOHCLbsqNtrXz/nI/2qojq3H/8qYI9zuzNP1mpy+5qOa5cUa1par+sVfPnvdN +yur3Fzg0P7VM67wN0Nhws4u9vXMHFOCzMxX+hzumbJPdWHVS6eZVntOTe2w4V2ozXco2EXa /HG+X9+x65f3fReVWbx6VWLAz0fWcnzf+3xWutx28X1w7ajoJjGPFAe5imSJDrcnYnl9lYcy 90/qmMceLvZkyYLD2UeZxE04P3tculhQYiGzoGLyrobLal+c6lNfZr6d9CXixQfJE0wHd9Qf Tn36ddqmxTNld3gqTX2wh+2PFMvl5idJ7qyXlFiKMxINtZiLihMBt6ztyi8EAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20220729045045epcms2p8caf00317889ed4da8531b7466ec6e368 References: <20220729045252epcms2p7fee5c1cdca5e4bef02a833e40f80649b@epcms2p7> <20220729045045epcms2p8caf00317889ed4da8531b7466ec6e368@epcms2p8> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The parameter name of ufshcd_wb_toggle_flush_during_h8() has been changed in the same as other toggle functions. Function names were ambiguous. So changed to suit the meaning. Reviewed-by: Avri Altman Signed-off-by: Jinyoung Choi --- drivers/ufs/core/ufshcd.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index bbf12aa6a5ae..a14d3fe39570 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -265,8 +265,9 @@ static int ufshcd_setup_vreg(struct ufs_hba *hba, bool on); static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba, struct ufs_vreg *vreg); static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag); -static void ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set); -static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable); +static void ufshcd_wb_toggle_buf_flush_during_h8(struct ufs_hba *hba, + bool enable); +static void ufshcd_wb_toggle_buf_flush(struct ufs_hba *hba, bool enable); static void ufshcd_hba_vreg_set_lpm(struct ufs_hba *hba); static void ufshcd_hba_vreg_set_hpm(struct ufs_hba *hba); @@ -286,16 +287,16 @@ static inline void ufshcd_disable_irq(struct ufs_hba *hba) } } -static inline void ufshcd_wb_config(struct ufs_hba *hba) +static void ufshcd_wb_set_default_flags(struct ufs_hba *hba) { if (!ufshcd_is_wb_allowed(hba)) return; ufshcd_wb_toggle(hba, true); - ufshcd_wb_toggle_flush_during_h8(hba, true); + ufshcd_wb_toggle_buf_flush_during_h8(hba, true); if (!(hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)) - ufshcd_wb_toggle_flush(hba, true); + ufshcd_wb_toggle_buf_flush(hba, true); } static void ufshcd_scsi_unblock_requests(struct ufs_hba *hba) @@ -5748,22 +5749,23 @@ int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable) return ret; } -static void ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set) +static void ufshcd_wb_toggle_buf_flush_during_h8(struct ufs_hba *hba, + bool enable) { int ret; - ret = __ufshcd_wb_toggle(hba, set, + ret = __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8); if (ret) { dev_err(hba->dev, "%s: WB-Buf Flush during H8 %s failed: %d\n", - __func__, set ? "enable" : "disable", ret); + __func__, enable ? "enable" : "disable", ret); return; } dev_dbg(hba->dev, "%s WB-Buf Flush during H8 %s\n", - __func__, set ? "enabled" : "disabled"); + __func__, enable ? "enabled" : "disabled"); } -static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable) +static void ufshcd_wb_toggle_buf_flush(struct ufs_hba *hba, bool enable) { int ret; @@ -5813,9 +5815,9 @@ static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba, static void ufshcd_wb_force_disable(struct ufs_hba *hba) { if (!(hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)) - ufshcd_wb_toggle_flush(hba, false); + ufshcd_wb_toggle_buf_flush(hba, false); - ufshcd_wb_toggle_flush_during_h8(hba, false); + ufshcd_wb_toggle_buf_flush_during_h8(hba, false); ufshcd_wb_toggle(hba, false); hba->caps &= ~UFSHCD_CAP_WB_EN; @@ -8212,7 +8214,9 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) */ ufshcd_set_active_icc_lvl(hba); - ufshcd_wb_config(hba); + /* Enable UFS Write Booster if supported */ + ufshcd_wb_set_default_flags(hba); + if (hba->ee_usr_mask) ufshcd_write_ee_control(hba); /* Enable Auto-Hibernate if configured */ From patchwork Fri Jul 29 04:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinyoung CHOI X-Patchwork-Id: 594456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A36DC00144 for ; Fri, 29 Jul 2022 04:57:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234037AbiG2E5D (ORCPT ); Fri, 29 Jul 2022 00:57:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234027AbiG2E5C (ORCPT ); Fri, 29 Jul 2022 00:57:02 -0400 Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F1287B795 for ; Thu, 28 Jul 2022 21:57:00 -0700 (PDT) Received: from epcas2p3.samsung.com (unknown [182.195.41.55]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20220729045658epoutp02134bd5dbcc151d77a0a90c8d21b7611e~GM-ACiXxN0801408014epoutp02_ for ; Fri, 29 Jul 2022 04:56:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20220729045658epoutp02134bd5dbcc151d77a0a90c8d21b7611e~GM-ACiXxN0801408014epoutp02_ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1659070618; bh=gW7j82RhlhznlAP4QTs59f+Tb5vwBEAzdSOhNq4apdk=; h=Subject:Reply-To:From:To:In-Reply-To:Date:References:From; b=BWegHYhXI2qrzsl3iUTt5sa45WC6fCtz53W2W4Iuum57RlVEU7zZginU98lh2da4T GxbqkOHaK1FP7Ig53dinRVFn5Gm3ZCtlANtXAdYS5UZQ6B245+WjVH9MGG0y6vX+lI +qs0iynAke+qnnF6vN4ixEMlQ83W8M9z1XQTVIwc= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20220729045657epcas2p1c2447fe304552907a3ea0ec4c05574f4~GM__2Ndvl1958819588epcas2p1j; Fri, 29 Jul 2022 04:56:57 +0000 (GMT) Received: from epsmges2p4.samsung.com (unknown [182.195.36.92]) by epsnrtp1.localdomain (Postfix) with ESMTP id 4LvFc85zYGz4x9Q8; Fri, 29 Jul 2022 04:56:56 +0000 (GMT) X-AuditID: b6c32a48-9f7ff700000025be-e8-62e36898d73c Received: from epcas2p4.samsung.com ( [182.195.41.56]) by epsmges2p4.samsung.com (Symantec Messaging Gateway) with SMTP id 09.63.09662.89863E26; Fri, 29 Jul 2022 13:56:56 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH v5 4/6] scsi: ufs: wb: Add ufshcd_is_wb_buf_flush_allowed() Reply-To: j-young.choi@samsung.com Sender: Jinyoung CHOI From: Jinyoung CHOI To: ALIM AKHTAR , "avri.altman@wdc.com" , "bvanassche@acm.org" , "jejb@linux.ibm.com" , "martin.petersen@oracle.com" , "beanhuo@micron.com" , "adrian.hunter@intel.com" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" X-Priority: 3 X-Content-Kind-Code: NORMAL In-Reply-To: <20220729045600epcms2p45c0f8a5a0a76c7fe85b0961570de89ce@epcms2p4> X-CPGS-Detection: blocking_info_exchange X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20220729045656epcms2p1e6912ae09ca2122d4d04854878e19b2c@epcms2p1> Date: Fri, 29 Jul 2022 13:56:56 +0900 X-CMS-MailID: 20220729045656epcms2p1e6912ae09ca2122d4d04854878e19b2c X-Sendblock-Type: AUTO_CONFIDENTIAL X-CPGSPASS: Y X-CPGSPASS: Y CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHJsWRmVeSWpSXmKPExsWy7bCmhe6MjMdJBn/vaVmcfLKGzeLBvG1s Fi9/XmWzOPiwk8Vi2oefzBYvD2laLLqxjcni8q45bBbd13ewWSw//o/Jgcvj8hVvj8V7XjJ5 TFh0gNHj+/oONo+PT2+xePRtWcXo8XmTnEf7gW6mAI6obJuM1MSU1CKF1Lzk/JTMvHRbJe/g eOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoBOVFMoSc0qBQgGJxcVK+nY2RfmlJakKGfnF JbZKqQUpOQXmBXrFibnFpXnpenmpJVaGBgZGpkCFCdkZszf/Zi74LFwx+fBRtgbGiYJdjJwc EgImEpP+bGbrYuTiEBLYwSjx/M9Jxi5GDg5eAUGJvzuEQWqEBbwlus60s4PYQgJKEufWzAIr ERYwkLjVaw4SZhPQk/i5ZAbYGBGBs8wSCx9OYYKYzysxo/0pC4QtLbF9+VZGEJtTwE9izYSZ zBBxDYkfy3qhbFGJm6vfssPY74/NZ4SwRSRa752FqhGUePBzN1RcUuLQoa9sIPdICORLbDgQ CBGukXi7/ABUib7EtY6NLBBf+Ups/hgPEmYRUJWY9mwJK0SJi8Tnh9/ApjMLyEtsfzuHGaSc WUBTYv0ufYjhyhJHbrHA/NSw8Tc7OptZgE+i4/BfuPiOeU+YIFrVJBY1GUGEZSS+Hp7PPoFR aRYikGchWTsLYe0CRuZVjGKpBcW56anFRgUm8HhNzs/dxAhOqFoeOxhnv/2gd4iRiYPxEKME B7OSCK9AwOMkId6UxMqq1KL8+KLSnNTiQ4ymQA9PZJYSTc4HpvS8knhDE0sDEzMzQ3MjUwNz JXFer5QNiUIC6YklqdmpqQWpRTB9TBycUg1MdfZFS6derjDkPJQVPyH87sUJc3b2P36n9vP3 Ed3T5W0+/MEb/q7tbn51e27osey+02dkv75M53vYrfA3gWXuwVgnLWnOS2ImlbkLe/d4xV+c Oqeu/Z2A7n79tS5v/oVFMxo9apn3+bW0ZOnPdfe8GV6UdbCu2ckjqpkoUn3FlW3fx7MLNnYx nLyzYO6pDz9Mo/nvFpi6LdFlZeoOW/LOcsVtU8u+O5FrHwsZqP0JOxpnEtJw2PaPxdzayk1l 62oYuT5qN33YHORszV/AxPqXfdecn/r+7SG+vjukhT8+uRnq/fY5S9fmjFW85etv3avmCnta rvM48VNsyKmrXZYv54cuFlCxX/aHyz7w3b51SizFGYmGWsxFxYkA5sFQwDEEAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20220729045045epcms2p8caf00317889ed4da8531b7466ec6e368 References: <20220729045600epcms2p45c0f8a5a0a76c7fe85b0961570de89ce@epcms2p4> <20220729045433epcms2p77ff2cdde6ddffd9ab0b0810ebe84f0e5@epcms2p7> <20220729045252epcms2p7fee5c1cdca5e4bef02a833e40f80649b@epcms2p7> <20220729045045epcms2p8caf00317889ed4da8531b7466ec6e368@epcms2p8> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The explicit flushing should check the following. - UFSHCD_CAP_WB_EN - UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL Changed to improve readability. Acked-by: Bean Huo Reviewed-by: Avri Altman Signed-off-by: Jinyoung Choi --- drivers/ufs/core/ufs-sysfs.c | 3 +-- drivers/ufs/core/ufshcd-priv.h | 6 ++++++ drivers/ufs/core/ufshcd.c | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c index 920094665f4d..63b02b2541c8 100644 --- a/drivers/ufs/core/ufs-sysfs.c +++ b/drivers/ufs/core/ufs-sysfs.c @@ -271,8 +271,7 @@ static ssize_t wb_buf_flush_en_store(struct device *dev, unsigned int wb_buf_flush_en; ssize_t res; - if (!ufshcd_is_wb_allowed(hba) || - (hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)) { + if (!ufshcd_is_wb_buf_flush_allowed(hba)) { dev_warn(dev, "It is not allowed to configure WB buf flush!\n"); return -EOPNOTSUPP; } diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h index 8f67db202d7b..d00dba17297d 100644 --- a/drivers/ufs/core/ufshcd-priv.h +++ b/drivers/ufs/core/ufshcd-priv.h @@ -26,6 +26,12 @@ static inline u8 ufshcd_wb_get_query_index(struct ufs_hba *hba) return 0; } +static inline bool ufshcd_is_wb_buf_flush_allowed(struct ufs_hba *hba) +{ + return ufshcd_is_wb_allowed(hba) && + !(hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL); +} + #ifdef CONFIG_SCSI_UFS_HWMON void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask); void ufs_hwmon_remove(struct ufs_hba *hba); diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 36d4708eaee0..584e246c769a 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -294,7 +294,8 @@ static void ufshcd_wb_set_default_flags(struct ufs_hba *hba) ufshcd_wb_toggle(hba, true); ufshcd_wb_toggle_buf_flush_during_h8(hba, true); - if (!(hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)) + + if (ufshcd_is_wb_buf_flush_allowed(hba)) ufshcd_wb_toggle_buf_flush(hba, true); } @@ -5815,7 +5816,7 @@ static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba, static void ufshcd_wb_force_disable(struct ufs_hba *hba) { - if (!(hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)) + if (ufshcd_is_wb_buf_flush_allowed(hba)) ufshcd_wb_toggle_buf_flush(hba, false); ufshcd_wb_toggle_buf_flush_during_h8(hba, false); From patchwork Fri Jul 29 04:59:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinyoung CHOI X-Patchwork-Id: 594455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6CA5C00144 for ; Fri, 29 Jul 2022 04:59:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234152AbiG2E7R (ORCPT ); Fri, 29 Jul 2022 00:59:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234091AbiG2E7R (ORCPT ); Fri, 29 Jul 2022 00:59:17 -0400 Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C95237B7A2 for ; Thu, 28 Jul 2022 21:59:15 -0700 (PDT) Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20220729045914epoutp01367b0b70d1fa82da8fdf7e489d4f8240~GNA_XwrAM0800408004epoutp01U for ; Fri, 29 Jul 2022 04:59:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20220729045914epoutp01367b0b70d1fa82da8fdf7e489d4f8240~GNA_XwrAM0800408004epoutp01U DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1659070754; bh=YaD5HG56b5yJxD/KEWPhhO1TGGVsj5lqfE49GcpKrwE=; h=Subject:Reply-To:From:To:In-Reply-To:Date:References:From; b=js8RYgJ2yhX7Ifk5muuaVnw5rR7ahfersrIwj7Ct1WiL2YXTytrjT++GQQEqrR++z XJJ5nBT2nbVHzdM8oUnZIiBgeU/wtEOToqm5Ta86Ou+zeVCehH39SKcR8e//mMnsS5 7mnk5uqAsBEqKbmX4tVU5PAgQDyac2nO4EgKSPXc= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20220729045913epcas2p1e58c1bbde95037ae2bf7db225f737423~GNA94mBC40569905699epcas2p1w; Fri, 29 Jul 2022 04:59:13 +0000 (GMT) Received: from epsmges2p2.samsung.com (unknown [182.195.36.101]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4LvFfn3GCQz4x9Py; Fri, 29 Jul 2022 04:59:13 +0000 (GMT) X-AuditID: b6c32a46-0a3ff700000025b2-05-62e36921e021 Received: from epcas2p4.samsung.com ( [182.195.41.56]) by epsmges2p2.samsung.com (Symantec Messaging Gateway) with SMTP id 8B.42.09650.12963E26; Fri, 29 Jul 2022 13:59:13 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH v5 6/6] scsi: ufs: wb: Move the comment to the right position Reply-To: j-young.choi@samsung.com Sender: Jinyoung CHOI From: Jinyoung CHOI To: ALIM AKHTAR , "avri.altman@wdc.com" , "bvanassche@acm.org" , "jejb@linux.ibm.com" , "martin.petersen@oracle.com" , "beanhuo@micron.com" , "adrian.hunter@intel.com" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" X-Priority: 3 X-Content-Kind-Code: NORMAL In-Reply-To: <20220729045756epcms2p40a1baa2c6bf17772023ccec20aef3f0a@epcms2p4> X-CPGS-Detection: blocking_info_exchange X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20220729045913epcms2p598edffb67d42db84526acce0a5a9ce5d@epcms2p5> Date: Fri, 29 Jul 2022 13:59:13 +0900 X-CMS-MailID: 20220729045913epcms2p598edffb67d42db84526acce0a5a9ce5d X-Sendblock-Type: AUTO_CONFIDENTIAL X-CPGSPASS: Y X-CPGSPASS: Y CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHJsWRmVeSWpSXmKPExsWy7bCmha5i5uMkg1+PJSxOPlnDZvFg3jY2 i5c/r7JZHHzYyWIx7cNPZouXhzQtFt3YxmRxedccNovu6zvYLJYf/8fkwOVx+Yq3x+I9L5k8 Jiw6wOjxfX0Hm8fHp7dYPPq2rGL0+LxJzqP9QDdTAEdUtk1GamJKapFCal5yfkpmXrqtkndw vHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0IlKCmWJOaVAoYDE4mIlfTubovzSklSFjPzi Elul1IKUnALzAr3ixNzi0rx0vbzUEitDAwMjU6DChOyM81+WshYsZas4uOAHawPjLNYuRk4O CQETiQdHfzF3MXJxCAnsYJRY3HkcKMHBwSsgKPF3hzBIjbCAv8TEebsZQWwhASWJc2tmMYKU CAsYSNzqNQcJswnoSfxcMoMNZIyIwFlmiYUPpzBBzOeVmNH+lAXClpbYvnwrWC+ngJ/E9X2F EGENiR/LepkhbFGJm6vfssPY74/NZ4SwRSRa752FqhGUePBzN1RcUuLQoa9sICMlBPIlNhwI hAjXSLxdfgCqRF/iWsdGsAt4BXwlOjpPg9ksAqoS9zachKpxkZjz/BRYnFlAXmL72znMICOZ BTQl1u/Sh5iuLHHkFgvMTw0bf7Ojs5kF+CQ6Dv+Fi++Y94QJolVNYlGTEURYRuLr4fnsExiV ZiECeRaStbMQ1i5gZF7FKJZaUJybnlpsVGAEj9fk/NxNjOCEquW2g3HK2w96hxiZOBgPMUpw MCuJ8AoEPE4S4k1JrKxKLcqPLyrNSS0+xGgK9PBEZinR5HxgSs8riTc0sTQwMTMzNDcyNTBX Euf1StmQKCSQnliSmp2aWpBaBNPHxMEp1cDEPWWD1vJtR1ZLWVzt4Kx4ZcSxV7XWK2wNi/Zn hk9f43siP8acE5z/s2Xby++mRo9ipOfucDh+2H/xpws/b32sODG9bsqcA9kaj+++0uqeY5Xs b8R6JVd/CfuT3ReqqkTMHhU1/wnYOme54Ufphi1yCr6/bzsxFUzX5BTp9Ki7vcXyXZtz30nP Z7U3s+8lrLjdrt6wVO8QT9aBxuivlxuPGLMz82g1Zmbv2n/5kGbbC3WTytxPvi68aqqpndyS mQIfrHqZHq7WPlG/fotMxZ1+T4WszB+/P+Rdr9b9VnPlt9zuowuM/xYm1nXJfbY9dal7tzHr DO29AdcKm/n63v9hnhyk+PnUFYUnJ8SuTkpUYinOSDTUYi4qTgQAY56rkjEEAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20220729045045epcms2p8caf00317889ed4da8531b7466ec6e368 References: <20220729045756epcms2p40a1baa2c6bf17772023ccec20aef3f0a@epcms2p4> <20220729045656epcms2p1e6912ae09ca2122d4d04854878e19b2c@epcms2p1> <20220729045600epcms2p45c0f8a5a0a76c7fe85b0961570de89ce@epcms2p4> <20220729045433epcms2p77ff2cdde6ddffd9ab0b0810ebe84f0e5@epcms2p7> <20220729045252epcms2p7fee5c1cdca5e4bef02a833e40f80649b@epcms2p7> <20220729045045epcms2p8caf00317889ed4da8531b7466ec6e368@epcms2p8> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The location of the comment is wrong. so fix it. Reviewed-by: Avri Altman Signed-off-by: Jinyoung Choi --- drivers/ufs/core/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 309f93122078..4120617ff7a6 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -1298,9 +1298,10 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up) } } - /* Enable Write Booster if we have scaled up else disable it */ downgrade_write(&hba->clk_scaling_lock); is_writelock = false; + + /* Enable Write Booster if we have scaled up else disable it */ ufshcd_wb_toggle(hba, scale_up); out_unprepare: