lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cxgb3: Leave interrupts for fatal errors asserted in common code.

Browse Source 
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>
This commit is contained in:
Casey Leedom
2010-09-02 13:07:31 +00:00
committed by David S. Miller
parent e05e6a397c
commit aa47632102
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/cxgb3/t3_hw.c
View File

@@ -1408,6 +1408,7 @@ static int t3_handle_intr_status(struct adapter *adapter, unsigned int reg,
fatal++; fatal++;
CH_ALERT(adapter, "%s (0x%x)\n", CH_ALERT(adapter, "%s (0x%x)\n",
acts->msg, status & acts->mask); acts->msg, status & acts->mask);
status &= ~acts->mask;
} else if (acts->msg) } else if (acts->msg)
CH_WARN(adapter, "%s (0x%x)\n", CH_WARN(adapter, "%s (0x%x)\n",
acts->msg, status & acts->mask); 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_os_link_fault_handler(adap, idx);
} }
t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause);
if (cause & XGM_INTR_FATAL) if (cause & XGM_INTR_FATAL)
t3_fatal_err(adap); t3_fatal_err(adap);
t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause);
return cause != 0; return cause != 0;
} }