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 8DF5DC4332F for ; Tue, 7 Nov 2023 15:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343958AbjKGP6r (ORCPT ); Tue, 7 Nov 2023 10:58:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343898AbjKGP55 (ORCPT ); Tue, 7 Nov 2023 10:57:57 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F19061B1; Tue, 7 Nov 2023 07:51:21 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00B4DC433CA; Tue, 7 Nov 2023 15:51:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372281; bh=iaSVpkJTVddZbniMMSUXSo3sRmO+294uguuid4T50sY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ea875CCGhBq0cvkK5lDEWXBIZ2b75S8uuDdf143SD8Rj7W6T3PAsAyODnhSgkrC7F HgUyAah0cyQFfqu28Wt8DFWhOswUup7mbOi8zBCVBze0CliRep8TXXIC59zVRqJcmO UjrTmRW+TjI/6+NCQ39F49XGWCWFBCuNrR2Tn/fRshGDkIjwHhjz5rqVCTm+jXvh3b dK7fp+uEm0y2t0Rg+15ch8rSd9DG/udATaVDaZeBWvmzpKk5oLZFthGbFZ62eA3u1Q eu1YDO//z0Z5txKT1uLa2zd8T61jrbNH0Jktd/H+86Yl/UWVTqdEY5i6pDf1Tu/KbQ /v1BQFYDaDnRw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bjorn Helgaas , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Jonathan Cameron , Kuppuswamy Sathyanarayanan , Nirmoy Das , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 25/30] PCI: Use FIELD_GET() in Sapphire RX 5600 XT Pulse quirk Date: Tue, 7 Nov 2023 10:49:59 -0500 Message-ID: <20231107155024.3766950-25-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107155024.3766950-1-sashal@kernel.org> References: <20231107155024.3766950-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.61 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Helgaas [ Upstream commit 04e82fa5951ca66495d7b05665eff673aa3852b4 ] Use FIELD_GET() to remove dependences on the field position, i.e., the shift value. No functional change intended. Separate because this isn't as trivial as the other FIELD_GET() changes. See 907830b0fc9e ("PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse") Link: https://lore.kernel.org/r/20231010204436.1000644-3-helgaas@kernel.org Signed-off-by: Bjorn Helgaas Reviewed-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron Reviewed-by: Kuppuswamy Sathyanarayanan Cc: Nirmoy Das Signed-off-by: Sasha Levin --- drivers/pci/pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4f37885017200..8df156c28aade 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3713,14 +3713,14 @@ u32 pci_rebar_get_possible_sizes(struct pci_dev *pdev, int bar) return 0; pci_read_config_dword(pdev, pos + PCI_REBAR_CAP, &cap); - cap &= PCI_REBAR_CAP_SIZES; + cap = FIELD_GET(PCI_REBAR_CAP_SIZES, cap); /* Sapphire RX 5600 XT Pulse has an invalid cap dword for BAR 0 */ if (pdev->vendor == PCI_VENDOR_ID_ATI && pdev->device == 0x731f && - bar == 0 && cap == 0x7000) - cap = 0x3f000; + bar == 0 && cap == 0x700) + return 0x3f00; - return cap >> 4; + return cap; } EXPORT_SYMBOL(pci_rebar_get_possible_sizes); -- 2.42.0