tools/power/acpi/acpidump: version 20101221 - find dynamic tables in sysfs

This is unchanged version 20101221, plus a small bit in
DEFINE_ALTERNATE_TYPES to enable building with latest kernel headers.

This version finds dynamic tables exported by Linux in
/sys/firmware/acpi/tables/dynamic

Signed-off-by: Yakui Zhao <yakui.zhao@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Yakui Zhao 2012-09-22 23:09:15 -04:00 committed by Len Brown
parent 39a55ff2c3
commit b7e1751278
1 changed files with 90 additions and 99 deletions

View File

@ -1,6 +1,5 @@
/* /*
* (c) Alexey Starikovskiy, Intel, 2005-2006. * (c) Alexey Starikovskiy, Intel, 2005-2006.
* (c) Len Brown, Intel, 2007.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -63,6 +62,8 @@ typedef long long s64;
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include <sys/types.h>
#include <dirent.h>
#include <acpi/acconfig.h> #include <acpi/acconfig.h>
#include <acpi/platform/acenv.h> #include <acpi/platform/acenv.h>
@ -186,40 +187,6 @@ static void acpi_show_data(int fd, u8 * data, int size)
/* /*
* Output ACPI table * Output ACPI table
*/ */
#define MAX_TABLES 128
int next_table_dump;
u64 dumped_tables[MAX_TABLES];
void
set_table_dumped(u64 address) {
if (next_table_dump >= MAX_TABLES) {
printf("increase MAX_TABLES\n");
exit(1);
}
dumped_tables[next_table_dump++] = address;
}
/*
* list the tables as they are dumped
* check the list so that they are not dumped twice.
*
* this is needed because we follow both the XSDT and RSDT
* which generally point to all duplicate tables
* except the FADT
*/
int
check_table_dumped(u64 address) {
int i;
for (i = 0; i < MAX_TABLES; ++i) {
if (address == dumped_tables[i])
return 1;
if (dumped_tables[i] == 0)
return 0;
}
return 0;
}
static void acpi_show_table(int fd, struct acpi_table_header *table, unsigned long addr) static void acpi_show_table(int fd, struct acpi_table_header *table, unsigned long addr)
{ {
char buff[80]; char buff[80];
@ -233,10 +200,6 @@ static void acpi_show_table(int fd, struct acpi_table_header *table, unsigned lo
static void write_table(int fd, struct acpi_table_header *tbl, unsigned long addr) static void write_table(int fd, struct acpi_table_header *tbl, unsigned long addr)
{ {
static int select_done = 0; static int select_done = 0;
if (check_table_dumped((u64)addr))
return;
if (!select_sig[0]) { if (!select_sig[0]) {
if (print) { if (print) {
acpi_show_table(fd, tbl, addr); acpi_show_table(fd, tbl, addr);
@ -255,7 +218,6 @@ static void write_table(int fd, struct acpi_table_header *tbl, unsigned long add
} }
select_done = 1; select_done = 1;
} }
set_table_dumped((u64) addr);
} }
static void acpi_dump_FADT(int fd, struct acpi_table_header *tbl, unsigned long xaddr) { static void acpi_dump_FADT(int fd, struct acpi_table_header *tbl, unsigned long xaddr) {
@ -312,26 +274,30 @@ no_facs:
write_table(fd, (struct acpi_table_header *)&x, xaddr); write_table(fd, (struct acpi_table_header *)&x, xaddr);
} }
static int acpi_dump_SDT(int fd, struct acpi_rsdp_descriptor *rsdp)
static int acpi_dump_RSDT(int fd, struct acpi_rsdp_descriptor *rsdp)
{ {
struct acpi_table_header *sdt, *tbl = 0; struct acpi_table_header *sdt, *tbl = 0;
int i, num; int xsdt = 1, i, num;
char *offset; char *offset;
unsigned long addr; unsigned long addr;
if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {
tbl = acpi_map_table(rsdp->rsdt_physical_address, "RSDT"); tbl = acpi_map_table(rsdp->xsdt_physical_address, "XSDT");
}
if (!tbl && rsdp->rsdt_physical_address) {
xsdt = 0;
tbl = acpi_map_table(rsdp->rsdt_physical_address, "RSDT");
}
if (!tbl) return 0; if (!tbl) return 0;
sdt = malloc(tbl->length); sdt = malloc(tbl->length);
memcpy(sdt, tbl, tbl->length); memcpy(sdt, tbl, tbl->length);
acpi_unmap_table(tbl); acpi_unmap_table(tbl);
if (checksum((u8 *)sdt, sdt->length)) if (checksum((u8 *)sdt, sdt->length))
fprintf(stderr, "Wrong checksum for %s!\n", "RSDT"); fprintf(stderr, "Wrong checksum for %s!\n", (xsdt)?"XSDT":"RSDT");
num = (sdt->length - sizeof(struct acpi_table_header))/sizeof(u32); num = (sdt->length - sizeof(struct acpi_table_header))/((xsdt)?sizeof(u64):sizeof(u32));
offset = (char *)sdt + sizeof(struct acpi_table_header); offset = (char *)sdt + sizeof(struct acpi_table_header);
for (i = 0; i < num; ++i, offset += sizeof(u32)) { for (i = 0; i < num; ++i, offset += ((xsdt) ? sizeof(u64) : sizeof(u32))) {
addr = (unsigned long)(*(u32 *)offset); addr = (xsdt) ? (unsigned long)(*(u64 *)offset):
(unsigned long)(*(u32 *)offset);
if (!addr) continue; if (!addr) continue;
tbl = acpi_map_table(addr, 0); tbl = acpi_map_table(addr, 0);
if (!tbl) continue; if (!tbl) continue;
@ -339,66 +305,92 @@ static int acpi_dump_RSDT(int fd, struct acpi_rsdp_descriptor *rsdp)
acpi_dump_FADT(fd, tbl, addr); acpi_dump_FADT(fd, tbl, addr);
} else { } else {
if (checksum((u8 *)tbl, tbl->length)) if (checksum((u8 *)tbl, tbl->length))
fprintf(stderr, "Wrong checksum for %.4s!\n", tbl->signature); fprintf(stderr, "Wrong checksum for generic table!\n");
write_table(fd, tbl, addr); write_table(fd, tbl, addr);
} }
acpi_unmap_table(tbl); acpi_unmap_table(tbl);
if (connect) { if (connect) {
(*(u32*)offset) = lseek(fd, 0, SEEK_CUR); if (xsdt)
(*(u64*)offset) = lseek(fd, 0, SEEK_CUR);
else
(*(u32*)offset) = lseek(fd, 0, SEEK_CUR);
} }
} }
addr = (unsigned long)rsdp->rsdt_physical_address; if (xsdt) {
if (connect) { addr = (unsigned long)rsdp->xsdt_physical_address;
rsdp->rsdt_physical_address = lseek(fd, 0, SEEK_CUR); if (connect) {
rsdp->xsdt_physical_address = lseek(fd, 0, SEEK_CUR);
}
} else {
addr = (unsigned long)rsdp->rsdt_physical_address;
if (connect) {
rsdp->rsdt_physical_address = lseek(fd, 0, SEEK_CUR);
}
} }
write_table(fd, sdt, addr); write_table(fd, sdt, addr);
free (sdt); free (sdt);
return 1; return 1;
} }
#define DYNAMIC_SSDT "/sys/firmware/acpi/tables/dynamic"
static int acpi_dump_XSDT(int fd, struct acpi_rsdp_descriptor *rsdp) static void acpi_dump_dynamic_SSDT(int fd)
{ {
struct acpi_table_header *sdt, *tbl = 0; struct stat file_stat;
int i, num; char filename[256], *ptr;
char *offset; DIR *tabledir;
unsigned long addr; struct dirent *entry;
if (rsdp->revision > 1 && rsdp->xsdt_physical_address) { FILE *fp;
tbl = acpi_map_table(rsdp->xsdt_physical_address, "XSDT"); int count, readcount, length;
} struct acpi_table_header table_header, *ptable;
if (!tbl) return 0;
sdt = malloc(tbl->length); if (stat(DYNAMIC_SSDT, &file_stat) == -1) {
memcpy(sdt, tbl, tbl->length); /* The directory doesn't exist */
acpi_unmap_table(tbl); return;
if (checksum((u8 *)sdt, sdt->length))
fprintf(stderr, "Wrong checksum for %s!\n", "XSDT");
num = (sdt->length - sizeof(struct acpi_table_header))/sizeof(u64);
offset = (char *)sdt + sizeof(struct acpi_table_header);
for (i = 0; i < num; ++i, offset += sizeof(u64)) {
addr = (unsigned long)(*(u64 *)offset);
if (!addr) continue;
tbl = acpi_map_table(addr, 0);
if (!tbl) continue;
if (!memcmp(tbl->signature, FADT_SIG, 4)) {
acpi_dump_FADT(fd, tbl, addr);
} else {
if (checksum((u8 *)tbl, tbl->length))
fprintf(stderr, "Wrong checksum for %.4s\n", tbl->signature);
write_table(fd, tbl, addr);
}
acpi_unmap_table(tbl);
if (connect) {
(*(u64*)offset) = lseek(fd, 0, SEEK_CUR);
}
} }
addr = (unsigned long)rsdp->xsdt_physical_address; tabledir = opendir(DYNAMIC_SSDT);
if (connect) { if(!tabledir){
rsdp->xsdt_physical_address = lseek(fd, 0, SEEK_CUR); /*can't open the directory */
return;
}
while ((entry = readdir(tabledir)) != 0){
/* skip the file of . /.. */
if (entry->d_name[0] == '.')
continue;
sprintf(filename, "%s/%s", DYNAMIC_SSDT, entry->d_name);
fp = fopen(filename, "r");
if (fp == NULL) {
fprintf(stderr, "Can't open the file of %s\n",
filename);
continue;
}
/* Read the Table header to parse the table length */
count = fread(&table_header, 1, sizeof(struct acpi_table_header), fp);
if (count < sizeof(table_header)) {
/* the length is lessn than ACPI table header. skip it */
fclose(fp);
continue;
}
length = table_header.length;
ptr = malloc(table_header.length);
fseek(fp, 0, SEEK_SET);
readcount = 0;
while(!feof(fp) && readcount < length) {
count = fread(ptr + readcount, 1, 256, fp);
readcount += count;
}
fclose(fp);
ptable = (struct acpi_table_header *) ptr;
if (checksum((u8 *) ptable, ptable->length))
fprintf(stderr, "Wrong checksum "
"for dynamic SSDT table!\n");
write_table(fd, ptable, 0);
free(ptr);
} }
write_table(fd, sdt, addr); closedir(tabledir);
free (sdt); return;
return 1;
} }
static void usage(const char *progname) static void usage(const char *progname)
@ -518,6 +510,7 @@ int main(int argc, char **argv)
goto not_found; goto not_found;
write(fd, raw, length); write(fd, raw, length);
acpi_unmap_memory(raw, length); acpi_unmap_memory(raw, length);
close(fd);
return 0; return 0;
} }
@ -540,12 +533,7 @@ int main(int argc, char **argv)
if (connect) { if (connect) {
lseek(fd, sizeof(struct acpi_rsdp_descriptor), SEEK_SET); lseek(fd, sizeof(struct acpi_rsdp_descriptor), SEEK_SET);
} }
if (rsdpx.revision > 1 && rsdpx.xsdt_physical_address) { if (!acpi_dump_SDT(fd, &rsdpx))
/* ACPIDUMP uses xsdt table */
if (!acpi_dump_XSDT(fd, &rsdpx))
goto not_found;
}
if (!acpi_dump_RSDT(fd, &rsdpx))
goto not_found; goto not_found;
if (connect) { if (connect) {
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
@ -560,8 +548,11 @@ int main(int argc, char **argv)
buff[0] = '\n'; buff[0] = '\n';
write(fd, buff, 1); write(fd, buff, 1);
} }
acpi_dump_dynamic_SSDT(fd);
close(fd);
return 0; return 0;
not_found: not_found:
close(fd);
fprintf(stderr, "ACPI tables were not found. If you know location " fprintf(stderr, "ACPI tables were not found. If you know location "
"of RSD PTR table (from dmesg, etc), " "of RSD PTR table (from dmesg, etc), "
"supply it with either --addr or -a option\n"); "supply it with either --addr or -a option\n");