From nobody Thu Apr 2 13:15:55 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