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.4-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.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4c65ebee999d93a378c442441b4d83f6b3805b63 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 18 Apr 2017 16:16:57 +0200
Subject: Revert "MIPS: Lantiq: Fix cascaded IRQ setup"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit 6280ac931a23d3fa40cd26057576abcf90a4f22d which is
commit 6c356eda225e3ee134ed4176b9ae3a76f793f4dd upstream.
It shouldn't have been included in a stable release.
Reported-by: Amit Pundir <amit.pundir@xxxxxxxxxx>
Cc: Felix Fietkau <nbd@xxxxxxxx>
Cc: John Crispin <john@xxxxxxxxxxx>
Cc: James Hogan <james.hogan@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxxxxxx are
queue-4.4/drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch
queue-4.4/xen-fbfront-fix-connecting-to-backend.patch
queue-4.4/acpi-nfit-libnvdimm-fix-interleave-set-cookie-calculation-64-bit-comparison.patch
queue-4.4/scsi-sd-consider-max_xfer_blocks-if-opt_xfer_blocks-is-unusable.patch
queue-4.4/char-lack-of-bool-string-made-config_devport-always-on.patch
queue-4.4/ftrace-fix-removing-of-second-function-probe.patch
queue-4.4/x86-vdso-ensure-vdso32_enabled-gets-set-to-valid-values-only.patch
queue-4.4/scsi-sr-sanity-check-returned-mode-data.patch
queue-4.4/thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch
queue-4.4/char-drop-bogus-dependency-of-devport-on-m68k.patch
queue-4.4/cgroup-avoid-attaching-a-cgroup-root-to-two-different-superblocks.patch
queue-4.4/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
queue-4.4/cifs-store-results-of-cifs_reopen_file-to-avoid-infinite-wait.patch
queue-4.4/x86-vdso-plug-race-between-mapping-and-elf-header-setup.patch
queue-4.4/iscsi-target-drop-work-around-for-legacy-globalsan-initiator.patch
queue-4.4/irqchip-irq-imx-gpcv2-fix-spinlock-initialization.patch
queue-4.4/revert-mips-lantiq-fix-cascaded-irq-setup.patch
queue-4.4/cgroup-kthread-close-race-window-where-new-kthreads-can-be-migrated-to-non-root-cgroups.patch
queue-4.4/zram-fix-operator-precedence-to-get-offset.patch
queue-4.4/iscsi-target-fix-tmr-reference-leak-during-session-shutdown.patch
queue-4.4/libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handle-lockdep-splat.patch
queue-4.4/perf-x86-avoid-exposing-wrong-stale-data-in-intel_pmu_lbr_read_32.patch
queue-4.4/input-xpad-add-support-for-razer-wildcat-gamepad.patch
queue-4.4/scsi-sd-fix-capacity-calculation-with-32-bit-sector_t.patch