net: hns3: refactor hclge_comm_send function in PF/VF drivers

Currently, there are two different sets of special command codes in PF and
VF cmdq modules, this is because VF driver only uses small part of all the
command codes. In other words, these not used command codes in VF are also
sepcial command codes theoretically.

So this patch unifes the special command codes and deletes the bool param
is_pf of hclge_comm_send. All the related functions are refactored
according to the new hclge_comm_send function prototype.

Signed-off-by: Jie Wang <wangjie125@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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 e3c9d2e400e437db7c0409011306fa12120cd846..d3e16e5764a0528e30c4b959ffb8d1b53d72cc44 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c
@@ -73,7 +73,7 @@ void hclge_comm_cmd_setup_basic_desc(struct hclge_desc *desc,
                desc->flag |= cpu_to_le16(HCLGE_COMM_CMD_FLAG_WR);
 }
 
-int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, bool is_pf,
+int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev,
                                      struct hclge_comm_hw *hw, bool en)
 {
        struct hclge_comm_firmware_compat_cmd *req;
@@ -96,7 +96,7 @@ int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, bool is_pf,
                req->compat = cpu_to_le32(compat);
        }
 
-       return hclge_comm_cmd_send(hw, &desc, 1, is_pf);
+       return hclge_comm_cmd_send(hw, &desc, 1);
 }
 
 void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring)
@@ -209,7 +209,7 @@ int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev,
        resp = (struct hclge_comm_query_version_cmd *)desc.data;
        resp->api_caps = hclge_comm_build_api_caps();
 
-       ret = hclge_comm_cmd_send(hw, &desc, 1, is_pf);
+       ret = hclge_comm_cmd_send(hw, &desc, 1);
        if (ret)
                return ret;
 
@@ -227,46 +227,32 @@ int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev,
        return ret;
 }
 
-static bool hclge_is_elem_in_array(const u16 *spec_opcode, u32 size, u16 opcode)
+static const u16 spec_opcode[] = { HCLGE_COMM_OPC_STATS_64_BIT,
+                                  HCLGE_COMM_OPC_STATS_32_BIT,
+                                  HCLGE_COMM_OPC_STATS_MAC,
+                                  HCLGE_COMM_OPC_STATS_MAC_ALL,
+                                  HCLGE_COMM_OPC_QUERY_32_BIT_REG,
+                                  HCLGE_COMM_OPC_QUERY_64_BIT_REG,
+                                  HCLGE_COMM_QUERY_CLEAR_MPF_RAS_INT,
+                                  HCLGE_COMM_QUERY_CLEAR_PF_RAS_INT,
+                                  HCLGE_COMM_QUERY_CLEAR_ALL_MPF_MSIX_INT,
+                                  HCLGE_COMM_QUERY_CLEAR_ALL_PF_MSIX_INT,
+                                  HCLGE_COMM_QUERY_ALL_ERR_INFO };
+
+static bool hclge_comm_is_special_opcode(u16 opcode)
 {
+       /* these commands have several descriptors,
+        * and use the first one to save opcode and return value
+        */
        u32 i;
 
-       for (i = 0; i < size; i++) {
+       for (i = 0; i < ARRAY_SIZE(spec_opcode); i++)
                if (spec_opcode[i] == opcode)
                        return true;
-       }
 
        return false;
 }
 
