Skip to content

Commit

Permalink
PCI: aardvark: Make msi_domain_info structure a static driver structure
Browse files Browse the repository at this point in the history
commit 26bcd54 upstream.

Make Aardvark's msi_domain_info structure into a private driver structure.
Domain info is same for every potential instatination of a controller.

Link: https://lore.kernel.org/r/20220110015018.26359-8-kabel@kernel.org
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
elkablo authored and gregkh committed May 12, 2022
1 parent 422d5bd commit fcf2764
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/pci/controller/pci-aardvark.c
Expand Up @@ -274,7 +274,6 @@ struct advk_pcie {
raw_spinlock_t irq_lock;
struct irq_domain *msi_domain;
struct irq_domain *msi_inner_domain;
struct msi_domain_info msi_domain_info;
DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
struct mutex msi_used_lock;
u16 msi_msg;
Expand Down Expand Up @@ -1286,20 +1285,20 @@ static struct irq_chip advk_msi_irq_chip = {
.name = "advk-MSI",
};

static struct msi_domain_info advk_msi_domain_info = {
.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
MSI_FLAG_MULTI_PCI_MSI,
.chip = &advk_msi_irq_chip,
};

static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
{
struct device *dev = &pcie->pdev->dev;
struct device_node *node = dev->of_node;
struct msi_domain_info *msi_di;
phys_addr_t msi_msg_phys;

mutex_init(&pcie->msi_used_lock);

msi_di = &pcie->msi_domain_info;
msi_di->flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
MSI_FLAG_MULTI_PCI_MSI;
msi_di->chip = &advk_msi_irq_chip;

msi_msg_phys = virt_to_phys(&pcie->msi_msg);

advk_writel(pcie, lower_32_bits(msi_msg_phys),
Expand All @@ -1315,7 +1314,8 @@ static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)

pcie->msi_domain =
pci_msi_create_irq_domain(of_node_to_fwnode(node),
msi_di, pcie->msi_inner_domain);
&advk_msi_domain_info,
pcie->msi_inner_domain);
if (!pcie->msi_domain) {
irq_domain_remove(pcie->msi_inner_domain);
return -ENOMEM;
Expand Down

0 comments on commit fcf2764

Please sign in to comment.