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 1B065EDEC50 for ; Wed, 13 Sep 2023 13:22:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235126AbjIMNWW convert rfc822-to-8bit (ORCPT ); Wed, 13 Sep 2023 09:22:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231190AbjIMNWV (ORCPT ); Wed, 13 Sep 2023 09:22:21 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E62EC19B1; Wed, 13 Sep 2023 06:22:17 -0700 (PDT) Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Rm1KY17rFz6HJfY; Wed, 13 Sep 2023 21:20:33 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 13 Sep 2023 14:22:15 +0100 Date: Wed, 13 Sep 2023 14:22:14 +0100 From: Jonathan Cameron To: Ilpo =?ISO-8859-1?Q?J=E4rvinen?= CC: , Bjorn Helgaas , "Jesse Brandeburg" , Tony Nguyen , "David S. Miller" , "Eric Dumazet" , Jakub Kicinski , "Paolo Abeni" , , , Subject: Re: [PATCH v2 10/10] e1000e: Use pcie_capability_read_word() for reading LNKSTA Message-ID: <20230913142214.000019ca@Huawei.com> In-Reply-To: <20230913122748.29530-11-ilpo.jarvinen@linux.intel.com> References: <20230913122748.29530-1-ilpo.jarvinen@linux.intel.com> <20230913122748.29530-11-ilpo.jarvinen@linux.intel.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 8BIT X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500005.china.huawei.com (7.191.163.240) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Wed, 13 Sep 2023 15:27:48 +0300 Ilpo Järvinen wrote: > Use pcie_capability_read_word() for reading LNKSTA and remove the > custom define that matches to PCI_EXP_LNKSTA. > > As only single user for cap_offset remains, remove it too and use > adapter->pdev->pcie_cap directly in the if condition. > > Signed-off-by: Ilpo Järvinen > --- > drivers/net/ethernet/intel/e1000e/defines.h | 1 - > drivers/net/ethernet/intel/e1000e/mac.c | 10 ++++------ > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h > index a4d29c9e03a6..23a58cada43a 100644 > --- a/drivers/net/ethernet/intel/e1000e/defines.h > +++ b/drivers/net/ethernet/intel/e1000e/defines.h > @@ -678,7 +678,6 @@ > > /* PCI/PCI-X/PCI-EX Config space */ > #define PCI_HEADER_TYPE_REGISTER 0x0E > -#define PCIE_LINK_STATUS 0x12 > > #define PCI_HEADER_TYPE_MULTIFUNC 0x80 > > diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c > index 5340cf73778d..e86652a30069 100644 > --- a/drivers/net/ethernet/intel/e1000e/mac.c > +++ b/drivers/net/ethernet/intel/e1000e/mac.c > @@ -18,15 +18,13 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw) > struct e1000_mac_info *mac = &hw->mac; > struct e1000_bus_info *bus = &hw->bus; > struct e1000_adapter *adapter = hw->adapter; > - u16 pcie_link_status, cap_offset; > + u16 pcie_link_status; > > - cap_offset = adapter->pdev->pcie_cap; > - if (!cap_offset) { > + if (!adapter->pdev->pcie_cap) { Could use pci_pcie_cap() though it'll end up longer, so not sure if it is a good idea. Given number of accesses to adapter->pdev, perhaps a local variable pdev, would help. > bus->width = e1000_bus_width_unknown; > } else { > - pci_read_config_word(adapter->pdev, > - cap_offset + PCIE_LINK_STATUS, > - &pcie_link_status); > + pcie_capability_read_word(adapter->pdev, PCI_EXP_LNKSTA, > + &pcie_link_status); > bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW, > pcie_link_status); > }