-static const u16 pf_spec_opcode[] = { HCLGE_COMM_OPC_STATS_64_BIT,
-                                     HCLGE_COMM_OPC_STATS_32_BIT,
-                                     HCLGE_COMM_OPC_STATS_MAC,
-                                     HCLGE_COMM_OPC_STATS_MAC_ALL,
-                                     HCLGE_COMM_OPC_QUERY_32_BIT_REG,
-                                     HCLGE_COMM_OPC_QUERY_64_BIT_REG,
-                                     HCLGE_COMM_QUERY_CLEAR_MPF_RAS_INT,
-                                     HCLGE_COMM_QUERY_CLEAR_PF_RAS_INT,
-                                     HCLGE_COMM_QUERY_CLEAR_ALL_MPF_MSIX_INT,
-                                     HCLGE_COMM_QUERY_CLEAR_ALL_PF_MSIX_INT,
-                                     HCLGE_COMM_QUERY_ALL_ERR_INFO };
-
-static const u16 vf_spec_opcode[] = { HCLGE_COMM_OPC_STATS_64_BIT,
-                                     HCLGE_COMM_OPC_STATS_32_BIT,
-                                     HCLGE_COMM_OPC_STATS_MAC };
-
-static bool hclge_comm_is_special_opcode(u16 opcode, bool is_pf)
-{
-       /* these commands have several descriptors,
-        * and use the first one to save opcode and return value
-        */
-       const u16 *spec_opcode = is_pf ? pf_spec_opcode : vf_spec_opcode;
-       u32 size = is_pf ? ARRAY_SIZE(pf_spec_opcode) :
-                               ARRAY_SIZE(vf_spec_opcode);
-
-       return hclge_is_elem_in_array(spec_opcode, size, opcode);
-}
-
 static int hclge_comm_ring_space(struct hclge_comm_cmq_ring *ring)
 {
        int ntc = ring->next_to_clean;
@@ -378,7 +364,7 @@ static int hclge_comm_cmd_convert_err_code(u16 desc_ret)
 
 static int hclge_comm_cmd_check_retval(struct hclge_comm_hw *hw,
                                       struct hclge_desc *desc, int num,
-                                      int ntc, bool is_pf)
+                                      int ntc)
 {
        u16 opcode, desc_ret;
        int handle;
@@ -390,7 +376,7 @@ static int hclge_comm_cmd_check_retval(struct hclge_comm_hw *hw,
                if (ntc >= hw->cmq.csq.desc_num)
                        ntc = 0;
        }
-       if (likely(!hclge_comm_is_special_opcode(opcode, is_pf)))
+       if (likely(!hclge_comm_is_special_opcode(opcode)))
                desc_ret = le16_to_cpu(desc[num - 1].retval);
        else
                desc_ret = le16_to_cpu(desc[0].retval);
@@ -402,7 +388,7 @@ static int hclge_comm_cmd_check_retval(struct hclge_comm_hw *hw,
 
 static int hclge_comm_cmd_check_result(struct hclge_comm_hw *hw,
                                       struct hclge_desc *desc,
-                                      int num, int ntc, bool is_pf)
+                                      int num, int ntc)
 {
        bool is_completed = false;
        int handle, ret;
@@ -416,7 +402,7 @@ static int hclge_comm_cmd_check_result(struct hclge_comm_hw *hw,
        if (!is_completed)
                ret = -EBADE;
        else
-               ret = hclge_comm_cmd_check_retval(hw, desc, num, ntc, is_pf);
+               ret = hclge_comm_cmd_check_retval(hw, desc, num, ntc);
 
        /* Clean the command send queue */
        handle = hclge_comm_cmd_csq_clean(hw);
@@ -433,13 +419,12 @@ static int hclge_comm_cmd_check_result(struct hclge_comm_hw *hw,
  * @hw: pointer to the hw struct
  * @desc: prefilled descriptor for describing the command
  * @num : the number of descriptors to be sent
- * @is_pf: bool to judge pf/vf module
  *
  * This is the main send command for command queue, it
  * sends the queue, cleans the queue, etc
  **/
 int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc,
-                       int num, bool is_pf)
+                       int num)
 {
        struct hclge_comm_cmq_ring *csq = &hw->cmq.csq;
        int ret;
@@ -474,7 +459,7 @@ int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc,
        hclge_comm_write_dev(hw, HCLGE_COMM_NIC_CSQ_TAIL_REG,
                             hw->cmq.csq.next_to_use);
 
-       ret = hclge_comm_cmd_check_result(hw, desc, num, ntc, is_pf);
+       ret = hclge_comm_cmd_check_result(hw, desc, num, ntc);
 
        spin_unlock_bh(&hw->cmq.csq.lock);
 
@@ -495,12 +480,12 @@ static void hclge_comm_cmd_uninit_regs(struct hclge_comm_hw *hw)
        hclge_comm_write_dev(hw, HCLGE_COMM_NIC_CRQ_TAIL_REG, 0);
 }
 
-void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev, bool is_pf,
+void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev,
                           struct hclge_comm_hw *hw)
 {
        struct hclge_comm_cmq *cmdq = &hw->cmq;
 
-       hclge_comm_firmware_compat_config(ae_dev, is_pf, hw, false);
+       hclge_comm_firmware_compat_config(ae_dev, hw, false);
        set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hw->comm_state);
 
        /* wait to ensure that the firmware completes the possible left
@@ -612,7 +597,7 @@ int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw,
        /* ask the firmware to enable some features, driver can work without
         * it.
         */
-       ret = hclge_comm_firmware_compat_config(ae_dev, is_pf, hw, true);
+       ret = hclge_comm_firmware_compat_config(ae_dev, hw, true);
        if (ret)
                dev_warn(&ae_dev->pdev->dev,
                         "Firmware compatible features not enabled(%d).\n",

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 2dd30a161cab6d2fa944d3e13cb1ca4353e6587c..000c9553420733cc7f9acf77cc45085f25244436 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h
@@ -209,15 +209,15 @@ int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev,
                                                u32 *fw_version, bool is_pf);
 int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type);
 int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc,
