net/bnxt: update shadow TCAM to use TruFlow hash

[dpdk.git] / drivers / net / hns3 / hns3_cmd.c

diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 58776c2..cbb0988 100644 (file)
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -215,28 +215,13 @@ hns3_cmd_csq_clean(struct hns3_hw *hw)
        head = hns3_read_dev(hw, HNS3_CMDQ_TX_HEAD_REG);
 
        if (!is_valid_csq_clean_head(csq, head)) {
-               struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
-               uint32_t global;
-               uint32_t fun_rst;
                hns3_err(hw, "wrong cmd head (%u, %u-%u)", head,
                            csq->next_to_use, csq->next_to_clean);
-               rte_atomic16_set(&hw->reset.disable_cmd, 1);
-               if (hns->is_vf) {
-                       global = hns3_read_dev(hw, HNS3_VF_RST_ING);
-                       fun_rst = hns3_read_dev(hw, HNS3_FUN_RST_ING);
-                       hns3_err(hw, "Delayed VF reset global: %x fun_rst: %x",
-                                global, fun_rst);
-                       hns3_atomic_set_bit(HNS3_VF_RESET, &hw->reset.pending);
-               } else {
-                       global = hns3_read_dev(hw, HNS3_GLOBAL_RESET_REG);
-                       fun_rst = hns3_read_dev(hw, HNS3_FUN_RST_ING);
-                       hns3_err(hw, "Delayed IMP reset global: %x fun_rst: %x",
-                                global, fun_rst);
-                       hns3_atomic_set_bit(HNS3_IMP_RESET, &hw->reset.pending);
+               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       rte_atomic16_set(&hw->reset.disable_cmd, 1);
+                       hns3_schedule_delayed_reset(HNS3_DEV_HW_TO_ADAPTER(hw));
                }
 
-               hns3_schedule_delayed_reset(hns);
-
                return -EIO;
        }
 
@@ -304,7 +289,7 @@ hns3_cmd_convert_err_code(uint16_t desc_ret)
        case HNS3_CMD_INVALID:
                return -EBADR;
        default:
-               return -EIO;
+               return -EREMOTEIO;
        }
 }
 
@@ -364,11 +349,23 @@ static int hns3_cmd_poll_reply(struct hns3_hw *hw)
 
 /*
  * hns3_cmd_send - send command to command queue
- * @hw: pointer to the hw struct
- * @desc: prefilled descriptor for describing the command
- * @num : the number of descriptors to be sent
  *
- * This is the main send command for command queue, it
+ * @param hw
+ *   pointer to the hw struct
+ * @param desc
+ *   prefilled descriptor for describing the command
+ * @param num
+ *   the number of descriptors to be sent
+ * @return
+ *   - -EBUSY if detect device is in resetting
+ *   - -EIO   if detect cmd csq corrupted (due to reset) or
+ *            there is reset pending
+ *   - -ENOMEM/-ETIME/...(Non-Zero) if other error case
+ *   - Zero   if operation completed successfully
+ *
+ * Note -BUSY/-EIO only used in reset case
+ *
+ * Note this is the main send command for command queue, it
  * sends the queue, cleans the queue, etc
  */
 int
@@ -493,6 +490,7 @@ err_crq:
 int
 hns3_cmd_init(struct hns3_hw *hw)
 {
+       uint32_t version;
        int ret;
 
        rte_spinlock_lock(&hw->cmq.csq.lock);
@@ -521,18 +519,27 @@ hns3_cmd_init(struct hns3_hw *hw)
        }
        rte_atomic16_clear(&hw->reset.disable_cmd);
 
-       ret = hns3_cmd_query_firmware_version(hw, &hw->fw_version);
+       ret = hns3_cmd_query_firmware_version(hw, &version);
        if (ret) {
                PMD_INIT_LOG(ERR, "firmware version query failed %d", ret);
                goto err_cmd_init;
        }
 
-       PMD_INIT_LOG(INFO, "The firmware version is %08x", hw->fw_version);
+       hw->fw_version = version;
+       PMD_INIT_LOG(INFO, "The firmware version is %lu.%lu.%lu.%lu",
+                    hns3_get_field(version, HNS3_FW_VERSION_BYTE3_M,
+                                   HNS3_FW_VERSION_BYTE3_S),
+                    hns3_get_field(version, HNS3_FW_VERSION_BYTE2_M,
+                                   HNS3_FW_VERSION_BYTE2_S),
+                    hns3_get_field(version, HNS3_FW_VERSION_BYTE1_M,
+                                   HNS3_FW_VERSION_BYTE1_S),
+                    hns3_get_field(version, HNS3_FW_VERSION_BYTE0_M,
+                                   HNS3_FW_VERSION_BYTE0_S));
 
        return 0;
 
 err_cmd_init:
-       hns3_cmd_uninit(hw);
+       rte_atomic16_set(&hw->reset.disable_cmd, 1);
        return ret;
 }