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

Commit e8bdc5a9 authored by Len Brown's avatar Len Brown
Browse files

Pull acpica into test branch

parents c6f4bc21 b0b7eaaf

arch/i386/kernel/acpi/boot.c

+99 −136
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 


#define BAD_MADT_ENTRY(entry, end) (					    \

		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \

		((acpi_table_entry_header *)entry)->length < sizeof(*entry))

		((struct acpi_subtable_header *)entry)->length < sizeof(*entry))



#define PREFIX			"ACPI: "
@@ -79,7 +79,7 @@ int acpi_ioapic; 
int acpi_strict;

EXPORT_SYMBOL(acpi_strict);



acpi_interrupt_flags acpi_sci_flags __initdata;

u8 acpi_sci_flags __initdata;

int acpi_sci_override_gsi __initdata;

int acpi_skip_timer_override __initdata;

int acpi_use_timer_override __initdata;
@@ -92,11 +92,6 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; 
#warning ACPI uses CMPXCHG, i486 and later hardware

#endif



#define MAX_MADT_ENTRIES	256

u8 x86_acpiid_to_apicid[MAX_MADT_ENTRIES] =

    {[0 ... MAX_MADT_ENTRIES - 1] = 0xff };

EXPORT_SYMBOL(x86_acpiid_to_apicid);



/* --------------------------------------------------------------------------

                              Boot-time Configuration

   -------------------------------------------------------------------------- */
@@ -166,30 +161,26 @@ char *__acpi_map_table(unsigned long phys, unsigned long size) 


#ifdef CONFIG_PCI_MMCONFIG

/* The physical address of the MMCONFIG aperture.  Set from ACPI tables. */

struct acpi_table_mcfg_config *pci_mmcfg_config;

struct acpi_mcfg_allocation *pci_mmcfg_config;

int pci_mmcfg_config_num;



int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)

int __init acpi_parse_mcfg(struct acpi_table_header *header)

{

	struct acpi_table_mcfg *mcfg;

	unsigned long i;

	int config_size;



	if (!phys_addr || !size)

	if (!header)

		return -EINVAL;



	mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);

	if (!mcfg) {

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

		return -ENODEV;

	}

	mcfg = (struct acpi_table_mcfg *)header;



	/* how many config structures do we have */

	pci_mmcfg_config_num = 0;

	i = size - sizeof(struct acpi_table_mcfg);

	while (i >= sizeof(struct acpi_table_mcfg_config)) {

	i = header->length - sizeof(struct acpi_table_mcfg);

	while (i >= sizeof(struct acpi_mcfg_allocation)) {

		++pci_mmcfg_config_num;

		i -= sizeof(struct acpi_table_mcfg_config);

		i -= sizeof(struct acpi_mcfg_allocation);

	};

	if (pci_mmcfg_config_num == 0) {

		printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
@@ -204,9 +195,9 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) 
		return -ENOMEM;

	}



	memcpy(pci_mmcfg_config, &mcfg->config, config_size);

	memcpy(pci_mmcfg_config, &mcfg[1], config_size);

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

		if (mcfg->config[i].base_reserved) {

		if (pci_mmcfg_config[i].address > 0xFFFFFFFF) {

			printk(KERN_ERR PREFIX

			       "MMCONFIG not in low 4GB of memory\n");

			kfree(pci_mmcfg_config);
@@ -220,24 +211,24 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) 
#endif				/* CONFIG_PCI_MMCONFIG */



#ifdef CONFIG_X86_LOCAL_APIC

static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)

static int __init acpi_parse_madt(struct acpi_table_header *table)

{

	struct acpi_table_madt *madt = NULL;



	if (!phys_addr || !size || !cpu_has_apic)

	if (!cpu_has_apic)

		return -EINVAL;



	madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);

	madt = (struct acpi_table_madt *)table;

	if (!madt) {

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

		return -ENODEV;

	}



	if (madt->lapic_address) {

		acpi_lapic_addr = (u64) madt->lapic_address;

	if (madt->address) {

		acpi_lapic_addr = (u64) madt->address;



		printk(KERN_DEBUG PREFIX "Local APIC address 0x%08x\n",

		       madt->lapic_address);

		       madt->address);

	}



	acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
