]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI/MSI: Check MSI_FLAG_PCI_MSI_MASK_PARENT in cond_[startup|shutdown]_parent()
authorInochi Amaoto <inochiama@gmail.com>
Wed, 27 Aug 2025 23:09:42 +0000 (07:09 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 2 Sep 2025 12:42:09 +0000 (14:42 +0200)
For MSI controllers which only support MSI_FLAG_PCI_MSI_MASK_PARENT, the
newly added callback irq_startup() and irq_shutdown() for
pci_msi[x]_template will not unmask or mask the interrupt when startup()
resp.  shutdown() is invoked. This prevents the interrupt from being
enabled resp. disabled.

Invoke irq_[un]mask_parent() in cond_[startup|shutdown]_parent(), when the
interrupt has the MSI_FLAG_PCI_MSI_MASK_PARENT flag set.

Fixes: 54f45a30c0d0 ("PCI/MSI: Add startup/shutdown for per device domains")
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Reported-by: Nathan Chancellor <nathan@kernel.org>
Reported-by: Wei Fang <wei.fang@nxp.com>
Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Wei Fang <wei.fang@nxp.com>
Tested-by: Chen Wang <unicorn_wang@outlook.com> # Pioneerbox/SG2042
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/all/20250827230943.17829-1-inochiama@gmail.com
Closes: https://lore.kernel.org/regressions/aK4O7Hl8NCVEMznB@monster/
Closes: https://lore.kernel.org/regressions/20250826220959.GA4119563@ax162/
Closes: https://lore.kernel.org/all/20250827093911.1218640-1-wei.fang@nxp.com/
drivers/pci/msi/irqdomain.c

index e0a800f918e81242f371a9ac806188806218df28..b11b7f63f0d6fcb192a20d6e2b96745b831a02f4 100644 (file)
@@ -154,6 +154,8 @@ static void cond_shutdown_parent(struct irq_data *data)
 
        if (unlikely(info->flags & MSI_FLAG_PCI_MSI_STARTUP_PARENT))
                irq_chip_shutdown_parent(data);
+       else if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
+               irq_chip_mask_parent(data);
 }
 
 static unsigned int cond_startup_parent(struct irq_data *data)
@@ -162,6 +164,9 @@ static unsigned int cond_startup_parent(struct irq_data *data)
 
        if (unlikely(info->flags & MSI_FLAG_PCI_MSI_STARTUP_PARENT))
                return irq_chip_startup_parent(data);
+       else if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
+               irq_chip_unmask_parent(data);
+
        return 0;
 }