Patch "Revert "MIPS: Lantiq: Fix cascaded IRQ setup"" has been added to the 4.10-stable tree

Patch "Revert "MIPS: Lantiq: Fix cascaded IRQ setup"" has been added to the 4.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    Revert "MIPS: Lantiq: Fix cascaded IRQ setup"

to the 4.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-mips-lantiq-fix-cascaded-irq-setup.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 4c65ebee999d93a378c442441b4d83f6b3805b63 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Apr 2017 16:16:57 +0200
Subject: Revert "MIPS: Lantiq: Fix cascaded IRQ setup"

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

This reverts commit b576c58331340c87bcf61f1205003a8fdffdff24 which is
commit 6c356eda225e3ee134ed4176b9ae3a76f793f4dd upstream.

It shouldn't have been included in a stable release.

Reported-by: Amit Pundir <amit.pundir@linaro.org>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: John Crispin <john@phrozen.org>
Cc: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/mips/lantiq/irq.c |   36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
@@ -269,11 +269,6 @@ static void ltq_hw5_irqdispatch(void)
 DEFINE_HWx_IRQDISPATCH(5)
 #endif
 
-static void ltq_hw_irq_handler(struct irq_desc *desc)
-{
-	ltq_hw_irqdispatch(irq_desc_get_irq(desc) - 2);
-}
-
 #ifdef CONFIG_MIPS_MT_SMP
 void __init arch_init_ipiirq(int irq, struct irqaction *action)
 {
@@ -318,19 +313,23 @@ static struct irqaction irq_call = {
 asmlinkage void plat_irq_dispatch(void)
 {
 	unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
-	int irq;
+	unsigned int i;
 
-	if (!pending) {
-		spurious_interrupt();
-		return;
+	if ((MIPS_CPU_TIMER_IRQ == 7) && (pending & CAUSEF_IP7)) {
+		do_IRQ(MIPS_CPU_TIMER_IRQ);
+		goto out;
+	} else {
+		for (i = 0; i < MAX_IM; i++) {
+			if (pending & (CAUSEF_IP2 << i)) {
+				ltq_hw_irqdispatch(i);
+				goto out;
+			}
+		}
 	}
+	pr_alert("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());
 
-	pending >>= CAUSEB_IP;
-	while (pending) {
-		irq = fls(pending) - 1;
-		do_IRQ(MIPS_CPU_IRQ_BASE + irq);
-		pending &= ~BIT(irq);
-	}
+out:
+	return;
 }
 
 static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
@@ -355,6 +354,11 @@ static const struct irq_domain_ops irq_d
 	.map = icu_map,
 };
 
+static struct irqaction cascade = {
+	.handler = no_action,
+	.name = "cascade",
+};
+
 int __init icu_of_init(struct device_node *node, struct device_node *parent)
 {
 	struct device_node *eiu_node;
@@ -386,7 +390,7 @@ int __init icu_of_init(struct device_nod
 	mips_cpu_irq_init();
 
 	for (i = 0; i < MAX_IM; i++)
-		irq_set_chained_handler(i + 2, ltq_hw_irq_handler);
+		setup_irq(i + 2, &cascade);
 
 	if (cpu_has_vint) {
 		pr_info("Setting up vectored interrupts\n");


Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are

queue-4.10/drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch
queue-4.10/orangefs-free-superblock-when-mount-fails.patch
queue-4.10/x86-efi-don-t-try-to-reserve-runtime-regions.patch
queue-4.10/x86-signals-fix-lower-upper-bound-reporting-in-compat-siginfo.patch
queue-4.10/libnvdimm-band-aid-btt-vs-clear-poison-locking.patch
queue-4.10/make-skb_copy_datagram_msg-et.al.-preserve-msg_iter-on-error.patch
queue-4.10/xen-fbfront-fix-connecting-to-backend.patch
queue-4.10/acpi-nfit-libnvdimm-fix-interleave-set-cookie-calculation-64-bit-comparison.patch
queue-4.10/scsi-sd-consider-max_xfer_blocks-if-opt_xfer_blocks-is-unusable.patch
queue-4.10/char-lack-of-bool-string-made-config_devport-always-on.patch
queue-4.10/scsi-qla2xxx-add-fix-to-read-correct-register-value-for-isp82xx.patch
queue-4.10/perf-annotate-s390-fix-perf-annotate-error-95-4.10-regression.patch
queue-4.10/ftrace-fix-removing-of-second-function-probe.patch
queue-4.10/cifs-reconnect-thread-reschedule-itself.patch
queue-4.10/audit-make-sure-we-don-t-let-the-retry-queue-grow-without-bounds.patch
queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
queue-4.10/x86-vdso-ensure-vdso32_enabled-gets-set-to-valid-values-only.patch
queue-4.10/libnvdimm-fix-blk-free-space-accounting.patch
queue-4.10/scsi-sr-sanity-check-returned-mode-data.patch
queue-4.10/thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch
queue-4.10/pwm-rockchip-state-of-pwm-clock-should-synchronize-with-pwm-enabled-state.patch
queue-4.10/drm-i915-gvt-set-the-correct-default-value-of-ctx-status-ptr.patch
queue-4.10/cgroup-avoid-attaching-a-cgroup-root-to-two-different-superblocks.patch
queue-4.10/efi-libstub-skip-gop-with-pixel_blt_only-format.patch
queue-4.10/new-privimitive-iov_iter_revert.patch
queue-4.10/x86-pmem-fix-broken-__copy_user_nocache-cache-bypass-assumptions.patch
queue-4.10/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
queue-4.10/cifs-store-results-of-cifs_reopen_file-to-avoid-infinite-wait.patch
queue-4.10/acpi-scan-set-the-visited-flag-for-all-enumerated-devices.patch
queue-4.10/tcmu-fix-wrongly-calculating-of-the-base_command_size.patch
queue-4.10/efi-fb-avoid-reconfiguration-of-bar-that-covers-the-framebuffer.patch
queue-4.10/cpufreq-bring-cpus-up-even-if-cpufreq_online-failed.patch
queue-4.10/x86-vdso-plug-race-between-mapping-and-elf-header-setup.patch
queue-4.10/drm-nouveau-kms-nv50-fix-setting-of-headsetrastervertblankdmi-method.patch
queue-4.10/x86-intel_rdt-fix-locking-in-rdtgroup_schemata_write.patch
queue-4.10/iscsi-target-drop-work-around-for-legacy-globalsan-initiator.patch
queue-4.10/irqchip-irq-imx-gpcv2-fix-spinlock-initialization.patch
queue-4.10/revert-mips-lantiq-fix-cascaded-irq-setup.patch
queue-4.10/drm-nouveau-kms-nv50-fix-double-dma_fence_put-when-destroying-plane-state.patch
queue-4.10/can-ifi-use-correct-register-to-read-rx-status.patch
queue-4.10/cgroup-kthread-close-race-window-where-new-kthreads-can-be-migrated-to-non-root-cgroups.patch
queue-4.10/zram-fix-operator-precedence-to-get-offset.patch
queue-4.10/iscsi-target-fix-tmr-reference-leak-during-session-shutdown.patch
queue-4.10/target-avoid-mappedlun-symlink-creation-during-lun-shutdown.patch
queue-4.10/drm-etnaviv-fix-missing-unlock-on-error-in-etnaviv_gpu_submit.patch
queue-4.10/libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handle-lockdep-splat.patch
queue-4.10/parisc-fix-bugs-in-pa_memcpy.patch
queue-4.10/tcmu-fix-possible-overwrite-of-t_data_sg-s-last-iov.patch
queue-4.10/thp-fix-madv_dontneed-vs.-madv_free-race.patch
queue-4.10/drm-nouveau-initial-support-display-only-for-gp107.patch
queue-4.10/tcmu-skip-data-out-blocks-before-gathering-data-in-buffer-for-bidi-case.patch
queue-4.10/zsmalloc-expand-class-bit.patch
queue-4.10/perf-x86-avoid-exposing-wrong-stale-data-in-intel_pmu_lbr_read_32.patch
queue-4.10/input-xpad-add-support-for-razer-wildcat-gamepad.patch
queue-4.10/drm-fb-helper-allow-var-x-yres-_virtual-fb-width-height-again.patch
queue-4.10/scsi-sd-fix-capacity-calculation-with-32-bit-sector_t.patch