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 A5D86C4332F for ; Tue, 7 Nov 2023 15:55:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235502AbjKGPzn (ORCPT ); Tue, 7 Nov 2023 10:55:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235500AbjKGPzP (ORCPT ); Tue, 7 Nov 2023 10:55:15 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C2E444B5; Tue, 7 Nov 2023 07:50:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD2CBC433D9; Tue, 7 Nov 2023 15:50:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372238; bh=rj+7Ib1z/7BrrrgvIDmdpHmalsDP54hABH+5CWARasg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kjo/yTLZm3OR4cVCk5DPc/FSoMyblis/4ONw4hGBlSHKdQbvxyHfsVlrGlmvad478 rYY776vUpZ4ddBo0kvBDNOSCo3aRpW7c+076Tflngwb0PveO1i37ieTWex57djHDIz rcrgTmA5iYiZer047kys7FqKBbWnaa47bAm8hLYDH/8secu90DbLs5ezxM+rYHF6QG 5GOmaWwv7mLKFhCY/TuFg0V0n4ZWTW14yY9nRVQvI+lAwjnrXww3xxn0MmhAYEp28T ZDzBWVlbkwLsbiJ5jkFLiZwNP6WQ1yx8c+pXxQ/BqXNfTf5zA/C7IEw1rRIuL1NG/b snF5xXCvn6ltA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Jonathan Cameron , Dean Luick , Leon Romanovsky , Sasha Levin , dennis.dalessandro@cornelisnetworks.com, linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 06/30] RDMA/hfi1: Use FIELD_GET() to extract Link Width Date: Tue, 7 Nov 2023 10:49:40 -0500 Message-ID: <20231107155024.3766950-6-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-rdma@vger.kernel.org From: Ilpo Järvinen [ Upstream commit 8bf7187d978610b9e327a3d92728c8864a575ebd ] Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of custom masking and shifting, and remove extract_width() which only wraps that FIELD_GET(). Signed-off-by: Ilpo Järvinen Link: https://lore.kernel.org/r/20230919125648.1920-2-ilpo.jarvinen@linux.intel.com Reviewed-by: Jonathan Cameron Reviewed-by: Dean Luick Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hfi1/pcie.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index a0802332c8cb3..5395cf56fbd90 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -3,6 +3,7 @@ * Copyright(c) 2015 - 2019 Intel Corporation. */ +#include #include #include #include @@ -212,12 +213,6 @@ static u32 extract_speed(u16 linkstat) return speed; } -/* return the PCIe link speed from the given link status */ -static u32 extract_width(u16 linkstat) -{ - return (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT; -} - /* read the link status and set dd->{lbus_width,lbus_speed,lbus_info} */ static void update_lbus_info(struct hfi1_devdata *dd) { @@ -230,7 +225,7 @@ static void update_lbus_info(struct hfi1_devdata *dd) return; } - dd->lbus_width = extract_width(linkstat); + dd->lbus_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat); dd->lbus_speed = extract_speed(linkstat); snprintf(dd->lbus_info, sizeof(dd->lbus_info), "PCIe,%uMHz,x%u", dd->lbus_speed, dd->lbus_width); -- 2.42.0