From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Marc Zyngier <maz@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>
Subject: [patch 2/2] PCI/MSI: Remove the conditional parent [un]mask logic
Date: Wed, 3 Sep 2025 16:04:48 +0200 (CEST) [thread overview]
Message-ID: <20250903135433.444329373@linutronix.de> (raw)
In-Reply-To: <20250903134437.863638669@linutronix.de>
Now that msi_lib_init_dev_msi_info() overwrites the irq_[un]mask()
callbacks when the MSI_FLAG_PCI_MSI_MASK_PARENT flag is set by the parent
domain, the conditional [un]mask logic is obsolete.
Remove it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/msi/irqdomain.c | 20 --------------------
1 file changed, 20 deletions(-)
--- a/drivers/pci/msi/irqdomain.c
+++ b/drivers/pci/msi/irqdomain.c
@@ -170,22 +170,6 @@ static unsigned int cond_startup_parent(
return 0;
}
-static __always_inline void cond_mask_parent(struct irq_data *data)
-{
- struct msi_domain_info *info = data->domain->host_data;
-
- if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
- irq_chip_mask_parent(data);
-}
-
-static __always_inline void cond_unmask_parent(struct irq_data *data)
-{
- struct msi_domain_info *info = data->domain->host_data;
-
- if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
- irq_chip_unmask_parent(data);
-}
-
static void pci_irq_shutdown_msi(struct irq_data *data)
{
struct msi_desc *desc = irq_data_get_msi_desc(data);
@@ -208,14 +192,12 @@ static void pci_irq_mask_msi(struct irq_
struct msi_desc *desc = irq_data_get_msi_desc(data);
pci_msi_mask(desc, BIT(data->irq - desc->irq));
- cond_mask_parent(data);
}
static void pci_irq_unmask_msi(struct irq_data *data)
{
struct msi_desc *desc = irq_data_get_msi_desc(data);
- cond_unmask_parent(data);
pci_msi_unmask(desc, BIT(data->irq - desc->irq));
}
@@ -268,12 +250,10 @@ static unsigned int pci_irq_startup_msix
static void pci_irq_mask_msix(struct irq_data *data)
{
pci_msix_mask(irq_data_get_msi_desc(data));
- cond_mask_parent(data);
}
static void pci_irq_unmask_msix(struct irq_data *data)
{
- cond_unmask_parent(data);
pci_msix_unmask(irq_data_get_msi_desc(data));
}
next prev parent reply other threads:[~2025-09-03 14:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-17 10:30 [PATCH] irqchip/msi-lib: Honor the MSI_FLAG_PCI_MSI_MASK_PARENT flag Marc Zyngier
2025-05-17 19:59 ` Thomas Gleixner
2025-05-23 9:06 ` Marc Zyngier
2025-06-30 8:59 ` Thomas Gleixner
2025-09-03 14:04 ` [patch 0/2] PCI/MSI: Avoid PCI level masking during normal operation if requested Thomas Gleixner
2025-09-03 14:04 ` [patch 1/2] irqchip/msi-lib: Honor the MSI_FLAG_PCI_MSI_MASK_PARENT flag Thomas Gleixner
2025-09-09 12:47 ` [tip: irq/drivers] " tip-bot2 for Marc Zyngier
2025-12-20 19:31 ` [patch 1/2] " Luigi Rizzo
2025-12-21 11:55 ` Marc Zyngier
2025-12-21 12:41 ` Luigi Rizzo
2025-12-22 16:16 ` Marc Zyngier
2026-01-08 21:32 ` Thomas Gleixner
2026-01-08 21:55 ` Luigi Rizzo
2026-01-09 12:20 ` Thomas Gleixner
2026-01-09 13:00 ` Luigi Rizzo
2026-01-09 17:01 ` Thomas Gleixner
2025-09-03 14:04 ` Thomas Gleixner [this message]
2025-09-03 17:38 ` [patch 2/2] PCI/MSI: Remove the conditional parent [un]mask logic Bjorn Helgaas
2025-09-09 12:47 ` [tip: irq/drivers] " tip-bot2 for Thomas Gleixner
2025-09-09 10:21 ` [patch 0/2] PCI/MSI: Avoid PCI level masking during normal operation if requested Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250903135433.444329373@linutronix.de \
--to=tglx@linutronix.de \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®