Skip to content

Commit 26bcd54

Browse files
elkabloLorenzo Pieralisi
authored andcommitted
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: Marek Behún <kabel@kernel.org> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
1 parent c3cb8e5 commit 26bcd54

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/pci/controller/pci-aardvark.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ struct advk_pcie {
274274
raw_spinlock_t irq_lock;
275275
struct irq_domain *msi_domain;
276276
struct irq_domain *msi_inner_domain;
277-
struct msi_domain_info msi_domain_info;
278277
DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
279278
struct mutex msi_used_lock;
280279
u16 msi_msg;
@@ -1284,20 +1283,20 @@ static struct irq_chip advk_msi_irq_chip = {
12841283
.name = "advk-MSI",
12851284
};
12861285

1286+
static struct msi_domain_info advk_msi_domain_info = {
1287+
.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
1288+
MSI_FLAG_MULTI_PCI_MSI,
1289+
.chip = &advk_msi_irq_chip,
1290+
};
1291+
12871292
static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
12881293
{
12891294
struct device *dev = &pcie->pdev->dev;
12901295
struct device_node *node = dev->of_node;
1291-
struct msi_domain_info *msi_di;
12921296
phys_addr_t msi_msg_phys;
12931297

12941298
mutex_init(&pcie->msi_used_lock);
12951299

1296-
msi_di = &pcie->msi_domain_info;
1297-
msi_di->flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
1298-
MSI_FLAG_MULTI_PCI_MSI;
1299-
msi_di->chip = &advk_msi_irq_chip;
1300-
13011300
msi_msg_phys = virt_to_phys(&pcie->msi_msg);
13021301

13031302
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)
13131312

13141313
pcie->msi_domain =
13151314
pci_msi_create_irq_domain(of_node_to_fwnode(node),
1316-
msi_di, pcie->msi_inner_domain);
1315+
&advk_msi_domain_info,
1316+
pcie->msi_inner_domain);
13171317
if (!pcie->msi_domain) {
13181318
irq_domain_remove(pcie->msi_inner_domain);
13191319
return -ENOMEM;

0 commit comments

Comments
 (0)