mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

staging: octeon: move irq into rx group specific data

Browse source 
Move IRQ number into RX group specific data.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2016-08-31 23:57:41 +03:00 committed by Greg Kroah-Hartman
parent 785e9b7d3f
commit 9382cfe133
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/octeon/ethernet-rx.c
View file

@ -44,6 +44,7 @@
#include <asm/octeon/cvmx-gmxx-defs.h>
static struct oct_rx_group {
int irq;
struct napi_struct napi;
} oct_rx_group;
@ -417,6 +418,8 @@ static int cvm_oct_poll(int budget)
*/
static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
{
struct oct_rx_group *rx_group = container_of(napi, struct oct_rx_group,
napi);
int rx_count;
rx_count = cvm_oct_poll(budget);
@ -424,7 +427,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
if (rx_count < budget) {
/* No more work */
napi_complete(napi);
enable_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group);
enable_irq(rx_group->irq);
}
return rx_count;
}
@ -461,16 +464,16 @@ void cvm_oct_rx_initialize(void)
rx_napi_weight);
napi_enable(&oct_rx_group.napi);
oct_rx_group.irq = OCTEON_IRQ_WORKQ0 + pow_receive_group;
/* Register an IRQ handler to receive POW interrupts */
i = request_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group,
cvm_oct_do_interrupt, 0, "Ethernet",
i = request_irq(oct_rx_group.irq, cvm_oct_do_interrupt, 0, "Ethernet",
&oct_rx_group.napi);
if (i)
panic("Could not acquire Ethernet IRQ %d\n",
OCTEON_IRQ_WORKQ0 + pow_receive_group);
panic("Could not acquire Ethernet IRQ %d\n", oct_rx_group.irq);
disable_irq_nosync(OCTEON_IRQ_WORKQ0 + pow_receive_group);
disable_irq_nosync(oct_rx_group.irq);
/* Enable POW interrupt when our port has at least one packet */
if (OCTEON_IS_MODEL(OCTEON_CN68XX)) {
@ -514,7 +517,7 @@ void cvm_oct_rx_shutdown(void)
cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0);
/* Free the interrupt handler */
free_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group, cvm_oct_device);
free_irq(oct_rx_group.irq, cvm_oct_device);
netif_napi_del(&oct_rx_group.napi);
}