-                       int num, bool is_pf);
+                       int num);
 void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, bool is_read);
-int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, bool is_pf,
+int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev,
                                      struct hclge_comm_hw *hw, bool en);
 void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring);
 void hclge_comm_cmd_setup_basic_desc(struct hclge_desc *desc,
                                     enum hclge_comm_opcode_type opcode,
                                     bool is_read);
-void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev, bool is_pf,
+void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev,
                           struct hclge_comm_hw *hw);
 int hclge_comm_cmd_queue_init(struct pci_dev *pdev, struct hclge_comm_hw *hw);
 int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw,

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index bc117ea3c9c531ecc647d6c2d9a2fcb7a75e44cd..a365b94124371c22458132954e91a8c74fb8ce25 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -490,7 +490,7 @@ static const struct key_info tuple_key_info[] = {
  **/
 int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num)
 {
-       return hclge_comm_cmd_send(&hw->hw, desc, num, true);
+       return hclge_comm_cmd_send(&hw->hw, desc, num);
 }
 
 static int hclge_mac_update_stats_defective(struct hclge_dev *hdev)
@@ -11968,7 +11968,7 @@ err_msi_irq_uninit:
 err_msi_uninit:
        pci_free_irq_vectors(pdev);
 err_cmd_uninit:
-       hclge_comm_cmd_uninit(hdev->ae_dev, true, &hdev->hw.hw);
+       hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
 err_devlink_uninit:
        hclge_devlink_uninit(hdev);
 err_pci_uninit:
@@ -12360,7 +12360,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
        hclge_config_nic_hw_error(hdev, false);
        hclge_config_rocee_ras_interrupt(hdev, false);
 
-       hclge_comm_cmd_uninit(hdev->ae_dev, true, &hdev->hw.hw);
+       hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
        hclge_misc_irq_uninit(hdev);
        hclge_devlink_uninit(hdev);
        hclge_pci_uninit(hdev);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 08bd6fe0f29e2bb8e5adb2ee2d87a4e816fe41df..66a65594d2869e023c59668706b9aba9779190d1 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -102,7 +102,7 @@ static const u32 tqp_intr_reg_addr_list[] = {HCLGEVF_TQP_INTR_CTRL_REG,
  */
 int hclgevf_cmd_send(struct hclgevf_hw *hw, struct hclge_desc *desc, int num)
 {
-       return hclge_comm_cmd_send(&hw->hw, desc, num, false);
+       return hclge_comm_cmd_send(&hw->hw, desc, num);
 }
 
 void hclgevf_arq_init(struct hclgevf_dev *hdev)
@@ -3498,7 +3498,7 @@ err_misc_irq_init:
        hclgevf_state_uninit(hdev);
        hclgevf_uninit_msi(hdev);
 err_cmd_init:
-       hclge_comm_cmd_uninit(hdev->ae_dev, false, &hdev->hw.hw);
+       hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
 err_cmd_queue_init:
        hclgevf_devlink_uninit(hdev);
 err_devlink_init:
@@ -3522,7 +3522,7 @@ static void hclgevf_uninit_hdev(struct hclgevf_dev *hdev)
                hclgevf_uninit_msi(hdev);
        }
 
-       hclge_comm_cmd_uninit(hdev->ae_dev, false, &hdev->hw.hw);
+       hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
        hclgevf_devlink_uninit(hdev);
        hclgevf_pci_uninit(hdev);
        hclgevf_uninit_mac_list(hdev);