@@ -246,21 +237,17 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size) 
}



static int __init

acpi_parse_lapic(acpi_table_entry_header * header, const unsigned long end)

acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)

{

	struct acpi_table_lapic *processor = NULL;

	struct acpi_madt_local_apic *processor = NULL;



	processor = (struct acpi_table_lapic *)header;

	processor = (struct acpi_madt_local_apic *)header;



	if (BAD_MADT_ENTRY(processor, end))

		return -EINVAL;



	acpi_table_print_madt_entry(header);



	/* Record local apic id only when enabled */

	if (processor->flags.enabled)

		x86_acpiid_to_apicid[processor->acpi_id] = processor->id;



	/*

	 * We need to register disabled CPU as well to permit

	 * counting disabled CPUs. This allows us to size
@@ -269,18 +256,18 @@ acpi_parse_lapic(acpi_table_entry_header * header, const unsigned long end) 
	 * when we use CPU hotplug.

	 */

	mp_register_lapic(processor->id,	/* APIC ID */

			  processor->flags.enabled);	/* Enabled? */

			  processor->lapic_flags & ACPI_MADT_ENABLED);	/* Enabled? */



	return 0;

}



static int __init

acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,

acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,

			  const unsigned long end)

{

	struct acpi_table_lapic_addr_ovr *lapic_addr_ovr = NULL;

	struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;



	lapic_addr_ovr = (struct acpi_table_lapic_addr_ovr *)header;

	lapic_addr_ovr = (struct acpi_madt_local_apic_override *)header;



	if (BAD_MADT_ENTRY(lapic_addr_ovr, end))

		return -EINVAL;
@@ -291,11 +278,11 @@ acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header, 
}



static int __init

acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)

acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end)

{

	struct acpi_table_lapic_nmi *lapic_nmi = NULL;

	struct acpi_madt_local_apic_nmi *lapic_nmi = NULL;



	lapic_nmi = (struct acpi_table_lapic_nmi *)header;

	lapic_nmi = (struct acpi_madt_local_apic_nmi *)header;



	if (BAD_MADT_ENTRY(lapic_nmi, end))

		return -EINVAL;
@@ -313,11 +300,11 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end) 
#ifdef CONFIG_X86_IO_APIC



static int __init

acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)

acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)

{

	struct acpi_table_ioapic *ioapic = NULL;

	struct acpi_madt_io_apic *ioapic = NULL;



	ioapic = (struct acpi_table_ioapic *)header;

	ioapic = (struct acpi_madt_io_apic *)header;



	if (BAD_MADT_ENTRY(ioapic, end))

		return -EINVAL;
@@ -342,11 +329,11 @@ static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) 
		polarity = 3;



	/* Command-line over-ride via acpi_sci= */

	if (acpi_sci_flags.trigger)

		trigger = acpi_sci_flags.trigger;

	if (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)

		trigger = (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2;



	if (acpi_sci_flags.polarity)

		polarity = acpi_sci_flags.polarity;

	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
@@ -357,51 +344,52 @@ 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;

}



static int __init

