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 smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57711EDEC70 for ; Wed, 13 Sep 2023 15:10:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EC9B1416B9; Wed, 13 Sep 2023 15:10:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EC9B1416B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1694617836; bh=wG8SVRjP7d3uFymrFGatFR2sif1QaBwRrKfcVU/ckXw=; h=Date:From:To:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=LU7Z3Dlc4sz5rTmWq5RiI07td4S5gZT7jaSjt7VFSLpgl+vpYXWnDM4/zXC6ltNtT sJ7UI3+OGoit75x9ktyOVnk4uib/7y3u7JUdV0RiVyO3McHV9pi3ylZRTYYhrXZA9e ilWVQSNxBbX5qzHFACIoU7KQEms+RIQJIocw5yLE/GSbt0OrNYeAlF0jmOfjc2bnG9 7qx3B9EELrOSWzlxHbcjrcgJzMPSE6E78oZ2yIU6FAp5gM47HpI3w4pNyC8ivqXlH5 cjcgakKiPLJiSkjFTvAA40RNSA7pLG0NbVls4ZCNV1vg/AQRSfJ/v4kdUI2W/nXFAL 65dcxAScc9Wmg== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7iaLEKEAWyG7; Wed, 13 Sep 2023 15:10:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 08E9E416B1; Wed, 13 Sep 2023 15:10:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 08E9E416B1 Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6DCBF1BF5F8 for ; Wed, 13 Sep 2023 13:22:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 437BC8232A for ; Wed, 13 Sep 2023 13:22:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 437BC8232A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gH2D-01aATwu for ; Wed, 13 Sep 2023 13:22:19 +0000 (UTC) Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 87A438231E for ; Wed, 13 Sep 2023 13:22:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 87A438231E 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?= 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 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 X-Mailman-Approved-At: Wed, 13 Sep 2023 15:10:27 +0000 Subject: Re: [Intel-wired-lan] [PATCH v2 10/10] e1000e: Use pcie_capability_read_word() for reading LNKSTA X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pci@vger.kernel.org, Jesse Brandeburg , linux-kernel@vger.kernel.org, Eric Dumazet , netdev@vger.kernel.org, Tony Nguyen , Jakub Kicinski , Bjorn Helgaas , Paolo Abeni , "David S. Miller" , intel-wired-lan@lists.osuosl.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Wed, 13 Sep 2023 15:27:48 +0300 Ilpo J=E4rvinen 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=E4rvinen > --- > 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/et= hernet/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/ethern= et/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 =3D &hw->mac; > struct e1000_bus_info *bus =3D &hw->bus; > struct e1000_adapter *adapter =3D hw->adapter; > - u16 pcie_link_status, cap_offset; > + u16 pcie_link_status; > = > - cap_offset =3D 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, w= ould help. > bus->width =3D 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 =3D (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW, > pcie_link_status); > } _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan 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); > }