X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fhns3%2Fhns3_cmd.c;h=5dc874fd7aa9e8711f89645a26ae61a3bbe180d0;hb=a41f593f1bce27cd94eae0e85a8085c592b14b30;hp=5beb3d97546c0968d5a01215395cc367bed94589;hpb=1f9d940d6d0b292937af7c1b7842ea68702f8e17;p=dpdk.git diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c index 5beb3d9754..5dc874fd7a 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -5,7 +5,7 @@ #include #include -#include "hns3_ethdev.h" +#include "hns3_common.h" #include "hns3_regs.h" #include "hns3_intr.h" #include "hns3_logs.h" @@ -44,10 +44,12 @@ static int hns3_allocate_dma_mem(struct hns3_hw *hw, struct hns3_cmq_ring *ring, uint64_t size, uint32_t alignment) { + static uint64_t hns3_dma_memzone_id; const struct rte_memzone *mz = NULL; char z_name[RTE_MEMZONE_NAMESIZE]; - snprintf(z_name, sizeof(z_name), "hns3_dma_%" PRIu64, rte_rand()); + snprintf(z_name, sizeof(z_name), "hns3_dma_%" PRIu64, + __atomic_fetch_add(&hns3_dma_memzone_id, 1, __ATOMIC_RELAXED)); mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY, RTE_MEMZONE_IOVA_CONTIG, alignment, RTE_PGSIZE_2M); @@ -58,18 +60,14 @@ hns3_allocate_dma_mem(struct hns3_hw *hw, struct hns3_cmq_ring *ring, ring->desc = mz->addr; ring->desc_dma_addr = mz->iova; ring->zone = (const void *)mz; - hns3_dbg(hw, "memzone %s allocated with physical address: %" PRIu64, - mz->name, ring->desc_dma_addr); + hns3_dbg(hw, "cmd ring memzone name: %s", mz->name); return 0; } static void -hns3_free_dma_mem(struct hns3_hw *hw, struct hns3_cmq_ring *ring) +hns3_free_dma_mem(struct hns3_cmq_ring *ring) { - hns3_dbg(hw, "memzone %s to be freed with physical address: %" PRIu64, - ((const struct rte_memzone *)ring->zone)->name, - ring->desc_dma_addr); rte_memzone_free((const struct rte_memzone *)ring->zone); ring->buf_size = 0; ring->desc = NULL; @@ -91,10 +89,10 @@ hns3_alloc_cmd_desc(struct hns3_hw *hw, struct hns3_cmq_ring *ring) } static void -hns3_free_cmd_desc(struct hns3_hw *hw, struct hns3_cmq_ring *ring) +hns3_free_cmd_desc(__rte_unused struct hns3_hw *hw, struct hns3_cmq_ring *ring) { if (ring->desc) - hns3_free_dma_mem(hw, ring); + hns3_free_dma_mem(ring); } static int @@ -241,7 +239,7 @@ hns3_is_special_opcode(uint16_t opcode) HNS3_OPC_QUERY_ALL_ERR_INFO,}; uint32_t i; - for (i = 0; i < ARRAY_SIZE(spec_opcode); i++) + for (i = 0; i < RTE_DIM(spec_opcode); i++) if (spec_opcode[i] == opcode) return true; @@ -272,7 +270,7 @@ hns3_cmd_convert_err_code(uint16_t desc_ret) uint32_t i; - for (i = 0; i < ARRAY_SIZE(hns3_cmdq_status); i++) + for (i = 0; i < RTE_DIM(hns3_cmdq_status); i++) if (hns3_cmdq_status[i].imp_errcode == desc_ret) return hns3_cmdq_status[i].linux_errcode; @@ -419,12 +417,8 @@ hns3_get_caps_name(uint32_t caps_id) enum HNS3_CAPS_BITS caps; const char *name; } dev_caps[] = { - { HNS3_CAPS_UDP_GSO_B, "udp_gso" }, - { HNS3_CAPS_ATR_B, "atr" }, { HNS3_CAPS_FD_QUEUE_REGION_B, "fd_queue_region" }, { HNS3_CAPS_PTP_B, "ptp" }, - { HNS3_CAPS_INT_QL_B, "int_ql" }, - { HNS3_CAPS_SIMPLE_BD_B, "simple_bd" }, { HNS3_CAPS_TX_PUSH_B, "tx_push" }, { HNS3_CAPS_PHY_IMP_B, "phy_imp" }, { HNS3_CAPS_TQP_TXRX_INDEP_B, "tqp_txrx_indep" }, @@ -432,9 +426,8 @@ hns3_get_caps_name(uint32_t caps_id) { HNS3_CAPS_STASH_B, "stash" }, { HNS3_CAPS_UDP_TUNNEL_CSUM_B, "udp_tunnel_csum" }, { HNS3_CAPS_RAS_IMP_B, "ras_imp" }, - { HNS3_CAPS_FEC_B, "fec" }, - { HNS3_CAPS_PAUSE_B, "pause" }, - { HNS3_CAPS_RXD_ADV_LAYOUT_B, "rxd_adv_layout" } + { HNS3_CAPS_RXD_ADV_LAYOUT_B, "rxd_adv_layout" }, + { HNS3_CAPS_TM_B, "tm_capability" } }; uint32_t i; @@ -469,7 +462,7 @@ hns3_mask_capability(struct hns3_hw *hw, for (i = 0; i < MAX_CAPS_BIT; i++) { if (!(caps_masked & BIT_ULL(i))) continue; - hns3_info(hw, "mask capabiliy: id-%u, name-%s.", + hns3_info(hw, "mask capability: id-%u, name-%s.", i, hns3_get_caps_name(i)); } } @@ -480,8 +473,6 @@ hns3_parse_capability(struct hns3_hw *hw, { uint32_t caps = rte_le_to_cpu_32(cmd->caps[0]); - if (hns3_get_bit(caps, HNS3_CAPS_UDP_GSO_B)) - hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_UDP_GSO_B, 1); if (hns3_get_bit(caps, HNS3_CAPS_FD_QUEUE_REGION_B)) hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B, 1); @@ -514,6 +505,8 @@ hns3_parse_capability(struct hns3_hw *hw, HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B, 1); if (hns3_get_bit(caps, HNS3_CAPS_RAS_IMP_B)) hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_RAS_IMP_B, 1); + if (hns3_get_bit(caps, HNS3_CAPS_TM_B)) + hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_TM_B, 1); } static uint32_t @@ -620,7 +613,7 @@ hns3_update_dev_lsc_cap(struct hns3_hw *hw, int fw_compact_cmd_result) static int hns3_apply_fw_compat_cmd_result(struct hns3_hw *hw, int result) { - if (result != 0 && hns3_dev_copper_supported(hw)) { + if (result != 0 && hns3_dev_get_support(hw, COPPER)) { hns3_err(hw, "firmware fails to initialize the PHY, ret = %d.", result); return result; @@ -659,7 +652,7 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init) } if (revision == PCI_REVISION_ID_HIP09_A) { struct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw); - if (hns3_dev_copper_supported(hw) == 0 || pf->is_tmp_phy) { + if (hns3_dev_get_support(hw, COPPER) == 0 || pf->is_tmp_phy) { PMD_INIT_LOG(ERR, "***use temp phy driver in dpdk***"); pf->is_tmp_phy = true; hns3_set_bit(hw->capability, @@ -677,7 +670,7 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init) if (is_init) { hns3_set_bit(compat, HNS3_LINK_EVENT_REPORT_EN_B, 1); hns3_set_bit(compat, HNS3_NCSI_ERROR_REPORT_EN_B, 0); - if (hns3_dev_copper_supported(hw)) + if (hns3_dev_get_support(hw, COPPER)) hns3_set_bit(compat, HNS3_FIRMWARE_PHY_DRIVER_EN_B, 1); } req->compat = rte_cpu_to_le_32(compat); @@ -739,7 +732,7 @@ hns3_cmd_init(struct hns3_hw *hw) return 0; /* - * Requiring firmware to enable some features, firber port can still + * Requiring firmware to enable some features, fiber port can still * work without it, but copper port can't work because the firmware * fails to take over the PHY. */