diff options
author | Casey Leedom <leedom@chelsio.com> | 2010-09-02 09:07:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-03 13:03:51 -0400 |
commit | aa476321022ac6c3cb8ebfd1736555ccf61da276 (patch) | |
tree | 2fad67e14b929fb8856e7c47af7e91d4f339d2de /drivers/net/cxgb3 | |
parent | e05e6a397c65ac9a31ce799cf85157f2d85f45b7 (diff) |
cxgb3: Leave interrupts for fatal errors asserted in common code.
Platform code needs to deal with them now.
Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
1408 | fatal++; | 1408 | fatal++; |
1409 | CH_ALERT(adapter, "%s (0x%x)\n", | 1409 | CH_ALERT(adapter, "%s (0x%x)\n", |
1410 | acts->msg, status & acts->mask); | 1410 | acts->msg, status & acts->mask); |
1411 | status &= ~acts->mask; | ||
1411 | } else if (acts->msg) | 1412 | } else if (acts->msg) |
1412 | CH_WARN(adapter, "%s (0x%x)\n", | 1413 | CH_WARN(adapter, "%s (0x%x)\n", |
1413 | acts->msg, status & acts->mask); | 1414 | acts->msg, status & acts->mask); |
@@ -1843,11 +1844,10 @@ static int mac_intr_handler(struct adapter *adap, unsigned int idx) | |||
1843 | t3_os_link_fault_handler(adap, idx); | 1844 | t3_os_link_fault_handler(adap, idx); |
1844 | } | 1845 | } |
1845 | 1846 | ||
1846 | t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); | ||
1847 | |||
1848 | if (cause & XGM_INTR_FATAL) | 1847 | if (cause & XGM_INTR_FATAL) |
1849 | t3_fatal_err(adap); | 1848 | t3_fatal_err(adap); |
1850 | 1849 | ||
1850 | t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); | ||
1851 | return cause != 0; | 1851 | return cause != 0; |
1852 | } | 1852 | } |
1853 | 1853 | ||