From mboxrd@z Thu Jan 1 00:00:00 1970 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 6CBB8C433EF for ; Sun, 24 Jul 2022 07:01:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236280AbiGXHBb (ORCPT ); Sun, 24 Jul 2022 03:01:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229483AbiGXHB2 (ORCPT ); Sun, 24 Jul 2022 03:01:28 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B530165AD; Sun, 24 Jul 2022 00:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658646087; x=1690182087; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Mx4BUcpOsmtinUM109LNg2QlhoUd2F+G+eJPhtIjKOQ=; b=YbuK8CpzCEpJ5jbx+7fsYElgAi1WT/hGSKJIYG/DfA2Nzb7vkvO4YAQ8 KcF4HbJjsscHXPe8dFxwR+rglV/SFHo5IqXFhqlnpeUKVkVaCjPhbnt/I BdIde2e3ZQM44wfZ7JrmPwova1BRdBtL7Q7S77sW2qeTrxXle/Q7Vsrz1 DBTzagVa6RWkzpq/zUY8bOQ9ymZak7zTYq4CYLW+aCOlFu1y8SoAbXyHm 1YTEhgl1JSU/vwqsxtW7MOsN4BUyU8/FFYcQGG9oTRjFVXrEIS0jG8w3K VLVZXlwBBkkuIYHWg7tAE2fT2Jul44gpO/Ywcd4CWVT4zi7+TREMMPEpZ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10417"; a="288702372" X-IronPort-AV: E=Sophos;i="5.93,190,1654585200"; d="scan'208";a="288702372" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2022 00:01:26 -0700 X-IronPort-AV: E=Sophos;i="5.93,190,1654585200"; d="scan'208";a="657734407" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.252.53.156]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2022 00:01:24 -0700 Message-ID: Date: Sun, 24 Jul 2022 10:01:19 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.11.0 Subject: Re: [PATCH v2] scsi: ufs: ufs-pci: Correct check for RESET DSM Content-Language: en-US To: Daniil Lunev Cc: Avri Altman , Bean Huo , "James E.J. Bottomley" , "Martin K. Petersen" , linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, Bart Van Assche References: <20220719101903.v2.1.I22460c4f4a9ccf2c96c3f9bb392b409926d80b2f@changeid> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: <20220719101903.v2.1.I22460c4f4a9ccf2c96c3f9bb392b409926d80b2f@changeid> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19/07/22 03:19, Daniil Lunev wrote: > dsm_fns is a bitmap, and it is 0-indexed according to the check in > __intel_dsm funciton. But common initialization was checking it as if it funciton -> function > was 1-indexed. The CL corrects the discrepancy. This change won't break "The CL" -> "This patch" > any existing calls to the function, since before the change both bits 0 > and 1 were checked and needed to be set. > > Signed-off-by: Daniil Lunev Some minor cosmetic issues, but with those amended: Reviewed-by: Adrian Hunter > > --- > > Changes in v2: > * Make __INTEL_DSM_SUPPORTED a function > * use `1u` instead of `1` in shift operator > > drivers/ufs/host/ufshcd-pci.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/ufs/host/ufshcd-pci.c b/drivers/ufs/host/ufshcd-pci.c > index 04166bda41daa..c13c31c2ae793 100644 > --- a/drivers/ufs/host/ufshcd-pci.c > +++ b/drivers/ufs/host/ufshcd-pci.c > @@ -24,7 +24,7 @@ struct ufs_host { > void (*late_init)(struct ufs_hba *hba); > }; > > -enum { > +enum intel_ufs_dsm_func_id { > INTEL_DSM_FNS = 0, > INTEL_DSM_RESET = 1, > }; > @@ -42,6 +42,15 @@ static const guid_t intel_dsm_guid = > GUID_INIT(0x1A4832A0, 0x7D03, 0x43CA, > 0xB0, 0x20, 0xF6, 0xDC, 0xD1, 0x2A, 0x19, 0x50); > > +static bool __intel_dsm_supported(struct intel_host *host, > + enum intel_ufs_dsm_func_id fn) CHECK: Alignment should match open parenthesis #35: FILE: drivers/ufs/host/ufshcd-pci.c:46: +static bool __intel_dsm_supported(struct intel_host *host, + enum intel_ufs_dsm_func_id fn) > +{ > + return fn < 32 && fn >= 0 && (host->dsm_fns & (1u << fn)); > +} > + > +#define INTEL_DSM_SUPPORTED(host, name) \ > + __intel_dsm_supported(host, INTEL_DSM_##name) > + > static int __intel_dsm(struct intel_host *intel_host, struct device *dev, > unsigned int fn, u32 *result) > { > @@ -71,7 +80,7 @@ static int __intel_dsm(struct intel_host *intel_host, struct device *dev, > static int intel_dsm(struct intel_host *intel_host, struct device *dev, > unsigned int fn, u32 *result) > { > - if (fn > 31 || !(intel_host->dsm_fns & (1 << fn))) > + if (!__intel_dsm_supported(intel_host, fn)) > return -EOPNOTSUPP; > > return __intel_dsm(intel_host, dev, fn, result); > @@ -300,7 +309,7 @@ static int ufs_intel_device_reset(struct ufs_hba *hba) > { > struct intel_host *host = ufshcd_get_variant(hba); > > - if (host->dsm_fns & INTEL_DSM_RESET) { > + if (INTEL_DSM_SUPPORTED(host, RESET)) { > u32 result = 0; > int err; > > @@ -342,7 +351,7 @@ static int ufs_intel_common_init(struct ufs_hba *hba) > return -ENOMEM; > ufshcd_set_variant(hba, host); > intel_dsm_init(host, hba->dev); > - if (host->dsm_fns & INTEL_DSM_RESET) { > + if (INTEL_DSM_SUPPORTED(host, RESET)) { > if (hba->vops->device_reset) > hba->caps |= UFSHCD_CAP_DEEPSLEEP; > } else {