diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 10:43:42 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 10:43:42 -0400 |
| commit | 149de4f69232d785f37cbb4fdb6927bb06242468 (patch) | |
| tree | 57ba9b1f5fdd6583f13af9efeb60eee9025a3ad5 | |
| parent | 57d545d312a87e594cc286c150b4a18e3570a626 (diff) | |
| download | longterm-queue-5.2-149de4f69232d785f37cbb4fdb6927bb06242468.tar.gz | |
net: qed (#2): ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/qed-suppress-false-positives-interrupt-error-message.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/queue/qed-suppress-false-positives-interrupt-error-message.patch b/queue/qed-suppress-false-positives-interrupt-error-message.patch index c2e0c1a6..61094045 100644 --- a/queue/qed-suppress-false-positives-interrupt-error-message.patch +++ b/queue/qed-suppress-false-positives-interrupt-error-message.patch @@ -1,4 +1,4 @@ -From eb61c2d69903e977ffa2b80b1da9d1f758cf228d Mon Sep 17 00:00:00 2001 +From 07b48e24621b307b891d2c0b1ecac8b156a2004c Mon Sep 17 00:00:00 2001 From: Alexander Lobakin <alobakin@marvell.com> Date: Tue, 21 Jul 2020 17:41:43 +0300 Subject: [PATCH] qed: suppress false-positives interrupt error messages on HW @@ -27,10 +27,10 @@ Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c -index 9c26fde663b3..dbdac983ccde 100644 +index 70fef2df165f..ede2d1cc4c8a 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c -@@ -3102,7 +3102,7 @@ int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params) +@@ -2151,7 +2151,7 @@ int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params) } /* Log and clear previous pglue_b errors if such exist */ @@ -40,10 +40,10 @@ index 9c26fde663b3..dbdac983ccde 100644 /* Enable the PF's internal FID_enable in the PXP */ rc = qed_pglueb_set_pfid_enable(p_hwfn, p_hwfn->p_main_ptt, diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c -index 7e13a9d9b89c..5eec1fc6229d 100644 +index 70a771cd8788..772f32297bbc 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_int.c +++ b/drivers/net/ethernet/qlogic/qed/qed_int.c -@@ -257,9 +257,10 @@ static int qed_grc_attn_cb(struct qed_hwfn *p_hwfn) +@@ -256,9 +256,10 @@ static int qed_grc_attn_cb(struct qed_hwfn *p_hwfn) #define PGLUE_ATTENTION_ZLR_VALID (1 << 25) #define PGLUE_ATTENTION_ILT_VALID (1 << 23) @@ -56,7 +56,7 @@ index 7e13a9d9b89c..5eec1fc6229d 100644 u32 tmp; tmp = qed_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_WR_DETAILS2); -@@ -273,22 +274,23 @@ int qed_pglueb_rbc_attn_handler(struct qed_hwfn *p_hwfn, +@@ -272,22 +273,23 @@ int qed_pglueb_rbc_attn_handler(struct qed_hwfn *p_hwfn, details = qed_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_WR_DETAILS); @@ -96,7 +96,7 @@ index 7e13a9d9b89c..5eec1fc6229d 100644 } tmp = qed_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_RD_DETAILS2); -@@ -321,8 +323,14 @@ int qed_pglueb_rbc_attn_handler(struct qed_hwfn *p_hwfn, +@@ -320,8 +322,14 @@ int qed_pglueb_rbc_attn_handler(struct qed_hwfn *p_hwfn, } tmp = qed_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_WR_DETAILS_ICPL); @@ -113,7 +113,7 @@ index 7e13a9d9b89c..5eec1fc6229d 100644 tmp = qed_rd(p_hwfn, p_ptt, PGLUE_B_REG_MASTER_ZLR_ERR_DETAILS); if (tmp & PGLUE_ATTENTION_ZLR_VALID) { -@@ -361,7 +369,7 @@ int qed_pglueb_rbc_attn_handler(struct qed_hwfn *p_hwfn, +@@ -360,7 +368,7 @@ int qed_pglueb_rbc_attn_handler(struct qed_hwfn *p_hwfn, static int qed_pglueb_rbc_attn_cb(struct qed_hwfn *p_hwfn) { @@ -121,12 +121,12 @@ index 7e13a9d9b89c..5eec1fc6229d 100644 + return qed_pglueb_rbc_attn_handler(p_hwfn, p_hwfn->p_dpc_ptt, false); } - static int qed_fw_assertion(struct qed_hwfn *p_hwfn) + #define QED_DORQ_ATTENTION_REASON_MASK (0xfffff) diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.h b/drivers/net/ethernet/qlogic/qed/qed_int.h -index e09db3386367..110169e90121 100644 +index d473b522afc5..ba5cfebf2d0d 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_int.h +++ b/drivers/net/ethernet/qlogic/qed/qed_int.h -@@ -442,7 +442,7 @@ int qed_int_set_timer_res(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, +@@ -431,7 +431,7 @@ int qed_int_set_timer_res(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, #define QED_MAPPING_MEMORY_SIZE(dev) (NUM_OF_SBS(dev)) |