diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-09-29 22:25:15 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-09-29 14:02:53 -0700 |
| commit | a17409e73bc559e9619d478fab92c8a160b77ff9 (patch) | |
| tree | 7f14648b8f0c480bf71f8603dfeb0ee57c2ad9b9 /drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | |
| parent | net: atheros: Remove WARN_ON(in_interrupt()) (diff) | |
| download | linux-dev-a17409e73bc559e9619d478fab92c8a160b77ff9.tar.xz linux-dev-a17409e73bc559e9619d478fab92c8a160b77ff9.zip | |
net: cxgb3: Cleanup in_interrupt() usage
t3_sge_stop() is called from task context and from error handlers in
interrupt context. It relies on in_interrupt() to differentiate the
contexts.
in_interrupt() is deprecated as it is ill defined and does not provide what
it suggests.
Instead of replacing it with some other construct, simply split the
function into t3_sge_stop_dma(), which can be called from any context, and
t3_sge_stop() which can be only called from task context.
This has the advantage that any bogus invocation of t3_sge_stop() from
wrong contexts can be caught by debug kernels instead of being papered over
by the conditional.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 6ed58bc12020..84ad7261e243 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -2996,7 +2996,7 @@ void t3_fatal_err(struct adapter *adapter) unsigned int fw_status[4]; if (adapter->flags & FULL_INIT_DONE) { - t3_sge_stop(adapter); + t3_sge_stop_dma(adapter); t3_write_reg(adapter, A_XGM_TX_CTRL, 0); t3_write_reg(adapter, A_XGM_RX_CTRL, 0); t3_write_reg(adapter, XGM_REG(A_XGM_TX_CTRL, 1), 0); |