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

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

x86, ACPI, trivial: Minor improvements to arch/x86/kernel/acpi/boot.c 



1) Remove out-of-date comment
2) Kill unused function acpi_set_irq_model_pic()
3) Use NR_IRQS_LEGACY instead of hard-coded 16
4) Trivial syntax improvements

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: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Jiri Kosina <trivial@kernel.org>
Link: http://lkml.kernel.org/r/1402302011-23642-8-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/kernel/acpi/boot.c

+16 −34
Original line number Diff line number Diff line
@@ -483,11 +483,6 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, 
	if (acpi_sci_flags & ACPI_MADT_POLARITY_MASK)

		polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;



	/*

	 * mp_config_acpi_legacy_irqs() already setup IRQs < 16

	 * If GSI is < 16, this will update its flags,

	 * else it will create a new mp_irqs[] entry.

	 */

	mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);



	/*
@@ -686,14 +681,7 @@ void acpi_unregister_gsi(u32 gsi) 
}

EXPORT_SYMBOL_GPL(acpi_unregister_gsi);



void __init acpi_set_irq_model_pic(void)

{

	acpi_irq_model = ACPI_IRQ_MODEL_PIC;

	__acpi_register_gsi = acpi_register_gsi_pic;

	acpi_ioapic = 0;

}



void __init acpi_set_irq_model_ioapic(void)

static void __init acpi_set_irq_model_ioapic(void)

{

	acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;

	__acpi_register_gsi = acpi_register_gsi_ioapic;
@@ -932,8 +920,7 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void) 
	 * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).

	 */



	count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,

				      acpi_parse_lapic_addr_ovr, 0);

	if (count < 0) {

		printk(KERN_ERR PREFIX
@@ -959,8 +946,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
	 * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).

	 */



	count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,

				      acpi_parse_lapic_addr_ovr, 0);

	if (count < 0) {

		printk(KERN_ERR PREFIX
@@ -989,11 +975,10 @@ static int __init acpi_parse_madt_lapic_entries(void) 
		return count;

	}



	x2count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC_NMI,

	x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC_NMI,

					acpi_parse_x2apic_nmi, 0);

	count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0);

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI,

				      acpi_parse_lapic_nmi, 0);

	if (count < 0 || x2count < 0) {

		printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");

		/* TBD: Cleanup to allow fallback to MPS */
@@ -1022,7 +1007,7 @@ static void __init mp_config_acpi_legacy_irqs(void) 
	 * Use the default configuration for the IRQs 0-15.  Unless

	 * overridden by (MADT) interrupt source override entries.

	 */

	for (i = 0; i < 16; i++) {

	for (i = 0; i < NR_IRQS_LEGACY; i++) {

		int ioapic, pin;

		unsigned int dstapic;

		int idx;
@@ -1099,8 +1084,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
		return -ENODEV;

	}



	count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,

				      MAX_IO_APICS);

	if (!count) {

		printk(KERN_ERR PREFIX "No IOAPIC entries present\n");
@@ -1110,9 +1094,8 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
		return count;

	}



	count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr,

				  nr_irqs);

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE,

				      acpi_parse_int_src_ovr, nr_irqs);

	if (count < 0) {

		printk(KERN_ERR PREFIX

		       "Error parsing interrupt source overrides entry\n");
@@ -1131,9 +1114,8 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	/* Fill in identity legacy mappings where no override */

	mp_config_acpi_legacy_irqs();



	count =

	    acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src,

				  nr_irqs);

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE,

				      acpi_parse_nmi_src, nr_irqs);

	if (count < 0) {

		printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");

		/* TBD: Cleanup to allow fallback to MPS */