net/ena: rework RSS configuration

[dpdk.git] / drivers / net / hinic / base / hinic_pmd_hwif.c

diff --git a/drivers/net/hinic/base/hinic_pmd_hwif.c b/drivers/net/hinic/base/hinic_pmd_hwif.c
index 8a01fbc..26fa1e2 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_hwif.c
+++ b/drivers/net/hinic/base/hinic_pmd_hwif.c
@@ -99,7 +99,7 @@ void hinic_set_pf_status(struct hinic_hwif *hwif, enum hinic_pf_status status)
        u32 addr  = HINIC_CSR_FUNC_ATTR5_ADDR;
 
        if (hwif->attr.func_type == TYPE_VF) {
-               PMD_DRV_LOG(ERR, "VF doesn't support set attr5");
+               PMD_DRV_LOG(INFO, "VF doesn't support to set attr5");
                return;
        }
 
@@ -183,17 +183,19 @@ static void set_ppf(struct hinic_hwif *hwif)
                attr->func_type = TYPE_PPF;
 }
 
-static void init_db_area_idx(struct hinic_free_db_area *free_db_area)
+static void init_db_area_idx(struct hinic_hwif *hwif)
 {
+       struct hinic_free_db_area *free_db_area = &hwif->free_db_area;
+       u32 db_max_areas = hwif->db_max_areas;
        u32 i;
 
-       for (i = 0; i < HINIC_DB_MAX_AREAS; i++)
+       for (i = 0; i < db_max_areas; i++)
                free_db_area->db_idx[i] = i;
 
        free_db_area->alloc_pos = 0;
        free_db_area->return_pos = 0;
 
-       free_db_area->num_free = HINIC_DB_MAX_AREAS;
+       free_db_area->num_free = db_max_areas;
 
        spin_lock_init(&free_db_area->idx_lock);
 }
@@ -214,7 +216,7 @@ static int get_db_idx(struct hinic_hwif *hwif, u32 *idx)
        free_db_area->num_free--;
 
        pos = free_db_area->alloc_pos++;
-       pos &= HINIC_DB_MAX_AREAS - 1;
+       pos &= (hwif->db_max_areas - 1);
 
        pg_idx = free_db_area->db_idx[pos];
 
@@ -235,7 +237,7 @@ static void free_db_idx(struct hinic_hwif *hwif, u32 idx)
        spin_lock(&free_db_area->idx_lock);
 
        pos = free_db_area->return_pos++;
-       pos &= HINIC_DB_MAX_AREAS - 1;
+       pos &= (hwif->db_max_areas - 1);
 
        free_db_area->db_idx[pos] = idx;
 
@@ -278,7 +280,7 @@ void hinic_set_msix_state(void *hwdev, u16 msix_idx, enum hinic_msix_state flag)
        /* vfio-pci does not mmap msi-x vector table to user space,
         * we can not access the space when kernel driver is vfio-pci
         */
-       if (hw->pcidev_hdl->kdrv == RTE_KDRV_VFIO)
+       if (hw->pcidev_hdl->kdrv == RTE_PCI_KDRV_VFIO)
                return;
 
        mask_bits = readl(hwif->intr_regs_base + offset);
@@ -319,7 +321,7 @@ int wait_until_doorbell_flush_states(struct hinic_hwif *hwif,
                rte_delay_ms(1);
        } while (time_before(jiffies, end));
 
-       return -EFAULT;
+       return -ETIMEDOUT;
 }
 
 static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif)
@@ -341,7 +343,7 @@ static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif)
                rte_delay_ms(1);
        } while (time_before(jiffies, end));
 
-       return -EFAULT;
+       return -ETIMEDOUT;
 }
 
 u16 hinic_global_func_id(void *hwdev)
@@ -391,8 +393,13 @@ static int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base,
                    void *db_base, __rte_unused void *dwqe_mapping)
 {
        struct hinic_hwif *hwif;
+       struct rte_pci_device *pci_dev;
+       u64 db_bar_len;
        int err;
 
+       pci_dev = (struct rte_pci_device *)(hwdev->pcidev_hdl);
+       db_bar_len = pci_dev->mem_resource[HINIC_DB_MEM_BAR].len;
+
        hwif = hwdev->hwif;
 
        hwif->cfg_regs_base = (u8 __iomem *)cfg_reg_base;
@@ -400,7 +407,11 @@ static int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base,
 
        hwif->db_base_phy = db_base_phy;
        hwif->db_base = (u8 __iomem *)db_base;
-       init_db_area_idx(&hwif->free_db_area);
+       hwif->db_max_areas = db_bar_len / HINIC_DB_PAGE_SIZE;
+       if (hwif->db_max_areas > HINIC_DB_MAX_AREAS)
+               hwif->db_max_areas = HINIC_DB_MAX_AREAS;
+
+       init_db_area_idx(hwif);
 
        get_hwif_attr(hwif);
 
@@ -439,8 +450,8 @@ static void hinic_parse_hwif_attr(struct hinic_hwdev *hwdev)
        struct hinic_hwif *hwif = hwdev->hwif;
 
        PMD_DRV_LOG(INFO, "Device %s hwif attribute:", hwdev->pcidev_hdl->name);
-       PMD_DRV_LOG(INFO, "func_idx:%u, p2p_idx:%u, pciintf_idx:%u, "
-                   "vf_in_pf:%u, ppf_idx:%u, global_vf_id:%u, func_type:%u",
+       PMD_DRV_LOG(INFO, "func_idx: %u, p2p_idx: %u, pciintf_idx: %u, "
+                   "vf_in_pf: %u, ppf_idx: %u, global_vf_id: %u, func_type: %u",
                    hwif->attr.func_global_idx,
                    hwif->attr.port_to_port_idx, hwif->attr.pci_intf_idx,
                    hwif->attr.vf_in_pf, hwif->attr.ppf_idx,