From 9899ffcfd35120f7a4aa1d401b85653e56b775b0 Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Thu, 15 Mar 2018 22:00:08 +0100 Subject: kernel: bump 4.14 to 4.14.27 * Refreshed patches. * Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream) Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers --- .../pending-4.14/201-extra_optimization.patch | 2 +- ...610-netfilter_match_bypass_default_checks.patch | 8 +-- .../pending-4.14/812-pci-dwc-fix-enumeration.patch | 60 ---------------------- 3 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch (limited to 'target/linux/generic/pending-4.14') diff --git a/target/linux/generic/pending-4.14/201-extra_optimization.patch b/target/linux/generic/pending-4.14/201-extra_optimization.patch index e92b1a1..3c3353c 100644 --- a/target/linux/generic/pending-4.14/201-extra_optimization.patch +++ b/target/linux/generic/pending-4.14/201-extra_optimization.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -639,12 +639,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni +@@ -650,12 +650,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += $(call cc-option,-Oz,-Os) diff --git a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch index 0a3c0f9..ec269b6 100644 --- a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch @@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau static bool ip_checkentry(const struct ipt_ip *ip) { -@@ -532,6 +558,8 @@ find_check_entry(struct ipt_entry *e, st +@@ -537,6 +563,8 @@ find_check_entry(struct ipt_entry *e, st struct xt_mtchk_param mtpar; struct xt_entry_match *ematch; @@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau if (!xt_percpu_counter_alloc(alloc_state, &e->counters)) return -ENOMEM; -@@ -812,6 +840,7 @@ copy_entries_to_user(unsigned int total_ +@@ -817,6 +845,7 @@ copy_entries_to_user(unsigned int total_ const struct xt_table_info *private = table->private; int ret = 0; const void *loc_cpu_entry; @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -839,6 +868,14 @@ copy_entries_to_user(unsigned int total_ +@@ -844,6 +873,14 @@ copy_entries_to_user(unsigned int total_ goto free_counters; } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau for (i = sizeof(struct ipt_entry); i < e->target_offset; i += m->u.match_size) { -@@ -1219,12 +1256,15 @@ compat_copy_entry_to_user(struct ipt_ent +@@ -1224,12 +1261,15 @@ compat_copy_entry_to_user(struct ipt_ent compat_uint_t origsize; const struct xt_entry_match *ematch; int ret = 0; diff --git a/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch b/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch deleted file mode 100644 index f829631..0000000 --- a/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch +++ /dev/null @@ -1,60 +0,0 @@ -From patchwork Tue Jan 9 14:42:21 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: PCI: dwc: fix enumeration end when reaching root subordinate -From: Koen Vandeputte -X-Patchwork-Id: 10152443 -Message-Id: <1515508941-20055-1-git-send-email-koen.vandeputte@ncentric.com> -To: linux-pci@vger.kernel.org -Cc: bhelgaas@google.com, lorenzo.pieralisi@arm.com, - Joao.Pinto@synopsys.com, jingoohan1@gmail.com, niklas.cassel@axis.com, - Koen Vandeputte , - Mika Westerberg -Date: Tue, 9 Jan 2018 15:42:21 +0100 - -The subordinate value indicates the highest bus number which can be -reached downstream though a certain device. - -Commit a20c7f36bd3d ("PCI: Do not allocate more buses than available in -parent") -ensures that downstream devices cannot assign busnumbers higher than the -upstream device subordinate number, which was indeed illogical. - -By default, dw_pcie_setup_rc() inits the Root Complex subordinate to a -value of 0x01. - -Due to this combined with above commit, enumeration stops digging deeper -downstream as soon as bus num 0x01 has been assigned, which is always -the case for a bridge device. - -This results in all devices behind a bridge bus to remain undetected, as -these would be connected to bus 0x02 or higher. - -Fix this by initializing the RC to a subordinate value of 0xff, meaning -that all busses [0x00-0xff] are reachable through this RC. - -Fixes: a20c7f36bd3d ("PCI: Do not allocate more buses than available in -parent") -Signed-off-by: Koen Vandeputte -Tested-by: Niklas Cassel -Cc: Mika Westerberg ---- - -Will send separate patches to stable as this file got moved/renamed - - - drivers/pci/dwc/pcie-designware-host.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/pci/dwc/pcie-designware-host.c -+++ b/drivers/pci/dwc/pcie-designware-host.c -@@ -607,7 +607,7 @@ void dw_pcie_setup_rc(struct pcie_port * - /* setup bus numbers */ - val = dw_pcie_readl_dbi(pci, PCI_PRIMARY_BUS); - val &= 0xff000000; -- val |= 0x00010100; -+ val |= 0x00ff0100; - dw_pcie_writel_dbi(pci, PCI_PRIMARY_BUS, val); - - /* setup command register */ -- cgit v1.1