From patchwork Sat Oct 22 21:36:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 7944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1364182wrr; Sat, 22 Oct 2022 14:47:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM602bVlZiA9ppEoyqoBnhGnm2usIIqOyzCFHU9esrBrxgRJr1hPYjeVLkZJ5Btj2i2iv+tC X-Received: by 2002:a17:907:845:b0:731:2f6c:6dbd with SMTP id ww5-20020a170907084500b007312f6c6dbdmr21140994ejb.551.1666475243453; Sat, 22 Oct 2022 14:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666475243; cv=none; d=google.com; s=arc-20160816; b=FDx0pvlDJ9IfZjSkKMGsqERgWjl37k5QikDI42m/qXd8x3lzajALcYIIjRjmcEx98F VfTpQUs1UoceTnyvJ88GUkVWV1uLmSa3e2eEb6/UvfzAT/F2MSptW5r7v01zZIlEVDzK 3hefIzOgC+c7XdmZJ95PuQRBanByxuFZ2gBnLt/dXVe7aWvWmAD4I13T3QDdnQ869Imz 8V6WoWIiJPzHK2aIcLE1tbFGMlfUkYMjRhpIXLjo4KS6tjwYm+X+TnamjIzZ8PoxEuqK cJrT1hSMYmfnUTPgkRp83FlL2csGNEfFl34sopCwJgLkre8Po3VWZ/BsJ7ua+p3PG+XD yK5w== 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=eWlJe8HaDj7UMQMSuvru7CEn5kVh7Q+O8gFfZxYR4ss=; b=a6WjYIaQTwyzBc8OxqgAW1YOZcNvIHG45tUQzW+QppC5o90wtXVblCEPnNyW8jL9J+ fpxEgR0PiC9XjMp68fQG1Vr3+XOZ1SRi3PNt9xQr97E908GEbXaYXQdmRduPHRW+OKLk jmfUvGoHDN6OLO1bpvzcGPow1MHrLCVhcEys+UezAOWLe/Zy0lIZdUindBxheBw3N3Ve LF26PUTlS67SteDTF5w2oCa/qYEd537u0lwmx+Jc64tsQPVKUtM8P9ZBdmKkfLLT7g6y 3uo6oTVbKsLWiqB2ZhrLuz79cus9rVIYVTnLwTu5nMeQT1RWkwRip+2kGKYUq87S30Nb 77XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=TuKubelJ; 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 i19-20020a170906445300b0078d9cec6a5asi20989975ejp.191.2022.10.22.14.46.59; Sat, 22 Oct 2022 14:47:23 -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=TuKubelJ; 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 S229987AbiJVVhV (ORCPT + 99 others); Sat, 22 Oct 2022 17:37:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbiJVVhN (ORCPT ); Sat, 22 Oct 2022 17:37:13 -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 1C5B1FA037; Sat, 22 Oct 2022 14:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1666474619; 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=eWlJe8HaDj7UMQMSuvru7CEn5kVh7Q+O8gFfZxYR4ss=; b=TuKubelJ4OzH/d4vDhimN6wQrEiX72oPO+ZD24Mg0nSoxjbt7ZXGVrpIxZqy0vwpyE YpECa9AW6syS8j7WevAN15ck6usowCi7yvSPw6oWCKvmrgXxLu5Ur58Ns/EfrmkTqx8U 0NCZLV9SOEkRRHjw9HGKS6+filLYDy9F6zc2fhJczyeuocgn6pXLK6ZPW+ntBOwIi3j+ Z8ue8K2p8HZ03rL/8Zv3fw0usGM6WkteG4wQWVhkR/FafZ+MksdjYUo7SNJOvzLrBjJ8 s75F794WJ+tBVVhtxhGBA5LiNfO5mBlOhr92ZwThTI+u0zdS6JNBR/h7VODU6T1UzLaS 6Rmg== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD/R51xABQjgP5pGGXp2Dw=" X-RZG-CLASS-ID: mo01 Received: from linux.. by smtp.strato.de (RZmta 48.2.0 DYNA|AUTH) with ESMTPSA id zad98cy9MLaxnUT (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sat, 22 Oct 2022 23:36:59 +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 Subject: [PATCH v4 1/3] scsi: ufs: core: Revert "WB is only available on LUN #0 to #7" Date: Sat, 22 Oct 2022 23:36:48 +0200 Message-Id: <20221022213650.626766-2-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221022213650.626766-1-beanhuo@iokpp.de> References: <20221022213650.626766-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?1747425944509498051?= X-GMAIL-MSGID: =?utf-8?q?1747425944509498051?= From: Bean Huo One 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 c8f0fe740005..8cdba9a54870 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -3606,7 +3606,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,