acpi_parse_int_src_ovr(acpi_table_entry_header * header,

acpi_parse_int_src_ovr(struct acpi_subtable_header * header,

		       const unsigned long end)

{

	struct acpi_table_int_src_ovr *intsrc = NULL;

	struct acpi_madt_interrupt_override *intsrc = NULL;



	intsrc = (struct acpi_table_int_src_ovr *)header;

	intsrc = (struct acpi_madt_interrupt_override *)header;



	if (BAD_MADT_ENTRY(intsrc, end))

		return -EINVAL;



	acpi_table_print_madt_entry(header);



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

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

		acpi_sci_ioapic_setup(intsrc->global_irq,

				      intsrc->flags.polarity,

				      intsrc->flags.trigger);

				      intsrc->inti_flags & ACPI_MADT_POLARITY_MASK,

				      (intsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2);

		return 0;

	}



	if (acpi_skip_timer_override &&

	    intsrc->bus_irq == 0 && intsrc->global_irq == 2) {

	    intsrc->source_irq == 0 && intsrc->global_irq == 2) {

		printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");

		return 0;

	}



	mp_override_legacy_irq(intsrc->bus_irq,

			       intsrc->flags.polarity,

			       intsrc->flags.trigger, intsrc->global_irq);

	mp_override_legacy_irq(intsrc->source_irq,

				intsrc->inti_flags & ACPI_MADT_POLARITY_MASK,

				(intsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2,

				intsrc->global_irq);



	return 0;

}



static int __init

acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)

acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end)

{

	struct acpi_table_nmi_src *nmi_src = NULL;

	struct acpi_madt_nmi_source *nmi_src = NULL;



	nmi_src = (struct acpi_table_nmi_src *)header;

	nmi_src = (struct acpi_madt_nmi_source *)header;



	if (BAD_MADT_ENTRY(nmi_src, end))

		return -EINVAL;
@@ -511,7 +499,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;

	struct acpi_table_lapic *lapic;

	struct acpi_madt_local_apic *lapic;

	cpumask_t tmp_map, new_map;

	u8 physid;

	int cpu;
@@ -529,10 +517,10 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
		return -EINVAL;

	}



	lapic = (struct acpi_table_lapic *)obj->buffer.pointer;

	lapic = (struct acpi_madt_local_apic *)obj->buffer.pointer;



	if ((lapic->header.type != ACPI_MADT_LAPIC) ||

	    (!lapic->flags.enabled)) {

	if (lapic->header.type != ACPI_MADT_TYPE_LOCAL_APIC ||

	    !(lapic->lapic_flags & ACPI_MADT_ENABLED)) {

		kfree(buffer.pointer);

		return -EINVAL;

	}
@@ -544,7 +532,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	buffer.pointer = NULL;



	tmp_map = cpu_present_map;

	mp_register_lapic(physid, lapic->flags.enabled);

	mp_register_lapic(physid, lapic->lapic_flags & ACPI_MADT_ENABLED);



	/*

	 * If mp_register_lapic successfully generates a new logical cpu
@@ -566,14 +554,6 @@ EXPORT_SYMBOL(acpi_map_lsapic); 


int acpi_unmap_lsapic(int cpu)

{

	int i;



	for_each_possible_cpu(i) {

		if (x86_acpiid_to_apicid[i] == x86_cpu_to_apicid[cpu]) {

			x86_acpiid_to_apicid[i] = -1;

			break;

		}

	}

	x86_cpu_to_apicid[cpu] = -1;

	cpu_clear(cpu, cpu_present_map);

	num_processors--;
@@ -619,42 +599,36 @@ acpi_scan_rsdp(unsigned long start, unsigned long length) 
	return 0;

}



static int __init acpi_parse_sbf(unsigned long phys_addr, unsigned long size)

static int __init acpi_parse_sbf(struct acpi_table_header *table)

{

	struct acpi_table_sbf *sb;

	struct acpi_table_boot *sb;



	if (!phys_addr || !size)

		return -EINVAL;



	sb = (struct acpi_table_sbf *)__acpi_map_table(phys_addr, size);

	sb = (struct acpi_table_boot *)table;

	if (!sb) {

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

		return -ENODEV;

	}



	sbf_port = sb->sbf_cmos;	/* Save CMOS port */

	sbf_port = sb->cmos_index;	/* Save CMOS port */



	return 0;

}



#ifdef CONFIG_HPET_TIMER



static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)

static int __init acpi_parse_hpet(struct acpi_table_header *table)

