ehea: Fixed error recovery
Subsystems (2)
PATCH 1/1 ehea: Fixed error recovery
Error recovery for QP errors: Reset QPs and dump error information
Signed-off-by Jan-Bernd Themann <[email protected]>
---
drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_main.c | 8 +++++++- drivers/net/ehea/ehea_phyp.c | 10 ++++++++++ drivers/net/ehea/ehea_phyp.h | 3 +++ drivers/net/ehea/ehea_qmr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ drivers/net/ehea/ehea_qmr.h | 5 +++++ 6 files changed, 68 insertions(+), 2 deletions(-)
drivers/net/ehea/ehea.h +1 -1
@@ -39,7 +39,7 @@ #include <asm/abs_addr.h>#include <asm/io.h> #define DRV_NAME "ehea" -#define DRV_VERSION "EHEA_0045" +#define DRV_VERSION "EHEA_0046"#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
drivers/net/ehea/ehea_main.c +7 -1
@@ -76,7 +76,7 @@ void ehea_dump(void *adr, int len, charint x;unsigned char *deb = adr;for (x =0 ; x < len; x +=16 ) { -printk (DRV_NAME "%s adr=%p ofs=%04x %016lx %016lx\n" , msg, +printk (DRV_NAME " %s adr=%p ofs=%04x %016lx %016lx\n" , msg, deb, x, *((u64 *)&deb[0 ]), *((u64 *)&deb[8 ])); deb +=16 ; }
@@ -555,6 +555,7 @@ static irqreturn_t ehea_qp_aff_irq_handl {struct ehea_port *port = param;struct ehea_eqe *eqe; +struct ehea_qp *qp;u32 qp_token; eqe =ehea_poll_eq (port->qp_eq);
@@ -563,9 +564,14 @@ static irqreturn_t ehea_qp_aff_irq_handl qp_token =EHEA_BMASK_GET (EHEA_EQE_QP_TOKEN , eqe->entry);ehea_error ("QP aff_err: entry=0x%lx, token=0x%x" , eqe->entry, qp_token); + + qp = port->port_res[qp_token].qp; +ehea_error_data (port->adapter, qp->fw_handle); eqe =ehea_poll_eq (port->qp_eq); } +queue_work (port->adapter->ehea_wq, &port->reset_task); +return IRQ_HANDLED ; }
drivers/net/ehea/ehea_phyp.c +10 -0
@@ -612,3 +612,13 @@ u64 ehea_h_reset_events(const u64 adapte event_mask,/* R6 */ 0, 0, 0, 0); /* R7-R12 */ } + +u64 ehea_h_error_data (const u64 adapter_handle,const u64 ressource_handle, +void *rblock) +{ +return ehea_plpar_hcall_norets (H_ERROR_DATA , + adapter_handle,/* R4 */ + ressource_handle,/* R5 */ +virt_to_abs (rblock),/* R6 */ +0 ,0 ,0 ,0 );/* R7-R12 */ +}
drivers/net/ehea/ehea_phyp.h +3 -0
@@ -454,4 +454,7 @@ u64 ehea_h_reg_dereg_bcmc(const u64 adapu64 ehea_h_reset_events (const u64 adapter_handle,const u64 neq_handle,const u64 event_mask); +u64 ehea_h_error_data (const u64 adapter_handle,const u64 ressource_handle, +void *rblock); +#endif /* __EHEA_PHYP_H__ */
drivers/net/ehea/ehea_qmr.c +42 -0
52 lines not on this page · raw message
drivers/net/ehea/ehea_qmr.h +5 -0
@@ -180,6 +180,9 @@ struct ehea_eqe {u64 entry; }; +#define ERROR_DATA_LENGTH EHEA_BMASK_IBM(52,63) +#define ERROR_DATA_TYPE EHEA_BMASK_IBM(0,7) +static inline void *hw_qeit_calc (struct hw_queue *queue,u64 q_offset) {struct ehea_page *current_page;
@@ -355,4 +358,6 @@ int ehea_destroy_qp(struct ehea_qp *qp);int ehea_reg_mr_adapter (struct ehea_adapter *adapter); +void ehea_error_data (struct ehea_adapter *adapter,u64 res_handle); +#endif /* __EHEA_QMR_H__ */