Commit 92b86f92 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'irq/gic-v2m-acpi' of... 

Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Pull another round of GIC changes from Marc:

 ACPI support for GIV-v2m
parents a4289dc2 0644b3da

drivers/irqchip/irq-gic-v2m.c

+141 −22
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 


#define pr_fmt(fmt) "GICv2m: " fmt



#include <linux/acpi.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/kernel.h>

#include <linux/msi.h>

#include <linux/of_address.h>

#include <linux/of_pci.h>

#include <linux/slab.h>
@@ -55,7 +57,7 @@ static DEFINE_SPINLOCK(v2m_lock); 


struct v2m_data {

	struct list_head entry;

	struct device_node *node;

	struct fwnode_handle *fwnode;

	struct resource res;	/* GICv2m resource */

	void __iomem *base;	/* GICv2m virt address */

	u32 spi_start;		/* The SPI number that MSIs start */
@@ -138,6 +140,11 @@ static int gicv2m_irq_gic_domain_alloc(struct irq_domain *domain, 
		fwspec.param[0] = 0;

		fwspec.param[1] = hwirq - 32;

		fwspec.param[2] = IRQ_TYPE_EDGE_RISING;

	} else if (is_fwnode_irqchip(domain->parent->fwnode)) {

		fwspec.fwnode = domain->parent->fwnode;

		fwspec.param_count = 2;

		fwspec.param[0] = hwirq;

		fwspec.param[1] = IRQ_TYPE_EDGE_RISING;

	} else {

		return -EINVAL;

	}
@@ -254,7 +261,9 @@ static void gicv2m_teardown(void) 
		list_del(&v2m->entry);

		kfree(v2m->bm);

		iounmap(v2m->base);

		of_node_put(v2m->node);

		of_node_put(to_of_node(v2m->fwnode));

		if (is_fwnode_irqchip(v2m->fwnode))

			irq_domain_free_fwnode(v2m->fwnode);

