From nobody Thu Apr 2 11:43:09 2026 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 B98D3C04A95 for ; Sat, 24 Sep 2022 02:33:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233240AbiIXCdW (ORCPT ); Fri, 23 Sep 2022 22:33:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233140AbiIXCdP (ORCPT ); Fri, 23 Sep 2022 22:33:15 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42E661514FF; Fri, 23 Sep 2022 19:33:14 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdB1NHqz1P6mK; Sat, 24 Sep 2022 10:29:02 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:12 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:11 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 01/14] net: hns3: modify macro hnae3_dev_fec_supported Date: Sat, 24 Sep 2022 10:30:11 +0800 Message-ID: <20220924023024.14219-2-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The macro hnae3_dev_fec_supported(hdev) just can be used in hclge layer, so redefine it to hnae3_ae_dev_fec_supported(ae_dev), then it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 0179fc288f5f..21308c5e280b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -107,8 +107,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_gro_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_GRO_B, (ae_dev)->caps) =20 -#define hnae3_dev_fec_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_FEC_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_fec_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_FEC_B, (ae_dev)->caps) =20 #define hnae3_dev_udp_gso_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_ethtool.c index cdf76fb58d45..f866b6676318 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -1705,7 +1705,7 @@ static int hns3_get_fecparam(struct net_device *netde= v, u8 fec_ability; u8 fec_mode; =20 - if (!test_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps)) + if (!hnae3_ae_dev_fec_supported(ae_dev)) return -EOPNOTSUPP; =20 if (!ops->get_fec) @@ -1729,7 +1729,7 @@ static int hns3_set_fecparam(struct net_device *netde= v, const struct hnae3_ae_ops *ops =3D handle->ae_algo->ops; u32 fec_mode; =20 - if (!test_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps)) + if (!hnae3_ae_dev_fec_supported(ae_dev)) return -EOPNOTSUPP; =20 if (!ops->set_fec) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 7b25d8f89427..0134bc8f7865 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -1179,7 +1179,7 @@ static void hclge_parse_fiber_link_mode(struct hclge_= dev *hdev, hclge_convert_setting_sr(speed_ability, mac->supported); hclge_convert_setting_lr(speed_ability, mac->supported); hclge_convert_setting_cr(speed_ability, mac->supported); - if (hnae3_dev_fec_supported(hdev)) + if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 if (hnae3_dev_pause_supported(hdev)) @@ -1195,7 +1195,7 @@ static void hclge_parse_backplane_link_mode(struct hc= lge_dev *hdev, struct hclge_mac *mac =3D &hdev->hw.mac; =20 hclge_convert_setting_kr(speed_ability, mac->supported); - if (hnae3_dev_fec_supported(hdev)) + if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 if (hnae3_dev_pause_supported(hdev)) @@ -3232,7 +3232,7 @@ static void hclge_update_advertising(struct hclge_dev= *hdev) static void hclge_update_port_capability(struct hclge_dev *hdev, struct hclge_mac *mac) { - if (hnae3_dev_fec_supported(hdev)) + if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 /* firmware can not identify back plane type, the media type --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 8DA2BC6FA8E for ; Sat, 24 Sep 2022 02:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233226AbiIXCd0 (ORCPT ); Fri, 23 Sep 2022 22:33:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233209AbiIXCdS (ORCPT ); Fri, 23 Sep 2022 22:33:18 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24D0E1514FD; Fri, 23 Sep 2022 19:33:17 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdF1QjPz1P6mk; Sat, 24 Sep 2022 10:29:05 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:12 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:12 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 02/14] net: hns3: modify macro hnae3_dev_udp_gso_supported Date: Sat, 24 Sep 2022 10:30:12 +0800 Message-ID: <20220924023024.14219-3-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_udp_gso_supported(hdev) to hnae3_ae_dev_udp_gso_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 21308c5e280b..3bc3fc528ed9 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -110,8 +110,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_fec_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_FEC_B, (ae_dev)->caps) =20 -#define hnae3_dev_udp_gso_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_udp_gso_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, (ae_dev)->caps) =20 #define hnae3_dev_qb_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_QB_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/= ethernet/hisilicon/hns3/hns3_enet.c index 39b75b68474c..9e4935a90c8b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3320,7 +3320,7 @@ static void hns3_set_default_feature(struct net_devic= e *netdev) if (hnae3_ae_dev_fd_supported(ae_dev)) netdev->features |=3D NETIF_F_NTUPLE; =20 - if (test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, ae_dev->caps)) + if (hnae3_ae_dev_udp_gso_supported(ae_dev)) netdev->features |=3D NETIF_F_GSO_UDP_L4; =20 if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps)) --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 D6079C6FA92 for ; Sat, 24 Sep 2022 02:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233386AbiIXCds (ORCPT ); Fri, 23 Sep 2022 22:33:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233196AbiIXCdS (ORCPT ); Fri, 23 Sep 2022 22:33:18 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88BD81514FE; Fri, 23 Sep 2022 19:33:17 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MZCcb5DXnzHtfd; Sat, 24 Sep 2022 10:28:31 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:15 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:12 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 03/14] net: hns3: modify macro hnae3_dev_qb_supported Date: Sat, 24 Sep 2022 10:30:13 +0800 Message-ID: <20220924023024.14219-4-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_qb_supported(hdev) to hnae3_ae_dev_qb_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 3bc3fc528ed9..60e06c7be32d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -113,8 +113,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_udp_gso_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, (ae_dev)->caps) =20 -#define hnae3_dev_qb_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_QB_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_qb_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_QB_B, (ae_dev)->caps) =20 #define hnae3_dev_fd_forward_tc_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, (hdev)->ae_dev->caps) --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 9FED6C04A95 for ; Sat, 24 Sep 2022 02:33:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233267AbiIXCda (ORCPT ); Fri, 23 Sep 2022 22:33:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233220AbiIXCdS (ORCPT ); Fri, 23 Sep 2022 22:33:18 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A532151B02; Fri, 23 Sep 2022 19:33:17 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdF4YvMz1P6p6; Sat, 24 Sep 2022 10:29:05 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:15 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:13 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 04/14] net: hns3: modify macro hnae3_dev_fd_forward_tc_supported Date: Sat, 24 Sep 2022 10:30:14 +0800 Message-ID: <20220924023024.14219-5-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_fd_forward_tc_supported(hdev) to hnae3_ae_dev_fd_forward_tc_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 60e06c7be32d..60fda66e08bd 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -116,8 +116,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_qb_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_QB_B, (ae_dev)->caps) =20 -#define hnae3_dev_fd_forward_tc_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_fd_forward_tc_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, (ae_dev)->caps) =20 #define hnae3_dev_ptp_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_PTP_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/= ethernet/hisilicon/hns3/hns3_enet.c index 9e4935a90c8b..ede31db761b3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3331,7 +3331,7 @@ static void hns3_set_default_feature(struct net_devic= e *netdev) if (test_bit(HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B, ae_dev->caps)) netdev->features |=3D NETIF_F_GSO_UDP_TUNNEL_CSUM; =20 - if (test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, ae_dev->caps)) + if (hnae3_ae_dev_fd_forward_tc_supported(ae_dev)) netdev->features |=3D NETIF_F_HW_TC; =20 netdev->hw_features |=3D netdev->features; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 0134bc8f7865..5fa5ae7c32a6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -5649,7 +5649,7 @@ static int hclge_fd_ad_config(struct hclge_dev *hdev,= u8 stage, int loc, action->write_rule_id_to_bd); hnae3_set_field(ad_data, HCLGE_FD_AD_RULE_ID_M, HCLGE_FD_AD_RULE_ID_S, action->rule_id); - if (test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, ae_dev->caps)) { + if (hnae3_ae_dev_fd_forward_tc_supported(ae_dev)) { hnae3_set_bit(ad_data, HCLGE_FD_AD_TC_OVRD_B, action->override_tc); hnae3_set_field(ad_data, HCLGE_FD_AD_TC_SIZE_M, --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 A60CDC04A95 for ; Sat, 24 Sep 2022 02:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233317AbiIXCdi (ORCPT ); Fri, 23 Sep 2022 22:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233225AbiIXCdT (ORCPT ); Fri, 23 Sep 2022 22:33:19 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27A1E151B01; Fri, 23 Sep 2022 19:33:17 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MZCgW5THWzHqBT; Sat, 24 Sep 2022 10:31:03 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:13 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 05/14] net: hns3: modify macro hnae3_dev_ptp_supported Date: Sat, 24 Sep 2022 10:30:15 +0800 Message-ID: <20220924023024.14219-6-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_ptp_supported(hdev) to hnae3_ae_dev_ptp_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 60fda66e08bd..dd2dd085ab3d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -119,8 +119,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_fd_forward_tc_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, (ae_dev)->caps) =20 -#define hnae3_dev_ptp_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_PTP_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_ptp_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_PTP_B, (ae_dev)->caps) =20 #define hnae3_dev_int_ql_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_INT_QL_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_debugfs.c index 66feb23f7b7b..7de1f91c4877 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c @@ -1367,7 +1367,7 @@ int hns3_dbg_init(struct hnae3_handle *handle) if ((hns3_dbg_cmd[i].cmd =3D=3D HNAE3_DBG_CMD_TM_NODES && ae_dev->dev_version <=3D HNAE3_DEVICE_VERSION_V2) || (hns3_dbg_cmd[i].cmd =3D=3D HNAE3_DBG_CMD_PTP_INFO && - !test_bit(HNAE3_DEV_SUPPORT_PTP_B, ae_dev->caps))) + !hnae3_ae_dev_ptp_supported(ae_dev))) continue; =20 if (!hns3_dbg_cmd[i].init) { diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drive= rs/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c index a40b1583f114..aebd98586e62 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c @@ -486,7 +486,7 @@ int hclge_ptp_init(struct hclge_dev *hdev) struct timespec64 ts; int ret; =20 - if (!test_bit(HNAE3_DEV_SUPPORT_PTP_B, ae_dev->caps)) + if (!hnae3_ae_dev_ptp_supported(ae_dev)) return 0; =20 if (!hdev->ptp) { --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 B5A03C6FA8E for ; Sat, 24 Sep 2022 02:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233331AbiIXCdm (ORCPT ); Fri, 23 Sep 2022 22:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233222AbiIXCdT (ORCPT ); Fri, 23 Sep 2022 22:33:19 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 279A71514FF; Fri, 23 Sep 2022 19:33:17 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MZCgW6wnpzHqM9; Sat, 24 Sep 2022 10:31:03 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:13 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 06/14] net: hns3: modify macro hnae3_dev_int_ql_supported Date: Sat, 24 Sep 2022 10:30:16 +0800 Message-ID: <20220924023024.14219-7-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_int_ql_supported(hdev) to hnae3_ae_dev_int_ql_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. DTS: Feature or Bugfix: Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index dd2dd085ab3d..ed06f8db2a27 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -122,8 +122,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_ptp_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_PTP_B, (ae_dev)->caps) =20 -#define hnae3_dev_int_ql_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_INT_QL_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_int_ql_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_INT_QL_B, (ae_dev)->caps) =20 #define hnae3_dev_hw_csum_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, (hdev)->ae_dev->caps) --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 067CFC07E9D for ; Sat, 24 Sep 2022 02:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233280AbiIXCdd (ORCPT ); Fri, 23 Sep 2022 22:33:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233223AbiIXCdT (ORCPT ); Fri, 23 Sep 2022 22:33:19 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29218151B03; Fri, 23 Sep 2022 19:33:18 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MZCdF62m5zlWGG; Sat, 24 Sep 2022 10:29:05 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:14 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 07/14] net: hns3: modify macro hnae3_dev_hw_csum_supported Date: Sat, 24 Sep 2022 10:30:17 +0800 Message-ID: <20220924023024.14219-8-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_hw_csum_supported(hdev) to hnae3_ae_dev_hw_csum_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index ed06f8db2a27..b802de61e63b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -125,8 +125,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_int_ql_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_INT_QL_B, (ae_dev)->caps) =20 -#define hnae3_dev_hw_csum_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_hw_csum_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, (ae_dev)->caps) =20 #define hnae3_dev_tx_push_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/= ethernet/hisilicon/hns3/hns3_enet.c index ede31db761b3..878c60d58061 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3323,7 +3323,7 @@ static void hns3_set_default_feature(struct net_devic= e *netdev) if (hnae3_ae_dev_udp_gso_supported(ae_dev)) netdev->features |=3D NETIF_F_GSO_UDP_L4; =20 - if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps)) + if (hnae3_ae_dev_hw_csum_supported(ae_dev)) netdev->features |=3D NETIF_F_HW_CSUM; else netdev->features |=3D NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; @@ -5235,7 +5235,7 @@ static void hns3_state_init(struct hnae3_handle *hand= le) if (ae_dev->dev_version >=3D HNAE3_DEVICE_VERSION_V3) set_bit(HNAE3_PFLAG_LIMIT_PROMISC, &handle->supported_pflags); =20 - if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps)) + if (hnae3_ae_dev_hw_csum_supported(ae_dev)) set_bit(HNS3_NIC_STATE_HW_TX_CSUM_ENABLE, &priv->state); =20 if (hnae3_ae_dev_rxd_adv_layout_supported(ae_dev)) --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 35AEBC04A95 for ; Sat, 24 Sep 2022 02:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233278AbiIXCeS (ORCPT ); Fri, 23 Sep 2022 22:34:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233242AbiIXCdZ (ORCPT ); Fri, 23 Sep 2022 22:33:25 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEE07151B1B; Fri, 23 Sep 2022 19:33:19 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MZCdT14yNzWgnl; Sat, 24 Sep 2022 10:29:17 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:14 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 08/14] net: hns3: modify macro hnae3_dev_tx_push_supported Date: Sat, 24 Sep 2022 10:30:18 +0800 Message-ID: <20220924023024.14219-9-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_tx_push_supported(hdev) to hnae3_ae_dev_tx_push_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index b802de61e63b..2a6d2ff3056b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -128,8 +128,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_hw_csum_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, (ae_dev)->caps) =20 -#define hnae3_dev_tx_push_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_tx_push_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, (ae_dev)->caps) =20 #define hnae3_dev_phy_imp_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/= ethernet/hisilicon/hns3/hns3_enet.c index 878c60d58061..fa7949fb2cb0 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -5229,7 +5229,7 @@ static void hns3_state_init(struct hnae3_handle *hand= le) =20 set_bit(HNS3_NIC_STATE_INITED, &priv->state); =20 - if (test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, ae_dev->caps)) + if (hnae3_ae_dev_tx_push_supported(ae_dev)) set_bit(HNS3_NIC_STATE_TX_PUSH_ENABLE, &priv->state); =20 if (ae_dev->dev_version >=3D HNAE3_DEVICE_VERSION_V3) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_ethtool.c index f866b6676318..dd1a32659800 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -1192,7 +1192,7 @@ static int hns3_set_tx_push(struct net_device *netdev= , u32 tx_push) struct hnae3_ae_dev *ae_dev =3D pci_get_drvdata(h->pdev); u32 old_state =3D test_bit(HNS3_NIC_STATE_TX_PUSH_ENABLE, &priv->state); =20 - if (!test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, ae_dev->caps) && tx_push) + if (!hnae3_ae_dev_tx_push_supported(ae_dev) && tx_push) return -EOPNOTSUPP; =20 if (tx_push =3D=3D old_state) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 5fa5ae7c32a6..a93df064da46 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -1709,7 +1709,7 @@ static int hclge_alloc_tqps(struct hclge_dev *hdev) * the queue can execute push mode or doorbell mode on * device memory. */ - if (test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, ae_dev->caps)) + if (hnae3_ae_dev_tx_push_supported(ae_dev)) tqp->q.mem_base =3D hdev->hw.hw.mem_base + HCLGE_TQP_MEM_OFFSET(hdev, i); =20 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/dr= ivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index 34ac33783e97..191daa5cc537 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -353,7 +353,7 @@ static int hclgevf_alloc_tqps(struct hclgevf_dev *hdev) * the queue can execute push mode or doorbell mode on * device memory. */ - if (test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, ae_dev->caps)) + if (hnae3_ae_dev_tx_push_supported(ae_dev)) tqp->q.mem_base =3D hdev->hw.hw.mem_base + HCLGEVF_TQP_MEM_OFFSET(hdev, i); =20 --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 018BFC6FA90 for ; Sat, 24 Sep 2022 02:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233434AbiIXCd4 (ORCPT ); Fri, 23 Sep 2022 22:33:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233009AbiIXCdU (ORCPT ); Fri, 23 Sep 2022 22:33:20 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A91B51514FD; Fri, 23 Sep 2022 19:33:18 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MZCdT2brjzWgq4; Sat, 24 Sep 2022 10:29:17 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:15 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 09/14] net: hns3: modify macro hnae3_dev_phy_imp_supported Date: Sat, 24 Sep 2022 10:30:19 +0800 Message-ID: <20220924023024.14219-10-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_phy_imp_supported(hdev) to hnae3_ae_dev_phy_imp_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 2 +- .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 3 --- .../net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 ++-- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 2 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 16 ++++++++-------- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 2a6d2ff3056b..494402074cb9 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -131,8 +131,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_tx_push_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_TX_PUSH_B, (ae_dev)->caps) =20 -#define hnae3_dev_phy_imp_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_phy_imp_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, (ae_dev)->caps) =20 #define hnae3_dev_ras_imp_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_RAS_IMP_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd= .c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c index f671a63cecde..bfef94360920 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c @@ -87,7 +87,7 @@ int hclge_comm_firmware_compat_config(struct hnae3_ae_dev= *ae_dev, =20 hnae3_set_bit(compat, HCLGE_COMM_LINK_EVENT_REPORT_EN_B, 1); hnae3_set_bit(compat, HCLGE_COMM_NCSI_ERROR_REPORT_EN_B, 1); - if (hclge_comm_dev_phy_imp_supported(ae_dev)) + if (hnae3_ae_dev_phy_imp_supported(ae_dev)) hnae3_set_bit(compat, HCLGE_COMM_PHY_IMP_EN_B, 1); hnae3_set_bit(compat, HCLGE_COMM_MAC_STATS_EXT_EN_B, 1); hnae3_set_bit(compat, HCLGE_COMM_SYNC_RX_RING_HEAD_EN_B, 1); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd= .h b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h index b1f9383b418f..ba2e46adde72 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h @@ -22,9 +22,6 @@ #define HCLGE_COMM_SYNC_RX_RING_HEAD_EN_B 4 #define HCLGE_COMM_LLRS_FEC_EN_B 5 =20 -#define hclge_comm_dev_phy_imp_supported(ae_dev) \ - test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, (ae_dev)->caps) - #define HCLGE_COMM_TYPE_CRQ 0 #define HCLGE_COMM_TYPE_CSQ 1 =20 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_ethtool.c index dd1a32659800..e4278ec95d21 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -789,7 +789,7 @@ static int hns3_get_link_ksettings(struct net_device *n= etdev, break; case HNAE3_MEDIA_TYPE_COPPER: cmd->base.port =3D PORT_TP; - if (test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, ae_dev->caps) && + if (hnae3_ae_dev_phy_imp_supported(ae_dev) && ops->get_phy_link_ksettings) ops->get_phy_link_ksettings(h, cmd); else if (!netdev->phydev) @@ -890,7 +890,7 @@ static int hns3_set_link_ksettings(struct net_device *n= etdev, return -EINVAL; =20 return phy_ethtool_ksettings_set(netdev->phydev, cmd); - } else if (test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, ae_dev->caps) && + } else if (hnae3_ae_dev_phy_imp_supported(ae_dev) && ops->set_phy_link_ksettings) { return ops->set_phy_link_ksettings(handle, cmd); } diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/d= rivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c index 142415c84c6b..90000ec07d55 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c @@ -1932,7 +1932,7 @@ static int hclge_dbg_dump_loopback(struct hclge_dev *= hdev, char *buf, int len) loopback_en =3D phydev->loopback_enabled; pos +=3D scnprintf(buf + pos, len - pos, "phy loopback: %s\n", state_str[loopback_en]); - } else if (hnae3_dev_phy_imp_supported(hdev)) { + } else if (hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) { loopback_en =3D req_common->enable & HCLGE_CMD_GE_PHY_INNER_LOOP_B; pos +=3D scnprintf(buf + pos, len - pos, "phy loopback: %s\n", diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index a93df064da46..7995e3388778 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -751,7 +751,7 @@ static int hclge_get_sset_count(struct hnae3_handle *ha= ndle, int stringset) =20 if ((hdev->hw.mac.phydev && hdev->hw.mac.phydev->drv && hdev->hw.mac.phydev->drv->set_loopback) || - hnae3_dev_phy_imp_supported(hdev)) { + hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) { count +=3D 1; handle->flags |=3D HNAE3_SUPPORT_PHY_LOOPBACK; } @@ -3433,7 +3433,7 @@ static int hclge_update_tp_port_info(struct hclge_dev= *hdev) struct ethtool_link_ksettings cmd; int ret; =20 - if (!hnae3_dev_phy_imp_supported(hdev)) + if (!hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) return 0; =20 ret =3D hclge_get_phy_link_ksettings(&hdev->vport->nic, &cmd); @@ -3451,7 +3451,7 @@ static int hclge_tp_port_init(struct hclge_dev *hdev) { struct ethtool_link_ksettings cmd; =20 - if (!hnae3_dev_phy_imp_supported(hdev)) + if (!hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) return 0; =20 cmd.base.autoneg =3D hdev->hw.mac.autoneg; @@ -7852,7 +7852,7 @@ static int hclge_set_phy_loopback(struct hclge_dev *h= dev, bool en) int ret; =20 if (!phydev) { - if (hnae3_dev_phy_imp_supported(hdev)) + if (hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) return hclge_set_common_loopback(hdev, en, HNAE3_LOOP_PHY); return -ENOTSUPP; @@ -9369,7 +9369,7 @@ static int hclge_mii_ioctl(struct hclge_dev *hdev, st= ruct ifreq *ifr, int cmd) { struct mii_ioctl_data *data =3D if_mii(ifr); =20 - if (!hnae3_dev_phy_imp_supported(hdev)) + if (!hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) return -EOPNOTSUPP; =20 switch (cmd) { @@ -10975,7 +10975,7 @@ static int hclge_set_pauseparam(struct hnae3_handle= *handle, u32 auto_neg, struct phy_device *phydev =3D hdev->hw.mac.phydev; u32 fc_autoneg; =20 - if (phydev || hnae3_dev_phy_imp_supported(hdev)) { + if (phydev || hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) { fc_autoneg =3D hclge_get_autoneg(handle); if (auto_neg !=3D fc_autoneg) { dev_info(&hdev->pdev->dev, @@ -10994,7 +10994,7 @@ static int hclge_set_pauseparam(struct hnae3_handle= *handle, u32 auto_neg, =20 hclge_record_user_pauseparam(hdev, rx_en, tx_en); =20 - if (!auto_neg || hnae3_dev_phy_imp_supported(hdev)) + if (!auto_neg || hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) return hclge_cfg_pauseparam(hdev, rx_en, tx_en); =20 if (phydev) @@ -11588,7 +11588,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *a= e_dev) goto err_msi_irq_uninit; =20 if (hdev->hw.mac.media_type =3D=3D HNAE3_MEDIA_TYPE_COPPER && - !hnae3_dev_phy_imp_supported(hdev)) { + !hnae3_ae_dev_phy_imp_supported(hdev->ae_dev)) { ret =3D hclge_mac_mdio_config(hdev); if (ret) goto err_msi_irq_uninit; --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 13D3BC04A95 for ; Sat, 24 Sep 2022 02:34:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233354AbiIXCeK (ORCPT ); Fri, 23 Sep 2022 22:34:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233117AbiIXCdW (ORCPT ); Fri, 23 Sep 2022 22:33:22 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19751151B0F; Fri, 23 Sep 2022 19:33:18 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdG6JF0z1P6qG; Sat, 24 Sep 2022 10:29:06 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:15 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 10/14] net: hns3: modify macro hnae3_dev_ras_imp_supported Date: Sat, 24 Sep 2022 10:30:20 +0800 Message-ID: <20220924023024.14219-11-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_ras_imp_supported(hdev) to hnae3_ae_dev_ras_imp_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 494402074cb9..0d8e0c461a31 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -134,8 +134,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_phy_imp_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_PHY_IMP_B, (ae_dev)->caps) =20 -#define hnae3_dev_ras_imp_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_RAS_IMP_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_ras_imp_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_RAS_IMP_B, (ae_dev)->caps) =20 #define hnae3_dev_tqp_txrx_indep_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 7995e3388778..cc3ba2a16f5e 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -4579,7 +4579,7 @@ static void hclge_errhand_service_task(struct hclge_d= ev *hdev) if (!test_and_clear_bit(HCLGE_STATE_ERR_SERVICE_SCHED, &hdev->state)) return; =20 - if (hnae3_dev_ras_imp_supported(hdev)) + if (hnae3_ae_dev_ras_imp_supported(hdev->ae_dev)) hclge_handle_err_recovery(hdev); else hclge_misc_err_recovery(hdev); @@ -11671,7 +11671,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *a= e_dev) hclge_clear_resetting_state(hdev); =20 /* Log and clear the hw errors those already occurred */ - if (hnae3_dev_ras_imp_supported(hdev)) + if (hnae3_ae_dev_ras_imp_supported(hdev->ae_dev)) hclge_handle_occurred_error(hdev); else hclge_handle_all_hns_hw_errors(ae_dev); @@ -12035,7 +12035,7 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *= ae_dev) return ret; =20 /* Log and clear the hw errors those already occurred */ - if (hnae3_dev_ras_imp_supported(hdev)) + if (hnae3_ae_dev_ras_imp_supported(hdev->ae_dev)) hclge_handle_occurred_error(hdev); else hclge_handle_all_hns_hw_errors(ae_dev); --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 1C877C6FA82 for ; Sat, 24 Sep 2022 02:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233205AbiIXCeG (ORCPT ); Fri, 23 Sep 2022 22:34:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233147AbiIXCdW (ORCPT ); Fri, 23 Sep 2022 22:33:22 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19D74151B14; Fri, 23 Sep 2022 19:33:18 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MZCdG4rJ0zlW11; Sat, 24 Sep 2022 10:29:06 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 11/14] net: hns3: delete redundant macro hnae3_dev_tqp_txrx_indep_supported Date: Sat, 24 Sep 2022 10:30:21 +0800 Message-ID: <20220924023024.14219-12-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There is macro hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev) can be used in both hclge and hns3_enet layer. The macro hnae3_dev_tqp_txrx_indep_supported(hdev) is redundant, so delete it. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 0d8e0c461a31..12730cbc3bfe 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -137,9 +137,6 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_ras_imp_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_RAS_IMP_B, (ae_dev)->caps) =20 -#define hnae3_dev_tqp_txrx_indep_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, (hdev)->ae_dev->caps) - #define hnae3_dev_hw_pad_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_HW_PAD_B, (hdev)->ae_dev->caps) =20 --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 DAEF0C6FA82 for ; Sat, 24 Sep 2022 02:34:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233311AbiIXCeC (ORCPT ); Fri, 23 Sep 2022 22:34:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233230AbiIXCdU (ORCPT ); Fri, 23 Sep 2022 22:33:20 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5168A151B16; Fri, 23 Sep 2022 19:33:19 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MZCfn6myPzpTWr; Sat, 24 Sep 2022 10:30:25 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:16 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 12/14] net: hns3: modify macro hnae3_dev_hw_pad_supported Date: Sat, 24 Sep 2022 10:30:22 +0800 Message-ID: <20220924023024.14219-13-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_hw_pad_supported(hdev) to hnae3_ae_dev_hw_pad_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 12730cbc3bfe..99140a7617f3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -137,8 +137,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_ras_imp_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_RAS_IMP_B, (ae_dev)->caps) =20 -#define hnae3_dev_hw_pad_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_HW_PAD_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_hw_pad_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_HW_PAD_B, (ae_dev)->caps) =20 #define hnae3_dev_stash_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_STASH_B, (hdev)->ae_dev->caps) --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 6A74FC07E9D for ; Sat, 24 Sep 2022 02:34:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233376AbiIXCeO (ORCPT ); Fri, 23 Sep 2022 22:34:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233243AbiIXCdZ (ORCPT ); Fri, 23 Sep 2022 22:33:25 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BED51151B02; Fri, 23 Sep 2022 19:33:19 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MZCfp16qBzpTK4; Sat, 24 Sep 2022 10:30:26 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 13/14] net: hns3: modify macro hnae3_dev_stash_supported Date: Sat, 24 Sep 2022 10:30:23 +0800 Message-ID: <20220924023024.14219-14-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_stash_supported(hdev) to hnae3_ae_dev_stash_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 99140a7617f3..94b71701a74d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -140,8 +140,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_hw_pad_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_HW_PAD_B, (ae_dev)->caps) =20 -#define hnae3_dev_stash_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_STASH_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_stash_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_STASH_B, (ae_dev)->caps) =20 #define hnae3_dev_pause_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (hdev)->ae_dev->caps) --=20 2.33.0 From nobody Thu Apr 2 11:43:09 2026 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 6128FC04A95 for ; Sat, 24 Sep 2022 02:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233379AbiIXCeU (ORCPT ); Fri, 23 Sep 2022 22:34:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233282AbiIXCdd (ORCPT ); Fri, 23 Sep 2022 22:33:33 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 661E8151B03; Fri, 23 Sep 2022 19:33:20 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdJ0XjBz1P6tw; Sat, 24 Sep 2022 10:29:08 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:18 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 14/14] net: hns3: modify macro hnae3_dev_pause_supported Date: Sat, 24 Sep 2022 10:30:24 +0800 Message-ID: <20220924023024.14219-15-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_pause_supported(hdev) to hnae3_ae_dev_pause_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 94b71701a74d..1bd695e88cca 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -143,8 +143,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_stash_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_STASH_B, (ae_dev)->caps) =20 -#define hnae3_dev_pause_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_pause_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (ae_dev)->caps) =20 #define hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, (ae_dev)->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_ethtool.c index e4278ec95d21..58f19006e403 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -701,7 +701,7 @@ static void hns3_get_pauseparam(struct net_device *netd= ev, struct hnae3_handle *h =3D hns3_get_handle(netdev); struct hnae3_ae_dev *ae_dev =3D pci_get_drvdata(h->pdev); =20 - if (!test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps)) + if (!hnae3_ae_dev_pause_supported(ae_dev)) return; =20 if (h->ae_algo->ops->get_pauseparam) @@ -715,7 +715,7 @@ static int hns3_set_pauseparam(struct net_device *netde= v, struct hnae3_handle *h =3D hns3_get_handle(netdev); struct hnae3_ae_dev *ae_dev =3D pci_get_drvdata(h->pdev); =20 - if (!test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps)) + if (!hnae3_ae_dev_pause_supported(ae_dev)) return -EOPNOTSUPP; =20 netif_dbg(h, drv, netdev, diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index cc3ba2a16f5e..e8e18bac5b50 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -1182,7 +1182,7 @@ static void hclge_parse_fiber_link_mode(struct hclge_= dev *hdev, if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 - if (hnae3_dev_pause_supported(hdev)) + if (hnae3_ae_dev_pause_supported(hdev->ae_dev)) linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported); =20 linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mac->supported); @@ -1198,7 +1198,7 @@ static void hclge_parse_backplane_link_mode(struct hc= lge_dev *hdev, if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 - if (hnae3_dev_pause_supported(hdev)) + if (hnae3_ae_dev_pause_supported(hdev->ae_dev)) linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported); =20 linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, mac->supported); @@ -1230,7 +1230,7 @@ static void hclge_parse_copper_link_mode(struct hclge= _dev *hdev, linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, supported); } =20 - if (hnae3_dev_pause_supported(hdev)) { + if (hnae3_ae_dev_pause_supported(hdev->ae_dev)) { linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported); linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, supported); } --=20 2.33.0