Skip to contentSkip to conversation

bnx2x: AER revised

PATCH Applied Yuval Mintz 2 participants 2 messages Mar 20, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bnx2x: AER revised

Revised bnx2x implementation of PCI Express Advanced Error Recovery - stop and free driver resources according to the AER flow (instead of the currently implemented `hope-for-the-best' release approach), and do not make any assumptions on the HW state after slot reset.

---
Hi Dave,

Please apply this patch to `net-next'.

Thanks,
Yuval

---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h      |   3 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c  |   4 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h  |   4 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 149 +++++++++++++++++++----
 4 files changed, 130 insertions(+), 30 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +2 -1
index a4729c7..c59da2d 100644
@@ -1226,10 +1226,11 @@ enum {
 
 
 struct bnx2x_prev_path_list {
+	struct list_head list;
 	u8 bus;
 	u8 slot;
 	u8 path;
-	struct list_head list;
+	u8 aer;
 	u8 undi;
 };
 
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +2 -2
index 8091de7..6f8a81c 100644
@@ -2010,7 +2010,7 @@ static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
  * Cleans the object that have internal lists without sending
  * ramrods. Should be run when interrutps are disabled.
  */
-static void bnx2x_squeeze_objects(struct bnx2x *bp)
+void bnx2x_squeeze_objects(struct bnx2x *bp)
 {
 	int rc;
 	unsigned long ramrod_flags = 0, vlan_mac_flags = 0;
@@ -2774,7 +2774,7 @@ load_error0:
 #endif /* ! BNX2X_STOP_ON_ERROR */
 }
 
-static int bnx2x_drain_tx_queues(struct bnx2x *bp)
+int bnx2x_drain_tx_queues(struct bnx2x *bp)
 {
 	u8 rc = 0, cos, i;
 
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +4 -0
index f9098d8..54e1b14 100644
@@ -1402,4 +1402,8 @@ static inline bool bnx2x_is_valid_ether_addr(struct bnx2x *bp, u8 *addr)
  *
  */
 void bnx2x_fill_fw_str(struct bnx2x *bp, char *buf, size_t buf_len);
+
+int bnx2x_drain_tx_queues(struct bnx2x *bp);
+void bnx2x_squeeze_objects(struct bnx2x *bp);
+
 #endif /* BNX2X_CMN_H */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +122 -27

246 lines not on this page · raw message

Signature · 1 line
1.8.1.227.g44fe835
maintainer Applied
#1 lore raw

From: "Yuval Mintz" <[email protected]>
Date: Wed, 20 Mar 2013 17:21:28 +0200

Quoted 7 lines

Revised bnx2x implementation of PCI Express Advanced Error Recovery - stop and free driver resources according to the AER flow (instead of the currently implemented `hope-for-the-best' release approach), and do not make any assumptions on the HW state after slot reset.

Applied, thanks.