From: Greg Kroah-Hartman Date: Tue, 9 May 2017 12:09:13 +0000 (+0200) Subject: remove some patches... X-Git-Tag: v4.4.68~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0361e8a16e8893ae9a87a1df88ddede84ad9b7a;p=thirdparty%2Fkernel%2Fstable-queue.git remove some patches... --- diff --git a/queue-4.10/irqchip-mips-gic-fix-local-interrupts.patch b/queue-4.10/irqchip-mips-gic-fix-local-interrupts.patch deleted file mode 100644 index 83fa0983c4a..00000000000 --- a/queue-4.10/irqchip-mips-gic-fix-local-interrupts.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 4cfffcfa5106492f5785924ce2e9af49f075999b Mon Sep 17 00:00:00 2001 -From: Marcin Nowakowski -Date: Wed, 25 Jan 2017 15:08:25 +0100 -Subject: irqchip/mips-gic: Fix local interrupts - -From: Marcin Nowakowski - -commit 4cfffcfa5106492f5785924ce2e9af49f075999b upstream. - -Some local interrupts are not initialised properly at the moment and -cannot be used since the domain's alloc method is never called for them. - -This has been observed earlier and partially fixed in commit -e875bd66dfb ("irqchip/mips-gic: Fix local interrupts"), but that change -still relied on the interrupt to be requested by an external driver (eg. -drivers/clocksource/mips-gic-timer.c). - -This does however not solve the issue for interrupts that are not -referenced by any driver through the device tree and results in -request_irq() calls returning -ENOSYS. It can be observed when attempting -to use perf tool to access hardware performance counters. - -Fix this by explicitly calling irq_create_fwspec_mapping() for local -interrupts. - -Fixes: e875bd66dfb ("irqchip/mips-gic: Fix local interrupts") -Signed-off-by: Marcin Nowakowski -Cc: Paul Burton -Cc: Thomas Gleixner -Cc: Jason Cooper -Cc: Marc Zyngier -Cc: linux-mips@linux-mips.org -Signed-off-by: Marc Zyngier -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/irqchip/irq-mips-gic.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - ---- a/drivers/irqchip/irq-mips-gic.c -+++ b/drivers/irqchip/irq-mips-gic.c -@@ -968,6 +968,34 @@ static struct irq_domain_ops gic_ipi_dom - .match = gic_ipi_domain_match, - }; - -+static void __init gic_map_single_int(struct device_node *node, -+ unsigned int irq) -+{ -+ unsigned int linux_irq; -+ struct irq_fwspec local_int_fwspec = { -+ .fwnode = &node->fwnode, -+ .param_count = 3, -+ .param = { -+ [0] = GIC_LOCAL, -+ [1] = irq, -+ [2] = IRQ_TYPE_NONE, -+ }, -+ }; -+ -+ if (!gic_local_irq_is_routable(irq)) -+ return; -+ -+ linux_irq = irq_create_fwspec_mapping(&local_int_fwspec); -+ WARN_ON(!linux_irq); -+} -+ -+static void __init gic_map_interrupts(struct device_node *node) -+{ -+ gic_map_single_int(node, GIC_LOCAL_INT_TIMER); -+ gic_map_single_int(node, GIC_LOCAL_INT_PERFCTR); -+ gic_map_single_int(node, GIC_LOCAL_INT_FDC); -+} -+ - static void __init __gic_init(unsigned long gic_base_addr, - unsigned long gic_addrspace_size, - unsigned int cpu_vec, unsigned int irqbase, -@@ -1067,6 +1095,7 @@ static void __init __gic_init(unsigned l - } - - gic_basic_init(); -+ gic_map_interrupts(node); - } - - void __init gic_init(unsigned long gic_base_addr, diff --git a/queue-4.10/series b/queue-4.10/series index 3aa424f35f7..ebe3241efe7 100644 --- a/queue-4.10/series +++ b/queue-4.10/series @@ -1,6 +1,5 @@ 9p-fix-a-potential-acl-leak.patch drm-sti-fix-gdp-size-to-support-up-to-uhd-resolution.patch -irqchip-mips-gic-fix-local-interrupts.patch hwmon-it87-fix-pwm4-detection-for-it8620-and-it8628.patch mtd-nand-add-ox820-nand-hardware-dependency.patch tpm-fix-rc-value-check-in-tpm2_seal_trusted.patch @@ -87,7 +86,6 @@ usb-serial-io_edgeport-fix-descriptor-error-handling.patch usb-serial-sierra-fix-bogus-alternate-setting-assumption.patch clk-rockchip-add-to-mux_pll_src_apll_dpll_gpll_usb480m_p-on-rk3036.patch phy-qcom-usb-hs-add-depends-on-extcon.patch -tty-serial-pl011-add-ttyama-for-matching-pl011-console.patch serial-8250_omap-fix-probe-and-remove-for-pm-runtime.patch scsi-qedi-fix-possible-memory-leak-in-qedi_iscsi_update_conn.patch scsi-qedi-fix-build-error-without-debug_fs.patch diff --git a/queue-4.10/tty-serial-pl011-add-ttyama-for-matching-pl011-console.patch b/queue-4.10/tty-serial-pl011-add-ttyama-for-matching-pl011-console.patch deleted file mode 100644 index 4501e07c47a..00000000000 --- a/queue-4.10/tty-serial-pl011-add-ttyama-for-matching-pl011-console.patch +++ /dev/null @@ -1,55 +0,0 @@ -From aea9a80ba98a0c9b4de88850260e9fbdcc98360b Mon Sep 17 00:00:00 2001 -From: Sudeep Holla -Date: Wed, 1 Feb 2017 15:46:38 +0000 -Subject: tty: serial: pl011: add ttyAMA for matching pl011 console - -From: Sudeep Holla - -commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b upstream. - -Commit c7cef0a84912 ("console: Add extensible console matching") added -match() method to struct console which allows the console to perform -console command line matching instead of (or in addition to) default -console matching (ie., by fixed name and index). - -Commit ad1696f6f09d ("ACPI: parse SPCR and enable matching console") -introduced support for SPCR as matching console. - -Commit 10879ae5f12e ("serial: pl011: add console matching function") -added the match method for pl011 console which checks for the console -string to be "pl011" - -Now on a platform which has both SPCR in the ACPI tables and ttyAMA in -the command line, the ttyAMA is chosen as "selected console" but it -doesn't pass the matching console method which results in CON_CONSDEV -not being set on the "selected console". - -As a result of that, the bootconsole(SPCR in the above case) is not -unregistered and all the beginning boot messages are seen twice. - -This patch adds "ttyAMA" so that it's considered to match pl011 console. - -Fixes: 10879ae5f12e ("serial: pl011: add console matching function") -Cc: Russell King -Cc: Greg Kroah-Hartman -Cc: Jiri Slaby -Cc: Peter Hurley -Cc: Aleksey Makarov -Signed-off-by: Sudeep Holla -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/tty/serial/amba-pl011.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/tty/serial/amba-pl011.c -+++ b/drivers/tty/serial/amba-pl011.c -@@ -2340,7 +2340,7 @@ static int __init pl011_console_match(st - resource_size_t addr; - int i; - -- if (strcmp(name, "pl011") != 0) -+ if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) - return -ENODEV; - - if (uart_parse_earlycon(options, &iotype, &addr, &options)) diff --git a/queue-4.4/iwlwifi-pcie-trans-remove-unused-shift_param.patch b/queue-4.4/iwlwifi-pcie-trans-remove-unused-shift_param.patch deleted file mode 100644 index 058b86b113e..00000000000 --- a/queue-4.4/iwlwifi-pcie-trans-remove-unused-shift_param.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3ce4a03852d6dd3fd28c2fb2ee9f89bb9ccf9a9b Mon Sep 17 00:00:00 2001 -From: Kirtika Ruchandani -Date: Tue, 8 Nov 2016 21:50:48 -0800 -Subject: iwlwifi: pcie: trans: Remove unused 'shift_param' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Kirtika Ruchandani - -commit 3ce4a03852d6dd3fd28c2fb2ee9f89bb9ccf9a9b upstream. - -shift_param is defined and set in iwl_pcie_load_cpu_sections but not -used. Fix this to avoid -Wunused-but-set-variable warning. - -The code using it turned into dead code with commit dcab8ecd5617 -("iwlwifi: mvm: support ucode load for family_8000 B0 only") which -added a separate function iwl_pcie_load_given_ucode_8000 (then 8000b) -for IWL_DEVICE_FAMILY_8000. Commit 76f8c0e17edc ("iwlwifi: pcie: -remove dead code") removed the dead code but left shift_param as is. - -iwlwifi/pcie/trans.c: In function ‘iwl_pcie_load_cpu_sections’: -iwlwifi/pcie/trans.c:871:6: warning: variable ‘shift_param’ set but not used [-Wunused-but-set-variable] - -Fixes: dcab8ecd5617 ("iwlwifi: mvm: support ucode load for family_8000 B0 only") -Fixes: 76f8c0e17edc ("iwlwifi: pcie: remove dead code") -Signed-off-by: Kirtika Ruchandani -Cc: Sara Sharon -Cc: Luca Coelho -Cc: Liad Kaufman -Cc: Emmanuel Grumbach -[removed some unnecessary braces] -Signed-off-by: Luca Coelho -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/iwlwifi/pcie/trans.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - ---- a/drivers/net/wireless/iwlwifi/pcie/trans.c -+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -817,17 +817,13 @@ static int iwl_pcie_load_cpu_sections(st - int cpu, - int *first_ucode_section) - { -- int shift_param; - int i, ret = 0; - u32 last_read_idx = 0; - -- if (cpu == 1) { -- shift_param = 0; -+ if (cpu == 1) - *first_ucode_section = 0; -- } else { -- shift_param = 16; -+ else - (*first_ucode_section)++; -- } - - for (i = *first_ucode_section; i < IWL_UCODE_SECTION_MAX; i++) { - last_read_idx = i; diff --git a/queue-4.4/series b/queue-4.4/series index 3b96477fe51..70cd44b0537 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -13,7 +13,6 @@ arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch mwifiex-debugfs-fix-sometimes-off-by-1-ssid-print.patch mwifiex-remove-redundant-dma-padding-in-amsdu.patch mwifiex-avoid-skipping-wep-key-deletion-for-ap.patch -iwlwifi-pcie-trans-remove-unused-shift_param.patch x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch x86-pci-calgary-fix-iommu_free-comparison-of-unsigned-expression-0.patch clk-make-x86-conditional-on-config_common_clk.patch diff --git a/queue-4.9/irqchip-mips-gic-fix-local-interrupts.patch b/queue-4.9/irqchip-mips-gic-fix-local-interrupts.patch deleted file mode 100644 index 83fa0983c4a..00000000000 --- a/queue-4.9/irqchip-mips-gic-fix-local-interrupts.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 4cfffcfa5106492f5785924ce2e9af49f075999b Mon Sep 17 00:00:00 2001 -From: Marcin Nowakowski -Date: Wed, 25 Jan 2017 15:08:25 +0100 -Subject: irqchip/mips-gic: Fix local interrupts - -From: Marcin Nowakowski - -commit 4cfffcfa5106492f5785924ce2e9af49f075999b upstream. - -Some local interrupts are not initialised properly at the moment and -cannot be used since the domain's alloc method is never called for them. - -This has been observed earlier and partially fixed in commit -e875bd66dfb ("irqchip/mips-gic: Fix local interrupts"), but that change -still relied on the interrupt to be requested by an external driver (eg. -drivers/clocksource/mips-gic-timer.c). - -This does however not solve the issue for interrupts that are not -referenced by any driver through the device tree and results in -request_irq() calls returning -ENOSYS. It can be observed when attempting -to use perf tool to access hardware performance counters. - -Fix this by explicitly calling irq_create_fwspec_mapping() for local -interrupts. - -Fixes: e875bd66dfb ("irqchip/mips-gic: Fix local interrupts") -Signed-off-by: Marcin Nowakowski -Cc: Paul Burton -Cc: Thomas Gleixner -Cc: Jason Cooper -Cc: Marc Zyngier -Cc: linux-mips@linux-mips.org -Signed-off-by: Marc Zyngier -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/irqchip/irq-mips-gic.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - ---- a/drivers/irqchip/irq-mips-gic.c -+++ b/drivers/irqchip/irq-mips-gic.c -@@ -968,6 +968,34 @@ static struct irq_domain_ops gic_ipi_dom - .match = gic_ipi_domain_match, - }; - -+static void __init gic_map_single_int(struct device_node *node, -+ unsigned int irq) -+{ -+ unsigned int linux_irq; -+ struct irq_fwspec local_int_fwspec = { -+ .fwnode = &node->fwnode, -+ .param_count = 3, -+ .param = { -+ [0] = GIC_LOCAL, -+ [1] = irq, -+ [2] = IRQ_TYPE_NONE, -+ }, -+ }; -+ -+ if (!gic_local_irq_is_routable(irq)) -+ return; -+ -+ linux_irq = irq_create_fwspec_mapping(&local_int_fwspec); -+ WARN_ON(!linux_irq); -+} -+ -+static void __init gic_map_interrupts(struct device_node *node) -+{ -+ gic_map_single_int(node, GIC_LOCAL_INT_TIMER); -+ gic_map_single_int(node, GIC_LOCAL_INT_PERFCTR); -+ gic_map_single_int(node, GIC_LOCAL_INT_FDC); -+} -+ - static void __init __gic_init(unsigned long gic_base_addr, - unsigned long gic_addrspace_size, - unsigned int cpu_vec, unsigned int irqbase, -@@ -1067,6 +1095,7 @@ static void __init __gic_init(unsigned l - } - - gic_basic_init(); -+ gic_map_interrupts(node); - } - - void __init gic_init(unsigned long gic_base_addr, diff --git a/queue-4.9/series b/queue-4.9/series index 9dca60c9182..048ac97ca43 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,6 +1,5 @@ 9p-fix-a-potential-acl-leak.patch drm-sti-fix-gdp-size-to-support-up-to-uhd-resolution.patch -irqchip-mips-gic-fix-local-interrupts.patch hwmon-it87-fix-pwm4-detection-for-it8620-and-it8628.patch tpm-fix-rc-value-check-in-tpm2_seal_trusted.patch tmp-use-pdev-for-parent-device-in-tpm_chip_alloc.patch