		kfree(v2m);

	}

}
@@ -268,7 +277,7 @@ static int gicv2m_allocate_domains(struct irq_domain *parent) 
	if (!v2m)

		return 0;



	inner_domain = irq_domain_create_tree(of_node_to_fwnode(v2m->node),

	inner_domain = irq_domain_create_tree(v2m->fwnode,

					      &gicv2m_domain_ops, v2m);

	if (!inner_domain) {

		pr_err("Failed to create GICv2m domain\n");
@@ -277,10 +286,10 @@ static int gicv2m_allocate_domains(struct irq_domain *parent) 


	inner_domain->bus_token = DOMAIN_BUS_NEXUS;

	inner_domain->parent = parent;

	pci_domain = pci_msi_create_irq_domain(of_node_to_fwnode(v2m->node),

	pci_domain = pci_msi_create_irq_domain(v2m->fwnode,

					       &gicv2m_msi_domain_info,

					       inner_domain);

	plat_domain = platform_msi_create_irq_domain(of_node_to_fwnode(v2m->node),

	plat_domain = platform_msi_create_irq_domain(v2m->fwnode,

						     &gicv2m_pmsi_domain_info,

						     inner_domain);

	if (!pci_domain || !plat_domain) {
@@ -296,8 +305,9 @@ static int gicv2m_allocate_domains(struct irq_domain *parent) 
	return 0;

}



static int __init gicv2m_init_one(struct device_node *node,

				  struct irq_domain *parent)

static int __init gicv2m_init_one(struct fwnode_handle *fwnode,

				  u32 spi_start, u32 nr_spis,

				  struct resource *res)

{

	int ret;

	struct v2m_data *v2m;
@@ -309,13 +319,9 @@ static int __init gicv2m_init_one(struct device_node *node, 
	}



	INIT_LIST_HEAD(&v2m->entry);

	v2m->node = node;

	v2m->fwnode = fwnode;



	ret = of_address_to_resource(node, 0, &v2m->res);

	if (ret) {

		pr_err("Failed to allocate v2m resource.\n");

		goto err_free_v2m;

	}

	memcpy(&v2m->res, res, sizeof(struct resource));



	v2m->base = ioremap(v2m->res.start, resource_size(&v2m->res));

	if (!v2m->base) {
@@ -324,10 +330,9 @@ static int __init gicv2m_init_one(struct device_node *node, 
		goto err_free_v2m;

	}



	if (!of_property_read_u32(node, "arm,msi-base-spi", &v2m->spi_start) &&

	    !of_property_read_u32(node, "arm,msi-num-spis", &v2m->nr_spis)) {

		pr_info("Overriding V2M MSI_TYPER (base:%u, num:%u)\n",

			v2m->spi_start, v2m->nr_spis);

	if (spi_start && nr_spis) {

		v2m->spi_start = spi_start;

		v2m->nr_spis = nr_spis;

	} else {

		u32 typer = readl_relaxed(v2m->base + V2M_MSI_TYPER);
@@ -359,10 +364,10 @@ static int __init gicv2m_init_one(struct device_node *node, 
	}



	list_add_tail(&v2m->entry, &v2m_nodes);

	pr_info("Node %s: range[%#lx:%#lx], SPI[%d:%d]\n", node->name,

		(unsigned long)v2m->res.start, (unsigned long)v2m->res.end,

		v2m->spi_start, (v2m->spi_start + v2m->nr_spis));



	pr_info("range[%#lx:%#lx], SPI[%d:%d]\n",

		(unsigned long)res->start, (unsigned long)res->end,

		v2m->spi_start, (v2m->spi_start + v2m->nr_spis));

	return 0;



err_iounmap:
@@ -377,17 +382,34 @@ static struct of_device_id gicv2m_device_id[] = { 
	{},

};



int __init gicv2m_of_init(struct device_node *node, struct irq_domain *parent)

static int __init gicv2m_of_init(struct fwnode_handle *parent_handle,

				 struct irq_domain *parent)

{

	int ret = 0;

	struct device_node *node = to_of_node(parent_handle);

	struct device_node *child;



	for (child = of_find_matching_node(node, gicv2m_device_id); child;

	     child = of_find_matching_node(child, gicv2m_device_id)) {

		u32 spi_start = 0, nr_spis = 0;

		struct resource res;



		if (!of_find_property(child, "msi-controller", NULL))

			continue;



		ret = gicv2m_init_one(child, parent);

		ret = of_address_to_resource(child, 0, &res);

		if (ret) {

			pr_err("Failed to allocate v2m resource.\n");

			break;

		}



		if (!of_property_read_u32(child, "arm,msi-base-spi",

					  &spi_start) &&

		    !of_property_read_u32(child, "arm,msi-num-spis", &nr_spis))

			pr_info("DT overriding V2M MSI_TYPER (base:%u, num:%u)\n",

				spi_start, nr_spis);



		ret = gicv2m_init_one(&child->fwnode, spi_start, nr_spis, &res);

		if (ret) {

			of_node_put(child);

			break;
@@ -400,3 +422,100 @@ int __init gicv2m_of_init(struct device_node *node, struct irq_domain *parent) 
		gicv2m_teardown();

	return ret;

}



#ifdef CONFIG_ACPI

static int acpi_num_msi;



static struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)

{

	struct v2m_data *data;



	if (WARN_ON(acpi_num_msi <= 0))

		return NULL;



	/* We only return the fwnode of the first MSI frame. */

	data = list_first_entry_or_null(&v2m_nodes, struct v2m_data, entry);

	if (!data)

		return NULL;



	return data->fwnode;

}



static int __init

acpi_parse_madt_msi(struct acpi_subtable_header *header,

		    const unsigned long end)

{

	int ret;

	struct resource res;

	u32 spi_start = 0, nr_spis = 0;

	struct acpi_madt_generic_msi_frame *m;

	struct fwnode_handle *fwnode;



	m = (struct acpi_madt_generic_msi_frame *)header;

	if (BAD_MADT_ENTRY(m, end))

		return -EINVAL;



	res.start = m->base_address;

	res.end = m->base_address + SZ_4K;



	if (m->flags & ACPI_MADT_OVERRIDE_SPI_VALUES) {

		spi_start = m->spi_base;

		nr_spis = m->spi_count;



		pr_info("ACPI overriding V2M MSI_TYPER (base:%u, num:%u)\n",

			spi_start, nr_spis);

	}



	fwnode = irq_domain_alloc_fwnode((void *)m->base_address);

	if (!fwnode) {

		pr_err("Unable to allocate GICv2m domain token\n");

		return -EINVAL;

	}



	ret = gicv2m_init_one(fwnode, spi_start, nr_spis, &res);

	if (ret)

		irq_domain_free_fwnode(fwnode);



	return ret;

}



static int __init gicv2m_acpi_init(struct irq_domain *parent)

{

	int ret;



	if (acpi_num_msi > 0)

		return 0;



	acpi_num_msi = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_MSI_FRAME,

				      acpi_parse_madt_msi, 0);



	if (acpi_num_msi <= 0)

		goto err_out;



	ret = gicv2m_allocate_domains(parent);

	if (ret)

		goto err_out;



	pci_msi_register_fwnode_provider(&gicv2m_get_fwnode);



	return 0;



err_out:

	gicv2m_teardown();

	return -EINVAL;

}

#else /* CONFIG_ACPI */

static int __init gicv2m_acpi_init(struct irq_domain *parent)

{

	return -EINVAL;

}

#endif /* CONFIG_ACPI */



int __init gicv2m_init(struct fwnode_handle *parent_handle,

		       struct irq_domain *parent)

{

	if (is_of_node(parent_handle))

		return gicv2m_of_init(parent_handle, parent);



	return gicv2m_acpi_init(parent);

}

drivers/irqchip/irq-gic.c

+6 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static int gic_irq_domain_translate(struct irq_domain *d, 
		return 0;

	}



	if (fwspec->fwnode->type == FWNODE_IRQCHIP) {

	if (is_fwnode_irqchip(fwspec->fwnode)) {

		if(fwspec->param_count != 2)

			return -EINVAL;
@@ -1228,7 +1228,7 @@ gic_of_init(struct device_node *node, struct device_node *parent) 
	}



	if (IS_ENABLED(CONFIG_ARM_GIC_V2M))

		gicv2m_of_init(node, gic_data[gic_cnt].domain);

		gicv2m_init(&node->fwnode, gic_data[gic_cnt].domain);



	gic_cnt++;

	return 0;
@@ -1353,6 +1353,10 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header, 
	__gic_init_bases(0, -1, dist_base, cpu_base, 0, domain_handle);



	acpi_set_irq_model(ACPI_IRQ_MODEL_GIC, domain_handle);



	if (IS_ENABLED(CONFIG_ARM_GIC_V2M))

		gicv2m_init(NULL, gic_data[0].domain);



	return 0;

}

IRQCHIP_ACPI_DECLARE(gic_v2, ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR,

drivers/pci/pci-acpi.c

+42 −0
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ 


#include <linux/delay.h>

#include <linux/init.h>

#include <linux/irqdomain.h>

#include <linux/pci.h>

#include <linux/msi.h>

#include <linux/pci_hotplug.h>

#include <linux/module.h>

#include <linux/pci-aspm.h>
@@ -689,6 +691,46 @@ static struct acpi_bus_type acpi_pci_bus = { 
	.cleanup = pci_acpi_cleanup,

};





static struct fwnode_handle *(*pci_msi_get_fwnode_cb)(struct device *dev);



/**

 * pci_msi_register_fwnode_provider - Register callback to retrieve fwnode

 * @fn:       Callback matching a device to a fwnode that identifies a PCI

 *            MSI domain.

 *

 * This should be called by irqchip driver, which is the parent of

 * the MSI domain to provide callback interface to query fwnode.

 */

void

pci_msi_register_fwnode_provider(struct fwnode_handle *(*fn)(struct device *))

{

	pci_msi_get_fwnode_cb = fn;

}



/**

 * pci_host_bridge_acpi_msi_domain - Retrieve MSI domain of a PCI host bridge

 * @bus:      The PCI host bridge bus.

 *

 * This function uses the callback function registered by

 * pci_msi_register_fwnode_provider() to retrieve the irq_domain with

 * type DOMAIN_BUS_PCI_MSI of the specified host bridge bus.

 * This returns NULL on error or when the domain is not found.

 */

struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus)

{

	struct fwnode_handle *fwnode;



	if (!pci_msi_get_fwnode_cb)

		return NULL;



	fwnode = pci_msi_get_fwnode_cb(&bus->dev);

	if (!fwnode)

		return NULL;



	return irq_find_matching_fwnode(fwnode, DOMAIN_BUS_PCI_MSI);

}



static int __init acpi_pci_init(void)

{

	int ret;

drivers/pci/probe.c

+2 −0
Original line number Diff line number Diff line
@@ -672,6 +672,8 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) 
	 * should be called from here.

	 */

	d = pci_host_bridge_of_msi_domain(bus);

	if (!d)

		d = pci_host_bridge_acpi_msi_domain(bus);



	return d;

}

include/linux/irqchip/arm-gic.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ int gic_of_init(struct device_node *node, struct device_node *parent); 
void gic_init(unsigned int nr, int start,

	      void __iomem *dist , void __iomem *cpu);



int gicv2m_of_init(struct device_node *node, struct irq_domain *parent);

int gicv2m_init(struct fwnode_handle *parent_handle,

		struct irq_domain *parent);



void gic_send_sgi(unsigned int cpu_id, unsigned int irq);

int gic_get_cpu_id(unsigned int cpu);