Skip to content
Permalink
Browse files

kernel: bump 4.14 to 4.14.125 (FS#2305 FS#2297)

Refreshed all patches.

This bump contains upstream commits which seem to avoid (not properly fix)
the errors as seen in FS#2305 and FS#2297

Altered patches:
- 403-net-mvneta-convert-to-phylink.patch
- 410-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch

Compile-tested on: ar71xx, cns3xxx, imx6, mvebu, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  • Loading branch information...
xback committed Jun 11, 2019
1 parent f2f7cc6 commit a7e68927d047c5c979a2bf7e9203e9da72ee80e7
Showing with 357 additions and 1,108 deletions.
  1. +2 −2 include/kernel-version.mk
  2. +1 −1 target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch
  3. +1 −1 target/linux/ar71xx/patches-4.14/509-MIPS-ath79-process-board-kernel-option.patch
  4. +2 −2 target/linux/ar71xx/patches-4.14/604-MIPS-ath79-no-of.patch
  5. +1 −1 target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
  6. +1 −1 target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-legacy-IRQ-code.patch
  7. +2 −2 target/linux/ath79/patches-4.14/0028-MIPS-ath79-drop-machfiles.patch
  8. +3 −3 target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
  9. +2 −2 ...t/linux/brcm2708/patches-4.14/950-0424-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch
  10. +2 −2 target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
  11. +0 −18 target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch
  12. +1 −0 target/linux/generic/config-4.14
  13. +0 −5 target/linux/generic/pending-4.14/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch
  14. +65 −82 target/linux/layerscape/patches-4.14/702-dpaa2-ethernet-support-layerscape.patch
  15. +3 −3 target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
  16. +237 −939 target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch
  17. +1 −1 target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
  18. +3 −14 target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch
  19. +1 −1 target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch
  20. +3 −3 target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch
  21. +5 −5 target/linux/mvebu/patches-4.14/403-net-mvneta-convert-to-phylink.patch
  22. +2 −2 target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
  23. +9 −8 target/linux/mvebu/patches-4.14/410-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch
  24. +1 −1 target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch
  25. +5 −5 target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
  26. +3 −3 target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch
  27. +1 −1 target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch
@@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL
endif

LINUX_VERSION-4.9 = .181
LINUX_VERSION-4.14 = .123
LINUX_VERSION-4.14 = .125
LINUX_VERSION-4.19 = .48

LINUX_KERNEL_HASH-4.9.181 = 8fcd223e11cba322801bc38cdb8b581d64c0115f585dcb6604de8561b574fced
LINUX_KERNEL_HASH-4.14.123 = 25f58cb56bde388ac9bcee984f5f2d0ca094b0a8af6b92ad1f5b2fd0e6725b85
LINUX_KERNEL_HASH-4.14.125 = 3e3dbc20215a28385bf46e2d0b8d9019df38ef1ee677e5e8870c7c3cde2ab318
LINUX_KERNEL_HASH-4.19.48 = 01d0db4f10cc8e384241a605e29413e32c442aa6853c116877538b07c16893fa

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
@@ -24,7 +24,7 @@ produce a noisy warning.

--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -372,10 +372,14 @@ static int xhci_try_enable_msi(struct us
@@ -370,10 +370,14 @@ static int xhci_try_enable_msi(struct us
free_irq(hcd->irq, hcd);
hcd->irq = 0;

@@ -1,6 +1,6 @@
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -277,6 +277,8 @@ void __init plat_time_init(void)
@@ -283,6 +283,8 @@ void __init plat_time_init(void)
mips_hpt_frequency = cpu_clk_rate / 2;
}

@@ -10,7 +10,7 @@

--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -190,16 +190,20 @@ unsigned int get_c0_compare_int(void)
@@ -196,16 +196,20 @@ unsigned int get_c0_compare_int(void)

void __init plat_mem_setup(void)
{
@@ -31,7 +31,7 @@

if (mips_machtype != ATH79_MACH_GENERIC_OF) {
ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
@@ -295,17 +299,21 @@ static int __init ath79_setup(void)
@@ -301,17 +305,21 @@ static int __init ath79_setup(void)

arch_initcall(ath79_setup);

@@ -457,7 +457,7 @@
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -537,7 +537,7 @@ static struct sk_buff *add_grec(struct s
@@ -548,7 +548,7 @@ static struct sk_buff *add_grec(struct s
if (!skb)
return NULL;
psrc = skb_put(skb, sizeof(__be32));
@@ -208,7 +208,7 @@ Signed-off-by: John Crispin <john@phrozen.org>

#include <asm/bootinfo.h>
#include <asm/idle.h>
@@ -305,6 +306,11 @@ void __init plat_time_init(void)
@@ -311,6 +312,11 @@ void __init plat_time_init(void)
mips_hpt_frequency = cpu_clk_rate / 2;
}

@@ -938,7 +938,7 @@ Signed-off-by: John Crispin <john@phrozen.org>

#define ATH79_SYS_TYPE_LEN 64

@@ -230,25 +229,21 @@ void __init plat_mem_setup(void)
@@ -236,25 +235,21 @@ void __init plat_mem_setup(void)
else if (fw_passed_dtb)
__dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb));

@@ -973,7 +973,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
{
struct device_node *np;
struct clk *clk;
@@ -278,66 +273,12 @@ static void __init ath79_of_plat_time_in
@@ -284,66 +279,12 @@ static void __init ath79_of_plat_time_in
clk_put(clk);
}

@@ -40,7 +40,7 @@ it on BCM4708 family.
/* called during probe() after chip reset completes */
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -168,6 +168,49 @@ int xhci_start(struct xhci_hcd *xhci)
@@ -166,6 +166,49 @@ int xhci_start(struct xhci_hcd *xhci)
return ret;
}

@@ -90,7 +90,7 @@ it on BCM4708 family.
/*
* Reset a halted HC.
*
@@ -551,10 +594,20 @@ static int xhci_init(struct usb_hcd *hcd
@@ -549,10 +592,20 @@ static int xhci_init(struct usb_hcd *hcd

static int xhci_run_finished(struct xhci_hcd *xhci)
{
@@ -114,7 +114,7 @@ it on BCM4708 family.
xhci->shared_hcd->state = HC_STATE_RUNNING;
xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;

@@ -564,6 +617,10 @@ static int xhci_run_finished(struct xhci
@@ -562,6 +615,10 @@ static int xhci_run_finished(struct xhci
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB3 roothub");
return 0;
@@ -95,7 +95,7 @@ Signed-off-by: Oliver Gjoneski <ogjoneski@gmail.com>
size_t pagelist_size;
struct scatterlist *scatterlist, *sg;
int dma_buffers;
@@ -417,10 +436,16 @@ create_pagelist(char __user *buf, size_t
@@ -426,10 +445,16 @@ create_pagelist(char __user *buf, size_t
/* Allocate enough storage to hold the page pointers and the page
** list
*/
@@ -116,7 +116,7 @@ Signed-off-by: Oliver Gjoneski <ogjoneski@gmail.com>

vchiq_log_trace(vchiq_arm_log_level, "create_pagelist - %pK",
pagelist);
@@ -441,6 +466,7 @@ create_pagelist(char __user *buf, size_t
@@ -450,6 +475,7 @@ create_pagelist(char __user *buf, size_t
pagelistinfo->pagelist = pagelist;
pagelistinfo->pagelist_buffer_size = pagelist_size;
pagelistinfo->dma_addr = dma_addr;
@@ -84,7 +84,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -362,3 +362,30 @@
@@ -366,3 +366,30 @@
#if GCC_VERSION >= 50100
#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
#endif
@@ -117,7 +117,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -283,4 +283,22 @@ struct ftrace_likely_data {
@@ -287,4 +287,22 @@ struct ftrace_likely_data {
# define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
#endif

@@ -55,9 +55,6 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h
create mode 100644 net/sched/act_ctinfo.c

diff --git a/include/net/tc_act/tc_ctinfo.h b/include/net/tc_act/tc_ctinfo.h
new file mode 100644
index 000000000000..d6a688571672
--- /dev/null
+++ b/include/net/tc_act/tc_ctinfo.h
@@ -0,0 +1,28 @@
@@ -89,8 +86,6 @@ index 000000000000..d6a688571672
+#define to_ctinfo(a) ((struct tcf_ctinfo *)a)
+
+#endif /* __NET_TC_CTINFO_H */
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 46c506615f4a..408b02fbb34a 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -66,7 +66,8 @@ enum {
@@ -103,9 +98,6 @@ index 46c506615f4a..408b02fbb34a 100644
};

#define TCA_ID_MAX __TCA_ID_MAX
diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
new file mode 100644
index 000000000000..da803e05a89b
--- /dev/null
+++ b/include/uapi/linux/tc_act/tc_ctinfo.h
@@ -0,0 +1,34 @@
@@ -143,8 +135,6 @@ index 000000000000..da803e05a89b
+};
+
+#endif
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index e70ed26485a2..962d90f72f54 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -808,6 +808,19 @@ config NET_ACT_CONNMARK
@@ -167,8 +157,6 @@ index e70ed26485a2..962d90f72f54 100644
config NET_ACT_SKBMOD
tristate "skb data modification action"
depends on NET_CLS_ACT
diff --git a/net/sched/Makefile b/net/sched/Makefile
index 9e43a4721ef8..44ee5b87b895 100644
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o
@@ -179,9 +167,6 @@ index 9e43a4721ef8..44ee5b87b895 100644
obj-$(CONFIG_NET_ACT_SKBMOD) += act_skbmod.o
obj-$(CONFIG_NET_ACT_IFE) += act_ife.o
obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o
diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c
new file mode 100644
index 000000000000..e65344e32801
--- /dev/null
+++ b/net/sched/act_ctinfo.c
@@ -0,0 +1,394 @@
@@ -579,6 +564,3 @@ index 000000000000..e65344e32801
+MODULE_AUTHOR("Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>");
+MODULE_DESCRIPTION("Conntrack mark to DSCP restoring");
+MODULE_LICENSE("GPL");
--
2.20.1 (Apple Git-117)

@@ -3344,6 +3344,7 @@ CONFIG_NMI_LOG_BUF_SHIFT=13
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_NORTEL_HERMES is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
# CONFIG_NOZOMI is not set
# CONFIG_NO_BOOTMEM is not set
# CONFIG_NO_HZ is not set
@@ -12,8 +12,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
arch/powerpc/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index de3b07c7be30..53f87983fb42 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -199,6 +199,7 @@ config PPC
@@ -24,6 +22,3 @@ index de3b07c7be30..53f87983fb42 100644
select HAVE_KPROBES
select HAVE_KPROBES_ON_FTRACE
select HAVE_KRETPROBES
--
2.20.1

0 comments on commit a7e6892

Please sign in to comment.
You can’t perform that action at this time.