Commit 34fff628 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

device: Move MSI related data into a struct 



The only unconditional part of MSI data in struct device is the irqdomain
pointer. Everything else can be allocated on demand. Create a data
structure and move the irqdomain pointer into it. The other MSI specific
parts are going to be removed from struct device in later steps.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20211210221813.617178827@linutronix.de
parent ed1533b5

drivers/base/platform-msi.c

+6 −6
Original line number Diff line number Diff line
@@ -210,10 +210,10 @@ platform_msi_alloc_priv_data(struct device *dev, unsigned int nvec, 
	 * accordingly (which would impact the max number of MSI

	 * capable devices).

	 */

	if (!dev->msi_domain || !write_msi_msg || !nvec || nvec > MAX_DEV_MSIS)

	if (!dev->msi.domain || !write_msi_msg || !nvec || nvec > MAX_DEV_MSIS)

		return ERR_PTR(-EINVAL);



	if (dev->msi_domain->bus_token != DOMAIN_BUS_PLATFORM_MSI) {

	if (dev->msi.domain->bus_token != DOMAIN_BUS_PLATFORM_MSI) {

		dev_err(dev, "Incompatible msi_domain, giving up\n");

		return ERR_PTR(-EINVAL);

	}
@@ -269,7 +269,7 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec, 
	if (err)

		goto out_free_priv_data;



	err = msi_domain_alloc_irqs(dev->msi_domain, dev, nvec);

	err = msi_domain_alloc_irqs(dev->msi.domain, dev, nvec);

	if (err)

		goto out_free_desc;
@@ -282,7 +282,7 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec, 
	return 0;



out_free_irqs:

	msi_domain_free_irqs(dev->msi_domain, dev);

	msi_domain_free_irqs(dev->msi.domain, dev);

out_free_desc:

	platform_msi_free_descs(dev, 0, nvec);

out_free_priv_data:
@@ -306,7 +306,7 @@ void platform_msi_domain_free_irqs(struct device *dev) 
		platform_msi_free_priv_data(desc->platform.msi_priv_data);

	}



	msi_domain_free_irqs(dev->msi_domain, dev);

	msi_domain_free_irqs(dev->msi.domain, dev);

	platform_msi_free_descs(dev, 0, MAX_DEV_MSIS);

}

EXPORT_SYMBOL_GPL(platform_msi_domain_free_irqs);
@@ -354,7 +354,7 @@ __platform_msi_create_device_domain(struct device *dev, 
		return NULL;



	data->host_data = host_data;

	domain = irq_domain_create_hierarchy(dev->msi_domain, 0,

	domain = irq_domain_create_hierarchy(dev->msi.domain, 0,

					     is_tree ? 0 : nvec,

					     dev->fwnode, ops, data);

	if (!domain)

drivers/dma/ti/k3-udma.c

+2 −2
Original line number Diff line number Diff line
@@ -5279,9 +5279,9 @@ static int udma_probe(struct platform_device *pdev) 
	if (IS_ERR(ud->ringacc))

		return PTR_ERR(ud->ringacc);



	dev->msi_domain = of_msi_get_domain(dev, dev->of_node,

	dev->msi.domain = of_msi_get_domain(dev, dev->of_node,

					    DOMAIN_BUS_TI_SCI_INTA_MSI);

	if (!dev->msi_domain) {

	if (!dev->msi.domain) {

		dev_err(dev, "Failed to get MSI domain\n");

		return -EPROBE_DEFER;

	}

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -3170,7 +3170,7 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu) 
	if (!(smmu->features & ARM_SMMU_FEAT_MSI))

		return;



	if (!dev->msi_domain) {

	if (!dev->msi.domain) {

		dev_info(smmu->dev, "msi_domain absent - falling back to wired irqs\n");

		return;

	}

drivers/irqchip/irq-mvebu-icu.c

+3 −3
Original line number Diff line number Diff line
@@ -314,12 +314,12 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev) 
		msi_data->subset_data = of_device_get_match_data(dev);

	}



	dev->msi_domain = of_msi_get_domain(dev, dev->of_node,

	dev->msi.domain = of_msi_get_domain(dev, dev->of_node,

					    DOMAIN_BUS_PLATFORM_MSI);

	if (!dev->msi_domain)

	if (!dev->msi.domain)

		return -EPROBE_DEFER;



	msi_parent_dn = irq_domain_get_of_node(dev->msi_domain);

	msi_parent_dn = irq_domain_get_of_node(dev->msi.domain);

	if (!msi_parent_dn)

		return -ENODEV;

drivers/soc/ti/k3-ringacc.c

+2 −2
Original line number Diff line number Diff line
@@ -1356,9 +1356,9 @@ static int k3_ringacc_init(struct platform_device *pdev, 
	struct resource *res;

	int ret, i;



	dev->msi_domain = of_msi_get_domain(dev, dev->of_node,

	dev->msi.domain = of_msi_get_domain(dev, dev->of_node,

					    DOMAIN_BUS_TI_SCI_INTA_MSI);

	if (!dev->msi_domain) {

	if (!dev->msi.domain) {

		dev_err(dev, "Failed to get MSI domain\n");

		return -EPROBE_DEFER;

	}