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

Commit 2bc6eba4 authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

acpi/gsi: Add acpi_set_irq_model to initialize the GSI layer 



In order to start embrassing irqdomains at the GSI level, introduce
a new initializer:

void acpi_set_irq_model(enum acpi_irq_model_id model,
			struct fwnode_handle *fwnode);

where:
- model is the value assigned to acpi_irq_model
- fwnode is the identifier for the irqdomain mapping
  GSI interrupts

As nobody calls this code yet, the current code is (mostly)
left in place.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-and-tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Tested-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Graeme Gregory <graeme@xora.org.uk>
Cc: Jake Oshins <jakeo@microsoft.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/1444737105-31573-11-git-send-email-marc.zyngier@arm.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d7f8504d

drivers/acpi/gsi.c

+27 −5
Original line number Diff line number Diff line
@@ -75,12 +75,21 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, 
{

	unsigned int irq;

	unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity);

	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,

							DOMAIN_BUS_ANY);



	irq = irq_create_mapping(d, gsi);

	if (acpi_gsi_domain_id) {

		struct irq_fwspec fwspec;



		fwspec.fwnode = acpi_gsi_domain_id;

		fwspec.param[0] = gsi;

		fwspec.param[1] = irq_type;

		fwspec.param_count = 2;



		return irq_create_fwspec_mapping(&fwspec);

	} else {

		irq = irq_create_mapping(NULL, gsi);

		if (!irq)

			return -EINVAL;

	}



	/* Set irq type if specified and different than the current one */

	if (irq_type != IRQ_TYPE_NONE &&
@@ -103,3 +112,16 @@ void acpi_unregister_gsi(u32 gsi) 
	irq_dispose_mapping(irq);

}

EXPORT_SYMBOL_GPL(acpi_unregister_gsi);



/**

 * acpi_set_irq_model - Setup the GSI irqdomain information

 * @model: the value assigned to acpi_irq_model

 * @fwnode: the irq_domain identifier for mapping and looking up

 *          GSI interrupts

 */

void __init acpi_set_irq_model(enum acpi_irq_model_id model,

			       struct fwnode_handle *fwnode)

{

	acpi_irq_model = model;

	acpi_gsi_domain_id = fwnode;

}

include/linux/acpi.h

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity 
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);

int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);



void acpi_set_irq_model(enum acpi_irq_model_id model,

			struct fwnode_handle *fwnode);



#ifdef CONFIG_X86_IO_APIC

extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity);

#else