{

	struct acpi_table_hpet *hpet_tbl;

	struct resource *hpet_res;

	resource_size_t res_start;



	if (!phys || !size)

		return -EINVAL;



	hpet_tbl = (struct acpi_table_hpet *)__acpi_map_table(phys, size);

	hpet_tbl = (struct acpi_table_hpet *)table;

	if (!hpet_tbl) {

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

		return -ENODEV;

	}



	if (hpet_tbl->addr.space_id != ACPI_SPACE_MEM) {

	if (hpet_tbl->address.space_id != ACPI_SPACE_MEM) {

		printk(KERN_WARNING PREFIX "HPET timers must be located in "

		       "memory.\n");

		return -1;
@@ -667,13 +641,12 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) 
		hpet_res->name = (void *)&hpet_res[1];

		hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,

			 "HPET %u", hpet_tbl->number);

			 "HPET %u", hpet_tbl->sequence);

		hpet_res->end = (1 * 1024) - 1;

	}



#ifdef CONFIG_X86_64

	vxtime.hpet_address = hpet_tbl->addr.addrl |

	    ((long)hpet_tbl->addr.addrh << 32);

	vxtime.hpet_address = hpet_tbl->address.address;



	printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",

		hpet_tbl->id, vxtime.hpet_address);
@@ -683,7 +656,7 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) 
	{

		extern unsigned long hpet_address;



		hpet_address = hpet_tbl->addr.addrl;

		hpet_address = hpet_tbl->address.address;

		printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",

			hpet_tbl->id, hpet_address);
@@ -707,42 +680,28 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) 
extern u32 pmtmr_ioport;

#endif



static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)

static int __init acpi_parse_fadt(struct acpi_table_header *table)

{

	struct fadt_descriptor *fadt = NULL;



	fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);

	if (!fadt) {

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

		return 0;

	}

	/* initialize sci_int early for INT_SRC_OVR MADT parsing */

	acpi_fadt.sci_int = fadt->sci_int;



	/* initialize rev and apic_phys_dest_mode for x86_64 genapic */

	acpi_fadt.revision = fadt->revision;

	acpi_fadt.force_apic_physical_destination_mode =

	    fadt->force_apic_physical_destination_mode;



