redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ACPICA: Remove duplicate table definitions. 

Signed-off-by: Len Brown <len.brown@intel.com>
hifive-unleashed-5.1
Alexey Starikovskiy 2007-02-02 19:48:22 +03:00 committed by Len Brown
parent cee324b145
commit ad363f80c3
4 changed files with 20 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/i386/kernel/acpi/boot.c
View File

@ -204,9 +204,9 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header)
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].base_reserved) {
printk(KERN_ERR PREFIX
"MMCONFIG not in low 4GB of memory\n");
kfree(pci_mmcfg_config);
@ -233,11 +233,11 @@ static int __init acpi_parse_madt(struct acpi_table_header *header)
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);
@ -654,7 +654,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *header)
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,29 +667,28 @@ static int __init acpi_parse_hpet(struct acpi_table_header *header)
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);
#ifdef CONFIG_X86_64
vxtime.hpet_address = hpet_tbl->address.address;
printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
hpet_tbl->id, vxtime.hpet_address);
hpet_tbl->id, vxtime.hpet_address);
res_start = vxtime.hpet_address;
#else /* X86 */
#else /* X86 */
{
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);
hpet_tbl->id, hpet_address);
res_start = hpet_address;
}
#endif /* X86 */
#endif /* X86 */
if (hpet_res) {
hpet_res->start = res_start;

8
drivers/acpi/ec.c
View File

@ -889,14 +889,14 @@ static int __init acpi_ec_get_real_ecdt(void)
if (acpi_ec_mode == EC_INTR) {
init_waitqueue_head(&ec_ecdt->wait);
}
ec_ecdt->command_addr = ecdt_ptr->ec_control.address;
ec_ecdt->data_addr = ecdt_ptr->ec_data.address;
ec_ecdt->gpe = ecdt_ptr->gpe_bit;
ec_ecdt->command_addr = ecdt_ptr->control.address;
ec_ecdt->data_addr = ecdt_ptr->data.address;
ec_ecdt->gpe = ecdt_ptr->gpe;
/* use the GL just to be safe */
ec_ecdt->global_lock = TRUE;
ec_ecdt->uid = ecdt_ptr->uid;
status = acpi_get_handle(NULL, ecdt_ptr->ec_id, &ec_ecdt->handle);
status = acpi_get_handle(NULL, ecdt_ptr->id, &ec_ecdt->handle);
if (ACPI_FAILURE(status)) {
goto error;
}

5
include/acpi/actbl.h
View File

@ -289,8 +289,7 @@ enum acpi_prefered_pm_profiles {
/*
* Get the remaining ACPI tables
*/
/*
Don't include any new tables definitions for now.
#include <acpi/actbl1.h>
*/
#endif /* __ACTBL_H__ */

59
include/linux/acpi.h
View File

@ -60,15 +60,6 @@ typedef struct {
/* Multiple APIC Description Table (MADT) */
struct acpi_table_madt {
struct acpi_table_header header;
u32 lapic_address;
struct {
u32 pcat_compat:1;
u32 reserved:31;
} flags;
} __attribute__ ((packed));
enum acpi_madt_entry_id {
ACPI_MADT_LAPIC = 0,
ACPI_MADT_IOAPIC,
@ -185,15 +176,6 @@ struct acpi_gen_regaddr {
u32 addrh;
} __attribute__ ((packed));
struct acpi_table_hpet {
struct acpi_table_header header;
u32 id;
struct acpi_gen_regaddr addr;
u8 number;
u16 min_tick;
u8 page_protect;
} __attribute__ ((packed));
/*
* Simple Boot Flags
* http://www.microsoft.com/whdc/hwdev/resources/specs/simp_bios.mspx
@ -218,12 +200,6 @@ struct acpi_table_sbf
* http://www.microsoft.com/whdc/hwdev/platform/proc/SRAT.mspx
*/
struct acpi_table_srat {
struct acpi_table_header header;
u32 table_revision;
u64 reserved;
} __attribute__ ((packed));
enum acpi_srat_entry_id {
ACPI_SRAT_PROCESSOR_AFFINITY = 0,
ACPI_SRAT_MEMORY_AFFINITY,
@ -267,36 +243,6 @@ enum acpi_address_range_id {
ACPI_ADDRESS_RANGE_COUNT
};
/*
* System Locality Information Table (SLIT)
* see http://devresource.hp.com/devresource/docs/techpapers/ia64/slit.pdf
*/
struct acpi_table_slit {
struct acpi_table_header header;
u64 localities;
u8 entry[1]; /* real size = localities^2 */
} __attribute__ ((packed));
/* Smart Battery Description Table (SBST) */
struct acpi_table_sbst {
struct acpi_table_header header;
u32 warning; /* Warn user */
u32 low; /* Critical sleep */
u32 critical; /* Critical shutdown */
} __attribute__ ((packed));
/* Embedded Controller Boot Resources Table (ECDT) */
struct acpi_table_ecdt {
struct acpi_table_header header;
struct acpi_generic_address ec_control;
struct acpi_generic_address ec_data;
u32 uid;
u8 gpe_bit;
char ec_id[0];
} __attribute__ ((packed));
/* PCI MMCONFIG */
@ -309,11 +255,6 @@ struct acpi_table_mcfg_config {
u8 end_bus_number;
u8 reserved[4];
} __attribute__ ((packed));
struct acpi_table_mcfg {
struct acpi_table_header header;
u8 reserved[8];
struct acpi_table_mcfg_config config[0];
} __attribute__ ((packed));
/* Table Handlers */