bnxt_en: Pre-map the firmware health monitoring registers.

Pre-map the GRC registers for periodic firmware health monitoring.

Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 825a7f945e517aa9dedf2943c4684927e3aa8cce..8ec41d66430e88c4c071742d76dee6c6140224b5 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6950,6 +6950,33 @@ hwrm_cfa_adv_qcaps_exit:
        return rc;
 }
 
+static int bnxt_map_fw_health_regs(struct bnxt *bp)
+{
+       struct bnxt_fw_health *fw_health = bp->fw_health;
+       u32 reg_base = 0xffffffff;
+       int i;
+
+       /* Only pre-map the monitoring GRC registers using window 3 */
+       for (i = 0; i < 4; i++) {
+               u32 reg = fw_health->regs[i];
+
+               if (BNXT_FW_HEALTH_REG_TYPE(reg) != BNXT_FW_HEALTH_REG_TYPE_GRC)
+                       continue;
+               if (reg_base == 0xffffffff)
+                       reg_base = reg & BNXT_GRC_BASE_MASK;
+               if ((reg & BNXT_GRC_BASE_MASK) != reg_base)
+                       return -ERANGE;
+               fw_health->mapped_regs[i] = BNXT_FW_HEALTH_WIN_BASE +
+                                           (reg & BNXT_GRC_OFFSET_MASK);
+       }
+       if (reg_base == 0xffffffff)
+               return 0;
+
+       writel(reg_base, bp->bar0 + BNXT_GRCPF_REG_WINDOW_BASE_OUT +
+                        BNXT_FW_HEALTH_WIN_MAP_OFF);
+       return 0;
+}
+
 static int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp)
 {
        struct hwrm_error_recovery_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
@@ -7013,6 +7040,8 @@ static int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp)
        }
 err_recovery_out:
        mutex_unlock(&bp->hwrm_cmd_lock);
+       if (!rc)
+               rc = bnxt_map_fw_health_regs(bp);
        if (rc)
                bp->fw_cap &= ~BNXT_FW_CAP_ERROR_RECOVERY;
        return rc;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index ce535e52eaa9a8e136ba89260ac368bb404ff0a6..78fd5850646bab4d36083b472c1113a78f604666 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1217,6 +1217,9 @@ struct bnxt_test_info {
 #define BNXT_GRCPF_REG_KONG_COMM               0xA00
 #define BNXT_GRCPF_REG_KONG_COMM_TRIGGER       0xB00
 
+#define BNXT_GRC_BASE_MASK                     0xfffff000
+#define BNXT_GRC_OFFSET_MASK                   0x00000ffc
+
 struct bnxt_tc_flow_stats {
        u64             packets;
        u64             bytes;
@@ -1368,6 +1371,9 @@ struct bnxt_fw_health {
 #define BNXT_FW_HEALTH_REG_TYPE(reg)   ((reg) & BNXT_FW_HEALTH_REG_TYPE_MASK)
 #define BNXT_FW_HEALTH_REG_OFF(reg)    ((reg) & ~BNXT_FW_HEALTH_REG_TYPE_MASK)
 
+#define BNXT_FW_HEALTH_WIN_BASE                0x3000
+#define BNXT_FW_HEALTH_WIN_MAP_OFF     8
+
 struct bnxt {
        void __iomem            *bar0;
        void __iomem            *bar1;