From patchwork Wed Sep 13 12:27:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 138792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1073292vqx; Wed, 13 Sep 2023 06:09:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd6HIsbujdOqfyCpmtW4N4TOnPvKY9pwWwnUQ1ZZM30r88ObuHZPUG3LIt/YvY7kNbvakK X-Received: by 2002:a17:902:c40a:b0:1b0:3ab6:5140 with SMTP id k10-20020a170902c40a00b001b03ab65140mr4044312plk.4.1694610545747; Wed, 13 Sep 2023 06:09:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694610545; cv=none; d=google.com; s=arc-20160816; b=1GCZEUKogyiZLmPh9Nth6ar7zpv/4zYIH4O6WPXtqac5Cf1/rhSuBj3eFkaASoy746 osJS1env7x7zloWb+1EKR72+hB1ahugXmc2e8EcR9qYXY/wXWsa7fzMpv69huE0JIcLg 62MvAkmfO31febooj+hAAurWMWS6KoErX6vHM0BUWHD0xWbSvdN1iFU4g/B4MYxgGThx jz2lk3AHFGSPtKfFYZ0jkhgWGmrYhJ2hCoKLRLNk9eH9Vds7QdoD6rbZHJFb0Sa1wMdM lOM/TjG6xDbCqOB2ernlcfAGQcS0ZJNlgyDfQE/Wh8bdfPzWZbCEY8ZrwkdpzQT8LIXF jPzg== 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=GTIW5xpIO85Vzrx69xXa/UYBrnHyEwPGjg9NjSdThNI=; fh=SwZCXEJZzs6ucvTPox1ePCNuqWWtjNFzfjl4nYefhx8=; b=n0ro+usX7Dqkt8DGvhRvxmyxiJcNUJqz4CKCh65Em462lj2R4cUH/Vir+7DqrWeWhq RZSfxRhBHxsqx5Z0ord3LKFFGmEuFoNm+2PQ9qxWk8+ma1BNl0iq8Z/d+0lMJS07LrDO ASSAWJNhPVtpiQGrNw9qHJFFLROHXuWEFc/acVlJtI/3WSo0a1IaJPF8xfIs6iSKni5Z /c755mg3krKzcbFbMAOgxbEQaUm+0iNwVcDqgDtVwxlOAYLtBM6stT8UwJj5HuaJXDrE ipBHiGZxhnLZpWQ15zGvhfx+hl2bGRoahx/t+QY+jnk1o3kXdiTT5kSiMqYPB5NbBLfe 0PCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hlU6qkgP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d9-20020a170903230900b001bbb8324bd5si10423622plh.479.2023.09.13.06.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 06:09:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hlU6qkgP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 6FF4B81E3E00; Wed, 13 Sep 2023 05:31:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240642AbjIMMbB (ORCPT + 36 others); Wed, 13 Sep 2023 08:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240507AbjIMMav (ORCPT ); Wed, 13 Sep 2023 08:30:51 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D93619AD; Wed, 13 Sep 2023 05:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608247; x=1726144247; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGsBT0uuTDOMajlNgJ3siJtE8uolW3uxhY8d88dRxik=; b=hlU6qkgP3pB5mUXJDy67iBLnatEEj6x8+/Koo7MXG3go6EQ0rgEWu3J7 vp4kuGiA2n5Sy+wdl73KdfWLg/Se+l/WWcFGJ4StsBa45WogMnqdRf9zN H4oq0yj2mw4qUUp6nGY9jWhiFGUFwKlekFAmkJ8pDpFPE7RtT/I1I5ycU b9YBwj+hlHUZRtWW5vS8uKD8gf9gAq9rWwuQSIMYRLMu2v/FOp2a7RBET NaljDv+TDVOuqx0oX8Y6d4e5qSYWD9sRkd/mPkBAdDGjKaWZqnKccQ0Oe ANybNPWBb5Gz9VO3rMZVTSfMSVE7BeWDOvpbwV/KiiEH+c6fWuJhsGLw4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912521" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912521" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 05:28:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836655" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836655" Received: from pakurapo-mobl3.ger.corp.intel.com (HELO ijarvine-mobl2.ger.corp.intel.com) ([10.249.45.213]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 05:28:22 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 06/10] PCI: Use FIELD_GET() to extract Link Width Date: Wed, 13 Sep 2023 15:27:44 +0300 Message-Id: <20230913122748.29530-7-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230913122748.29530-1-ilpo.jarvinen@linux.intel.com> References: <20230913122748.29530-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:31:15 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776927947584969436 X-GMAIL-MSGID: 1776927947584969436 Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/pci/pci-sysfs.c | 5 ++--- drivers/pci/pci.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index d9eede2dbc0e..5a6241044c3c 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -12,7 +12,7 @@ * Modeled after usb's driverfs.c */ - +#include #include #include #include @@ -230,8 +230,7 @@ static ssize_t current_link_width_show(struct device *dev, if (err) return -EINVAL; - return sysfs_emit(buf, "%u\n", - (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT); + return sysfs_emit(buf, "%u\n", FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat)); } static DEVICE_ATTR_RO(current_link_width); diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 59c01d68c6d5..a8adc34dc86f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -6257,8 +6258,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev, pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &lnksta); next_speed = pcie_link_speed[lnksta & PCI_EXP_LNKSTA_CLS]; - next_width = (lnksta & PCI_EXP_LNKSTA_NLW) >> - PCI_EXP_LNKSTA_NLW_SHIFT; + next_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta); next_bw = next_width * PCIE_SPEED2MBS_ENC(next_speed); @@ -6330,7 +6330,7 @@ enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev) pcie_capability_read_dword(dev, PCI_EXP_LNKCAP, &lnkcap); if (lnkcap) - return (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4; + return FIELD_GET(PCI_EXP_LNKCAP_MLW, lnkcap); return PCIE_LNK_WIDTH_UNKNOWN; }