[OpenWrt-Devel] [PATCH 2/3] kernel: fix patches for 3.19

Daniel Golle daniel at makrotopia.org
Tue Feb 10 09:06:16 EST 2015


130, 771 and 772 were merged upstream.
304 had to be refreshed to apply on the new sources.

Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../patches-3.19/130-mips_cpu_irq_disable.patch    | 20 ----------
 .../patches-3.19/304-mips_disable_fpu.patch        |  8 ++--
 ...771-bgmac-register-napi-before-the-device.patch | 43 ----------------------
 ...ate-irqs-only-if-there-is-nothing-to-poll.patch | 29 ---------------
 4 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 target/linux/generic/patches-3.19/130-mips_cpu_irq_disable.patch
 delete mode 100644 target/linux/generic/patches-3.19/771-bgmac-register-napi-before-the-device.patch
 delete mode 100644 target/linux/generic/patches-3.19/772-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch

diff --git a/target/linux/generic/patches-3.19/130-mips_cpu_irq_disable.patch b/target/linux/generic/patches-3.19/130-mips_cpu_irq_disable.patch
deleted file mode 100644
index 659a8d3..0000000
--- a/target/linux/generic/patches-3.19/130-mips_cpu_irq_disable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/kernel/irq_cpu.c
-+++ b/arch/mips/kernel/irq_cpu.c
-@@ -57,6 +57,8 @@ static struct irq_chip mips_cpu_irq_cont
- 	.irq_mask_ack	= mask_mips_irq,
- 	.irq_unmask	= unmask_mips_irq,
- 	.irq_eoi	= unmask_mips_irq,
-+	.irq_disable	= mask_mips_irq,
-+	.irq_enable	= unmask_mips_irq,
- };
- 
- /*
-@@ -93,6 +95,8 @@ static struct irq_chip mips_mt_cpu_irq_c
- 	.irq_mask_ack	= mips_mt_cpu_irq_ack,
- 	.irq_unmask	= unmask_mips_irq,
- 	.irq_eoi	= unmask_mips_irq,
-+	.irq_disable	= mask_mips_irq,
-+	.irq_enable	= unmask_mips_irq,
- };
- 
- asmlinkage void __weak plat_irq_dispatch(void)
diff --git a/target/linux/generic/patches-3.19/304-mips_disable_fpu.patch b/target/linux/generic/patches-3.19/304-mips_disable_fpu.patch
index 1ea48a3..2a6bbc4 100644
--- a/target/linux/generic/patches-3.19/304-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-3.19/304-mips_disable_fpu.patch
@@ -60,10 +60,10 @@ v2: incorporated changes suggested by Jonas Gorski
  core-y += arch/mips/
 --- a/arch/mips/include/asm/fpu.h
 +++ b/arch/mips/include/asm/fpu.h
-@@ -201,8 +201,10 @@ static inline int init_fpu(void)
- 			write_c0_config5(config5);
- 			enable_fpu_hazard();
- 		}
+@@ -210,8 +210,10 @@ static inline int init_fpu(void)
+ 		/* Restore FRE */
+ 		write_c0_config5(config5);
+ 		enable_fpu_hazard();
 -	} else
 +	} else if (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR))
  		fpu_emulator_init_fpu();
diff --git a/target/linux/generic/patches-3.19/771-bgmac-register-napi-before-the-device.patch b/target/linux/generic/patches-3.19/771-bgmac-register-napi-before-the-device.patch
deleted file mode 100644
index 56248c6..0000000
--- a/target/linux/generic/patches-3.19/771-bgmac-register-napi-before-the-device.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d5b4e70e8c205a67e2e246908b259367ab9ccecf Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke at hauke-m.de>
-Date: Mon, 8 Dec 2014 08:27:23 +0100
-Subject: [PATCH 2/4] bgmac: register napi before the device
-
-napi should get registered before the netdev and not after.
-
-Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_devic
- 	if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
- 		bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
- 
-+	netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
-+
- 	err = bgmac_mii_register(bgmac);
- 	if (err) {
- 		bgmac_err(bgmac, "Cannot register MDIO\n");
-@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic
- 
- 	netif_carrier_off(net_dev);
- 
--	netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
--
- 	return 0;
- 
- err_mii_unregister:
-@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev
- {
- 	struct bgmac *bgmac = bcma_get_drvdata(core);
- 
--	netif_napi_del(&bgmac->napi);
- 	unregister_netdev(bgmac->net_dev);
- 	bgmac_mii_unregister(bgmac);
-+	netif_napi_del(&bgmac->napi);
- 	bgmac_dma_free(bgmac);
- 	bcma_set_drvdata(core, NULL);
- 	free_netdev(bgmac->net_dev);
diff --git a/target/linux/generic/patches-3.19/772-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch b/target/linux/generic/patches-3.19/772-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch
deleted file mode 100644
index b494998..0000000
--- a/target/linux/generic/patches-3.19/772-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fbd3b188fbaa861165a074c454d8f8dcf15343a0 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke at hauke-m.de>
-Date: Mon, 8 Dec 2014 08:47:10 +0100
-Subject: [PATCH 3/4] bgmac: activate irqs only if there is nothing to poll
-
-IRQs should only get activated when there is nothing to poll in the
-queue any more and to after every poll.
-
-Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct
- 		bgmac->int_status = 0;
- 	}
- 
--	if (handled < weight)
-+	if (handled < weight) {
- 		napi_complete(napi);
--
--	bgmac_chip_intrs_on(bgmac);
-+		bgmac_chip_intrs_on(bgmac);
-+	}
- 
- 	return handled;
- }
-- 
2.2.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list