Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4266ab1a authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Marc Zyngier
Browse files

irqchip/gic-v2m: Refactor to prepare for ACPI support 



This patch replaces the struct device_node with struct fwnode_handle
since this structure is common between DT and ACPI.

It also refactors gicv2m_init_one() to prepare for ACPI support.
The only functional change is removing the node name from pr_info.

Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarSuravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 75aba7b0

drivers/irqchip/irq-gic-v2m.c

+32 −21
Original line number Diff line number Diff line
@@ -55,7 +55,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 */
@@ -254,7 +254,7 @@ 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));

		kfree(v2m);

	}

}
@@ -268,7 +268,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 +277,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 +296,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 +310,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 +321,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 +355,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:
@@ -384,10 +380,25 @@ int __init gicv2m_of_init(struct device_node *node, struct irq_domain *parent) 


	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(node);

			break;