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

Commit cee324b1 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPICA: use new ACPI headers. 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ceb6c468

arch/i386/kernel/acpi/boot.c

+5 −5
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) 


	/*

	 * stash over-ride to indicate we've been here

	 * and for later update of acpi_fadt

	 * and for later update of acpi_gbl_FADT

	 */

	acpi_sci_override_gsi = gsi;

	return;
@@ -376,7 +376,7 @@ acpi_parse_int_src_ovr(acpi_table_entry_header * header, 


	acpi_table_print_madt_entry(header);



	if (intsrc->bus_irq == acpi_fadt.sci_int) {

	if (intsrc->bus_irq == acpi_gbl_FADT.sci_interrupt) {

		acpi_sci_ioapic_setup(intsrc->global_irq,

				      intsrc->flags.polarity,

				      intsrc->flags.trigger);
@@ -709,9 +709,9 @@ extern u32 pmtmr_ioport; 


static int __init acpi_parse_fadt(struct acpi_table_header *header)

{

	struct fadt_descriptor *fadt = NULL;

	struct acpi_table_fadt *fadt = NULL;



	fadt = (struct fadt_descriptor *)header;

	fadt = (struct acpi_table_fadt *)header;

	if (!fadt) {

		printk(KERN_WARNING PREFIX "Unable to map FADT\n");

		return 0;
@@ -873,7 +873,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	 * pretend we got one so we can set the SCI flags.

	 */

	if (!acpi_sci_override_gsi)

		acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0);

		acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0);



	/* Fill in identity legacy mapings where no override */

	mp_config_acpi_legacy_irqs();

arch/i386/kernel/cpu/cpufreq/longhaul.c

+6 −9
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index) 
		/* Invoke C3 */

		inb(cx_address);

		/* Dummy op - must do something useless after P_LVL3 read */

		t = inl(acpi_fadt.xpm_tmr_blk.address);

		t = inl(acpi_gbl_FADT.xpm_timer_block.address);

	}

	/* Disable bus ratio bit */

	local_irq_disable();
@@ -250,8 +250,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index) 
		outb(3, 0x22);

	} else if ((pr != NULL) && pr->flags.bm_control) {

 		/* Disable bus master arbitration */

		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,

				  ACPI_MTX_DO_NOT_LOCK);

		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);

	}

	switch (longhaul_version) {
@@ -281,8 +280,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index) 
	case TYPE_POWERSAVER:

		if (longhaul_flags & USE_ACPI_C3) {

			/* Don't allow wakeup */

			acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,

					  ACPI_MTX_DO_NOT_LOCK);

			acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);

			do_powersaver(cx->address, clock_ratio_index);

		} else {

			do_powersaver(0, clock_ratio_index);
@@ -295,8 +293,7 @@ static void longhaul_setstate(unsigned int clock_ratio_index) 
		outb(0, 0x22);

	} else if ((pr != NULL) && pr->flags.bm_control) {

		/* Enable bus master arbitration */

		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,

				  ACPI_MTX_DO_NOT_LOCK);

		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);

	}

	outb(pic2_mask,0xA1);	/* restore mask */

	outb(pic1_mask,0x21);

arch/i386/kernel/mpparse.c

+2 −2
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) 
	static int		gsi_to_irq[MAX_GSI_NUM];



	/* Don't set up the ACPI SCI because it's already set up */

	if (acpi_fadt.sci_int == gsi)

	if (acpi_gbl_FADT.sci_interrupt == gsi)

		return gsi;



	ioapic = mp_find_ioapic(gsi);
@@ -1114,7 +1114,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) 
			/*

			 * Don't assign IRQ used by ACPI SCI

			 */

			if (gsi == acpi_fadt.sci_int)

			if (gsi == acpi_gbl_FADT.sci_interrupt)

				gsi = pci_irq++;

			gsi_to_irq[irq] = gsi;

		} else {

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ EXPORT_SYMBOL(acpi_unregister_gsi); 
static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)

{

	struct acpi_table_header *fadt_header;

	struct fadt_descriptor *fadt;

	struct acpi_table_fadt *fadt;



	if (!phys_addr || !size)

		return -EINVAL;
@@ -626,9 +626,9 @@ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) 
	if (fadt_header->revision != 3)

		return -ENODEV;	/* Only deal with ACPI 2.0 FADT */



	fadt = (struct fadt_descriptor *)fadt_header;

	fadt = (struct acpi_table_fadt *)fadt_header;



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

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

	return 0;

}

arch/x86_64/kernel/genapic.c

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ void __init clustered_apic_check(void) 
	 * Some x86_64 machines use physical APIC mode regardless of how many

	 * procs/clusters are present (x86_64 ES7000 is an example).

	 */

	if (acpi_fadt.revision > FADT2_REVISION_ID)

		if (acpi_fadt.force_apic_physical_destination_mode) {

	if (acpi_gbl_FADT.header.revision > FADT2_REVISION_ID)

		if (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) {

			genapic = &apic_cluster;

			goto print;

		}