Commit ae79351e authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

PCI: xgene: Convert to MSI parent infrastructure 



In an effort to move ARM64 away from the legacy MSI setup, convert the
XGENE PCIe driver to the MSI-parent infrastructure and let each device have
its own MSI domain.

[ tglx: Moved the struct out of the function call argument ]

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250513172819.2216709-9-maz@kernel.org
parent 5d627a94

drivers/pci/controller/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ config PCI_XGENE_MSI 
	bool "X-Gene v1 PCIe MSI feature"

	depends on PCI_XGENE

	depends on PCI_MSI

	select IRQ_MSI_LIB

	default y

	help

	  Say Y here if you want PCIe MSI support for the APM X-Gene v1 SoC.

drivers/pci/controller/pci-xgene-msi.c

+20 −33
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/module.h>

#include <linux/msi.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/irqchip/irq-msi-lib.h>

#include <linux/pci.h>

#include <linux/platform_device.h>

#include <linux/of_pci.h>
@@ -32,7 +33,6 @@ struct xgene_msi_group { 
struct xgene_msi {

	struct device_node	*node;

	struct irq_domain	*inner_domain;

	struct irq_domain	*msi_domain;

	u64			msi_addr;

	void __iomem		*msi_regs;

	unsigned long		*bitmap;
@@ -44,20 +44,6 @@ struct xgene_msi { 
/* Global data */

static struct xgene_msi xgene_msi_ctrl;



static struct irq_chip xgene_msi_top_irq_chip = {

	.name		= "X-Gene1 MSI",

	.irq_enable	= pci_msi_unmask_irq,

	.irq_disable	= pci_msi_mask_irq,

	.irq_mask	= pci_msi_mask_irq,

	.irq_unmask	= pci_msi_unmask_irq,

};



static struct  msi_domain_info xgene_msi_domain_info = {

	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |

		  MSI_FLAG_PCI_MSIX),

	.chip	= &xgene_msi_top_irq_chip,

};



/*

 * X-Gene v1 has 16 groups of MSI termination registers MSInIRx, where

 * n is group number (0..F), x is index of registers in each group (0..7)
@@ -235,34 +221,35 @@ static void xgene_irq_domain_free(struct irq_domain *domain, 
	irq_domain_free_irqs_parent(domain, virq, nr_irqs);

}



static const struct irq_domain_ops msi_domain_ops = {

static const struct irq_domain_ops xgene_msi_domain_ops = {

	.alloc  = xgene_irq_domain_alloc,

	.free   = xgene_irq_domain_free,

};



static const struct msi_parent_ops xgene_msi_parent_ops = {

	.supported_flags	= (MSI_GENERIC_FLAGS_MASK	|

				   MSI_FLAG_PCI_MSIX),

	.required_flags		= (MSI_FLAG_USE_DEF_DOM_OPS	|

				   MSI_FLAG_USE_DEF_CHIP_OPS),

	.bus_select_token	= DOMAIN_BUS_PCI_MSI,

	.init_dev_msi_info	= msi_lib_init_dev_msi_info,

};



static int xgene_allocate_domains(struct xgene_msi *msi)

{

	msi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC,

						  &msi_domain_ops, msi);

	if (!msi->inner_domain)

		return -ENOMEM;



	msi->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(msi->node),

						    &xgene_msi_domain_info,

						    msi->inner_domain);



	if (!msi->msi_domain) {

		irq_domain_remove(msi->inner_domain);

		return -ENOMEM;

	}

	struct irq_domain_info info = {

		.fwnode		= of_fwnode_handle(msi->node),

		.ops		= &xgene_msi_domain_ops,

		.size		= NR_MSI_VEC,

		.host_data	= msi,

	};



	return 0;

	msi->inner_domain = msi_create_parent_irq_domain(&info, &xgene_msi_parent_ops);

	return msi->inner_domain ? 0 : -ENOMEM;

}



static void xgene_free_domains(struct xgene_msi *msi)

{

	if (msi->msi_domain)

		irq_domain_remove(msi->msi_domain);

	if (msi->inner_domain)

		irq_domain_remove(msi->inner_domain);

}