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

Commit a2f809b0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

irq: change ACPI GSI APIs to also take a device argument 



We want to use dev_to_node() later on, to be aware of the 'home node'
of the GSI in question.

[ Impact: cleanup, prepare the IRQ code to be more NUMA aware ]

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarLen Brown <lenb@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Len Brown <lenb@kernel.org>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-acpi@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
LKML-Reference: <49F65560.20904@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 85ac16d0

arch/ia64/kernel/acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ void __init acpi_numa_arch_fixup(void) 
 * success: return IRQ number (>=0)

 * failure: return < 0

 */

int acpi_register_gsi(u32 gsi, int triggering, int polarity)

int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)

{

	if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)

		return gsi;
@@ -678,7 +678,8 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) 


	fadt = (struct acpi_table_fadt *)fadt_header;



	acpi_register_gsi(fadt->sci_interrupt, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);

	acpi_register_gsi(NULL, fadt->sci_interrupt, ACPI_LEVEL_SENSITIVE,

				 ACPI_ACTIVE_LOW);

	return 0;

}

arch/x86/include/asm/io_apic.h

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ extern int timer_through_8259; 
extern int io_apic_get_unique_id(int ioapic, int apic_id);

extern int io_apic_get_version(int ioapic);

extern int io_apic_get_redir_entries(int ioapic);

extern int io_apic_set_pci_routing(int ioapic, int pin, int irq,

				   int edge_level, int active_high_low);

extern int io_apic_set_pci_routing(struct device *dev, int ioapic, int pin,

				  int irq, int edge_level, int active_high_low);

#endif /* CONFIG_ACPI */



extern int (*ioapic_renumber_irq)(int ioapic, int irq);

arch/x86/include/asm/mpspec.h

+3 −1
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ extern void mp_register_ioapic(int id, u32 address, u32 gsi_base); 
extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,

				   u32 gsi);

extern void mp_config_acpi_legacy_irqs(void);

extern int mp_register_gsi(u32 gsi, int edge_level, int active_high_low);

struct device;

extern int mp_register_gsi(struct device *dev, u32 gsi, int edge_level,

				 int active_high_low);

extern int acpi_probe_gsi(void);

#ifdef CONFIG_X86_IO_APIC

extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin,

arch/x86/kernel/acpi/boot.c

+4 −4
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) 
 * success: return IRQ number (>=0)

 * failure: return < 0

 */

int acpi_register_gsi(u32 gsi, int triggering, int polarity)

int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)

{

	unsigned int irq;

	unsigned int plat_gsi = gsi;
@@ -539,7 +539,7 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) 


#ifdef CONFIG_X86_IO_APIC

	if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {

		plat_gsi = mp_register_gsi(gsi, triggering, polarity);

		plat_gsi = mp_register_gsi(dev, gsi, triggering, polarity);

	}

#endif

	acpi_gsi_to_irq(plat_gsi, &irq);
@@ -1158,7 +1158,7 @@ void __init mp_config_acpi_legacy_irqs(void) 
	}

}



int mp_register_gsi(u32 gsi, int triggering, int polarity)

int mp_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)

{

	int ioapic;

	int ioapic_pin;
@@ -1253,7 +1253,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) 
		}

	}

#endif

	io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,

	io_apic_set_pci_routing(dev, ioapic, ioapic_pin, gsi,

				triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,

				polarity == ACPI_ACTIVE_HIGH ? 0 : 1);

	return gsi;

arch/x86/kernel/apic/io_apic.c

+2 −1
Original line number Diff line number Diff line
@@ -3958,7 +3958,8 @@ int __init io_apic_get_version(int ioapic) 
}

#endif



int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int polarity)

int io_apic_set_pci_routing(struct device *dev, int ioapic, int pin, int irq,

				 int triggering, int polarity)

{

	struct irq_desc *desc;

	struct irq_cfg *cfg;