You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
101 lines
3.5 KiB
101 lines
3.5 KiB
5 years ago
|
From 48b35e7c5e2e2b19be38219c97a652453b982bc7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonathan Toppins <jtoppins@redhat.com>
|
||
|
|
Date: Wed, 2 Oct 2019 18:23:23 -0400
|
||
|
|
Subject: [PATCH 68/96] [netdrv] bnxt_en: Pre-map the firmware health
|
||
|
|
monitoring registers
|
||
|
|
|
||
|
|
Message-id: <91d24ffc1068f9308c91815baf3e8aa149d16a36.1570027456.git.jtoppins@redhat.com>
|
||
|
|
Patchwork-id: 276483
|
||
|
|
O-Subject: [RHEL-8.2 PATCH 61/78] bnxt_en: Pre-map the firmware health monitoring registers.
|
||
|
|
Bugzilla: 1724766
|
||
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit 9ffbd67734909ca8bb099e62f06387649b43d5a8)
|
||
|
|
Bugzilla: 1724766
|
||
|
|
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=23809532
|
||
|
|
Tested: build, boot, basic ping
|
||
|
|
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
||
|
|
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 29 +++++++++++++++++++++++++++++
|
||
|
|
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 ++++++
|
||
|
|
2 files changed, 35 insertions(+)
|
||
|
|
|
||
|
|
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt.c
|
||
|
|
===================================================================
|
||
|
|
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt.c 2020-02-06 16:23:19.289480300 +0100
|
||
|
|
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt.c 2020-02-06 16:23:19.432478987 +0100
|
||
|
|
@@ -6955,6 +6955,33 @@
|
||
|
|
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;
|
||
|
|
@@ -7018,6 +7045,8 @@
|
||
|
|
}
|
||
|
|
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;
|
||
|
|
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt.h
|
||
|
|
===================================================================
|
||
|
|
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt.h 2020-02-06 16:23:19.289480300 +0100
|
||
|
|
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt.h 2020-02-06 16:23:19.432478987 +0100
|
||
|
|
@@ -1217,6 +1217,9 @@
|
||
|
|
#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 @@
|
||
|
|
#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;
|