diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-30 20:41:02 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-31 16:31:26 +0200 |
commit | aed03d5d0f304cc85a8ccb4ef98684703fc027af (patch) | |
tree | 213cf2340e8cfaf55deccea5054572dc25f71211 /target/linux/generic/pending-4.9 | |
parent | ef6939b0afec410dd2db6d4382edc2231baf9a4c (diff) | |
download | mtk-20170518-aed03d5d0f304cc85a8ccb4ef98684703fc027af.zip mtk-20170518-aed03d5d0f304cc85a8ccb4ef98684703fc027af.tar.gz mtk-20170518-aed03d5d0f304cc85a8ccb4ef98684703fc027af.tar.bz2 |
kernel: update kernel 4.9 to version 4.9.91
* Refreshed patches.
* Deleted 210-Revert-led-core-Fix-brightness-setting-when-setting-.patch (was accepted upstream)
* Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream)
Compile and run tested on lantiq
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.9')
5 files changed, 13 insertions, 99 deletions
diff --git a/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch b/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch index f980bb0..c8258e5 100644 --- a/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch +++ b/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch @@ -23,7 +23,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com> --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c -@@ -5066,7 +5066,7 @@ static bool e1000e_has_link(struct e1000 +@@ -5072,7 +5072,7 @@ static bool e1000e_has_link(struct e1000 /* get_link_status is set on LSC (link status) interrupt or * Rx sequence error interrupt. get_link_status will stay @@ -32,7 +32,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com> * for copper adapters ONLY */ switch (hw->phy.media_type) { -@@ -5084,7 +5084,7 @@ static bool e1000e_has_link(struct e1000 +@@ -5090,7 +5090,7 @@ static bool e1000e_has_link(struct e1000 break; case e1000_media_type_internal_serdes: ret_val = hw->mac.ops.check_for_link(hw); diff --git a/target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch b/target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch deleted file mode 100644 index df23bb3..0000000 --- a/target/linux/generic/pending-4.9/210-Revert-led-core-Fix-brightness-setting-when-setting-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Matthias Schiffer <mschiffer@universe-factory.net> -Date: Sat, 17 Mar 2018 16:53:21 +0100 -Subject: [PATCH] Revert "led: core: Fix brightness setting when setting - delay_off=0" - -This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836. ---- - drivers/leds/led-core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c -index d70d4a5273b8..3bce44893021 100644 ---- a/drivers/leds/led-core.c -+++ b/drivers/leds/led-core.c -@@ -186,7 +186,7 @@ void led_blink_set(struct led_classdev *led_cdev, - unsigned long *delay_on, - unsigned long *delay_off) - { -- led_stop_software_blink(led_cdev); -+ del_timer_sync(&led_cdev->blink_timer); - - led_cdev->flags &= ~LED_BLINK_ONESHOT; - led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP; --- -2.16.2 - diff --git a/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch index 6e653ef..217d20e 100644 --- a/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch @@ -59,16 +59,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static bool ip_checkentry(const struct ipt_ip *ip) { -@@ -545,6 +571,8 @@ find_check_entry(struct ipt_entry *e, st +@@ -550,6 +576,8 @@ find_check_entry(struct ipt_entry *e, st + struct xt_mtchk_param mtpar; struct xt_entry_match *ematch; - unsigned long pcnt; + ip_checkdefault(&e->ip); + - pcnt = xt_percpu_counter_alloc(); - if (IS_ERR_VALUE(pcnt)) + if (!xt_percpu_counter_alloc(alloc_state, &e->counters)) return -ENOMEM; -@@ -824,6 +852,7 @@ copy_entries_to_user(unsigned int total_ + +@@ -829,6 +857,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 <nbd@nbd.name> counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -851,6 +880,14 @@ copy_entries_to_user(unsigned int total_ +@@ -856,6 +885,14 @@ copy_entries_to_user(unsigned int total_ goto free_counters; } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> for (i = sizeof(struct ipt_entry); i < e->target_offset; i += m->u.match_size) { -@@ -1240,12 +1277,15 @@ compat_copy_entry_to_user(struct ipt_ent +@@ -1245,12 +1282,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.9/812-pci-dwc-fix-enumeration.patch b/target/linux/generic/pending-4.9/812-pci-dwc-fix-enumeration.patch deleted file mode 100644 index bb0e0c4..0000000 --- a/target/linux/generic/pending-4.9/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 <koen.vandeputte@ncentric.com> -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 <koen.vandeputte@ncentric.com>, - Mika Westerberg <mika.westerberg@linux.intel.com> -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 <koen.vandeputte@ncentric.com> -Tested-by: Niklas Cassel <niklas.cassel@axis.com> -Cc: Mika Westerberg <mika.westerberg@linux.intel.com> ---- - -Will send separate patches to stable as this file got moved/renamed - - - drivers/pci/host/pcie-designware.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/pci/host/pcie-designware.c -+++ b/drivers/pci/host/pcie-designware.c -@@ -861,7 +861,7 @@ void dw_pcie_setup_rc(struct pcie_port * - /* setup bus numbers */ - val = dw_pcie_readl_rc(pp, PCI_PRIMARY_BUS); - val &= 0xff000000; -- val |= 0x00010100; -+ val |= 0x00ff0100; - dw_pcie_writel_rc(pp, PCI_PRIMARY_BUS, val); - - /* setup command register */ diff --git a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch index 50eaa52..197e01a 100644 --- a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4964,6 +4977,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4985,6 +4998,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> qc = __ata_qc_from_tag(ap, tag); qc->tag = tag; -@@ -5866,6 +5882,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5886,6 +5902,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> ata_sff_port_init(ap); return ap; -@@ -5887,6 +5906,12 @@ static void ata_host_release(struct devi +@@ -5907,6 +5926,12 @@ static void ata_host_release(struct devi kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> kfree(ap); host->ports[i] = NULL; } -@@ -6333,7 +6358,23 @@ int ata_host_register(struct ata_host *h +@@ -6353,7 +6378,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } |