mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-22 07:53:11 -05:00
irqchip/imx-mu-msi: Switch to MSI parent
All platform MSI users and the PCI/MSI code handle per device MSI domains when the irqdomain associated to the device provides MSI parent functionality. Remove the "global" platform domain related code and provide the MSI parent functionality by filling in msi_parent_ops. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de> Signed-off-by: Shivamurthy Shastri <shivamurthy.shastri@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240623142235.574932935@linutronix.de
This commit is contained in:
parent
74e44454aa
commit
7b2f8aa005
3 changed files with 24 additions and 27 deletions
|
@ -492,6 +492,7 @@ config IMX_MU_MSI
|
|||
select IRQ_DOMAIN
|
||||
select IRQ_DOMAIN_HIERARCHY
|
||||
select GENERIC_MSI_IRQ
|
||||
select IRQ_MSI_LIB
|
||||
help
|
||||
Provide a driver for the i.MX Messaging Unit block used as a
|
||||
CPU-to-CPU MSI controller. This requires a specially crafted DT
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
#include <linux/pm_domain.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
||||
#include "irq-msi-lib.h"
|
||||
|
||||
#define IMX_MU_CHANS 4
|
||||
|
||||
enum imx_mu_xcr {
|
||||
|
@ -114,20 +116,6 @@ static void imx_mu_msi_parent_ack_irq(struct irq_data *data)
|
|||
imx_mu_read(msi_data, msi_data->cfg->xRR + data->hwirq * 4);
|
||||
}
|
||||
|
||||
static struct irq_chip imx_mu_msi_irq_chip = {
|
||||
.name = "MU-MSI",
|
||||
.irq_ack = irq_chip_ack_parent,
|
||||
};
|
||||
|
||||
static struct msi_domain_ops imx_mu_msi_irq_ops = {
|
||||
};
|
||||
|
||||
static struct msi_domain_info imx_mu_msi_domain_info = {
|
||||
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
|
||||
.ops = &imx_mu_msi_irq_ops,
|
||||
.chip = &imx_mu_msi_irq_chip,
|
||||
};
|
||||
|
||||
static void imx_mu_msi_parent_compose_msg(struct irq_data *data,
|
||||
struct msi_msg *msg)
|
||||
{
|
||||
|
@ -195,6 +183,7 @@ static void imx_mu_msi_domain_irq_free(struct irq_domain *domain,
|
|||
}
|
||||
|
||||
static const struct irq_domain_ops imx_mu_msi_domain_ops = {
|
||||
.select = msi_lib_irq_domain_select,
|
||||
.alloc = imx_mu_msi_domain_irq_alloc,
|
||||
.free = imx_mu_msi_domain_irq_free,
|
||||
};
|
||||
|
@ -216,6 +205,21 @@ static void imx_mu_msi_irq_handler(struct irq_desc *desc)
|
|||
chained_irq_exit(chip, desc);
|
||||
}
|
||||
|
||||
#define IMX_MU_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \
|
||||
MSI_FLAG_USE_DEF_CHIP_OPS | \
|
||||
MSI_FLAG_PARENT_PM_DEV)
|
||||
|
||||
#define IMX_MU_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK)
|
||||
|
||||
static const struct msi_parent_ops imx_mu_msi_parent_ops = {
|
||||
.supported_flags = IMX_MU_MSI_FLAGS_SUPPORTED,
|
||||
.required_flags = IMX_MU_MSI_FLAGS_REQUIRED,
|
||||
.bus_select_token = DOMAIN_BUS_NEXUS,
|
||||
.bus_select_mask = MATCH_PLATFORM_MSI,
|
||||
.prefix = "MU-MSI-",
|
||||
.init_dev_msi_info = msi_lib_init_dev_msi_info,
|
||||
};
|
||||
|
||||
static int imx_mu_msi_domains_init(struct imx_mu_msi *msi_data, struct device *dev)
|
||||
{
|
||||
struct fwnode_handle *fwnodes = dev_fwnode(dev);
|
||||
|
@ -230,19 +234,9 @@ static int imx_mu_msi_domains_init(struct imx_mu_msi *msi_data, struct device *d
|
|||
}
|
||||
|
||||
irq_domain_update_bus_token(parent, DOMAIN_BUS_NEXUS);
|
||||
|
||||
msi_data->msi_domain = platform_msi_create_irq_domain(fwnodes,
|
||||
&imx_mu_msi_domain_info,
|
||||
parent);
|
||||
|
||||
if (!msi_data->msi_domain) {
|
||||
dev_err(dev, "failed to create MSI domain\n");
|
||||
irq_domain_remove(parent);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
irq_domain_set_pm_device(msi_data->msi_domain, dev);
|
||||
|
||||
parent->dev = parent->pm_dev = dev;
|
||||
parent->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;
|
||||
parent->msi_parent_ops = &imx_mu_msi_parent_ops;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -94,6 +94,8 @@ bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain,
|
|||
/* Chip updates for all child bus types */
|
||||
if (!info->chip->irq_eoi)
|
||||
info->chip->irq_eoi = irq_chip_eoi_parent;
|
||||
if (!info->chip->irq_ack)
|
||||
info->chip->irq_ack = irq_chip_ack_parent;
|
||||
|
||||
/*
|
||||
* The device MSI domain can never have a set affinity callback. It
|
||||
|
|
Loading…
Reference in a new issue