Commit ef50645a authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner

irqchip/GICv2m: Add platform MSI support

In order to support non-PCI MSI with GICv2m, add the minimal
required entry points for the MSI domain, which is actually almost
nothing (we just use the defaults provided by the core code).
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Ma Jun <majun258@huawei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Duc Dang <dhdang@apm.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-18-git-send-email-marc.zyngier@arm.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5cedceb3
...@@ -50,7 +50,6 @@ struct v2m_data { ...@@ -50,7 +50,6 @@ struct v2m_data {
u32 spi_start; /* The SPI number that MSIs start */ u32 spi_start; /* The SPI number that MSIs start */
u32 nr_spis; /* The number of SPIs for MSIs */ u32 nr_spis; /* The number of SPIs for MSIs */
unsigned long *bm; /* MSI vector bitmap */ unsigned long *bm; /* MSI vector bitmap */
struct irq_domain *domain;
}; };
static void gicv2m_mask_msi_irq(struct irq_data *d) static void gicv2m_mask_msi_irq(struct irq_data *d)
...@@ -212,12 +211,25 @@ static bool is_msi_spi_valid(u32 base, u32 num) ...@@ -212,12 +211,25 @@ static bool is_msi_spi_valid(u32 base, u32 num)
return true; return true;
} }
static struct irq_chip gicv2m_pmsi_irq_chip = {
.name = "pMSI",
};
static struct msi_domain_ops gicv2m_pmsi_ops = {
};
static struct msi_domain_info gicv2m_pmsi_domain_info = {
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
.ops = &gicv2m_pmsi_ops,
.chip = &gicv2m_pmsi_irq_chip,
};
static int __init gicv2m_init_one(struct device_node *node, static int __init gicv2m_init_one(struct device_node *node,
struct irq_domain *parent) struct irq_domain *parent)
{ {
int ret; int ret;
struct v2m_data *v2m; struct v2m_data *v2m;
struct irq_domain *inner_domain; struct irq_domain *inner_domain, *pci_domain, *plat_domain;
v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL); v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL);
if (!v2m) { if (!v2m) {
...@@ -270,10 +282,13 @@ static int __init gicv2m_init_one(struct device_node *node, ...@@ -270,10 +282,13 @@ static int __init gicv2m_init_one(struct device_node *node,
inner_domain->bus_token = DOMAIN_BUS_NEXUS; inner_domain->bus_token = DOMAIN_BUS_NEXUS;
inner_domain->parent = parent; inner_domain->parent = parent;
v2m->domain = pci_msi_create_irq_domain(node, &gicv2m_msi_domain_info, pci_domain = pci_msi_create_irq_domain(node, &gicv2m_msi_domain_info,
inner_domain);
plat_domain = platform_msi_create_irq_domain(node,
&gicv2m_pmsi_domain_info,
inner_domain); inner_domain);
if (!v2m->domain) { if (!pci_domain || !plat_domain) {
pr_err("Failed to create MSI domain\n"); pr_err("Failed to create MSI domains\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_free_domains; goto err_free_domains;
} }
...@@ -287,8 +302,10 @@ static int __init gicv2m_init_one(struct device_node *node, ...@@ -287,8 +302,10 @@ static int __init gicv2m_init_one(struct device_node *node,
return 0; return 0;
err_free_domains: err_free_domains:
if (v2m->domain) if (plat_domain)
irq_domain_remove(v2m->domain); irq_domain_remove(plat_domain);
if (pci_domain)
irq_domain_remove(pci_domain);
if (inner_domain) if (inner_domain)
irq_domain_remove(inner_domain); irq_domain_remove(inner_domain);
err_free_bm: err_free_bm:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment