From patchwork Tue Oct 25 22:24:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 10996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1248091wru; Tue, 25 Oct 2022 15:28:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5QZhZ+37kZ3NYTi9P3p4YLnnUJIYjCdUA4WVP7RGoQt/ZNMxIeWg9GuvpYmsla+lJbWjbK X-Received: by 2002:a05:6402:e01:b0:442:dd7e:f49d with SMTP id h1-20020a0564020e0100b00442dd7ef49dmr37173880edh.355.1666736911838; Tue, 25 Oct 2022 15:28:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666736911; cv=none; d=google.com; s=arc-20160816; b=yifqN/7tfJB8QJabL4jRJmwi6cRzpLL0Iwa2oE34KLjWHTkD10hI1YST1IngbOwnqY Wsrq++TsRQZ0/D7Cc+hcmq6wKXvNR65Bkn7Z6a9YOFFhtjw4Uk2uVkP7ZsdVc2G8kq02 HHeCKv32lLgMtJQTRCq9rs65vKRepR6rYTb8bkQAz4vspDAlmYk1UDmafyJMRxU9whc5 SDdOLMxzXNFDOa0QBgSc615cpSwHnNGT3fD3F3hcHXgBv5QccWWAKHZx5RP94efX9fU+ NvZnu3uz8Zbjig5MrJ9tNBIX46dOO5ICA9LO3IQFcBybxCWKMhpaIgJ59Dwe6AhgjQxU Q0Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F+Q9lWsGLwYwprnt2SVEQBWdOSFu9C8P5456RbyUtu8=; b=RmSFcQk4Mq5nVsLoHPufrKtwEsDt7ihQ6MX0/qd573PtZ2WLllifbSAT4Vxofox6Bf x4KHfLy2lFH5IpF7zqDMqfp8c91TZ14g5HpQccGhHzYZRKMfKjUJernljlErfxKOTpSQ a+EaUd0AIIlYPTbduKr2sV9Qy88WuNezvNa4/kBcr4Utk8H1BRxgG2gVA6DHHOeF8noR dypysL1LNc9e/iaZly8XX4r+K4cG7dJ7/z3zRptDDZvzbdA3TDCzTro1uiI4Pnwu4YFz iUAGuYRrNntwdmslKStcDt8BO0yjk9XNH3qhuUYTranQaqevFpnmeZIyZcU4pLe+RXCZ E20g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=h5fLdsDO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fj14-20020a0564022b8e00b00458c5c47070si3408435edb.234.2022.10.25.15.27.56; Tue, 25 Oct 2022 15:28:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=h5fLdsDO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232191AbiJYWZ0 (ORCPT + 99 others); Tue, 25 Oct 2022 18:25:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230075AbiJYWZN (ORCPT ); Tue, 25 Oct 2022 18:25:13 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B62B25E573; Tue, 25 Oct 2022 15:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666736696; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=F+Q9lWsGLwYwprnt2SVEQBWdOSFu9C8P5456RbyUtu8=; b=h5fLdsDOGp5myEJsI9ZyGs2FKKRV7pAhgD0jNzTWPX68T1t9bubwkXppPHF9k6+Zcq c3aHI/nlqpNnhZfsyIXCFLjyrmgKbnZoyDhRvb7fSEsWDmWgOqF5eqOCDwlqGn8t8EfN VwS0xCTBNos7i/Ak0CxBZX6m16CsUZLXLOsygsdjihSZOQpF80Er3BcT+bp2EyqHQo6c WNJdKQNxgNjZBF7ONT0V3FNvNFmoZsVWI/u7SBucww1VKCe+Yxo5w0ORrWXH+YKTNqE+ +LaeUl9Wuo8XGeQWSwG4iKbfQAfdTr9zISpP8GMO8W1cewc3IpzgvC6fESX1Tv3wmlTR szqA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD/R51xABQjgPFtj5ophaE=" X-RZG-CLASS-ID: mo01 Received: from linux.. by smtp.strato.de (RZmta 48.2.1 DYNA|AUTH) with ESMTPSA id z9cfbfy9PMOu2EB (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 26 Oct 2022 00:24:56 +0200 (CEST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org, daejun7.park@samsung.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Jaegeuk Kim , Arthur Simchaev Subject: [PATCH v5 1/3] scsi: ufs: core: Revert "WB is only available on LUN #0 to #7" Date: Wed, 26 Oct 2022 00:24:28 +0200 Message-Id: <20221025222430.277768-2-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221025222430.277768-1-beanhuo@iokpp.de> References: <20221025222430.277768-1-beanhuo@iokpp.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747700323855189388?= X-GMAIL-MSGID: =?utf-8?q?1747700323855189388?= From: Bean Huo A newer 'commit d3d9c4570285 ("scsi: ufs: Fix memory corruption by ufshcd_read_desc_param()")' has properly fixed stack overflow issue, 'commit a2fca52ee640 ("scsi: ufs: WB is only available on LUN #0 to #7")' is no longer required, we can revert it now. Cc: Jaegeuk Kim Signed-off-by: Bean Huo Reviewed-by: Arthur Simchaev Reviewed-by: Bart Van Assche --- drivers/ufs/core/ufs-sysfs.c | 3 +-- drivers/ufs/core/ufshcd-priv.h | 6 +----- drivers/ufs/core/ufshcd.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c index 53aea56d1de1..eb6b278c4e79 100644 --- a/drivers/ufs/core/ufs-sysfs.c +++ b/drivers/ufs/core/ufs-sysfs.c @@ -1234,8 +1234,7 @@ static ssize_t _pname##_show(struct device *dev, \ struct scsi_device *sdev = to_scsi_device(dev); \ struct ufs_hba *hba = shost_priv(sdev->host); \ u8 lun = ufshcd_scsi_to_upiu_lun(sdev->lun); \ - if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun, \ - _duname##_DESC_PARAM##_puname)) \ + if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun)) \ return -EINVAL; \ return ufs_sysfs_read_desc_param(hba, QUERY_DESC_IDN_##_duname, \ lun, _duname##_DESC_PARAM##_puname, buf, _size); \ diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h index f68ca33f6ac7..a9e8e1f5afe7 100644 --- a/drivers/ufs/core/ufshcd-priv.h +++ b/drivers/ufs/core/ufshcd-priv.h @@ -293,16 +293,12 @@ static inline int ufshcd_rpm_put(struct ufs_hba *hba) * @lun: LU number to check * @return: true if the lun has a matching unit descriptor, false otherwise */ -static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info, - u8 lun, u8 param_offset) +static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info, u8 lun) { if (!dev_info || !dev_info->max_lu_supported) { pr_err("Max General LU supported by UFS isn't initialized\n"); return false; } - /* WB is available only for the logical unit from 0 to 7 */ - if (param_offset == UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS) - return lun < UFS_UPIU_MAX_WB_LUN_ID; return lun == UFS_UPIU_RPMB_WLUN || (lun < dev_info->max_lu_supported); } diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index b2203dd79e8c..e8b8b213c420 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -3605,7 +3605,7 @@ static inline int ufshcd_read_unit_desc_param(struct ufs_hba *hba, * Unit descriptors are only available for general purpose LUs (LUN id * from 0 to 7) and RPMB Well known LU. */ - if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun, param_offset)) + if (!ufs_is_valid_unit_desc_lun(&hba->dev_info, lun)) return -EOPNOTSUPP; return ufshcd_read_desc_param(hba, QUERY_DESC_IDN_UNIT, lun, From patchwork Tue Oct 25 22:24:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 10995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1247877wru; Tue, 25 Oct 2022 15:28:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5MtTbaIv7bPLZr8KFGXQT1mHWKHAcBKJ48VNVh5zFog9TqDwsxBG7PuvySrKgLn4njM0dd X-Received: by 2002:a17:906:6791:b0:78d:4051:969f with SMTP id q17-20020a170906679100b0078d4051969fmr34927384ejp.171.1666736888477; Tue, 25 Oct 2022 15:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666736888; cv=none; d=google.com; s=arc-20160816; b=NgbxITL/Pz3j84xiYd3IcwBOdoj5DMrERcv3hZvlWi/o65AlJjuw9/L8fZFfHF5jAN WgLodeG9YE74FMuH7HvdoPKRxySAYZpF8epCNioZMCaRjM7cJeIPzB9PN2xiR1UPcfsn j01Nx7E2UyZvqWjGQUgXDrLqWq5yKZEbIMZAkVVtngszREh1+8ScPR59W9aBfvYmhboF aq/mcCglnyBnlWztDZDdWkTy1IdThXQDewGF9B+zw5uJ6xYydYUeIhZ/ZXfJnXfimO3w 3mwq6aD9g/83GcE0s9eYndME34YMJ3CNEmVGGcMIo5fgpf8M/H1Ld/A5aUBvFawkFKKL m/RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PzH4fq7bJw/i77p2T4QRP9ACEtVytVNCIsTQiqRDr9U=; b=Imr7SiCB+150W6bolbx9y3zfMsZFKvdrguIeB0AUTSJ4izEUzeG9OIoE7U3U78xQ43 E1quK+mPrCcdQY0ZPa+xcLTcQcDas8276B8fREIhsftNZC2drT65Bu/yfD7NAHJ4oXB0 J9t0jNxO4iDbiMQoL9hRMTQvvVUzH8ye7hlm+LZ49JkBYFXAMfnYYc4iHdmuUfVa87VJ GIq+56KPgLAM3HI6EMORdWauIfQ9rSzcaUU/5782clq8qYsxdPK4zLXt5J1xYHPwvuk7 i3r6TZBJ4YvDvZz3L6Fxv9ghGVM0BEsAxUbk1NlDmbyj8ZmurD6+rHTn4FxnJ43VE8r5 zLlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=L2HIwbtw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f5-20020a170906c08500b0077b6ecac099si3329604ejz.287.2022.10.25.15.27.42; Tue, 25 Oct 2022 15:28:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=L2HIwbtw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229714AbiJYWZW (ORCPT + 99 others); Tue, 25 Oct 2022 18:25:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232620AbiJYWZK (ORCPT ); Tue, 25 Oct 2022 18:25:10 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [81.169.146.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ACB94E85F; Tue, 25 Oct 2022 15:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666736696; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=PzH4fq7bJw/i77p2T4QRP9ACEtVytVNCIsTQiqRDr9U=; b=L2HIwbtwyAonDss3H7sgUMYcyZB0/dAJTRduXle/aXZ3l7qWj3xYAXhP2xCuhTTd3d DRrjQijAl4Hqv6uaS/CvvHf1gTeA59d2lPI/yvRFkPsfdRP0Rg5UZT5JazdoMD+GgF8S DUuN+kYh27DfwEiYvvp7WgFg2ZacdMJs9LBpPGLhiviEGOU2VeNuAe3+hBKPmHiH/SJi fHKxt4/2jEjhTq8vmSzP17otRfT7GqzHMdV8Ea2j17AQPJA0ZRXULbxay8Q+n5OgKf4e M447lWxyutlzZ+4aPGAaBVXz6offth1dueONweysEPWwC6lpKv3FLpuNdwAxSoxYZ0Lf sPUA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD/R51xABQjgPFtj5ophaE=" X-RZG-CLASS-ID: mo02 Received: from linux.. by smtp.strato.de (RZmta 48.2.1 DYNA|AUTH) with ESMTPSA id z9cfbfy9PMOu2EC (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 26 Oct 2022 00:24:56 +0200 (CEST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org, daejun7.park@samsung.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Arthur Simchaev Subject: [PATCH v5 2/3] scsi: ufs: core: Cleanup ufshcd_slave_alloc() Date: Wed, 26 Oct 2022 00:24:29 +0200 Message-Id: <20221025222430.277768-3-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221025222430.277768-1-beanhuo@iokpp.de> References: <20221025222430.277768-1-beanhuo@iokpp.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747700299445466972?= X-GMAIL-MSGID: =?utf-8?q?1747700299445466972?= From: Bean Huo Combine ufshcd_get_lu_power_on_wp_status() and ufshcd_set_queue_depth() into one single ufshcd_lu_init(), so that we only need to read the LUN descriptor once. Signed-off-by: Bean Huo Reviewed-by: Arthur Simchaev Reviewed-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 150 ++++++++++++++------------------------ 1 file changed, 53 insertions(+), 97 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index e8b8b213c420..cd55853c0127 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -4858,100 +4858,6 @@ static int ufshcd_verify_dev_init(struct ufs_hba *hba) return err; } -/** - * ufshcd_set_queue_depth - set lun queue depth - * @sdev: pointer to SCSI device - * - * Read bLUQueueDepth value and activate scsi tagged command - * queueing. For WLUN, queue depth is set to 1. For best-effort - * cases (bLUQueueDepth = 0) the queue depth is set to a maximum - * value that host can queue. - */ -static void ufshcd_set_queue_depth(struct scsi_device *sdev) -{ - int ret = 0; - u8 lun_qdepth; - struct ufs_hba *hba; - - hba = shost_priv(sdev->host); - - lun_qdepth = hba->nutrs; - ret = ufshcd_read_unit_desc_param(hba, - ufshcd_scsi_to_upiu_lun(sdev->lun), - UNIT_DESC_PARAM_LU_Q_DEPTH, - &lun_qdepth, - sizeof(lun_qdepth)); - - /* Some WLUN doesn't support unit descriptor */ - if (ret == -EOPNOTSUPP) - lun_qdepth = 1; - else if (!lun_qdepth) - /* eventually, we can figure out the real queue depth */ - lun_qdepth = hba->nutrs; - else - lun_qdepth = min_t(int, lun_qdepth, hba->nutrs); - - dev_dbg(hba->dev, "%s: activate tcq with queue depth %d\n", - __func__, lun_qdepth); - scsi_change_queue_depth(sdev, lun_qdepth); -} - -/* - * ufshcd_get_lu_wp - returns the "b_lu_write_protect" from UNIT DESCRIPTOR - * @hba: per-adapter instance - * @lun: UFS device lun id - * @b_lu_write_protect: pointer to buffer to hold the LU's write protect info - * - * Returns 0 in case of success and b_lu_write_protect status would be returned - * @b_lu_write_protect parameter. - * Returns -ENOTSUPP if reading b_lu_write_protect is not supported. - * Returns -EINVAL in case of invalid parameters passed to this function. - */ -static int ufshcd_get_lu_wp(struct ufs_hba *hba, - u8 lun, - u8 *b_lu_write_protect) -{ - int ret; - - if (!b_lu_write_protect) - ret = -EINVAL; - /* - * According to UFS device spec, RPMB LU can't be write - * protected so skip reading bLUWriteProtect parameter for - * it. For other W-LUs, UNIT DESCRIPTOR is not available. - */ - else if (lun >= hba->dev_info.max_lu_supported) - ret = -ENOTSUPP; - else - ret = ufshcd_read_unit_desc_param(hba, - lun, - UNIT_DESC_PARAM_LU_WR_PROTECT, - b_lu_write_protect, - sizeof(*b_lu_write_protect)); - return ret; -} - -/** - * ufshcd_get_lu_power_on_wp_status - get LU's power on write protect - * status - * @hba: per-adapter instance - * @sdev: pointer to SCSI device - * - */ -static inline void ufshcd_get_lu_power_on_wp_status(struct ufs_hba *hba, - const struct scsi_device *sdev) -{ - if (hba->dev_info.f_power_on_wp_en && - !hba->dev_info.is_lu_power_on_wp) { - u8 b_lu_write_protect; - - if (!ufshcd_get_lu_wp(hba, ufshcd_scsi_to_upiu_lun(sdev->lun), - &b_lu_write_protect) && - (b_lu_write_protect == UFS_LU_POWER_ON_WP)) - hba->dev_info.is_lu_power_on_wp = true; - } -} - /** * ufshcd_setup_links - associate link b/w device wlun and other luns * @sdev: pointer to SCSI device @@ -4989,6 +4895,58 @@ static void ufshcd_setup_links(struct ufs_hba *hba, struct scsi_device *sdev) } } +/** + * ufshcd_lu_init - Initialize the relevant parameters of the LU + * @hba: per-adapter instance + * @sdev: pointer to SCSI device + */ +static void ufshcd_lu_init(struct ufs_hba *hba, struct scsi_device *sdev) +{ + int len = hba->desc_size[QUERY_DESC_IDN_UNIT]; + u8 lun = ufshcd_scsi_to_upiu_lun(sdev->lun); + u8 lun_qdepth = hba->nutrs; + u8 *desc_buf; + int ret; + + desc_buf = kzalloc(len, GFP_KERNEL); + if (!desc_buf) + goto set_qdepth; + + ret = ufshcd_read_unit_desc_param(hba, lun, 0, desc_buf, len); + if (ret < 0) { + if (ret == -EOPNOTSUPP) + /* If LU doesn't support unit descriptor, its queue depth is set to 1 */ + lun_qdepth = 1; + kfree(desc_buf); + goto set_qdepth; + } + + if (desc_buf[UNIT_DESC_PARAM_LU_Q_DEPTH]) { + /* + * In per-LU queueing architecture, bLUQueueDepth will not be 0, then we will + * use the smaller between UFSHCI CAP.NUTRS and UFS LU bLUQueueDepth + */ + lun_qdepth = min_t(int, desc_buf[UNIT_DESC_PARAM_LU_Q_DEPTH], hba->nutrs); + } + /* + * According to UFS device specification, the write protection mode is only supported by + * normal LU, not supported by WLUN. + */ + if (hba->dev_info.f_power_on_wp_en && lun < hba->dev_info.max_lu_supported && + !hba->dev_info.is_lu_power_on_wp && + desc_buf[UNIT_DESC_PARAM_LU_WR_PROTECT] == UFS_LU_POWER_ON_WP) + hba->dev_info.is_lu_power_on_wp = true; + + kfree(desc_buf); +set_qdepth: + /* + * For WLUNs that don't support unit descriptor, queue depth is set to 1. For LUs whose + * bLUQueueDepth == 0, the queue depth is set to a maximum value that host can queue. + */ + dev_dbg(hba->dev, "Set LU %x queue depth %d\n", lun, lun_qdepth); + scsi_change_queue_depth(sdev, lun_qdepth); +} + /** * ufshcd_slave_alloc - handle initial SCSI device configurations * @sdev: pointer to SCSI device @@ -5016,9 +4974,7 @@ static int ufshcd_slave_alloc(struct scsi_device *sdev) /* WRITE_SAME command is not supported */ sdev->no_write_same = 1; - ufshcd_set_queue_depth(sdev); - - ufshcd_get_lu_power_on_wp_status(hba, sdev); + ufshcd_lu_init(hba, sdev); ufshcd_setup_links(hba, sdev); From patchwork Tue Oct 25 22:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 10997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1248529wru; Tue, 25 Oct 2022 15:29:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53Y92cETJTpFT9VaW5O129lwAsJ2brw6QkXzET4hZwtYdFNBkIdawZIokHK8/pAPpLJhjL X-Received: by 2002:a17:907:7e95:b0:78d:e9cf:82c7 with SMTP id qb21-20020a1709077e9500b0078de9cf82c7mr35367887ejc.724.1666736978165; Tue, 25 Oct 2022 15:29:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666736978; cv=none; d=google.com; s=arc-20160816; b=GlilupSIUsUGGQ6hyTf1Eu7/z6o83DtDwi0aGGWuWAjdTjFAf0bR3CVBPThY2ULkEN cVCC7m4w7ypXaY4uHGZNLxFWjwmmmIGQeyWClvimzCXGpKygBCEXJPBGyjdpbBTPVO6g xXYX2N1twVZopqT2sM8GXjE81kmcFL9ZBbApCh1Bl5J4Co4+WBBYu3Damq6HehGUdnRu OGQ2/ZAysrxWVhJ/Ny+mmHVsQ1oq3FRkqEa3t7GNrh45EAfMsisxKVJGxAO/kswsV6cH CYTzZdPHu8+e9ELgIcxCADrMWVkZYej3xT+eeMLqHBoYUodZrgq28au8nB/qwPf/Irlf iJMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mwFtD7LJDHgC11+f0Gx4DGs9WDF8xrFm6PuLut/yrQ0=; b=BrEgjd6xzoDHMwZ77o+Li6mM1hj/qJUpdWLAzkMHZD+RSrxJvQloKqZ33WkjsrU3Wq CYdZ3yFKuGZyC+bU64yePkNRsDBCV8fx1MbafjJyNMjFSCp9c0ML7WAKhkJZ9+zJm2+j rwds9kldxnbXSkd02MNyAN4DqE6XIecSVAlnmA3OMJi7t6oCIDZg10yRQsSMKd5Yrerl Q8CAEh76WZZ54oAZ61gSI6HIiOCdu63P/XsWODEKCNiM/IqGAiDU6gNglpByjUcWe7Kw fblNyJJQrl+eZJaSu8QkH2xvoYM6vkQeKJZWuwTWrdfaVFdYRU5SAKhDhhGIleVEOPcE 7p4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=iNCS6Tqr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rk20-20020a170907215400b0078d3b940ec5si394512ejb.373.2022.10.25.15.29.13; Tue, 25 Oct 2022 15:29:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=iNCS6Tqr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232634AbiJYWZN (ORCPT + 99 others); Tue, 25 Oct 2022 18:25:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232617AbiJYWZG (ORCPT ); Tue, 25 Oct 2022 18:25:06 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A67194E1A4; Tue, 25 Oct 2022 15:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666736696; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=mwFtD7LJDHgC11+f0Gx4DGs9WDF8xrFm6PuLut/yrQ0=; b=iNCS6TqrUcqFcrhknK61EqtR+HPAyGQwQWIQJVVPmi/UwzTL9QL1lvuesso9RF5EuE 6Dmu++rRbqEE5ttDcNnN0o+CT3OzVRsoP5hvrqvsVa3R2qi6T0Kjv5JbZFztRUnRum15 ju7UkuTo0Wevng7wPcJUZmsRu4AtRnetB/r3By8nLMLqyGCKBDXbcWBPwv1kFmaM7tvM UMQ98YuEGMP+GAzev2Yj+X4Ji/4+Mk0AO8Q+pPaZv6ileOfrUCDbEeCkE2xUn21lSg+2 GnmN0aHCJIwPWiS5+KlRyH2yC7BEW4GPaOrmlSySYGuIXeyc5kWIsrvAt3jdzNXU0G2d McKQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD/R51xABQjgPFtj5ophaE=" X-RZG-CLASS-ID: mo02 Received: from linux.. by smtp.strato.de (RZmta 48.2.1 DYNA|AUTH) with ESMTPSA id z9cfbfy9PMOu2ED (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 26 Oct 2022 00:24:56 +0200 (CEST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org, daejun7.park@samsung.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Arthur Simchaev Subject: [PATCH v5 3/3] scsi: ufs: core: Use is_visible to control UFS unit descriptor sysfs nodes Date: Wed, 26 Oct 2022 00:24:30 +0200 Message-Id: <20221025222430.277768-4-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221025222430.277768-1-beanhuo@iokpp.de> References: <20221025222430.277768-1-beanhuo@iokpp.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747700393492277335?= X-GMAIL-MSGID: =?utf-8?q?1747700393492277335?= From: Bean Huo UFS Boot and Device W-LUs do not have unit descriptors, and RPMB does not support WB, we can use is_visible() to control which nodes are visible and which are not. Signed-off-by: Bean Huo Reviewed-by: Bart Van Assche Reviewed-by: Arthur Simchaev --- drivers/ufs/core/ufs-sysfs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/ufs/core/ufs-sysfs.c b/drivers/ufs/core/ufs-sysfs.c index eb6b278c4e79..883f0e44b54e 100644 --- a/drivers/ufs/core/ufs-sysfs.c +++ b/drivers/ufs/core/ufs-sysfs.c @@ -1285,9 +1285,27 @@ static struct attribute *ufs_sysfs_unit_descriptor[] = { NULL, }; +static umode_t ufs_unit_descriptor_is_visible(struct kobject *kobj, struct attribute *attr, int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); + struct scsi_device *sdev = to_scsi_device(dev); + u8 lun = ufshcd_scsi_to_upiu_lun(sdev->lun); + umode_t mode = attr->mode; + + if (lun == UFS_UPIU_BOOT_WLUN || lun == UFS_UPIU_UFS_DEVICE_WLUN) + /* Boot and device WLUN have no unit descriptors */ + mode = 0; + if (lun == UFS_UPIU_RPMB_WLUN && attr == &dev_attr_wb_buf_alloc_units.attr) + mode = 0; + + return mode; +} + + const struct attribute_group ufs_sysfs_unit_descriptor_group = { .name = "unit_descriptor", .attrs = ufs_sysfs_unit_descriptor, + .is_visible = ufs_unit_descriptor_is_visible, }; static ssize_t dyn_cap_needed_attribute_show(struct device *dev,