Skip to content

Commit ba9d484

Browse files
committed
PCI/MSI: Remove the conditional parent [un]mask logic
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> Tested-by: Marc Zyngier <maz@kernel.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/all/20250903135433.444329373@linutronix.de
1 parent f09c1d6 commit ba9d484

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

drivers/pci/msi/irqdomain.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -170,22 +170,6 @@ static unsigned int cond_startup_parent(struct irq_data *data)
170170
return 0;
171171
}
172172

173-
static __always_inline void cond_mask_parent(struct irq_data *data)
174-
{
175-
struct msi_domain_info *info = data->domain->host_data;
176-
177-
if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
178-
irq_chip_mask_parent(data);
179-
}
180-
181-
static __always_inline void cond_unmask_parent(struct irq_data *data)
182-
{
183-
struct msi_domain_info *info = data->domain->host_data;
184-
185-
if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
186-
irq_chip_unmask_parent(data);
187-
}
188-
189173
static void pci_irq_shutdown_msi(struct irq_data *data)
190174
{
191175
struct msi_desc *desc = irq_data_get_msi_desc(data);
@@ -208,14 +192,12 @@ static void pci_irq_mask_msi(struct irq_data *data)
208192
struct msi_desc *desc = irq_data_get_msi_desc(data);
209193

210194
pci_msi_mask(desc, BIT(data->irq - desc->irq));
211-
cond_mask_parent(data);
212195
}
213196

214197
static void pci_irq_unmask_msi(struct irq_data *data)
215198
{
216199
struct msi_desc *desc = irq_data_get_msi_desc(data);
217200

218-
cond_unmask_parent(data);
219201
pci_msi_unmask(desc, BIT(data->irq - desc->irq));
220202
}
221203

@@ -268,12 +250,10 @@ static unsigned int pci_irq_startup_msix(struct irq_data *data)
268250
static void pci_irq_mask_msix(struct irq_data *data)
269251
{
270252
pci_msix_mask(irq_data_get_msi_desc(data));
271-
cond_mask_parent(data);
272253
}
273254

274255
static void pci_irq_unmask_msix(struct irq_data *data)
275256
{
276-
cond_unmask_parent(data);
277257
pci_msix_unmask(irq_data_get_msi_desc(data));
278258
}
279259

0 commit comments

Comments
 (0)