[patch V3 11/35] bus: fsl-mc-msi: Allocate MSI device data on first use
flat view
STALE1730d
LANDED: 2 (2M)
From: Thomas Gleixner <hidden>
Date: 2021-12-10 22:19:47
Also in:
dmaengine, linux-arm-kernel, linux-iommu, linux-pci, lkml, xen-devel
Subsystem:
qoriq dpaa2 fsl-mc bus driver, the rest · Maintainers:
Ioana Ciornei, Linus Torvalds
Status: Landed in mainline as 86ca622628d3 on 2021-12-16.
Revision v3 (3 revisions archived); 2 review trailers.
Revisions (3)
- v1 re-posted go to this post
- v2 [diff against previous]
- v3 current [diff against previous]
From: Thomas Gleixner <redacted> Allocate the MSI device data on first invocation of the allocation function. Signed-off-by: Thomas Gleixner <redacted> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Cc: Stuart Yoder <redacted> Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- drivers/bus/fsl-mc/fsl-mc-msi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
--- a/drivers/bus/fsl-mc/fsl-mc-msi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-msi.c@@ -253,6 +253,14 @@ int fsl_mc_msi_domain_alloc_irqs(struct struct irq_domain *msi_domain; int error; + msi_domain = dev_get_msi_domain(dev); + if (!msi_domain) + return -EINVAL; + + error = msi_setup_device_data(dev); + if (error) + return error; + if (!list_empty(dev_to_msi_list(dev))) return -EINVAL;
@@ -260,12 +268,6 @@ int fsl_mc_msi_domain_alloc_irqs(struct if (error < 0) return error; - msi_domain = dev_get_msi_domain(dev); - if (!msi_domain) { - error = -EINVAL; - goto cleanup_msi_descs; - } - /* * NOTE: Calling this function will trigger the invocation of the * its_fsl_mc_msi_prepare() callback