Skip to content

L
linux
Commit 81442037 authored by Andy Grover's avatar Andy Grover
Browse files
Options

ACPI: Dynamically allocate SDT list (suggested by Andi Kleen)

parent fbdebc89
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 45 deletions
drivers/acpi/tables.c
View file @ 81442037
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/bootmem.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
...@@ -61,16 +62,14 @@ static char *acpi_table_signatures[ACPI_TABLE_COUNT] = { ...@@ -61,16 +62,14 @@ static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
/* System Description Table (RSDT/XSDT) */ /* System Description Table (RSDT/XSDT) */
struct acpi_table_sdt { struct acpi_table_sdt {
unsigned long pa; /* Physical Address */ unsigned long pa;
unsigned long count; /* Table count */ enum acpi_table_id id;
struct { unsigned long size;
unsigned long pa;
enum acpi_table_id id;
unsigned long size;
} entry[ACPI_MAX_TABLES];
} __attribute__ ((packed)); } __attribute__ ((packed));
static struct acpi_table_sdt sdt; static unsigned long sdt_pa; /* Physical Address */
static unsigned long sdt_count; /* Table count */
static struct acpi_table_sdt *sdt_entry;
void void
acpi_table_print ( acpi_table_print (
...@@ -236,11 +235,11 @@ acpi_get_table_header_early ( ...@@ -236,11 +235,11 @@ acpi_get_table_header_early (
/* Locate the table. */ /* Locate the table. */
for (i = 0; i < sdt.count; i++) { for (i = 0; i < sdt_count; i++) {
if (sdt.entry[i].id != temp_id) if (sdt_entry[i].id != temp_id)
continue; continue;
*header = (void *) *header = (void *)
__acpi_map_table(sdt.entry[i].pa, sdt.entry[i].size); __acpi_map_table(sdt_entry[i].pa, sdt_entry[i].size);
if (!*header) { if (!*header) {
printk(KERN_WARNING PREFIX "Unable to map %s\n", printk(KERN_WARNING PREFIX "Unable to map %s\n",
acpi_table_signatures[temp_id]); acpi_table_signatures[temp_id]);
...@@ -289,11 +288,11 @@ acpi_table_parse_madt_family ( ...@@ -289,11 +288,11 @@ acpi_table_parse_madt_family (
/* Locate the MADT (if exists). There should only be one. */ /* Locate the MADT (if exists). There should only be one. */
for (i = 0; i < sdt.count; i++) { for (i = 0; i < sdt_count; i++) {
if (sdt.entry[i].id != id) if (sdt_entry[i].id != id)
continue; continue;
madt = (void *) madt = (void *)
__acpi_map_table(sdt.entry[i].pa, sdt.entry[i].size); __acpi_map_table(sdt_entry[i].pa, sdt_entry[i].size);
if (!madt) { if (!madt) {
printk(KERN_WARNING PREFIX "Unable to map %s\n", printk(KERN_WARNING PREFIX "Unable to map %s\n",
acpi_table_signatures[id]); acpi_table_signatures[id]);
...@@ -308,7 +307,7 @@ acpi_table_parse_madt_family ( ...@@ -308,7 +307,7 @@ acpi_table_parse_madt_family (
return -ENODEV; return -ENODEV;
} }
madt_end = (unsigned long) madt + sdt.entry[i].size; madt_end = (unsigned long) madt + sdt_entry[i].size;
/* Parse all entries looking for a match. */ /* Parse all entries looking for a match. */
...@@ -349,10 +348,10 @@ acpi_table_parse ( ...@@ -349,10 +348,10 @@ acpi_table_parse (
if (!handler) if (!handler)
return -EINVAL; return -EINVAL;
for (i = 0; i < sdt.count; i++) { for (i = 0; i < sdt_count; i++) {
if (sdt.entry[i].id != id) if (sdt_entry[i].id != id)
continue; continue;
handler(sdt.entry[i].pa, sdt.entry[i].size); handler(sdt_entry[i].pa, sdt_entry[i].size);
count++; count++;
} }
...@@ -377,11 +376,11 @@ acpi_table_get_sdt ( ...@@ -377,11 +376,11 @@ acpi_table_get_sdt (
struct acpi_table_xsdt *mapped_xsdt = NULL; struct acpi_table_xsdt *mapped_xsdt = NULL;
sdt.pa = ((struct acpi20_table_rsdp*)rsdp)->xsdt_address; sdt_pa = ((struct acpi20_table_rsdp*)rsdp)->xsdt_address;
/* map in just the header */ /* map in just the header */
header = (struct acpi_table_header *) header = (struct acpi_table_header *)
__acpi_map_table(sdt.pa, sizeof(struct acpi_table_header)); __acpi_map_table(sdt_pa, sizeof(struct acpi_table_header));
if (!header) { if (!header) {
printk(KERN_WARNING PREFIX "Unable to map XSDT header\n"); printk(KERN_WARNING PREFIX "Unable to map XSDT header\n");
...@@ -390,7 +389,7 @@ acpi_table_get_sdt ( ...@@ -390,7 +389,7 @@ acpi_table_get_sdt (
/* remap in the entire table before processing */ /* remap in the entire table before processing */
mapped_xsdt = (struct acpi_table_xsdt *) mapped_xsdt = (struct acpi_table_xsdt *)
__acpi_map_table(sdt.pa, header->length); __acpi_map_table(sdt_pa, header->length);
if (!mapped_xsdt) { if (!mapped_xsdt) {
printk(KERN_WARNING PREFIX "Unable to map XSDT\n"); printk(KERN_WARNING PREFIX "Unable to map XSDT\n");
return -ENODEV; return -ENODEV;
...@@ -407,15 +406,21 @@ acpi_table_get_sdt ( ...@@ -407,15 +406,21 @@ acpi_table_get_sdt (
return -ENODEV; return -ENODEV;
} }
sdt.count = (header->length - sizeof(struct acpi_table_header)) >> 3; sdt_count = (header->length - sizeof(struct acpi_table_header)) >> 3;
if (sdt.count > ACPI_MAX_TABLES) { if (sdt_count > ACPI_MAX_TABLES) {
printk(KERN_WARNING PREFIX "Truncated %lu XSDT entries\n", printk(KERN_WARNING PREFIX "Truncated %lu XSDT entries\n",
(sdt.count - ACPI_MAX_TABLES)); (sdt_count - ACPI_MAX_TABLES));
sdt.count = ACPI_MAX_TABLES; sdt_count = ACPI_MAX_TABLES;
} }
for (i = 0; i < sdt.count; i++) sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
sdt.entry[i].pa = (unsigned long) mapped_xsdt->entry[i]; if (!sdt_entry) {
printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
return -ENOMEM;
}
for (i = 0; i < sdt_count; i++)
sdt_entry[i].pa = (unsigned long) mapped_xsdt->entry[i];
} }
/* Then check RSDT */ /* Then check RSDT */
...@@ -424,11 +429,11 @@ acpi_table_get_sdt ( ...@@ -424,11 +429,11 @@ acpi_table_get_sdt (
struct acpi_table_rsdt *mapped_rsdt = NULL; struct acpi_table_rsdt *mapped_rsdt = NULL;
sdt.pa = rsdp->rsdt_address; sdt_pa = rsdp->rsdt_address;
/* map in just the header */ /* map in just the header */
header = (struct acpi_table_header *) header = (struct acpi_table_header *)
__acpi_map_table(sdt.pa, sizeof(struct acpi_table_header)); __acpi_map_table(sdt_pa, sizeof(struct acpi_table_header));
if (!header) { if (!header) {
printk(KERN_WARNING PREFIX "Unable to map RSDT header\n"); printk(KERN_WARNING PREFIX "Unable to map RSDT header\n");
return -ENODEV; return -ENODEV;
...@@ -436,7 +441,7 @@ acpi_table_get_sdt ( ...@@ -436,7 +441,7 @@ acpi_table_get_sdt (
/* remap in the entire table before processing */ /* remap in the entire table before processing */
mapped_rsdt = (struct acpi_table_rsdt *) mapped_rsdt = (struct acpi_table_rsdt *)
__acpi_map_table(sdt.pa, header->length); __acpi_map_table(sdt_pa, header->length);
if (!mapped_rsdt) { if (!mapped_rsdt) {
printk(KERN_WARNING PREFIX "Unable to map RSDT\n"); printk(KERN_WARNING PREFIX "Unable to map RSDT\n");
return -ENODEV; return -ENODEV;
...@@ -453,15 +458,21 @@ acpi_table_get_sdt ( ...@@ -453,15 +458,21 @@ acpi_table_get_sdt (
return -ENODEV; return -ENODEV;
} }
sdt.count = (header->length - sizeof(struct acpi_table_header)) >> 2; sdt_count = (header->length - sizeof(struct acpi_table_header)) >> 2;
if (sdt.count > ACPI_MAX_TABLES) { if (sdt_count > ACPI_MAX_TABLES) {
printk(KERN_WARNING PREFIX "Truncated %lu RSDT entries\n", printk(KERN_WARNING PREFIX "Truncated %lu RSDT entries\n",
(sdt.count - ACPI_TABLE_COUNT)); (sdt_count - ACPI_MAX_TABLES));
sdt.count = ACPI_MAX_TABLES; sdt_count = ACPI_MAX_TABLES;
} }
for (i = 0; i < sdt.count; i++) sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
sdt.entry[i].pa = (unsigned long) mapped_rsdt->entry[i]; if (!sdt_entry) {
printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
return -ENOMEM;
}
for (i = 0; i < sdt_count; i++)
sdt_entry[i].pa = (unsigned long) mapped_rsdt->entry[i];
} }
else { else {
...@@ -469,38 +480,38 @@ acpi_table_get_sdt ( ...@@ -469,38 +480,38 @@ acpi_table_get_sdt (
return -ENODEV; return -ENODEV;
} }
acpi_table_print(header, sdt.pa); acpi_table_print(header, sdt_pa);
for (i = 0; i < sdt.count; i++) { for (i = 0; i < sdt_count; i++) {
/* map in just the header */ /* map in just the header */
header = (struct acpi_table_header *) header = (struct acpi_table_header *)
__acpi_map_table(sdt.entry[i].pa, __acpi_map_table(sdt_entry[i].pa,
sizeof(struct acpi_table_header)); sizeof(struct acpi_table_header));
if (!header) if (!header)
continue; continue;
/* remap in the entire table before processing */ /* remap in the entire table before processing */
header = (struct acpi_table_header *) header = (struct acpi_table_header *)
__acpi_map_table(sdt.entry[i].pa, __acpi_map_table(sdt_entry[i].pa,
header->length); header->length);
if (!header) if (!header)
continue; continue;
acpi_table_print(header, sdt.entry[i].pa); acpi_table_print(header, sdt_entry[i].pa);
if (acpi_table_compute_checksum(header, header->length)) { if (acpi_table_compute_checksum(header, header->length)) {
printk(KERN_WARNING " >>> ERROR: Invalid checksum\n"); printk(KERN_WARNING " >>> ERROR: Invalid checksum\n");
continue; continue;
} }
sdt.entry[i].size = header->length; sdt_entry[i].size = header->length;
for (id = 0; id < ACPI_TABLE_COUNT; id++) { for (id = 0; id < ACPI_TABLE_COUNT; id++) {
if (!strncmp((char *) &header->signature, if (!strncmp((char *) &header->signature,
acpi_table_signatures[id], acpi_table_signatures[id],
sizeof(header->signature))) { sizeof(header->signature))) {
sdt.entry[i].id = id; sdt_entry[i].id = id;
} }
} }
} }
...@@ -525,8 +536,6 @@ acpi_table_init (void) ...@@ -525,8 +536,6 @@ acpi_table_init (void)
unsigned long rsdp_phys = 0; unsigned long rsdp_phys = 0;
int result = 0; int result = 0;
memset(&sdt, 0, sizeof(struct acpi_table_sdt));
/* Locate and map the Root System Description Table (RSDP) */ /* Locate and map the Root System Description Table (RSDP) */
rsdp_phys = acpi_find_rsdp(); rsdp_phys = acpi_find_rsdp();
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7