Commit ceb6c468 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown

ACPICA: Remove duplicate table manager

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a7a22fa9
...@@ -169,16 +169,16 @@ char *__acpi_map_table(unsigned long phys, unsigned long size) ...@@ -169,16 +169,16 @@ char *__acpi_map_table(unsigned long phys, unsigned long size)
struct acpi_table_mcfg_config *pci_mmcfg_config; struct acpi_table_mcfg_config *pci_mmcfg_config;
int pci_mmcfg_config_num; 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; struct acpi_table_mcfg *mcfg;
unsigned long i; unsigned long i;
int config_size; int config_size;
if (!phys_addr || !size) if (!header)
return -EINVAL; return -EINVAL;
mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size); mcfg = (struct acpi_table_mcfg *)header;
if (!mcfg) { if (!mcfg) {
printk(KERN_WARNING PREFIX "Unable to map MCFG\n"); printk(KERN_WARNING PREFIX "Unable to map MCFG\n");
return -ENODEV; return -ENODEV;
...@@ -186,7 +186,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) ...@@ -186,7 +186,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
/* how many config structures do we have */ /* how many config structures do we have */
pci_mmcfg_config_num = 0; pci_mmcfg_config_num = 0;
i = size - sizeof(struct acpi_table_mcfg); i = header->length - sizeof(struct acpi_table_mcfg);
while (i >= sizeof(struct acpi_table_mcfg_config)) { while (i >= sizeof(struct acpi_table_mcfg_config)) {
++pci_mmcfg_config_num; ++pci_mmcfg_config_num;
i -= sizeof(struct acpi_table_mcfg_config); i -= sizeof(struct acpi_table_mcfg_config);
...@@ -220,14 +220,14 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) ...@@ -220,14 +220,14 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
#endif /* CONFIG_PCI_MMCONFIG */ #endif /* CONFIG_PCI_MMCONFIG */
#ifdef CONFIG_X86_LOCAL_APIC #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 *header)
{ {
struct acpi_table_madt *madt = NULL; struct acpi_table_madt *madt = NULL;
if (!phys_addr || !size || !cpu_has_apic) if (!header|| !cpu_has_apic)
return -EINVAL; return -EINVAL;
madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size); madt = (struct acpi_table_madt *)header;
if (!madt) { if (!madt) {
printk(KERN_WARNING PREFIX "Unable to map MADT\n"); printk(KERN_WARNING PREFIX "Unable to map MADT\n");
return -ENODEV; return -ENODEV;
...@@ -619,14 +619,14 @@ acpi_scan_rsdp(unsigned long start, unsigned long length) ...@@ -619,14 +619,14 @@ acpi_scan_rsdp(unsigned long start, unsigned long length)
return 0; 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 *header)
{ {
struct acpi_table_sbf *sb; struct acpi_table_sbf *sb;
if (!phys_addr || !size) if (!header)
return -EINVAL; return -EINVAL;
sb = (struct acpi_table_sbf *)__acpi_map_table(phys_addr, size); sb = (struct acpi_table_sbf *)header;
if (!sb) { if (!sb) {
printk(KERN_WARNING PREFIX "Unable to map SBF\n"); printk(KERN_WARNING PREFIX "Unable to map SBF\n");
return -ENODEV; return -ENODEV;
...@@ -639,16 +639,16 @@ static int __init acpi_parse_sbf(unsigned long phys_addr, unsigned long size) ...@@ -639,16 +639,16 @@ static int __init acpi_parse_sbf(unsigned long phys_addr, unsigned long size)
#ifdef CONFIG_HPET_TIMER #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 *header)
{ {
struct acpi_table_hpet *hpet_tbl; struct acpi_table_hpet *hpet_tbl;
struct resource *hpet_res; struct resource *hpet_res;
resource_size_t res_start; resource_size_t res_start;
if (!phys || !size) if (!header)
return -EINVAL; return -EINVAL;
hpet_tbl = (struct acpi_table_hpet *)__acpi_map_table(phys, size); hpet_tbl = (struct acpi_table_hpet *)header;
if (!hpet_tbl) { if (!hpet_tbl) {
printk(KERN_WARNING PREFIX "Unable to map HPET\n"); printk(KERN_WARNING PREFIX "Unable to map HPET\n");
return -ENODEV; return -ENODEV;
...@@ -707,11 +707,11 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) ...@@ -707,11 +707,11 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)
extern u32 pmtmr_ioport; extern u32 pmtmr_ioport;
#endif #endif
static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) static int __init acpi_parse_fadt(struct acpi_table_header *header)
{ {
struct fadt_descriptor *fadt = NULL; struct fadt_descriptor *fadt = NULL;
fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size); fadt = (struct fadt_descriptor *)header;
if (!fadt) { if (!fadt) {
printk(KERN_WARNING PREFIX "Unable to map FADT\n"); printk(KERN_WARNING PREFIX "Unable to map FADT\n");
return 0; return 0;
...@@ -901,7 +901,7 @@ static void __init acpi_process_madt(void) ...@@ -901,7 +901,7 @@ static void __init acpi_process_madt(void)
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
int count, error; int count, error;
count = acpi_table_parse(ACPI_APIC, acpi_parse_madt); count = acpi_table_parse("APIC", acpi_parse_madt);
if (count >= 1) { if (count >= 1) {
/* /*
...@@ -1197,7 +1197,7 @@ int __init acpi_boot_table_init(void) ...@@ -1197,7 +1197,7 @@ int __init acpi_boot_table_init(void)
return error; return error;
} }
acpi_table_parse(ACPI_BOOT, acpi_parse_sbf); acpi_table_parse("BOOT", acpi_parse_sbf);
/* /*
* blacklist may disable ACPI entirely * blacklist may disable ACPI entirely
...@@ -1225,19 +1225,19 @@ int __init acpi_boot_init(void) ...@@ -1225,19 +1225,19 @@ int __init acpi_boot_init(void)
if (acpi_disabled && !acpi_ht) if (acpi_disabled && !acpi_ht)
return 1; return 1;
acpi_table_parse(ACPI_BOOT, acpi_parse_sbf); acpi_table_parse("BOOT", acpi_parse_sbf);
/* /*
* set sci_int and PM timer address * 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 * Process the Multiple APIC Description Table (MADT), if present
*/ */
acpi_process_madt(); acpi_process_madt();
acpi_table_parse(ACPI_HPET, acpi_parse_hpet); acpi_table_parse("HPET", acpi_parse_hpet);
return 0; return 0;
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
static int nvidia_hpet_detected __initdata; 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; nvidia_hpet_detected = 1;
return 0; return 0;
...@@ -30,7 +30,7 @@ static int __init check_bridge(int vendor, int device) ...@@ -30,7 +30,7 @@ static int __init check_bridge(int vendor, int device)
is enabled. */ is enabled. */
if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) { if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
nvidia_hpet_detected = 0; nvidia_hpet_detected = 0;
acpi_table_parse(ACPI_HPET, nvidia_hpet_check); acpi_table_parse("HPET", nvidia_hpet_check);
if (nvidia_hpet_detected == 0) { if (nvidia_hpet_detected == 0) {
acpi_skip_timer_override = 1; acpi_skip_timer_override = 1;
printk(KERN_INFO "Nvidia board " printk(KERN_INFO "Nvidia board "
......
...@@ -84,15 +84,6 @@ struct es7000_oem_table { ...@@ -84,15 +84,6 @@ struct es7000_oem_table {
}; };
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
struct acpi_table_sdt {
unsigned long pa;
unsigned long count;
struct {
unsigned long pa;
enum acpi_table_id id;
unsigned long size;
} entry[50];
};
struct oem_table { struct oem_table {
struct acpi_table_header Header; struct acpi_table_header Header;
......
...@@ -160,53 +160,16 @@ parse_unisys_oem (char *oemptr) ...@@ -160,53 +160,16 @@ parse_unisys_oem (char *oemptr)
int __init int __init
find_unisys_acpi_oem_table(unsigned long *oem_addr) find_unisys_acpi_oem_table(unsigned long *oem_addr)
{ {
struct acpi_table_rsdp *rsdp = NULL;
unsigned long rsdp_phys = 0;
struct acpi_table_header *header = NULL; struct acpi_table_header *header = NULL;
int i; int i = 0;
struct acpi_table_sdt sdt; while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &header))) {
if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) {
rsdp_phys = acpi_find_rsdp(); struct oem_table *t = (struct oem_table *)header;
rsdp = __va(rsdp_phys); *oem_addr = (unsigned long)__acpi_map_table(t->OEMTableAddr,
if (rsdp->rsdt_address) { t->OEMTableSize);
struct acpi_table_rsdt *mapped_rsdt = NULL;
sdt.pa = rsdp->rsdt_address;
header = (struct acpi_table_header *)
__acpi_map_table(sdt.pa, sizeof(struct acpi_table_header));
if (!header)
return -ENODEV;
sdt.count = (header->length - sizeof(struct acpi_table_header)) >> 3;
mapped_rsdt = (struct acpi_table_rsdt *)
__acpi_map_table(sdt.pa, header->length);
if (!mapped_rsdt)
return -ENODEV;
header = &mapped_rsdt->header;
for (i = 0; i < sdt.count; i++)
sdt.entry[i].pa = (unsigned long) mapped_rsdt->entry[i];
};
for (i = 0; i < sdt.count; i++) {
header = (struct acpi_table_header *)
__acpi_map_table(sdt.entry[i].pa,
sizeof(struct acpi_table_header));
if (!header)
continue;
if (!strncmp((char *) &header->signature, "OEM1", 4)) {
if (!strncmp((char *) &header->oem_id, "UNISYS", 6)) {
void *addr;
struct oem_table *t;
acpi_table_print(header, sdt.entry[i].pa);
t = (struct oem_table *) __acpi_map_table(sdt.entry[i].pa, header->length);
addr = (void *) __acpi_map_table(t->OEMTableAddr, t->OEMTableSize);
*oem_addr = (unsigned long) addr;
return 0; return 0;
} }
} }
}
return -1; return -1;
} }
#endif #endif
......
...@@ -199,7 +199,7 @@ void __init pci_mmcfg_init(int type) ...@@ -199,7 +199,7 @@ void __init pci_mmcfg_init(int type)
if ((pci_probe & PCI_PROBE_MMCONF) == 0) if ((pci_probe & PCI_PROBE_MMCONF) == 0)
return; return;
acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg); acpi_table_parse("MCFG", acpi_parse_mcfg);
if ((pci_mmcfg_config_num == 0) || if ((pci_mmcfg_config_num == 0) ||
(pci_mmcfg_config == NULL) || (pci_mmcfg_config == NULL) ||
(pci_mmcfg_config[0].base_address == 0)) (pci_mmcfg_config[0].base_address == 0))
......
This diff is collapsed.
...@@ -340,7 +340,7 @@ enum acpi_table_id { ...@@ -340,7 +340,7 @@ enum acpi_table_id {
ACPI_TABLE_COUNT ACPI_TABLE_COUNT
}; };
typedef int (*acpi_table_handler) (unsigned long phys_addr, unsigned long size); typedef int (*acpi_table_handler) (struct acpi_table_header *header);
extern acpi_table_handler acpi_table_ops[ACPI_TABLE_COUNT]; extern acpi_table_handler acpi_table_ops[ACPI_TABLE_COUNT];
...@@ -353,11 +353,10 @@ int acpi_boot_table_init (void); ...@@ -353,11 +353,10 @@ int acpi_boot_table_init (void);
int acpi_numa_init (void); int acpi_numa_init (void);
int acpi_table_init (void); int acpi_table_init (void);
int acpi_table_parse (enum acpi_table_id id, acpi_table_handler handler); int acpi_table_parse (char *id, acpi_table_handler handler);
int acpi_get_table_header_early (enum acpi_table_id id, struct acpi_table_header **header);
int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler, unsigned int max_entries); int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler, unsigned int max_entries);
int acpi_table_parse_srat (enum acpi_srat_entry_id id, acpi_madt_entry_handler handler, unsigned int max_entries); int acpi_table_parse_srat (enum acpi_srat_entry_id id, acpi_madt_entry_handler handler, unsigned int max_entries);
int acpi_parse_mcfg (unsigned long phys_addr, unsigned long size); int acpi_parse_mcfg (struct acpi_table_header *header);
void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr); void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);
void acpi_table_print_madt_entry (acpi_table_entry_header *madt); void acpi_table_print_madt_entry (acpi_table_entry_header *madt);
void acpi_table_print_srat_entry (acpi_table_entry_header *srat); void acpi_table_print_srat_entry (acpi_table_entry_header *srat);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment