From: Casey Leedom Date: Thu, 2 Sep 2010 13:07:31 +0000 (+0000) Subject: cxgb3: Leave interrupts for fatal errors asserted in common code. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa476321022ac6c3cb8ebfd1736555ccf61da276;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git cxgb3: Leave interrupts for fatal errors asserted in common code. Platform code needs to deal with them now. Signed-off-by: Dimitris Michailidis Signed-off-by: Casey Leedom Signed-off-by: David S. Miller --- diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 14a56640dfa9..d307c9de59fb 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c @@ -1408,6 +1408,7 @@ static int t3_handle_intr_status(struct adapter *adapter, unsigned int reg, fatal++; CH_ALERT(adapter, "%s (0x%x)\n", acts->msg, status & acts->mask); + status &= ~acts->mask; } else if (acts->msg) CH_WARN(adapter, "%s (0x%x)\n", acts->msg, status & acts->mask); @@ -1843,11 +1844,10 @@ static int mac_intr_handler(struct adapter *adap, unsigned int idx) t3_os_link_fault_handler(adap, idx); } - t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); - if (cause & XGM_INTR_FATAL) t3_fatal_err(adap); + t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); return cause != 0; }