| Message ID | 1525271040-11191-2-git-send-email-koen.vandeputte@ncentric.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [LEDE-DEV,1/2] kernel: bump 4.9 to 4.9.97 | expand |
All, Please skip these. It does not apply anymore due to: "kernel: add missing in6_dev_put_clear call to an ipv6 network patch" Also .. yet another kernel bump was released yesterday .. V2 later on .. Koen
Hi Koen. W dniu 03.05.2018 o 11:57, Koen Vandeputte pisze: > All, > > Please skip these. > It does not apply anymore due to: "kernel: add missing in6_dev_put_clear call to an ipv6 network patch" > > Also .. yet another kernel bump was released yesterday .. If You'll be doing kernel bump for 4.14.39 or later, You cane safely drop these patches: target/linux/mvebu/patches-4.14/522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch target/linux/mvebu/patches-4.14/523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch target/linux/mvebu/patches-4.14/525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch target/linux/mvebu/patches-4.14/526-PCI-aardvark-disable-LOS-state-by-default.patch target/linux/mvebu/patches-4.14/527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch Thanks for all Your work. > V2 later on .. > > Koen > Cheers, Tomasz.
On 06-05-18 19:25, Tomasz Maciej Nowak wrote: > Hi Koen. > > W dniu 03.05.2018 o 11:57, Koen Vandeputte pisze: >> All, >> >> Please skip these. >> It does not apply anymore due to: "kernel: add missing in6_dev_put_clear call to an ipv6 network patch" >> >> Also .. yet another kernel bump was released yesterday .. > If You'll be doing kernel bump for 4.14.39 or later, You cane safely drop these patches: > > target/linux/mvebu/patches-4.14/522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch > target/linux/mvebu/patches-4.14/523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch > target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch > target/linux/mvebu/patches-4.14/525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch > target/linux/mvebu/patches-4.14/526-PCI-aardvark-disable-LOS-state-by-default.patch > target/linux/mvebu/patches-4.14/527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch > > Thanks for all Your work. Hi, I started working on the V2 last week, and it seems not all of these were upstreamed. If I have some time, I'll check it further in detail tomorrow how it should be handled. >> V2 later on .. >> >> Koen >> > Cheers, Tomasz. >
On 2018-05-06 23:41, Koen Vandeputte wrote: > > > On 06-05-18 19:25, Tomasz Maciej Nowak wrote: >> Hi Koen. >> >> W dniu 03.05.2018 o 11:57, Koen Vandeputte pisze: >>> All, >>> >>> Please skip these. >>> It does not apply anymore due to: "kernel: add missing >>> in6_dev_put_clear call to an ipv6 network patch" >>> >>> Also .. yet another kernel bump was released yesterday .. >> If You'll be doing kernel bump for 4.14.39 or later, You cane safely >> drop these patches: >> >> target/linux/mvebu/patches-4.14/522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch >> >> target/linux/mvebu/patches-4.14/523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch >> >> target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch >> >> target/linux/mvebu/patches-4.14/525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch >> >> target/linux/mvebu/patches-4.14/526-PCI-aardvark-disable-LOS-state-by-default.patch >> >> target/linux/mvebu/patches-4.14/527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch >> >> >> Thanks for all Your work. > Hi, > I started working on the V2 last week, and it seems not all of these > were upstreamed. > If I have some time, I'll check it further in detail tomorrow how it > should be handled. > I've gone into the details of it, also checking the online discussions between the author and Bjorn Helgaas. [1] It seems it is still ongoing .. and the safest option according to me is to keep the MPS at 128 for now, ensuring no malformed communication happens between the RC and the endpoints. Dropping this patch would be cleaner and might very slightly improving performance, but at the cost of potential communication errors with specific devices. The disable-LoS patch is similar and should also be kept for now. Please let me know if you disagree (and why :) ) Koen [1] https://patchwork.kernel.org/patch/9976017/ >>> V2 later on .. >>> >>> Koen >>> >> Cheers, Tomasz. >> >
W dniu 07.05.2018 o 14:46, Koen Vandeputte pisze: > > > On 2018-05-06 23:41, Koen Vandeputte wrote: >> >> >> On 06-05-18 19:25, Tomasz Maciej Nowak wrote: >>> Hi Koen. >>> >>> W dniu 03.05.2018 o 11:57, Koen Vandeputte pisze: >>>> All, >>>> >>>> Please skip these. >>>> It does not apply anymore due to: "kernel: add missing in6_dev_put_clear call to an ipv6 network patch" >>>> >>>> Also .. yet another kernel bump was released yesterday .. >>> If You'll be doing kernel bump for 4.14.39 or later, You cane safely drop these patches: >>> >>> target/linux/mvebu/patches-4.14/522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch >>> target/linux/mvebu/patches-4.14/523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch >>> target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch >>> target/linux/mvebu/patches-4.14/525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch >>> target/linux/mvebu/patches-4.14/526-PCI-aardvark-disable-LOS-state-by-default.patch >>> target/linux/mvebu/patches-4.14/527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch >>> >>> Thanks for all Your work. >> Hi, >> I started working on the V2 last week, and it seems not all of these were upstreamed. >> If I have some time, I'll check it further in detail tomorrow how it should be handled. >> > I've gone into the details of it, also checking the online discussions between the author and Bjorn Helgaas. [1] > > It seems it is still ongoing .. and the safest option according to me is to keep the MPS at 128 for now, ensuring no malformed communication happens between the RC and the endpoints. > Dropping this patch would be cleaner and might very slightly improving performance, but at the cost of potential communication errors with specific devices. > > The disable-LoS patch is similar and should also be kept for now. > > > Please let me know if you disagree (and why :) ) > OK, seems I was bit to hasty. That's a valid point about those two patches. Given that Thomas dropped the mentioned patches in later series revision [1] and is working on better solution, let's keep them for now (better safe than sorry). Initially I added the whole series regarding this [2] bug report. That made the mini PCIe port working without kernel lockups or panics. After some of the patches got accepted, I removed the series and included the fixes which still made my cards JWX6051 (ath9k) and U7612E-H1 (mt76) working, didn't observe any issues. Unfortunately since the beginning my board is missing one element and it's not providing 1.5V to mini PCIe port, so cards requiring it do not work. Because of that my testing has been limited. Last week I ordered the missing element and at end of the week I should be ready for testing the rest of cards. I'll report back if those test show any difference with or without those patches. 1. https://www.spinics.net/lists/linux-pci/msg70774.html 2. https://bugzilla.kernel.org/show_bug.cgi?id=196339 > > Koen > > [1] https://patchwork.kernel.org/patch/9976017/ >>>> V2 later on .. >>>> >>>> Koen >>>> >>> Cheers, Tomasz. >>> >> > > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev Regards, Tomasz.
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e284751a5742..4ffcc3ab4a47 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -4,13 +4,13 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 LINUX_VERSION-4.4 = .121 -LINUX_VERSION-4.14 = .37 LINUX_VERSION-4.9 = .97 +LINUX_VERSION-4.14 = .38 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729 -LINUX_KERNEL_HASH-4.14.37 = 8197e7ed3620713e412905430a7bf93e2048384042ffba189a66f0eeb6908e92 LINUX_KERNEL_HASH-4.9.97 = c4f1b80847410294f966bb5b9b0618bd0826c890326016fd6504e8012a456f23 +LINUX_KERNEL_HASH-4.14.38 = eff3d6264c9c45cad740e7aa03db2022c8d6829ce78348acc58cb4310ccd2b02 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch index 32df8009eac5..ca5530ae976d 100644 --- a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch @@ -396,7 +396,7 @@ if (dc_lsize == 0) r4k_blast_dcache = (void *)cache_noop; else if (dc_lsize == 16) -@@ -952,6 +964,8 @@ static void local_r4k_flush_cache_sigtra +@@ -955,6 +967,8 @@ static void local_r4k_flush_cache_sigtra } R4600_HIT_CACHEOP_WAR_IMPL; @@ -405,7 +405,7 @@ if (!cpu_has_ic_fills_f_dc) { if (dc_lsize) vaddr ? flush_dcache_line(addr & ~(dc_lsize - 1)) -@@ -1846,6 +1860,17 @@ static void coherency_setup(void) +@@ -1849,6 +1863,17 @@ static void coherency_setup(void) * silly idea of putting something else there ... */ switch (current_cpu_type()) { @@ -423,7 +423,7 @@ case CPU_R4000PC: case CPU_R4000SC: case CPU_R4000MC: -@@ -1892,6 +1917,15 @@ void r4k_cache_init(void) +@@ -1895,6 +1920,15 @@ void r4k_cache_init(void) extern void build_copy_page(void); struct cpuinfo_mips *c = ¤t_cpu_data; @@ -439,7 +439,7 @@ probe_pcache(); probe_vcache(); setup_scache(); -@@ -1969,7 +2003,15 @@ void r4k_cache_init(void) +@@ -1972,7 +2006,15 @@ void r4k_cache_init(void) */ local_r4k___flush_cache_all(NULL); diff --git a/target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch b/target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch old mode 100755 new mode 100644 index 3cfbd2ce9169..69d926bd5bf0 --- a/target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch +++ b/target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch @@ -62,11 +62,9 @@ Signed-off-by: NeilBrown <neil@brown.name> arch/mips/mm/c-r4k.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c -index 6f534b209971..e12dfa48b478 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -851,9 +851,12 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size) +@@ -851,9 +851,12 @@ static void r4k_dma_cache_wback_inv(unsi /* * Either no secondary cache or the available caches don't have the * subset property so we have to flush the primary caches @@ -81,7 +79,7 @@ index 6f534b209971..e12dfa48b478 100644 r4k_blast_dcache(); } else { R4600_HIT_CACHEOP_WAR_IMPL; -@@ -890,7 +893,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size) +@@ -890,7 +893,7 @@ static void r4k_dma_cache_inv(unsigned l return; } diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch index ed48128c9e4d..82e2c51afddc 100644 --- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.14/630-packet_socket_type.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1822,6 +1822,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1829,6 +1829,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* * When we registered the protocol we saved the socket in the data -@@ -1829,6 +1830,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1836,6 +1837,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* * Yank back the headers [hope the device set this -@@ -1841,7 +1843,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1848,7 +1850,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2068,12 +2070,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2075,12 +2077,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2199,12 +2201,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2206,12 +2208,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3251,6 +3253,7 @@ static int packet_create(struct net *net +@@ -3260,6 +3262,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3837,6 +3840,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3873,6 +3876,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3889,6 +3902,13 @@ static int packet_getsockopt(struct sock +@@ -3925,6 +3938,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch index 9565412c0045..aa0eb0f0e9a3 100644 --- a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch @@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <linux/nsproxy.h> #include <net/net_namespace.h> -@@ -970,8 +972,32 @@ static int pppoe_xmit(struct ppp_channel +@@ -974,8 +976,32 @@ static int pppoe_xmit(struct ppp_channel return __pppoe_xmit(sk, skb); } diff --git a/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 1ac009b65cd9..4f8002c7afc4 100644 --- a/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* * Allocate a dst for local (unicast / anycast) address. */ -@@ -3000,7 +3033,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -3002,7 +3035,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -3490,6 +3524,9 @@ static int rt6_fill_node(struct net *net +@@ -3492,6 +3526,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -3808,6 +3845,8 @@ static int ip6_route_dev_notify(struct n +@@ -3810,6 +3847,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -4035,6 +4074,17 @@ static int __net_init ip6_route_net_init +@@ -4037,6 +4076,17 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #endif net->ipv6.sysctl.flush_delay = 0; -@@ -4053,6 +4103,8 @@ out: +@@ -4055,6 +4105,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -4070,6 +4122,7 @@ static void __net_exit ip6_route_net_exi +@@ -4072,6 +4124,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); @@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -4143,6 +4196,9 @@ void __init ip6_route_init_special_entri +@@ -4145,6 +4198,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
Refreshed all patches Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> --- include/kernel-version.mk | 4 ++-- target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch | 8 ++++---- ...-fix-data-corruption-related-to-cache-coherence.patch | 6 ++---- .../generic/pending-4.14/630-packet_socket_type.patch | 16 ++++++++-------- ...4-net-pppoe-support-hardware-flow-table-offload.patch | 2 +- ...low-rejecting-with-source-address-failed-policy.patch | 14 +++++++------- 6 files changed, 24 insertions(+), 26 deletions(-) mode change 100755 => 100644 target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch