aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2013-10-06 23:35:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-06 22:03:18 -0700
commitcd39f7374d343e6af22d7c929ec87c7406ebd00c (patch)
tree9b0667ddf465fd7cc7264b4e69dd73fb50fd5ff8 /drivers/staging/octeon
parentaa87afe20710dfa71937f945a93e2bfa26a2f1df (diff)
staging: octeon-ethernet: allow to set IRQ smp_affinity freely
Currently the driver assumes that CPU 0 is handling all the hard IRQs. This is wrong in Linux SMP systems where user is allowed to assign to hardware IRQs to any CPU. The driver will stop working if user sets smp_affinity so that interrupts end up being handled by other than CPU 0. The patch fixes that. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
-rw-r--r--drivers/staging/octeon/ethernet-rx.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 8897d2d38578..0d539eb2be5b 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -80,6 +80,8 @@ struct cvm_oct_core_state {
static struct cvm_oct_core_state core_state __cacheline_aligned_in_smp;
+static int cvm_irq_cpu;
+
static void cvm_oct_enable_napi(void *_)
{
int cpu = smp_processor_id();
@@ -112,11 +114,7 @@ static void cvm_oct_no_more_work(void)
{
int cpu = smp_processor_id();
- /*
- * CPU zero is special. It always has the irq enabled when
- * waiting for incoming packets.
- */
- if (cpu == 0) {
+ if (cpu == cvm_irq_cpu) {
enable_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group);
return;
}
@@ -135,6 +133,7 @@ static irqreturn_t cvm_oct_do_interrupt(int cpl, void *dev_id)
{
/* Disable the IRQ and start napi_poll. */
disable_irq_nosync(OCTEON_IRQ_WORKQ0 + pow_receive_group);
+ cvm_irq_cpu = smp_processor_id();
cvm_oct_enable_napi(NULL);
return IRQ_HANDLED;

Privacy Policy