lkml.org 
[lkml]   [2022]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 08/14] net: hns3: modify macro hnae3_dev_tx_push_supported
    Date
    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 <huangguangbin2@huawei.com>
    ---
    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/ethernet/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)

    -#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)

    #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 *handle)

    set_bit(HNS3_NIC_STATE_INITED, &priv->state);

    - 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);

    if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3)
    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/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 = pci_get_drvdata(h->pdev);
    u32 old_state = test_bit(HNS3_NIC_STATE_TX_PUSH_ENABLE, &priv->state);

    - 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;

    if (tx_push == old_state)
    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/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 = hdev->hw.hw.mem_base +
    HCLGE_TQP_MEM_OFFSET(hdev, i);

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/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 = hdev->hw.hw.mem_base +
    HCLGEVF_TQP_MEM_OFFSET(hdev, i);

    --
    2.33.0
    \
     
     \ /
      Last update: 2022-09-24 04:35    [W:3.361 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site