From patchwork Tue Oct 18 18:16:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 4289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp2097881wrs; Tue, 18 Oct 2022 11:19:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LScWXkPWTdNU8yJUqZxY7diNuvKzSwQ/JFcie1hd0gzUTaNrQcUVKpdSdFXEp2/zhV5q9 X-Received: by 2002:a17:90a:e291:b0:20a:acde:1c43 with SMTP id d17-20020a17090ae29100b0020aacde1c43mr5007809pjz.62.1666117196480; Tue, 18 Oct 2022 11:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666117196; cv=none; d=google.com; s=arc-20160816; b=ZbBG3WHD4dyPNPiB/4IGVNmwKAUxmyMQfXJFWN3rgcrCwxUQ9axoWJf6PNPB3XflVW hDUXVX31pIMmHeFSZ3tC87CJaPT0bnb4WesxBfB37mVgt+Th8DALB3s1YpbhfCuqb254 4F8IyoVHjJhuLGcoKvy1MLy/qj4t6BmKO0Sp/RkovK8k1vkDTSRO7KbXWFXbA2rMiLcD yNaC/oHhSeXnrLwOSFI6JMHvs2/RUYn1OjF4rJAB8UhlX0K9W0q/eJ39V5H6yFSzNVnj t1CVBYxxtbTQOwfAyM7fMq6+g1dVIKcL1R9F2Op2lv3q1z5kHPT239QdjiwfxckWdR4j dMYQ== 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=S91eEeMsyosroXGbKbWQ4sKh+HjZ4BdVLK1HuQ79ma4=; b=Mypsk7057Ul0Z6LPAO120NnXmvhksKv+fswBRIj92nIAcEUOpmh5m8dR7T0NLbVgnH EOW74LcxefP68uNTmvAFV4MQE8Imyup8IXAhfKE9KvN892ToWEzl44him8Qr7Sxhp724 6ZDUTxnmAqkCaS+kMNIaXatOXogrweq5GQYApZ2I4WkgP3pskAe+RRrTG6rcwm7CZ3T4 e1RzgSa2Hvp8sKXna3FDTpNEf8AaNAEdI6TZkc+AbvCblit41gcBqhwRNN9gG6xC7e2K idR1/dcPIE2JPE1zxMK9TjYKulFU3zQZRxwBAP5Qf4FPu464//jcHy7ER0H4CCAA82AL wvoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=SMvpMKHA; 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 v9-20020a63b949000000b0045a2b6e1192si16048901pgo.233.2022.10.18.11.19.36; Tue, 18 Oct 2022 11:19:56 -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=SMvpMKHA; 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 S230041AbiJRSQz (ORCPT + 99 others); Tue, 18 Oct 2022 14:16:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbiJRSQr (ORCPT ); Tue, 18 Oct 2022 14:16:47 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F25227D1EF; Tue, 18 Oct 2022 11:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666116999; 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=S91eEeMsyosroXGbKbWQ4sKh+HjZ4BdVLK1HuQ79ma4=; b=SMvpMKHAiIhPyP5VZ0gU8sdbi+TgCK//2f6arD8TC8fRW2PhXWkxHSZ667C2Vqlge8 93fbl9Bnogr5fqRNtQZvkQxDrx5DQNDDtD4NK4LGUg2lH1t57hxG5o7M7f9cBRA3MATX V3e+wAcWVaJq/KdjOK3NuR8pSXUv067QZ3lXaNzfdUM5yPFbzcbKMGImDXAMEZfxeY90 W24yPp4XN67Zck90rj2HGg+w0f5v6WRlVPFimpAcUntjhdudqanc9KzUojurGNrvbz6O xw12dIVIzBTk7JOZc9hKsyMoncVwfcND6+f4+2fJVvuasdHS1IxT4PW+5q3aPHkVCIls yo8Q== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD2QzemV2tdlNlNRZBXiUw=" X-RZG-CLASS-ID: mo01 Received: from linux.micron.com by smtp.strato.de (RZmta 48.2.0 AUTH) with ESMTPSA id zad98cy9IIGcYST (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 18 Oct 2022 20:16:38 +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, huobean@gmail.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] scsi: ufs: core: Remove unnecessary if statement Date: Tue, 18 Oct 2022 20:16:25 +0200 Message-Id: <20221018181627.326657-2-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221018181627.326657-1-beanhuo@iokpp.de> References: <20221018181627.326657-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 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?1747050505217627871?= X-GMAIL-MSGID: =?utf-8?q?1747050505217627871?= From: Bean Huo LUs with WB potential support are properly checked in ufshcd_wb_probe() before calling ufshcd_read_unit_desc_param(), so remove this unnecessary if-checkup in ufs_is_valid_unit_desc_lun() to match its function definition. Signed-off-by: Bean Huo --- 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 7c15cbc737b4..85679e8a043b 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -3609,7 +3609,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 18 18:16:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 4286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp2097316wrs; Tue, 18 Oct 2022 11:18:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6MkTBe3LHOWNph/SAPWtRqOScjEyTHJquLm6rwAuvpj4evOT55DMXqdH1teo2k8TGLB88S X-Received: by 2002:a17:902:f687:b0:185:4163:3368 with SMTP id l7-20020a170902f68700b0018541633368mr4536113plg.25.1666117105349; Tue, 18 Oct 2022 11:18:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666117105; cv=none; d=google.com; s=arc-20160816; b=pqaz0bb4V/O/ZrX8htMW37h1jupgHWOa5zspNn+CNsLZ1M7hy+7ZZuvtfAXRf1f4dB VIIbNXrw19eynDzd//hInM3H+YC9DzU+Q+XJSb1a7qiGxorJxHh8GLJs9vQZTIj0QZps v9U7Xk4creIyEwWl6HxdjgC+/DXRf6FsltcznCDQvYkCJXa/MT+kzcczvBgqCRBLhTri AE+dzCRIpGusUAHmiKj1v0PMotYmfW/jf1nNaK9PzIqYtWaRTOKynmPXez4AZQI0uUfq wZPpqpVQbv+iD049B+TbzVDIAjvt0VEkFyga8Qm5Gfb9maRiqTKfQ5oknXMchSGOntjt K43g== 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=qKNosLNCStNRtibwneALV6KKx+aoKGlw0dZGidzTbSQ=; b=Eu9YcnP0T9NF5lSMePMtkM8CcKkBf36INO+EBEnhS5sNUnUdLkML6M38K5ikChqCAT KBDmYX6wpMv6J5GVi/TnT56bBaSlizMHPtR+2MeSsN76uvgV84d48H0QnmEUC7LZbavO pzsswmR9QgUleWtJ+dEt6ZS9HN31XoPbGaeG7hBayC4RQpJ7tNjj2e+jCcxwudt1WBNX uXtqXzYgvNLKO/u5wciCL7vjz1G5WTaoy6JNxBxT+8sJi4j0ZtzvNw4/o0+F1gmbyrjM +9C78tLkH3VchGY7hvg/+Bkdq3RCy7uluTtiSW/U3SlFVIeWFHGWa7fc+Pdi7Ob+LaDu uaPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=jBttCJuH; 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 g22-20020a63f416000000b004350783ee63si15559207pgi.237.2022.10.18.11.18.09; Tue, 18 Oct 2022 11:18:25 -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=jBttCJuH; 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 S229726AbiJRSQr (ORCPT + 99 others); Tue, 18 Oct 2022 14:16:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbiJRSQq (ORCPT ); Tue, 18 Oct 2022 14:16:46 -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 CE94033436; Tue, 18 Oct 2022 11:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666116999; 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=qKNosLNCStNRtibwneALV6KKx+aoKGlw0dZGidzTbSQ=; b=jBttCJuHwQpaTp5RQBvaEV3Ko/etYrHTeX9W3zztq8PmblxYVXeSsRgR03Kqpzs95G Kbm2PoHsIOg0DvH3/e0PBBC9iIhPVPd9HV35DbTgy00lK9btbCypUiX+ArcaE7sehQMj lJAVM8On8mH2wHxuFC8XImSQ2fIgAwkhBVsuiX6piKfnN/S3zhGQn02WufL/oZQFKuv3 AfAxut7PA4T2S/5LAMT7wGlQPbZiKQ4YEiROMvFJ2gFps6NOo2QQNP+cfzKQ3Xbt6sfb 8jhlKT2p0b2hwAvri3xQkFIXQv48Bgm73reyoVr8izlAoKkAOb+WofSRUzqjKDIMIuAI zXsQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD2QzemV2tdlNlNRZBXiUw=" X-RZG-CLASS-ID: mo02 Received: from linux.micron.com by smtp.strato.de (RZmta 48.2.0 AUTH) with ESMTPSA id zad98cy9IIGdYSU (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 18 Oct 2022 20:16:39 +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, huobean@gmail.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] scsi: ufs: core: Cleanup ufshcd_slave_alloc() Date: Tue, 18 Oct 2022 20:16:26 +0200 Message-Id: <20221018181627.326657-3-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221018181627.326657-1-beanhuo@iokpp.de> References: <20221018181627.326657-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 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?1747050409819691900?= X-GMAIL-MSGID: =?utf-8?q?1747050409819691900?= 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 --- drivers/ufs/core/ufshcd.c | 153 ++++++++++++++------------------------ 1 file changed, 56 insertions(+), 97 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 85679e8a043b..8bf64dea1130 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -4862,100 +4862,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 @@ -4993,6 +4899,61 @@ 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) +{ + u8 lun_qdepth; + u8 *desc_buf; + int ret; + int len; + u8 lun; + + lun_qdepth = hba->nutrs; + lun = ufshcd_scsi_to_upiu_lun(sdev->lun); + len = hba->desc_size[QUERY_DESC_IDN_UNIT]; + + 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 @@ -5020,9 +4981,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 18 18:16:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 4287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp2097487wrs; Tue, 18 Oct 2022 11:18:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7MroLf6pCC9j9cmZonEEldhL6YgT9UVu7xnYl4Pc8aTczyvu/n8c+BDA5p7a7sEJcF1/l7 X-Received: by 2002:a17:90b:1b06:b0:20d:3b10:3817 with SMTP id nu6-20020a17090b1b0600b0020d3b103817mr5072419pjb.43.1666117127886; Tue, 18 Oct 2022 11:18:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666117127; cv=none; d=google.com; s=arc-20160816; b=n6Vp50nlEZrGj/l7JgfYMy2NZ529H9XkGzcF7qChPL/5YTraYahpDb6x1VY2QkiQVQ IgFdec2M8TkUeHXHCDi3NGFfckL7e4v/QK67VicRSA6TR0ea2fq3pSOmixEi5EUYcK5g HvJTZenxsb8xelyR5+sGMX5X7Y1Dukoh5alJpSOee1f2501D6FZK9SOtEYxbZC+AUfed IBCFUjZawBgW7mLRthAy6Qfnm+W+0S4u7sK4WOn3fl8yHjTBPHK7sh0HOps1byjLCTYX vhWntAh6CP9w9PcXyvJe+59g1L8ISL/hRWxaxU6O4uSPDJqa2h83o08kwD/V+wn+rCgY ga4A== 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=fWQgbZey9us7ESK6PQD6XKaBy+xKVXDQ/LVBroNYgfI=; b=LSpT5NmpRqfvdYc12f7lGEfguV2LhcL3fFMOto1ag3O9sLMUZV1/5waYw18XB7quDq hchpCoxN6LarAgZVSuP/LXceQwbMstOPXaOxZT+VMPbDs+rY1YuWjMfSgAXW5MEAYMd5 rOhsWFnVH25uWoYnfiPIKD+aG7ND5ExcBi0DX5BHIjFh6nYngSSJk1bWahVG/vi5P7Mq aylBcBF96hBalOGuSjxA6dnDMJUB2hv4zRtTLYVQA/0PoYgmqisx4sVldPbW+RQaNotc EA1XYVmgAHOZHLNq4D5uGmr4qxlrb1s7UDjm+gf9SVv62accCED/RwVSq67A9buYrizI uADw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=EqMm5bHB; 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 f16-20020a63f110000000b0045fd05b2ce9si12613256pgi.521.2022.10.18.11.18.34; Tue, 18 Oct 2022 11:18:47 -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=EqMm5bHB; 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 S229924AbiJRSQw (ORCPT + 99 others); Tue, 18 Oct 2022 14:16:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229732AbiJRSQr (ORCPT ); Tue, 18 Oct 2022 14:16:47 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F26DD7D1F4; Tue, 18 Oct 2022 11:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666117000; 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=fWQgbZey9us7ESK6PQD6XKaBy+xKVXDQ/LVBroNYgfI=; b=EqMm5bHB0hlVXQl3bSuYXsPhoCM3mhe6EfGhSUfrFKwbyM4j2B8FwR/itIx/6yN0WQ cYTD5pfb5hZ/IivG25IxST+SJWiu7YFr6b/lB0qNdWYqv2vVXxGXKJLS0XiD5/ME6rvB OxoP5flgNUi4CXwGm0A/t3fuXi+FyTE5J/TjP62sTvoNIPkCHaC9iy9UK/0r9n+gvEsB mZxRkdthKFYcaUmU2B2izILiuKJAaruOD36/wKhLahkPRP/qf+L8MCZXcXszyjBKKBmU ZrEAtu2KHAOmpOMTogfRDi6mr9YNYp6V88LZ2NvQHE3gg8GRIXYShcXRTzW4opOgaB21 f4dw== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD2QzemV2tdlNlNRZBXiUw=" X-RZG-CLASS-ID: mo02 Received: from linux.micron.com by smtp.strato.de (RZmta 48.2.0 AUTH) with ESMTPSA id zad98cy9IIGdYSV (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 18 Oct 2022 20:16:39 +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, huobean@gmail.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] scsi: ufs: core: Use is_visible to control UFS unit descriptor sysfs nodes Date: Tue, 18 Oct 2022 20:16:27 +0200 Message-Id: <20221018181627.326657-4-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221018181627.326657-1-beanhuo@iokpp.de> References: <20221018181627.326657-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 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?1747050433472257398?= X-GMAIL-MSGID: =?utf-8?q?1747050433472257398?= From: Bean Huo UFS Boot and Device W-LUs do not have unit descriptors, and PRMB 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 --- 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,