#ifdef CONFIG_X86_PM_TIMER

	/* detect the location of the ACPI PM Timer */

	if (fadt->revision >= FADT2_REVISION_ID) {

	if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) {

		/* FADT rev. 2 */

		if (fadt->xpm_tmr_blk.address_space_id !=

		if (acpi_gbl_FADT.xpm_timer_block.space_id !=

		    ACPI_ADR_SPACE_SYSTEM_IO)

			return 0;



		pmtmr_ioport = fadt->xpm_tmr_blk.address;

		pmtmr_ioport = acpi_gbl_FADT.xpm_timer_block.address;

		/*

		 * "X" fields are optional extensions to the original V1.0

		 * fields, so we must selectively expand V1.0 fields if the

		 * corresponding X field is zero.

	 	 */

		if (!pmtmr_ioport)

			pmtmr_ioport = fadt->V1_pm_tmr_blk;

			pmtmr_ioport = acpi_gbl_FADT.pm_timer_block;

	} else {

		/* FADT rev. 1 */

		pmtmr_ioport = fadt->V1_pm_tmr_blk;

		pmtmr_ioport = acpi_gbl_FADT.pm_timer_block;

	}

	if (pmtmr_ioport)

		printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n",
@@ -790,7 +749,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
	 */



	count =

	    acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR,

	    acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,

				  acpi_parse_lapic_addr_ovr, 0);

	if (count < 0) {

		printk(KERN_ERR PREFIX
@@ -800,7 +759,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 


	mp_register_lapic_address(acpi_lapic_addr);



	count = acpi_table_parse_madt(ACPI_MADT_LAPIC, acpi_parse_lapic,

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC, acpi_parse_lapic,

				      MAX_APICS);

	if (!count) {

		printk(KERN_ERR PREFIX "No LAPIC entries present\n");
@@ -813,7 +772,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
	}



	count =

	    acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0);

	    acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0);

	if (count < 0) {

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

		/* TBD: Cleanup to allow fallback to MPS */
@@ -855,7 +814,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	}



	count =

	    acpi_table_parse_madt(ACPI_MADT_IOAPIC, acpi_parse_ioapic,

	    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");
@@ -866,7 +825,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	}



	count =

	    acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr,

	    acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr,

				  NR_IRQ_VECTORS);

	if (count < 0) {

		printk(KERN_ERR PREFIX
@@ -880,13 +839,13 @@ 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();



	count =

	    acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src,

	    acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src,

				  NR_IRQ_VECTORS);

	if (count < 0) {

		printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
@@ -908,7 +867,7 @@ static void __init acpi_process_madt(void) 
#ifdef CONFIG_X86_LOCAL_APIC

	int count, error;



	count = acpi_table_parse(ACPI_APIC, acpi_parse_madt);

	count = acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt);

	if (count >= 1) {



		/*
@@ -1204,7 +1163,7 @@ int __init acpi_boot_table_init(void) 
		return error;

	}



	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);

	acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);



	/*

	 * blacklist may disable ACPI entirely
@@ -1232,19 +1191,19 @@ int __init acpi_boot_init(void) 
	if (acpi_disabled && !acpi_ht)

		return 1;



	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);

	acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);



	/*

	 * set sci_int and PM timer address

	 */

	acpi_table_parse(ACPI_FADT, acpi_parse_fadt);

	acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt);



	/*

	 * Process the Multiple APIC Description Table (MADT), if present

	 */

	acpi_process_madt();



	acpi_table_parse(ACPI_HPET, acpi_parse_hpet);

	acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);



	return 0;

}
@@ -1315,13 +1274,17 @@ static int __init setup_acpi_sci(char *s) 
	if (!s)

		return -EINVAL;

	if (!strcmp(s, "edge"))

		acpi_sci_flags.trigger = 1;

		acpi_sci_flags =  ACPI_MADT_TRIGGER_EDGE |

			(acpi_sci_flags & ~ACPI_MADT_TRIGGER_MASK);

	else if (!strcmp(s, "level"))

		acpi_sci_flags.trigger = 3;

		acpi_sci_flags = ACPI_MADT_TRIGGER_LEVEL |

			(acpi_sci_flags & ~ACPI_MADT_TRIGGER_MASK);

	else if (!strcmp(s, "high"))

		acpi_sci_flags.polarity = 1;

		acpi_sci_flags = ACPI_MADT_POLARITY_ACTIVE_HIGH |

			(acpi_sci_flags & ~ACPI_MADT_POLARITY_MASK);

	else if (!strcmp(s, "low"))

		acpi_sci_flags.polarity = 3;

		acpi_sci_flags = ACPI_MADT_POLARITY_ACTIVE_LOW |

			(acpi_sci_flags & ~ACPI_MADT_POLARITY_MASK);

	else

		return -EINVAL;

	return 0;

arch/i386/kernel/acpi/earlyquirk.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


static int nvidia_hpet_detected __initdata;



static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)

static int __init nvidia_hpet_check(struct acpi_table_header *header)

