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

Commit 795aacf6 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86, irq, devicetree: Use common irqdomain map interface to program IOAPIC pins 



Refine devicetree to use common irqdomain map interface to program
IOAPIC pins, so we can unify the callsite to progam IOAPIC pins.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Tony Lindgren <tony@atomide.com>
Link: http://lkml.kernel.org/r/1402302011-23642-34-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/kernel/devicetree.c

+5 −9
Original line number Diff line number Diff line
@@ -201,10 +201,8 @@ static int ioapic_xlate(struct irq_domain *domain, 
			const u32 *intspec, u32 intsize,

			irq_hw_number_t *out_hwirq, u32 *out_type)

{

	struct io_apic_irq_attr attr;

	struct of_ioapic_type *it;

	u32 line, idx;

	int rc;

	u32 line, idx, gsi;



	if (WARN_ON(intsize < 2))

		return -EINVAL;
@@ -217,12 +215,9 @@ static int ioapic_xlate(struct irq_domain *domain, 
	it = &of_ioapic_type[intspec[1]];



	idx = (u32)(long)domain->host_data;

	set_io_apic_irq_attr(&attr, idx, line, it->trigger, it->polarity);



	rc = io_apic_setup_irq_pin_once(irq_find_mapping(domain, line),

					cpu_to_node(0), &attr);

	if (rc)

		return rc;

	gsi = mp_pin_to_gsi(idx, line);

	if (mp_set_gsi_attr(gsi, it->trigger, it->polarity, cpu_to_node(0)))

		return -EBUSY;



	*out_hwirq = line;

	*out_type = it->out_type;
@@ -230,6 +225,7 @@ static int ioapic_xlate(struct irq_domain *domain, 
}



const struct irq_domain_ops ioapic_irq_domain_ops = {

	.map = mp_irqdomain_map,

	.xlate = ioapic_xlate,

};