bnxt_en: Consolidate DB offset calculation

The doorbell offset on P5 chips is hard coded.  On the new P7 chips,
it is returned by the firmware.  Simplify the logic that determines
this offset and store it in a new db_offset field in struct bnxt.
Also, provide this offset to the RoCE driver in struct bnxt_en_dev.

Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Hongguang Gao <hongguang.gao@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20231201223924.26955-5-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 829b2a6a05a092222677f7fbf02e3075d676cc89..a17de1aceff418b1b308f2aecbe2195d5d9ce4fd 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6031,10 +6031,6 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,
                        u32 map_idx, u32 xid)
 {
        if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
-               if (BNXT_PF(bp))
-                       db->doorbell = bp->bar1 + DB_PF_OFFSET_P5;
-               else
-                       db->doorbell = bp->bar1 + DB_VF_OFFSET_P5;
                switch (ring_type) {
                case HWRM_RING_ALLOC_TX:
                        db->db_key64 = DBR_PATH_L2 | DBR_TYPE_SQ;
@@ -6054,6 +6050,8 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,
 
                if (bp->flags & BNXT_FLAG_CHIP_P7)
                        db->db_key64 |= DBR_VALID;
+
+               db->doorbell = bp->bar1 + bp->db_offset;
        } else {
                db->doorbell = bp->bar1 + map_idx * 0x80;
                switch (ring_type) {
@@ -7146,7 +7144,6 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp)
 {
        struct hwrm_func_qcfg_output *resp;
        struct hwrm_func_qcfg_input *req;
-       u32 min_db_offset = 0;
        u16 flags;
        int rc;
 
@@ -7204,16 +7201,17 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp)
        if (bp->db_size)
                goto func_qcfg_exit;
 
-       if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
+       bp->db_offset = le16_to_cpu(resp->legacy_l2_db_size_kb) * 1024;
+       if (BNXT_CHIP_P5(bp)) {
                if (BNXT_PF(bp))
-                       min_db_offset = DB_PF_OFFSET_P5;
+                       bp->db_offset = DB_PF_OFFSET_P5;
                else
-                       min_db_offset = DB_VF_OFFSET_P5;
+                       bp->db_offset = DB_VF_OFFSET_P5;
        }
        bp->db_size = PAGE_ALIGN(le16_to_cpu(resp->l2_doorbell_bar_size_kb) *
                                 1024);
        if (!bp->db_size || bp->db_size > pci_resource_len(bp->pdev, 2) ||
-           bp->db_size <= min_db_offset)
+           bp->db_size <= bp->db_offset)
                bp->db_size = pci_resource_len(bp->pdev, 2);
 
 func_qcfg_exit:

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 40b26f7a0f5ea445c2201f608b5a3b8fc0086c85..6d96f66dc8c04553389d58f36eeb36588cf10918 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -2216,6 +2216,7 @@ struct bnxt {
        /* ensure atomic 64-bit doorbell writes on 32-bit systems. */
        spinlock_t              db_lock;
 #endif
+       int                     db_offset;      /* db_offset within db_size */
        int                     db_size;
 
 #define BNXT_NTP_FLTR_MAX_FLTR 4096

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index e89731492f5e9109ac682807d8d9dde13c784b83..93f9bd55020f277f02fb6ed959bd5e82ec35fd93 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -42,13 +42,10 @@ static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *ent)
        for (i = 0; i < num_msix; i++) {
                ent[i].vector = bp->irq_tbl[idx + i].vector;
                ent[i].ring_idx = idx + i;
-               if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
-                       ent[i].db_offset = DB_PF_OFFSET_P5;
-                       if (BNXT_VF(bp))
-                               ent[i].db_offset = DB_VF_OFFSET_P5;
-               } else {
+               if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS)
+                       ent[i].db_offset = bp->db_offset;
+               else
                        ent[i].db_offset = (idx + i) * 0x80;
-               }
        }
 }
 
@@ -333,6 +330,7 @@ static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp)
        edev->pdev = bp->pdev;
        edev->l2_db_size = bp->db_size;
        edev->l2_db_size_nc = bp->db_size;
+       edev->l2_db_offset = bp->db_offset;
 
        if (bp->flags & BNXT_FLAG_ROCEV1_CAP)
                edev->flags |= BNXT_EN_FLAG_ROCEV1_CAP;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
index 6ff77f082e6c744626b0c6ed227d69acec1e81f3..b9e73de14b5721ab21ffd68d7ca3343f83eb3323 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
@@ -73,6 +73,10 @@ struct bnxt_en_dev {
                                                         * bytes mapped as non-
                                                         * cacheable.
                                                         */
+       int                             l2_db_offset;   /* Doorbell offset in
+                                                        * bytes within
+                                                        * l2_db_size_nc.
+                                                        */
        u16                             chip_num;
        u16                             hw_ring_stats_size;
        u16                             pf_port_id;