Commit 26bcd54e authored by Marek Behún's avatar Marek Behún Committed by Lorenzo Pieralisi
Browse files

PCI: aardvark: Make msi_domain_info structure a static driver structure 

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: default avatarMarek Behún <kabel@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent c3cb8e51

drivers/pci/controller/pci-aardvark.c

+8 −8
Original line number Diff line number Diff line
@@ -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;
@@ -1284,20 +1283,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),
@@ -1313,7 +1312,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;