From 40e6eae61fe4412ac14c19f0f4b5fbf6b84c841e Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 28 Feb 2015 19:59:46 +0000 Subject: [PATCH] brcm63xx: fix ethernet breakage in 3.18 Linux commit d75b1ade567ffab ("net: less interrupt masking in NAPI") chose the samantics of the napi poll return value, which caused napi to not resume interrups/polling anymore. Fix the return value to restore expected behaviour. Signed-off-by: Jonas Gorski SVN-Revision: 44576 --- ...63xx_enet-fix-napi-poll-return-value.patch | 27 +++++++++++++++++++ ...63xx_enet-fix-napi-poll-return-value.patch | 27 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 target/linux/brcm63xx/patches-3.14/426-bcm63xx_enet-fix-napi-poll-return-value.patch create mode 100644 target/linux/brcm63xx/patches-3.18/426-bcm63xx_enet-fix-napi-poll-return-value.patch diff --git a/target/linux/brcm63xx/patches-3.14/426-bcm63xx_enet-fix-napi-poll-return-value.patch b/target/linux/brcm63xx/patches-3.14/426-bcm63xx_enet-fix-napi-poll-return-value.patch new file mode 100644 index 0000000000..af34c23ea4 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.14/426-bcm63xx_enet-fix-napi-poll-return-value.patch @@ -0,0 +1,27 @@ +From d150ac8f353cb1ab59288829db006300120c9daf Mon Sep 17 00:00:00 2001 +From: Jonas Gorski +Date: Sat, 28 Feb 2015 20:23:13 +0100 +Subject: [PATCH] bcm63xx_enet: fix napi poll return value + +Commit d75b1ade567ffab ("net: less interrupt masking in NAPI") changed +the way how napi treated a returnvalue < budget, which causes hangs when +there there was tx_work_done, but rx_work_done is less than budget. + +To fix this, return budget instead of rx_done to ensure repolling. + +Signed-off-by: Jonas Gorski +--- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c ++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +@@ -508,7 +508,7 @@ static int bcm_enet_poll(struct napi_str + + if (rx_work_done >= budget || tx_work_done > 0) { + /* rx/tx queue is not yet empty/clean */ +- return rx_work_done; ++ return budget; + } + + /* no more packet in rx/tx queue, remove device from poll diff --git a/target/linux/brcm63xx/patches-3.18/426-bcm63xx_enet-fix-napi-poll-return-value.patch b/target/linux/brcm63xx/patches-3.18/426-bcm63xx_enet-fix-napi-poll-return-value.patch new file mode 100644 index 0000000000..af34c23ea4 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.18/426-bcm63xx_enet-fix-napi-poll-return-value.patch @@ -0,0 +1,27 @@ +From d150ac8f353cb1ab59288829db006300120c9daf Mon Sep 17 00:00:00 2001 +From: Jonas Gorski +Date: Sat, 28 Feb 2015 20:23:13 +0100 +Subject: [PATCH] bcm63xx_enet: fix napi poll return value + +Commit d75b1ade567ffab ("net: less interrupt masking in NAPI") changed +the way how napi treated a returnvalue < budget, which causes hangs when +there there was tx_work_done, but rx_work_done is less than budget. + +To fix this, return budget instead of rx_done to ensure repolling. + +Signed-off-by: Jonas Gorski +--- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c ++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +@@ -508,7 +508,7 @@ static int bcm_enet_poll(struct napi_str + + if (rx_work_done >= budget || tx_work_done > 0) { + /* rx/tx queue is not yet empty/clean */ +- return rx_work_done; ++ return budget; + } + + /* no more packet in rx/tx queue, remove device from poll -- 2.30.2