diff options
| author |   Aaro Koskinen <aaro.koskinen@nokia.com> | 2015-08-13 16:21:39 +0300 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2015-09-03 12:08:09 +0200 |
| commit | bcbb13964dd4174f3a512d6a4460173c5c252199 (patch) | |
| tree | 3065554d131f2e7b08c5d8f85df9016d5bb0b7d8 /drivers/staging/octeon/ethernet.c | |
| parent | MIPS: Octeon: Add definitions for setting up SSO (diff) | |
| download | linux-dev-bcbb13964dd4174f3a512d6a4460173c5c252199.tar.xz linux-dev-bcbb13964dd4174f3a512d6a4460173c5c252199.zip | |
STAGING: Octeon: Properly enable/disable SSO WQE interrupts
The Octeon models with SSO instead of POW need to use a different register
for configuring the WQE interrupt thresholds.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Janne Huttunen <janne.huttunen@nokia.com>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org
Patchwork: https://patchwork.linux-mips.org/patch/10964/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index f9dba23a3759..363742a0f6ee 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -859,7 +859,10 @@ static int cvm_oct_remove(struct platform_device *pdev) int port; /* Disable POW interrupt */ - cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0); + if (OCTEON_IS_MODEL(OCTEON_CN68XX)) + cvmx_write_csr(CVMX_SSO_WQ_INT_THRX(pow_receive_group), 0); + else + cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0); cvmx_ipd_disable(); |