openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: octeon: prevent poll during rx init 

Prevent poll before the RX init has been completed.

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:46 +03:00 committed by Greg Kroah-Hartman
parent ce060d8af3
commit d48f10fc61
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/octeon/ethernet-rx.c
View File

@ -43,6 +43,8 @@
#include <asm/octeon/cvmx-gmxx-defs.h> #include <asm/octeon/cvmx-gmxx-defs.h>
static atomic_t oct_rx_ready = ATOMIC_INIT(0);
static struct oct_rx_group { static struct oct_rx_group {
int irq; int irq;
int group; int group;
@ -444,6 +446,9 @@ void cvm_oct_poll_controller(struct net_device *dev)
{ {
int i; int i;
if (!atomic_read(&oct_rx_ready))
return;
for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) { for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) {
if (!(pow_receive_groups & BIT(i))) if (!(pow_receive_groups & BIT(i)))
@ -524,6 +529,7 @@ void cvm_oct_rx_initialize(void)
*/ */
napi_schedule(&oct_rx_group[i].napi); napi_schedule(&oct_rx_group[i].napi);
} }
atomic_inc(&oct_rx_ready);
} }
void cvm_oct_rx_shutdown(void) void cvm_oct_rx_shutdown(void)