{

	nvidia_hpet_detected = 1;

	return 0;
@@ -30,7 +30,7 @@ static int __init check_bridge(int vendor, int device) 
	   is enabled. */

	if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {

		nvidia_hpet_detected = 0;

		acpi_table_parse(ACPI_HPET, nvidia_hpet_check);

		acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);

		if (nvidia_hpet_detected == 0) {

			acpi_skip_timer_override = 1;

			  printk(KERN_INFO "Nvidia board "

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/i386/kernel/srat.c

+41 −43
Original line number Diff line number Diff line
@@ -62,19 +62,19 @@ extern void * boot_ioremap(unsigned long, unsigned long); 
/* Identify CPU proximity domains */

static void __init parse_cpu_affinity_structure(char *p)

{

	struct acpi_table_processor_affinity *cpu_affinity = 

				(struct acpi_table_processor_affinity *) p;

	struct acpi_srat_cpu_affinity *cpu_affinity =

				(struct acpi_srat_cpu_affinity *) p;



	if (!cpu_affinity->flags.enabled)

	if ((cpu_affinity->flags & ACPI_SRAT_CPU_ENABLED) == 0)

		return;		/* empty entry */



	/* mark this node as "seen" in node bitmap */

	BMAP_SET(pxm_bitmap, cpu_affinity->proximity_domain);

	BMAP_SET(pxm_bitmap, cpu_affinity->proximity_domain_lo);



	apicid_to_pxm[cpu_affinity->apic_id] = cpu_affinity->proximity_domain;

	apicid_to_pxm[cpu_affinity->apic_id] = cpu_affinity->proximity_domain_lo;



	printk("CPU 0x%02X in proximity domain 0x%02X\n",

		cpu_affinity->apic_id, cpu_affinity->proximity_domain);

		cpu_affinity->apic_id, cpu_affinity->proximity_domain_lo);

}



/*
@@ -87,25 +87,24 @@ static void __init parse_memory_affinity_structure (char *sratp) 
	unsigned long start_pfn, end_pfn;

	u8 pxm;

	struct node_memory_chunk_s *p, *q, *pend;

	struct acpi_table_memory_affinity *memory_affinity =

			(struct acpi_table_memory_affinity *) sratp;

	struct acpi_srat_mem_affinity *memory_affinity =

			(struct acpi_srat_mem_affinity *) sratp;



	if (!memory_affinity->flags.enabled)

	if ((memory_affinity->flags & ACPI_SRAT_MEM_ENABLED) == 0)

		return;		/* empty entry */



	pxm = memory_affinity->proximity_domain & 0xff;



	/* mark this node as "seen" in node bitmap */

	BMAP_SET(pxm_bitmap, memory_affinity->proximity_domain);

	BMAP_SET(pxm_bitmap, pxm);



	/* calculate info for memory chunk structure */

	paddr = memory_affinity->base_addr_hi;

	paddr = (paddr << 32) | memory_affinity->base_addr_lo;

	size = memory_affinity->length_hi;

	size = (size << 32) | memory_affinity->length_lo;

	paddr = memory_affinity->base_address;

	size = memory_affinity->length;



	start_pfn = paddr >> PAGE_SHIFT;

	end_pfn = (paddr + size) >> PAGE_SHIFT;



	pxm = memory_affinity->proximity_domain;



	if (num_memory_chunks >= MAXCHUNKS) {

		printk("Too many mem chunks in SRAT. Ignoring %lld MBytes at %llx\n",
@@ -132,8 +131,8 @@ static void __init parse_memory_affinity_structure (char *sratp) 
	printk("Memory range 0x%lX to 0x%lX (type 0x%X) in proximity domain 0x%02X %s\n",

		start_pfn, end_pfn,

		memory_affinity->memory_type,

		memory_affinity->proximity_domain,

		(memory_affinity->flags.hot_pluggable ?

		pxm,

		((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?

		 "enabled and removable" : "enabled" ) );

}
@@ -185,10 +184,10 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) 
	num_memory_chunks = 0;

	while (p < end) {

		switch (*p) {

		case ACPI_SRAT_PROCESSOR_AFFINITY:

		case ACPI_SRAT_TYPE_CPU_AFFINITY:

			parse_cpu_affinity_structure(p);

			break;

		case ACPI_SRAT_MEMORY_AFFINITY:

		case ACPI_SRAT_TYPE_MEMORY_AFFINITY:

			parse_memory_affinity_structure(p);

			break;

		default:
@@ -262,31 +261,30 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) 
	return 0;

}



struct acpi_static_rsdt {

	struct acpi_table_rsdt table;

	u32 padding[7]; /* Allow for 7 more table entries */

};



int __init get_memcfg_from_srat(void)

{

	struct acpi_table_header *header = NULL;

	struct acpi_table_rsdp *rsdp = NULL;

	struct acpi_table_rsdt *rsdt = NULL;

	struct acpi_pointer *rsdp_address = NULL;

	struct acpi_table_rsdt saved_rsdt;

	acpi_native_uint rsdp_address = 0;

	struct acpi_static_rsdt saved_rsdt;

	int tables = 0;

	int i = 0;



	if (ACPI_FAILURE(acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING,

						rsdp_address))) {

	rsdp_address = acpi_find_rsdp();

	if (!rsdp_address) {

		printk("%s: System description tables not found\n",

		       __FUNCTION__);

		goto out_err;

	}



	if (rsdp_address->pointer_type == ACPI_PHYSICAL_POINTER) {

	printk("%s: assigning address to rsdp\n", __FUNCTION__);

		rsdp = (struct acpi_table_rsdp *)

				(u32)rsdp_address->pointer.physical;

	} else {

		printk("%s: rsdp_address is not a physical pointer\n", __FUNCTION__);

		goto out_err;

	}

	rsdp = (struct acpi_table_rsdp *)(u32)rsdp_address;

	if (!rsdp) {

		printk("%s: Didn't find ACPI root!\n", __FUNCTION__);

		goto out_err;
@@ -295,13 +293,13 @@ int __init get_memcfg_from_srat(void) 
	printk(KERN_INFO "%.8s v%d [%.6s]\n", rsdp->signature, rsdp->revision,

		rsdp->oem_id);



	if (strncmp(rsdp->signature, RSDP_SIG,strlen(RSDP_SIG))) {

	if (strncmp(rsdp->signature, ACPI_SIG_RSDP,strlen(ACPI_SIG_RSDP))) {

		printk(KERN_WARNING "%s: RSDP table signature incorrect\n", __FUNCTION__);

		goto out_err;

	}



	rsdt = (struct acpi_table_rsdt *)

	    boot_ioremap(rsdp->rsdt_address, sizeof(struct acpi_table_rsdt));

	    boot_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt));



	if (!rsdt) {

		printk(KERN_WARNING
@@ -312,7 +310,7 @@ int __init get_memcfg_from_srat(void) 


	header = &rsdt->header;



	if (strncmp(header->signature, RSDT_SIG, strlen(RSDT_SIG))) {

	if (strncmp(header->signature, ACPI_SIG_RSDT, strlen(ACPI_SIG_RSDT))) {

		printk(KERN_WARNING "ACPI: RSDT signature incorrect\n");

		goto out_err;

	}
@@ -330,9 +328,9 @@ int __init get_memcfg_from_srat(void) 


	memcpy(&saved_rsdt, rsdt, sizeof(saved_rsdt));



	if (saved_rsdt.header.length > sizeof(saved_rsdt)) {

	if (saved_rsdt.table.header.length > sizeof(saved_rsdt)) {

		printk(KERN_WARNING "ACPI: Too big length in RSDT: %d\n",

		       saved_rsdt.header.length);

		       saved_rsdt.table.header.length);

		goto out_err;

	}
@@ -341,15 +339,15 @@ int __init get_memcfg_from_srat(void) 
	for (i = 0; i < tables; i++) {

		/* Map in header, then map in full table length. */

		header = (struct acpi_table_header *)

			boot_ioremap(saved_rsdt.entry[i], sizeof(struct acpi_table_header));

			boot_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header));

		if (!header)

			break;

		header = (struct acpi_table_header *)

			boot_ioremap(saved_rsdt.entry[i], header->length);

			boot_ioremap(saved_rsdt.table.table_offset_entry[i], header->length);

		if (!header)

			break;



		if (strncmp((char *) &header->signature, "SRAT", 4))

		if (strncmp((char *) &header->signature, ACPI_SIG_SRAT, 4))

			continue;



		/* we've found the srat table. don't need to look at any more tables */