net/hinic: fix offload info calculating for TSO

[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 a5e223b..8a01fbc 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_hwif.c
+++ b/drivers/net/hinic/base/hinic_pmd_hwif.c
@@ -13,6 +13,9 @@
 #define HINIC_INTR_MSI_BAR     2
 #define HINIC_DB_MEM_BAR       4
 
+#define PAGE_SIZE_4K           0x1000
+#define PAGE_SIZE_64K          0x10000
+
 #define        HINIC_MSIX_CNT_RESEND_TIMER_SHIFT       29
 #define        HINIC_MSIX_CNT_RESEND_TIMER_MASK        0x7U
 
@@ -24,17 +27,22 @@
  * hwif_ready - test if the HW initialization passed
  * @hwdev: the pointer to the private hardware device object
  * Return: 0 - success, negative - failure
- **/
+ */
 static int hwif_ready(struct hinic_hwdev *hwdev)
 {
-       u32 addr, attr1;
+       u32 addr, attr0, attr1;
 
        addr   = HINIC_CSR_FUNC_ATTR1_ADDR;
        attr1  = hinic_hwif_read_reg(hwdev->hwif, addr);
-
        if (!HINIC_AF1_GET(attr1, MGMT_INIT_STATUS))
                return -EBUSY;
 
+       addr   = HINIC_CSR_FUNC_ATTR0_ADDR;
+       attr0  = hinic_hwif_read_reg(hwdev->hwif, addr);
+       if ((HINIC_AF0_GET(attr0, FUNC_TYPE) == TYPE_VF) &&
+            !HINIC_AF1_GET(attr1, PF_INIT_STATUS))
+               return -EBUSY;
+
        return 0;
 }
 
@@ -44,7 +52,7 @@ static int hwif_ready(struct hinic_hwdev *hwdev)
  * @attr0: the first attribute that was read from the hw
  * @attr1: the second attribute that was read from the hw
  * @attr2: the third attribute that was read from the hw
- **/
+ */
 static void set_hwif_attr(struct hinic_hwif *hwif, u32 attr0, u32 attr1,
                          u32 attr2)
 {
@@ -68,7 +76,7 @@ static void set_hwif_attr(struct hinic_hwif *hwif, u32 attr0, u32 attr1,
 /**
  * get_hwif_attr - read and set the attributes as members in hwif
  * @hwif: the hardware interface of a pci function device
- **/
+ */
 static void get_hwif_attr(struct hinic_hwif *hwif)
 {
        u32 addr, attr0, attr1, attr2;
@@ -90,6 +98,11 @@ void hinic_set_pf_status(struct hinic_hwif *hwif, enum hinic_pf_status status)
        u32 attr5 = HINIC_AF5_SET(status, PF_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");
+               return;
+       }
+
        hinic_hwif_write_reg(hwif, addr, attr5);
 }
 
@@ -145,7 +158,7 @@ void hinic_disable_doorbell(struct hinic_hwif *hwif)
 /**
  * set_ppf - try to set hwif as ppf and set the type of hwif in this case
  * @hwif: the hardware interface of a pci function device
- **/
+ */
 static void set_ppf(struct hinic_hwif *hwif)
 {
        struct hinic_func_attr *attr = &hwif->attr;
@@ -285,6 +298,30 @@ static void disable_all_msix(struct hinic_hwdev *hwdev)
                hinic_set_msix_state(hwdev, i, HINIC_MSIX_DISABLE);
 }
 
+/**
+ * Wait for up enable or disable doorbell flush finished.
+ * @hwif: the hardware interface of a pci function device.
+ * @states: Disable or Enable.
+ */
+int wait_until_doorbell_flush_states(struct hinic_hwif *hwif,
+                                       enum hinic_doorbell_ctrl states)
+{
+       unsigned long end;
+       enum hinic_doorbell_ctrl db_ctrl;
+
+       end = jiffies +
+               msecs_to_jiffies(HINIC_WAIT_DOORBELL_AND_OUTBOUND_TIMEOUT);
+       do {
+               db_ctrl = hinic_get_doorbell_ctrl_status(hwif);
+               if (db_ctrl == states)
+                       return 0;
+
+               rte_delay_ms(1);
+       } while (time_before(jiffies, end));
+
+       return -EFAULT;
+}
+
 static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif)
 {
        unsigned long end;
@@ -328,6 +365,17 @@ u8 hinic_ppf_idx(void *hwdev)
        return hwif->attr.ppf_idx;
 }
 
+/**
+ * hinic_dma_attr_entry_num - get number id of DMA attribute table.
+ * @hwdev: the pointer to the private hardware device object.
+ * Return: The number id of DMA attribute table.
+ */
+u8 hinic_dma_attr_entry_num(void *hwdev)
+{
+       struct hinic_hwif *hwif = ((struct hinic_hwdev *)hwdev)->hwif;
+       return hwif->attr.num_dma_attr;
+}
+
 /**
  * hinic_init_hwif - initialize the hw interface
  * @hwdev: the pointer to the private hardware device object
@@ -337,7 +385,7 @@ u8 hinic_ppf_idx(void *hwdev)
  * @db_base: base virtual address of doorbell registers
  * @dwqe_mapping: direct wqe io mapping address
  * Return: 0 - success, negative - failure
- **/
+ */
 static int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base,
                    void *intr_reg_base, u64 db_base_phy,
                    void *db_base, __rte_unused void *dwqe_mapping)
@@ -371,6 +419,9 @@ static int hinic_init_hwif(struct hinic_hwdev *hwdev, void *cfg_reg_base,
        if (!HINIC_IS_VF(hwdev))
                set_ppf(hwif);
 
+       /* disable mgmt cpu report any event */
+       hinic_set_pf_status(hwdev->hwif, HINIC_PF_STATUS_INIT);
+
        return 0;
 
 hwif_ready_err:
@@ -403,10 +454,28 @@ static void hinic_get_mmio(struct hinic_hwdev *hwdev, void **cfg_regs_base,
                           void **intr_base, void **db_base)
 {
        struct rte_pci_device *pci_dev = hwdev->pcidev_hdl;
+       uint64_t bar0_size;
+       uint64_t bar2_size;
+       uint64_t bar0_phy_addr;
+       uint64_t pagesize = sysconf(_SC_PAGESIZE);
 
        *cfg_regs_base = pci_dev->mem_resource[HINIC_CFG_REGS_BAR].addr;
        *intr_base = pci_dev->mem_resource[HINIC_INTR_MSI_BAR].addr;
        *db_base = pci_dev->mem_resource[HINIC_DB_MEM_BAR].addr;
+
+       bar0_size = pci_dev->mem_resource[HINIC_CFG_REGS_BAR].len;
+       bar2_size = pci_dev->mem_resource[HINIC_INTR_MSI_BAR].len;
+
+       if (pagesize == PAGE_SIZE_64K && (bar0_size % pagesize != 0)) {
+               bar0_phy_addr =
+                       pci_dev->mem_resource[HINIC_CFG_REGS_BAR].phys_addr;
+               if (bar0_phy_addr % pagesize != 0 &&
+               (bar0_size + bar2_size <= pagesize) &&
+               bar2_size >= bar0_size) {
+                       *cfg_regs_base = (void *)((uint8_t *)(*intr_base)
+                               + bar2_size);
+               }
+       }
 }
 
 void hinic_hwif_res_free(struct hinic_hwdev *hwdev)
@@ -459,7 +528,7 @@ init_hwif_err:
  * @hwdev: the hardware interface of a nic device
  * @msix_idx: Index of msix interrupt
  * @clear_resend_en: enable flag of clear resend configuration
- **/
+ */
 void hinic_misx_intr_clear_resend_bit(void *hwdev, u16 msix_idx,
                                      u8 clear_resend_en)
 {