github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

PCI: dwc: Switch to msi_create_parent_irq_domain()

Browse Source 
Switch to msi_create_parent_irq_domain() from pci_msi_create_irq_domain()
which was using legacy MSI domain setup.

Signed-off-by: Nam Cao <namcao@linutronix.de>
[mani: reworded commit message]
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
[bhelgaas: rebase on dev_fwnode() conversion]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/04d4a96046490e50139826c16423954e033cdf89.1750858083.git.namcao@linutronix.de
This commit is contained in:
Nam Cao 2025-06-26 16:47:51 +02:00 committed by Bjorn Helgaas
parent a103d2dede
commit 8e717112ca
3 changed files with 23 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/controller/dwc/Kconfig
View File

@ -19,6 +19,7 @@ config PCIE_DW_DEBUGFS
config PCIE_DW_HOST config PCIE_DW_HOST
bool bool
select PCIE_DW select PCIE_DW
select IRQ_MSI_LIB
config PCIE_DW_EP config PCIE_DW_EP
bool bool

65
drivers/pci/controller/dwc/pcie-designware-host.c
View File

@ -10,6 +10,7 @@
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/irqchip/chained_irq.h> #include <linux/irqchip/chained_irq.h>
#include <linux/irqchip/irq-msi-lib.h>
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <linux/msi.h> #include <linux/msi.h>
#include <linux/of_address.h> #include <linux/of_address.h>
@ -23,35 +24,21 @@
static struct pci_ops dw_pcie_ops; static struct pci_ops dw_pcie_ops;
static struct pci_ops dw_child_pcie_ops; static struct pci_ops dw_child_pcie_ops;
static void dw_msi_ack_irq(struct irq_data *d) #define DW_PCIE_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \
{ MSI_FLAG_USE_DEF_CHIP_OPS | \
irq_chip_ack_parent(d); MSI_FLAG_NO_AFFINITY | \
} MSI_FLAG_PCI_MSI_MASK_PARENT)
#define DW_PCIE_MSI_FLAGS_SUPPORTED (MSI_FLAG_MULTI_PCI_MSI | \
MSI_FLAG_PCI_MSIX | \
MSI_GENERIC_FLAGS_MASK)
static void dw_msi_mask_irq(struct irq_data *d) static const struct msi_parent_ops dw_pcie_msi_parent_ops = {
{ .required_flags = DW_PCIE_MSI_FLAGS_REQUIRED,
pci_msi_mask_irq(d); .supported_flags = DW_PCIE_MSI_FLAGS_SUPPORTED,
irq_chip_mask_parent(d); .bus_select_token = DOMAIN_BUS_PCI_MSI,
} .chip_flags = MSI_CHIP_FLAG_SET_ACK,
.prefix = "DW-",
static void dw_msi_unmask_irq(struct irq_data *d) .init_dev_msi_info = msi_lib_init_dev_msi_info,
{
pci_msi_unmask_irq(d);
irq_chip_unmask_parent(d);
}
static struct irq_chip dw_pcie_msi_irq_chip = {
.name = "PCI-MSI",
.irq_ack = dw_msi_ack_irq,
.irq_mask = dw_msi_mask_irq,
.irq_unmask = dw_msi_unmask_irq,
};
static struct msi_domain_info dw_pcie_msi_domain_info = {
.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
MSI_FLAG_NO_AFFINITY | MSI_FLAG_PCI_MSIX |
MSI_FLAG_MULTI_PCI_MSI,
.chip = &dw_pcie_msi_irq_chip,
}; };
/* MSI int handler */ /* MSI int handler */
@ -227,26 +214,19 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = {
int dw_pcie_allocate_domains(struct dw_pcie_rp *pp) int dw_pcie_allocate_domains(struct dw_pcie_rp *pp)
{ {
struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct fwnode_handle *fwnode = dev_fwnode(pci->dev); struct irq_domain_info info = {
.fwnode = dev_fwnode(pci->dev),
.ops = &dw_pcie_msi_domain_ops,
.size = pp->num_vectors,
.host_data = pp,
};
pp->irq_domain = irq_domain_create_linear(fwnode, pp->num_vectors, pp->irq_domain = msi_create_parent_irq_domain(&info, &dw_pcie_msi_parent_ops);
&dw_pcie_msi_domain_ops, pp);
if (!pp->irq_domain) { if (!pp->irq_domain) {
dev_err(pci->dev, "Failed to create IRQ domain\n"); dev_err(pci->dev, "Failed to create IRQ domain\n");
return -ENOMEM; return -ENOMEM;
} }
irq_domain_update_bus_token(pp->irq_domain, DOMAIN_BUS_NEXUS);
pp->msi_domain = pci_msi_create_irq_domain(fwnode,
&dw_pcie_msi_domain_info,
pp->irq_domain);
if (!pp->msi_domain) {
dev_err(pci->dev, "Failed to create MSI domain\n");
irq_domain_remove(pp->irq_domain);
return -ENOMEM;
}
return 0; return 0;
} }
@ -260,7 +240,6 @@ static void dw_pcie_free_msi(struct dw_pcie_rp *pp)
NULL, NULL); NULL, NULL);
} }
irq_domain_remove(pp->msi_domain);
irq_domain_remove(pp->irq_domain); irq_domain_remove(pp->irq_domain);
} }

1
drivers/pci/controller/dwc/pcie-designware.h
View File

@ -417,7 +417,6 @@ struct dw_pcie_rp {
const struct dw_pcie_host_ops *ops; const struct dw_pcie_host_ops *ops;
int msi_irq[MAX_MSI_CTRLS]; int msi_irq[MAX_MSI_CTRLS];
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
struct irq_domain *msi_domain;
dma_addr_t msi_data; dma_addr_t msi_data;
struct irq_chip *msi_irq_chip; struct irq_chip *msi_irq_chip;
u32 num_vectors; u32 num_vectors;