Linaro-acpi August 2013

linaro-acpi@lists.linaro.org

15 participants
57 discussions

FYI //Fwd: ACPI vs Device Tree - moving forward

by Hanjun Guo

Hi, Lots of people from different companies are concerned about ACPI vs FDT, not only Linaro, This is a good news for us. They will discuss it in person in New Orleans at Linux Plumber (September, 2013) Al, Graeme, will you attend Linux Plumber next month？ Thanks Hanjun -------- Original Message -------- Subject: ACPI vs Device Tree - moving forward Date: Tue, 20 Aug 2013 20:26:50 +0100 From: Matthew Garrett <mjg59(a)srcf.ucam.org> To: <linux-kernel(a)vger.kernel.org>, <linux-acpi(a)vger.kernel.org> CC: <linux(a)roeck-us.net>, <dvhart(a)linux.intel.com>, <hpa(a)zytor.com>, <linus.walleij(a)linaro.org>, <rjw(a)sisk.pl> This conversation seems to have pretty much entirely ended up happening on ksummit-discuss, which doesn't seem that useful. So let's have another go with a wider audience (and where I don't have to sign up for yet another mailing list...) ACPI and DT overlap in that they both provide a mechanism for enumerating non-enumerable devices, and both also provide a mechanism for attaching additional configuration data to devices (which may or may not be otherwise enumerable). There's a sufficient overlap in functionality that at least one platform that's traditionally been Device Tree (arm) is also adding support for ACPI - there's even ACPI-based arm hardware on the market already. Right now that's a problem for us. The same hardware may end up shipped with either ACPI or DT-based firmware, and at the moment we'd need to either write two drivers or one driver with two glue layers. This is somewhat suboptimal. The biggest difference between DT and ACPI is that DT is effectively a somewhat structured mechanism for passing arbitrary data, while ACPI tends (with exceptions) to provide standardised data. For instance, in DT we might have: sdhci@c8000000 { status = "okay"; power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; bus-width = <4>; keep-power-in-suspend; }; In ACPI the normal way to handle this would be to have a GPIO operation region that listed the GPIOs: OperationRegion(GPO1, GeneralPurposeIO, 0, 1) Field(GP01, ByteAcc, NoLock, Preserve) { Connection (GpioIo(Exclusive, PullUp,,,,,) TG06, 1 } And then an ACPI device: Device (\_SB.SDHC) { Method (_PS0, 0, NotSerialized) { Store (1, TG06) } Method (_PS3, 0, NotSerialized) { Store (0, TG06) } } with the ACPI core then executing these methods whenever a device is powered up or down. How can we unify these two different representations? The only terribly plausible way of doing so seems to be to push that out to a helper function and then have it handled as part of device runtime power management, and just have the driver make pm_runtime_get() and _put() calls. So we can theoretically handle cases like power lines without /too/ much trouble, while representing the same thing in either ACPI or DT. But we have plenty of other data - in the case of SDHCI alone, there's the bus width and potentially card detect and write protect gpio lines. These can easily be represented in ACPI, but not in a terribly generic way. We could easily add new functions to retrieve this information, but doing this through the standards body is likely to prove tedious, especially when new hardware types appear and we want to be able to ship support pretty much immediately. The other choice is to ignore most of the existing ACPI functionality and just use it as a mechanism for providing additional metadata. Apple already do this using the _DSM methods: Method (_DSM, 4, NotSerialized) { Store (Package (0x07) { "refnum", 0x00, "address", 0x39, "device-id", 0x0cc8, Buffer (0x01) { 0x00 } }, Local0) DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0)) Return (Local0) } where the DTGP() method verifies that the caller passed in an appropriate UUID and then hands back this buffer. Putting all our existing DT metadata in there would be straightforward, but we would then effectively just be using ACPI to repackage DT - drivers would continue to make DT-specific calls in order to obtain the information they need. This seems like the least-effort approach, but it doesn't really solve much. Any other OS on the same hardware is unlikely to use the DT data, and if someone wants to run Linux on hardware that was intended for another OS they're unlikely to have any DT data to use. So while unifying this seems hugely desirable, right now it's not incredibly obvious how we can actually achieve that. In some cases it's easy to take DT information and rewrite it the ACPI way, but in others we just don't seem to have the primitives we need for that. One approach would be to work through the existing DT bindings documentation and see what's missing from ACPI and work on adding it, but we'll still then need helper functions that are able to obtain the same information from either source. In any case, it seems like this is something that should be discussed. A bunch of people in the earlier discussion mentioned that they were going to be in New Orleans, so I'd suggest that we arrange a time for in-person discussion there. That should give us a solid basis for further mailing list discussion, and then there'll be another opportunity for discussion in Edinburgh. -- Matthew Garrett | mjg59(a)srcf.ucam.org -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html .

10 years, 8 months

[PATCH] Fix comments ARMv8 foundation acpi platform

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> Fix comments ARMv8 foundation acpi platform --- platforms/foundation-v8.acpi/dsdt.asl | 2 +- platforms/foundation-v8.acpi/ssdt0.asl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/foundation-v8.acpi/dsdt.asl b/platforms/foundation-v8.acpi/dsdt.asl index d1a9716..69f5884 100644 --- a/platforms/foundation-v8.acpi/dsdt.asl +++ b/platforms/foundation-v8.acpi/dsdt.asl @@ -1,7 +1,7 @@ /* * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> * - * [DSDT] Description of the Arndale board (exynos5250) + * [DSDT] Description of the ARMv8 foundation model * * This source is released under the terms of the GPLv2. */ diff --git a/platforms/foundation-v8.acpi/ssdt0.asl b/platforms/foundation-v8.acpi/ssdt0.asl index 165c1ae..9796ebd 100644 --- a/platforms/foundation-v8.acpi/ssdt0.asl +++ b/platforms/foundation-v8.acpi/ssdt0.asl @@ -1,7 +1,7 @@ /* * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> * - * [SSDT] Description of the Arndale board (exynos5250) GPIO structure + * [SSDT] Description of the ARMv8 foundation model GPIO structure * * This source is released under the terms of the GPLv2. */ -- 1.7.9.5

10 years, 8 months

[PATCH] Update comments under foundation-v8.acpi

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> Fix all the comments under foundation-v8.acpi platforms --- platforms/foundation-v8.acpi/dsdt.asl | 2 +- platforms/foundation-v8.acpi/ssdt0.asl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/foundation-v8.acpi/dsdt.asl b/platforms/foundation-v8.acpi/dsdt.asl index 6a5d1be..c5c692b 100644 --- a/platforms/foundation-v8.acpi/dsdt.asl +++ b/platforms/foundation-v8.acpi/dsdt.asl @@ -1,7 +1,7 @@ /* * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> * - * [DSDT] Description of the Arndale board (exynos5250) + * [DSDT] Description of the foundation-v8 * * This source is released under the terms of the GPLv2. */ diff --git a/platforms/foundation-v8.acpi/ssdt0.asl b/platforms/foundation-v8.acpi/ssdt0.asl index 165c1ae..11328f9 100644 --- a/platforms/foundation-v8.acpi/ssdt0.asl +++ b/platforms/foundation-v8.acpi/ssdt0.asl @@ -1,7 +1,7 @@ /* * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> * - * [SSDT] Description of the Arndale board (exynos5250) GPIO structure + * [SSDT] Description of the foundation-v8 GPIO structure * * This source is released under the terms of the GPLv2. */ -- 1.7.9.5

10 years, 8 months

[PATCH] arm: setup: remove BOZO pfn_mapped handling

by Graeme Gregory

This is only required if we are doing initrd table overiding. This is currently disabled for arm/arm64. Remove this as allowing initrd overiding needs fuller re-work on these platforms anyway. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- arch/arm/kernel/setup.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 168f7c5..da3d8df 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -62,19 +62,6 @@ #include "atags.h" -/* BOZO: clears up the missing symbol during compile, but is this - * the right way to handle it? - */ -/* - * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. - * The direct mapping extends to max_pfn_mapped, so that we can directly access - * apertures, ACPI and other tables without having to play with fixmaps. - */ -unsigned long max_low_pfn_mapped; -unsigned long max_pfn_mapped; - -/* END BOZO */ - #if defined(CONFIG_FPE_NWFPE) || defined(CONFIG_FPE_FASTFPE) char fpe_type[8]; -- 1.7.10.4

10 years, 8 months

[PATCH] acpi: remove last trace of MAB from Kconfig

by Graeme Gregory

MAB is now moved to acpi-asl so remove it from Kconfig here. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- drivers/acpi/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index bd08033..85f774a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -2,9 +2,6 @@ # ACPI Configuration # -config MAB - bool - config ACPI_ARM bool @@ -13,7 +10,6 @@ menuconfig ACPI depends on !IA64_HP_SIM depends on ((IA64 || X86) && PCI) || (ARM || ARM64) select PNP - select MAB if (ARM || ARM64) select ACPI_ARM if (ARM || ARM64) default y if !(ARM || ARM64) help -- 1.7.10.4

10 years, 8 months

[PATCH 1/3] x86 / ACPI: modify the stale comment for __acpi_map_table()

by Hanjun Guo

The comment for __acpi_map_table() is obvious wrong. In fact, after commit 1c14fa49 (x86: use early_ioremap in __acpi_map_table), the comment became stale, so remove it and add a new one. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/x86/kernel/acpi/boot.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2627a81..665f857 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -141,16 +141,8 @@ static u32 irq_to_gsi(int irq) } /* - * Temporarily use the virtual area starting from FIX_IO_APIC_BASE_END, - * to map the target physical address. The problem is that set_fixmap() - * provides a single page, and it is possible that the page is not - * sufficient. - * By using this area, we can map up to MAX_IO_APICS pages temporarily, - * i.e. until the next __va_range() call. - * - * Important Safety Note: The fixed I/O APIC page numbers are *subtracted* - * from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and - * count idx down while incrementing the phys address. + * __acpi_map_table() will be called before the memory allocation + * is ready, so call early_ioremap() to map tables. */ char *__init __acpi_map_table(unsigned long phys, unsigned long size) { -- 1.7.9.5

10 years, 8 months

[PATCH][acpi-asl] cab (check-ACPI-blob): new tool that looks for errors in an ACPI blob.

by al.stone＠linaro.org

From: Al Stone <ahs3(a)redhat.com> While trying to hunt down what appeared to be structural errors in an ACPI blob, I got tired of double checking pointers and load addresses by hand (and having to double check my lousy arithmetic). So, cab will search a blob for tables using brute force to determine where tables actually are, and then compare those locations with where all the table pointers say they should be, reporting any discrepancies found. Cab will also double check all table headers looking for invalid checksums, and table revision levels older than current ACPI 5.0 spec dictates. If you can think of additional checks on tables, please add them. Signed-off-by: Al Stone <al.stone(a)linaro.org> --- Makefile | 7 +- tools/cab/Makefile | 8 + tools/cab/cab.c | 650 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/cab/cab.h | 169 ++++++++++++++ 4 files changed, 833 insertions(+), 1 deletion(-) create mode 100644 tools/cab/Makefile create mode 100644 tools/cab/cab.c create mode 100644 tools/cab/cab.h diff --git a/Makefile b/Makefile index e82376d..ef63965 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,19 @@ MABDIR := tools/mab/ +CABDIR := tools/cab/ PLATDIR := platforms/ -%.acpi : $(MABDIR)/mab +%.acpi : $(MABDIR)/mab $(CABDIR)/cab make MAB=$(CURDIR)/$(MABDIR)/mab PADDR=$(PADDR) -C $(PLATDIR) $@ $(MABDIR)/mab : FORCE make -C $(MABDIR) +$(CABDIR)/cab : FORCE + make -C $(CABDIR) + clean : make -C $(MABDIR) clean + make -C $(CABDIR) clean make -C $(PLATDIR) clean FORCE : diff --git a/tools/cab/Makefile b/tools/cab/Makefile new file mode 100644 index 0000000..7d86b59 --- /dev/null +++ b/tools/cab/Makefile @@ -0,0 +1,8 @@ +CFLAGS := -g + +cab : cab.h cab.c + $(CC) $(CFLAGS) -o cab cab.c + +clean : + -rm -f cab cab.o + diff --git a/tools/cab/cab.c b/tools/cab/cab.c new file mode 100644 index 0000000..ebf5a83 --- /dev/null +++ b/tools/cab/cab.c @@ -0,0 +1,650 @@ +/* + * cab.c: main program for the tool to Check A Blob of ACPI tables + * + * This file is subject to the terms and conditions of the GNU General + * Public License. See the file "COPYING" in the main directory of this + * archive for more details. + * + * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> + * + * NB: all values are assumed to be little-endian in the blob. + * + */ + +#include "cab.h" + +#include <sys/queue.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/mman.h> + +#include <ctype.h> +#include <endian.h> +#include <errno.h> +#include <fcntl.h> +#include <libgen.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +int passed = 0; +int failed = 0; + +void usage(void) +{ + printf("%s %s\n", PROGNAME, VERSION); + printf("usage: %s -b <blob> -p <paddr> [-q]\n", PROGNAME); + printf("\n"); + printf(" -b <blob> => file name of input ACPI blob\n"); + printf(" -p <paddr> => physical address used in relocation\n"); + printf(" -q => if given, supress output\n"); +} + +int get_file_size(char *fname) +{ + struct stat buf; + int err; + + err = stat(fname, &buf); + if (err) + printf("? cannot stat %s (%d)\n", fname, err); + return (err == 0 ? buf.st_size : 0); +} + +int valid_sig(char *sig) +{ + char **p; + + p = known_sigs; + while (*p != NULL) { + if (strncmp(*p, sig, strlen(*p)) == 0) + return 1; + p++; + } + return 0; +} + +struct table *build_table_entry(unsigned char *buf) +{ + struct table *tmp; + const int RSDP_NUDGE = 3; + int len; + + tmp = (struct table *)malloc(sizeof(struct table)); + if (tmp != NULL) { + memset(tmp, 0, sizeof(struct table)); + + /* fill in the struct */ + len = SIG_LENGTH + 1; + if (strncmp(buf, SIG_RSDP, SIG_LENGTH + RSDP_NUDGE) == 0) + len += RSDP_NUDGE; + tmp->signature = (char *)malloc(len); + memset(tmp->signature, 0, len); + memcpy(tmp->signature, buf, len - 1); + + LIST_INSERT_HEAD(&thead, tmp, tables); + } + + return tmp; +} + +struct table *find_table(char *sig) +{ + struct table *np; + + LIST_FOREACH(np, &thead, tables) { + if (strncmp(np->signature, sig, strlen(np->signature)) == 0) + return np; + } + return NULL; +} + +struct known_table_info *find_known_table_info(char *sig) +{ + struct known_table_info *np; + + for (np = known_info; np->signature != NULL; np++) { + if (strncmp(np->signature, sig, strlen(np->signature)) == 0) + return np; + } + return NULL; +} + +int verify_checksum(unsigned char *start, int offset, int len) +{ + uint8_t newsum, oldsum; + uint8_t *p; + uint8_t old_cksum, cksum; + + old_cksum = start[offset]; + cksum = old_cksum; + newsum = 0; + for (p = (uint8_t *)start; p < (uint8_t *)(start + len); p++) + newsum += *p; + + oldsum = cksum; + newsum = (uint8_t)(newsum - oldsum); + + cksum = (uint8_t)(0 - newsum); + + return (old_cksum == cksum ? PASS : FAIL); +} + +int verify_revision(unsigned char *r, int min) +{ + return (*(uint8_t *)r >= min ? PASS : FAIL); +} + +void presult(int res, char *topic) +{ + if (res != 0) + passed++; + else + failed++; + if (res >= 0) + printf("[%4s] %s\n", (res != 0) ? "PASS" : "FAIL", topic); + else + printf("[%4s] %s\n", "INFO", topic); +} + +void check_blob_header(unsigned char *blob) +{ + int res; + + printf ("\nchecking blob header...\n"); + res = strncmp(blob, BLOB_MAGIC, BLOB_MAGIC_SIZE); + res = (res == 0 ? PASS : FAIL); + presult(res, "blob magic number is correct"); +} + +void check_table_header(char *name, unsigned char *loc) +{ + const int CHECKSUM_OFFSET = 9; + const int CREATOR_ID_OFFSET = 28; + const int CREATOR_ID_LEN = 4; + const int CREATOR_REV_OFFSET = 32; + const int CREATOR_REV_LEN = 4; + const int OEMID_OFFSET = 10; + const int OEMID_LEN = 6; + const int REVISION_OFFSET = 8; + + struct known_table_info *kp; + char buf[MAX_LINE]; + int res; + int offset; + uint32_t len; + int min; + + /* valid signature? */ + kp = find_known_table_info(name); + res = (kp ? PASS : FAIL); + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: signature is correct", name); + presult(res, buf); + + if (!kp) { + printf("? %s is an unknown table\n", name); + return; + } + + /* possibly usable length? */ + len = *(uint32_t *)(loc + TABLE_LEN_OFFSET); + res = PASS; + if ((len <= 0) || (len < MIN_TABLE_LENGTH)) + res = FAIL; + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: table length is reasonable (%d)", name, len); + presult(res, buf); + + /* valid checksum? */ + res = verify_checksum(loc, CHECKSUM_OFFSET, len); + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: checksum is correct", name); + presult(res, buf); + + /* valid revision number? */ + res = verify_revision(loc + REVISION_OFFSET, kp->min_revision); + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: minimum revision is correct", name); + presult(res, buf); + + /* non-empty OEMID field? */ + res = (loc[OEMID_OFFSET] != 0 ? PASS : FAIL); + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: there is an OEMID (", name); + strncat(buf, (unsigned char *)(loc + OEMID_OFFSET), OEMID_LEN); + strncat(buf, ")", 1); + presult(res, buf); + + /* non-empty CreatorID field? */ + res = (loc[CREATOR_ID_OFFSET] != 0 ? PASS : FAIL); + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: there is a CreatorID", name); + presult(res, buf); + + /* non-empty CreatorRevision field? */ + res = (loc[CREATOR_REV_OFFSET] != 0 ? PASS : FAIL); + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s: there is a CreatorRevision", name); + presult(res, buf); +} + +void check_first_table_is_rsdp(unsigned char *blob) +{ + int res; + + res = strncmp(blob + BLOB_HEADER_SIZE, SIG_RSDP, strlen(SIG_RSDP)); + res = (res == 0 ? PASS : FAIL); + presult(res, "first table has RSDP signature"); +} + +void check_rsdp(unsigned char *blob) +{ + const int RSDP_FIRST_CKSUM_OFFSET = 8; + const int RSDP_FIRST_CKSUM_LEN = 20; + const int RSDP_SECOND_CKSUM_OFFSET = 32; + const int RSDP_SECOND_CKSUM_LEN = 36; + const int RSDP_RSDT_ADDR_OFFSET = 16; + + unsigned char *ptr; + int res; + uint32_t rsdt_addr; + + ptr = blob + BLOB_HEADER_SIZE; + printf ("\nchecking RSDP...\n"); + check_first_table_is_rsdp(blob); + + res = verify_checksum(ptr, RSDP_FIRST_CKSUM_OFFSET, + RSDP_FIRST_CKSUM_LEN); + presult(res, "first RSDP checksum verified"); + + res = verify_checksum(ptr, RSDP_SECOND_CKSUM_OFFSET, + RSDP_SECOND_CKSUM_LEN); + presult(res, "second RSDP checksum verified"); + + rsdt_addr = *(uint32_t *)(ptr + RSDP_RSDT_ADDR_OFFSET); + res = (rsdt_addr == 0) ? PASS : FAIL; + presult(res, "RSDT address is null"); +} + +void find_all_tables(unsigned char *blob, int size, int base_addr) +{ + struct table *tp; + unsigned char *p; + int offset; + int delta; + + /* this assumes that all signatures and lengths are correct */ + printf("\nscanning for tables...\n"); + + p = blob + BLOB_HEADER_SIZE; + offset = (int)(p - blob); + + while (offset + SIG_LENGTH < size) { + if (valid_sig(p)) { + tp = build_table_entry(p); + if (tp) { + delta = TABLE_LEN_OFFSET; + if (strcmp(tp->signature, SIG_RSDP) == 0) + delta = RSDP_LEN_OFFSET; + tp->len = *(uint32_t *)(p + delta); + tp->offset = offset; + tp->paddr = base_addr + offset; + + offset += *(uint32_t *)(p + delta); + p += tp->len; + } else { + printf("? no room for building a table\n"); + exit(1); + } + } else { + /* skip forward until we find something; a table + * could have been moved to the next page boundary */ + while (offset + SIG_LENGTH < size) { + p++; + offset++; + if (isalpha(*p) && valid_sig(p)) + break; + } + } + } +} + +void check_rsdp_relocs(unsigned char *blob, int size, uint64_t paddr) +{ + const int RSDT_ADDR_OFFSET = 16; + const int XSDT_ADDR_OFFSET = 24; + + struct table *np, *xp; + int res; + uint32_t rsdt_addr; + uint64_t xsdt_addr; + + printf("\nchecking RSDP relocations...\n"); + + res = FAIL; + np = find_table(SIG_RSDP); + if (np) { + np->ref_cnt++; + + rsdt_addr = *(uint32_t *)(blob + np->offset + RSDT_ADDR_OFFSET); + res = (rsdt_addr == 0) ? PASS : FAIL; + presult(res, "RSDP has null RSDT pointer"); + + xsdt_addr = *(uint32_t *)(blob + np->offset + XSDT_ADDR_OFFSET); + xp = find_table(SIG_XSDT); + if (xp) { + xp->ref_cnt++; + if ((xsdt_addr == xp->paddr) && + (strncmp(blob + xp->offset, SIG_XSDT, + strlen(xp->signature)) == 0)) + res = PASS; + } + presult(res, "RSDP has correct XSDT pointer"); + } else { + res = FAIL; + presult(res, "RSDP has null RSDT pointer"); + presult(res, "RSDP has correct XSDT pointer"); + } +} + +void check_xsdt_relocs(unsigned char *blob, int size, uint64_t paddr) +{ + const int XSDT_ENTRY_START = 36; + const int XSDT_ENTRY_SIZE = 8; + + struct table *np, *xp; + int res; + int cnt; + int ii; + int offset; + uint32_t len; + uint64_t *tpaddr; + char buf[MAX_LINE]; + + printf("\nchecking XSDT relocations...\n"); + + res = FAIL; + np = find_table(SIG_XSDT); + if (np) { + len = *(uint32_t *)(blob + np->offset + TABLE_LEN_OFFSET); + cnt = (len - XSDT_ENTRY_START) / XSDT_ENTRY_SIZE; + tpaddr = (uint64_t *)(blob + np->offset + XSDT_ENTRY_START); + if (len < 1) { + printf("? XSDT can not have an empty list\n"); + exit(1); + } + + /* first entry needs to be the FACP (aka FADT) */ + offset = (*tpaddr - paddr); + if (strncmp(blob + offset, SIG_FACP, strlen(SIG_FACP)) == 0) + res = PASS; + presult(res, "first XSDT entry points to the FADT (aka FACP)"); + + /* verify all the relocations, best we can */ + for (ii = 0; ii < cnt; ii++, tpaddr++) { + offset = (*tpaddr - paddr); + res = FAIL; + if (valid_sig(blob + offset)) { + xp = find_table(blob + offset); + if (xp) { + xp->ref_cnt++; + if ((*tpaddr == xp->paddr) && + (strncmp(blob + xp->offset, + blob + offset, + strlen(xp->signature)) == 0)) + res = PASS; + memset(buf, 0, MAX_LINE); + sprintf(buf, + "XSDT has correct %s pointer", + xp->signature); + presult(res, buf); + } else { + memset(buf, 0, MAX_LINE); + sprintf(buf, + "XSDT entry %d does not point to a valid table", + ii); + presult(res, buf); + } + } + } + } else { + printf("? XSDT can not be found in table list\n"); + exit(1); + } +} + +void check_fadt_relocs(unsigned char *blob, int size, uint64_t paddr) +{ + const int FWCTL_OFFSET = 36; + const int DSDT_OFFSET = 40; + const int XFWCTL_OFFSET = 132; + const int XDSDT_OFFSET = 140; + + struct table *np, *xp; + uint32_t fwctl, dsdt; + uint64_t xfwctl, xdsdt; + uint64_t tpaddr; + int res; + int offset; + + printf("\nchecking FADT relocations...\n"); + np = find_table(SIG_FACP); + if (np) { + fwctl = *(uint32_t *)(blob + np->offset + FWCTL_OFFSET); + xfwctl = *(uint64_t *)(blob + np->offset + XFWCTL_OFFSET); + res = FAIL; + if ((fwctl == 0 && xfwctl == 0) || /* no FACS is okay */ + (fwctl == 0 && xfwctl != 0) || + (fwctl != 0 && xfwctl == 0)) + res = PASS; + presult(res, "FADT has a proper 32-bit FACS pointer"); + presult(res, "FADT has a proper 64-bit FACS pointer"); + if (fwctl != 0 && xfwctl != 0) + presult(INFO, + "both fields have been set, not just one"); + + if (fwctl != 0 || xfwctl != 0) { + tpaddr = (fwctl == 0) ? xfwctl : fwctl; + offset = tpaddr - paddr; + + xp = find_table(SIG_FACS); + if (xp) { + xp->ref_cnt++; + res = FAIL; + if ((tpaddr == xp->paddr) && + (strncmp(blob + xp->offset, + blob + offset, + strlen(xp->signature)) == 0)) + res = PASS; + presult(res, "FADT has correct FACS pointer"); + + } else { + printf("? FADT refers to an FACS but "); + printf("there is no such table\n"); + exit(1); + } + } + + dsdt = *(uint32_t *)(blob + np->offset + DSDT_OFFSET); + xdsdt = *(uint64_t *)(blob + np->offset + XDSDT_OFFSET); + res = FAIL; + if ((dsdt == 0 && xdsdt != 0) || /* must have a DSDT */ + (dsdt != 0 && xdsdt == 0)) + res = PASS; + presult(res, "FADT has a proper 32-bit DSDT pointer"); + presult(res, "FADT has a proper 64-bit DSDT pointer"); + if (dsdt != 0 && xdsdt != 0) + presult(INFO, + "both fields have been set, not just one"); + + if (dsdt != 0 || xdsdt != 0) { + tpaddr = (dsdt == 0) ? xdsdt : dsdt; + offset = tpaddr - paddr; + + xp = find_table(SIG_DSDT); + if (xp) { + xp->ref_cnt++; + res = FAIL; + if ((tpaddr == xp->paddr) && + (strncmp(blob + xp->offset, + blob + offset, + strlen(xp->signature)) == 0)) + res = PASS; + presult(res, "FADT has correct DSDT pointer"); + + } else { + printf("? FADT refers to a DSDT but "); + printf("there is no such table\n"); + exit(1); + } + } + + } else { + printf("? FADT (aka FACP) can not be found in table list\n"); + exit(1); + } +} + +void check_ref_cnts(void) +{ + struct table *np; + int res; + char buf[MAX_LINE]; + + printf("\nchecking references to tables...\n"); + LIST_FOREACH(np, &thead, tables) { + memset(buf, 0, MAX_LINE); + sprintf(buf, "%s referenced only once", np->signature); + res = (np->ref_cnt == 1) ? PASS : FAIL; + presult(res, buf); + } + +} + +void check_relocations(unsigned char *blob, int size, uint64_t paddr) +{ + check_rsdp_relocs(blob, size, paddr); + check_xsdt_relocs(blob, size, paddr); + check_fadt_relocs(blob, size, paddr); + check_ref_cnts(); +} + +int main(int argc, char *argv[]) +{ + int ii, jj; + int offset; + int delta; + int size; + int fd; + unsigned char *blob; + char *acpi_blob_name; + char *paddr_cmd; + uint64_t paddr = 0; + char sig[SIG_LENGTH]; + struct table *np; + int opt; + int quiet; + + /* parameter handling */ + acpi_blob_name = NULL; + paddr_cmd = NULL; + quiet = 0; + + while ((opt = getopt(argc, argv, "b:p:q")) != EOF) { + switch (opt) { + case 'b': + acpi_blob_name = optarg; + break; + case 'p': + paddr_cmd = optarg; + break; + case 'q': + quiet = 1; + break; + default: + usage(); + return 1; + } + } + + if (!quiet) + printf("%s %s\n", PROGNAME, VERSION); + + if ((argc > (optind + 1)) || (acpi_blob_name == NULL)) { + printf("? missing a parameter value\n"); + usage(); + return 1; + } + if (paddr_cmd) { + errno = 0; + paddr = strtoull(paddr_cmd, NULL, 0); + if (errno) { + printf("invalid physical address given\n"); + return 1; + } else { + printf("assume blob was relocated to 0x%llx\n", paddr); + } + } else { + printf("? missing required physical address parameter\n"); + usage(); + return 1; + } + + size = get_file_size(acpi_blob_name); + if (!size) { + printf("? blob cannot be zero length\n"); + exit(1); + } + + fd = open(acpi_blob_name, O_RDONLY); + if (fd < 0) { + perror(PROGNAME); + exit(1); + } + blob = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd , 0); + if (blob == MAP_FAILED) { + perror(PROGNAME); + exit(1); + } + + LIST_INIT(&thead); + + check_blob_header(blob); + check_rsdp(blob); + + find_all_tables(blob, size, paddr); + if (!quiet) { + printf("found the following tables....\n"); + ii = 0; + LIST_FOREACH(np, &thead, tables) { + printf( + "[%03d] %4s: %d bytes @ 0x%08x, loads @ 0x%016x\n", + ii, np->signature, np->len, np->offset, np->paddr); + ii++; + } + } + LIST_FOREACH(np, &thead, tables) { + if ((strncmp(np->signature, SIG_RSDP, + strlen(np->signature) != 0)) && + (strncmp(np->signature, SIG_FACS, + strlen(np->signature) != 0))) { + printf("\nchecking header of %s...\n", np->signature); + check_table_header(np->signature, blob + np->offset); + } + } + + check_relocations(blob, size, paddr); + + printf("\nTotal tests: %d\n", passed + failed); + printf("Passed: %d\n", passed); + printf("Failed: %d\n", failed); + printf("Success rate: %0.1f%\n", + (100.0 * (float)passed) / (float)(passed + failed)); + + munmap(blob, size); + + return (failed > 0) ? 1 : 0; +} diff --git a/tools/cab/cab.h b/tools/cab/cab.h new file mode 100644 index 0000000..4512757 --- /dev/null +++ b/tools/cab/cab.h @@ -0,0 +1,169 @@ +#ifndef _CAB_H +#define _CAB_H +/* + * cab.h: tool to Check A Blob of ACPI tables + * + * This file is subject to the terms and conditions of the GNU General + * Public License. See the file "COPYING" in the main directory of this + * archive for more details. + * + * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> + * + * NB: all values are assumed to be little-endian in the blob. + * + */ + +#include <stdint.h> +#include <string.h> + +#include <sys/queue.h> + +/* VERSION a.b.c = <ACPI standard>.<functionality changes>.<bug fixes> */ +const char VERSION[] = { "5.0~3.1" }; +const char PROGNAME[] = { "cab" }; + +#define PASS 1 +#define FAIL 0 +#define INFO (-1) + +#define BLOB_HEADER_SIZE 8 +#define BLOB_MAGIC "ACPI" +#define BLOB_MAGIC_SIZE 4 +#define MAX_LINE 1024 +#define MIN_TABLE_LENGTH 36 +#define NOT_REQUIRED 0 +#define REQUIRED 1 +#define RSDP_LEN_OFFSET 20 +#define SIG_LENGTH 4 +#define TABLE_LEN_OFFSET 4 + +#define SIG_APIC "APIC" +#define SIG_BERT "BERT" +#define SIG_CPEP "CPEP" +#define SIG_DSDT "DSDT" +#define SIG_ECDT "ECDT" +#define SIG_EINJ "EINJ" +#define SIG_ERST "ERST" +#define SIG_FACP "FACP" +#define SIG_FACS "FACS" +#define SIG_FPDT "FPDT" +#define SIG_GTDT "GTDT" +#define SIG_HEST "HEST" +#define SIG_MCFG "MCFG" +#define SIG_MCHI "MCHI" +#define SIG_MPST "MPST" +#define SIG_MSCT "MSCT" +#define SIG_OEM "OEM" +#define SIG_PCCT "PCCT" +#define SIG_PMTT "PMTT" +#define SIG_RASF "RASF" +#define SIG_RSDP "RSD PTR" +#define SIG_RSDT "RSDT" +#define SIG_SLIT "SLIT" +#define SIG_SPMI "SPMI" +#define SIG_SRAT "SRAT" +#define SIG_SSDT "SSDT" +#define SIG_UEFI "UEFI" +#define SIG_XSDT "XSDT" + +struct known_table_info { + char *signature; /* table signature */ + int min_revision; /* minimum allowed revision */ +}; + +struct known_table_info known_info[] = { + { SIG_APIC, 3 }, + { SIG_BERT, 1 }, + { SIG_CPEP, 1 }, + { SIG_DSDT, 2 }, + { SIG_ECDT, 1 }, + { SIG_EINJ, 1 }, + { SIG_ERST, 1 }, + { SIG_FACP, 5 }, + { SIG_FACS, 5 }, + { SIG_FPDT, 1 }, + { SIG_GTDT, 1 }, + { SIG_HEST, 1 }, + { SIG_MCFG, 1 }, + { SIG_MCHI, 1 }, + { SIG_MPST, 1 }, + { SIG_MSCT, 1 }, + { SIG_OEM, 1 }, + { SIG_PMTT, 1 }, + { SIG_RASF, 1 }, + { SIG_RSDP, 2 }, + { SIG_RSDT, 1 }, + { SIG_SLIT, 1 }, + { SIG_SPMI, 1 }, + { SIG_SRAT, 3 }, + { SIG_SSDT, 2 }, + { SIG_UEFI, 1 }, + { SIG_XSDT, 1 }, + { NULL, 0 } +}; + +char *known_sigs[] = { + "APIC", + "BERT", + "CPEP", + "DSDT", + "ECDT", + "EINJ", + "ERST", + "FACP", + "FACS", + "FPDT", + "GTDT", + "HEST", + "MCFG", + "MCHI", + "MPST", + "MSCT", + "OEM", + "PCCT", + "PMTT", + "RASF", + "RSD PTR", + "SLIT", + "SPMI", + "SRAT", + "SSDT", + "UEFI", + "XSDT", + NULL +}; + +LIST_HEAD(table_head, table) thead; +struct table_head *theadp; + +struct table { + char *signature; /* an ACPI table name/signature */ + int len; /* reported table length */ + int offset; /* location in the blob */ + uint64_t paddr; /* where it should live in RAM */ + int ref_cnt; /* reference count */ + LIST_ENTRY(table) tables; +}; + + +struct table *build_table_entry(unsigned char *buf); +void check_blob_header(unsigned char *blob); +void check_fadt_relocs(unsigned char *blob, int size, uint64_t paddr); +void check_first_table_is_rsdp(unsigned char *blob); +void check_rsdp(unsigned char *blob); +void check_ref_cnts(void); +void check_relocations(unsigned char *blob, int size, uint64_t paddr); +void check_rsdp_relocs(unsigned char *blob, int size, uint64_t paddr); +void check_table_header(char *name, unsigned char *loc); +void check_xsdt_relocs(unsigned char *blob, int size, uint64_t paddr); +void find_all_tables(unsigned char *blob, int size, int base_addr); +struct known_table_info *find_known_table_info(char *sig); +struct table *find_table(char *sig); +int get_file_size(char *fname); +void usage(void); +int valid_sig(char *sig); +int verify_checksum(unsigned char *start, int offset, int len); +int verify_revision(unsigned char *r, int min); +void presult(int res, char *topic); + +#endif -- 1.8.3.1

10 years, 8 months

[PATCH][acpi-asl] ASL: set proper revision level in tables

by al.stone＠linaro.org

From: Al Stone <ahs3(a)redhat.com> Checking for some other errors in tables, I stumbled across several tables where the ASL had an old revision number in them (pre-5.0 spec). These have now been set to at least the 5.0 revision level that they should be at. Signed-off-by: Al Stone <al.stone(a)linaro.org> --- platforms/exynos5250-arndale.acpi/apic.asl | 2 +- platforms/exynos5250-arndale.acpi/dsdt.asl | 2 +- platforms/foundation-v8.acpi/dsdt.asl | 2 +- platforms/loadtest.acpi/dsdt.asl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/exynos5250-arndale.acpi/apic.asl b/platforms/exynos5250-arndale.acpi/apic.asl index 69f0dc1..c93a3a4 100644 --- a/platforms/exynos5250-arndale.acpi/apic.asl +++ b/platforms/exynos5250-arndale.acpi/apic.asl @@ -9,7 +9,7 @@ [0004] Signature : "APIC" [0004] Table Length : 000000F6 -[0001] Revision : 01 +[0001] Revision : 03 [0001] Checksum : B0 [0006] Oem ID : "LINARO" [0008] Oem Table ID : "ARNDALE " diff --git a/platforms/exynos5250-arndale.acpi/dsdt.asl b/platforms/exynos5250-arndale.acpi/dsdt.asl index 7f05c6b..aa01757 100644 --- a/platforms/exynos5250-arndale.acpi/dsdt.asl +++ b/platforms/exynos5250-arndale.acpi/dsdt.asl @@ -9,7 +9,7 @@ DefinitionBlock ( "dsdt.aml", // output filename "DSDT", // table signature - 1, // DSDT compliance revision + 2, // DSDT compliance revision "LINARO", // OEM ID "ARNDALE ", // table ID 0x00000002) // OEM revision diff --git a/platforms/foundation-v8.acpi/dsdt.asl b/platforms/foundation-v8.acpi/dsdt.asl index d1a9716..6a5d1be 100644 --- a/platforms/foundation-v8.acpi/dsdt.asl +++ b/platforms/foundation-v8.acpi/dsdt.asl @@ -9,7 +9,7 @@ DefinitionBlock ( "dsdt.aml", // output filename "DSDT", // table signature - 1, // DSDT compliance revision + 2, // DSDT compliance revision "LINARO", // OEM ID "FOUNDATI", // table ID 0x00000002) // OEM revision diff --git a/platforms/loadtest.acpi/dsdt.asl b/platforms/loadtest.acpi/dsdt.asl index 394bca6..d0d7178 100644 --- a/platforms/loadtest.acpi/dsdt.asl +++ b/platforms/loadtest.acpi/dsdt.asl @@ -9,7 +9,7 @@ DefinitionBlock ( "dsdt.aml", // output filename "DSDT", // table signature - 1, // DSDT compliance revision + 2, // DSDT compliance revision "LINARO", // OEM ID "LOADTEST", // table ID 0x00000001) // OEM revision -- 1.8.3.1

10 years, 8 months

[PATCH 0/7][acpi-asl] mab 0.28.1: fixes and new features

by al.stone＠linaro.org

From: Al Stone <ahs3(a)redhat.com> While trying to figure out some problems I was having with my ACPI blobs, I ran into several things that needed fixing in mab. Some of these are innocuous, but some -- like using both 32- and 64-bit addresses in the FACS, and the RSDP checksums -- are actually in violation of the spec. While I was there, I added a little more info in the verbose output, and corrected what was being printed out. The new feature is that one can now use -H to produce a blob that does not have the header we've been using so far. Al Stone (7): mab: Makefile needs to rebuild if .h changes and use CFLAGS properly mab: use 32- or 64-bit FACS addresses in the FADT, not both mab: set both checksums in the RSDP, not just one mab: print out the correct offset in the blob mab: add option to NOT use a blob header, if needed mab: print out physical address when being verbose mab: update Changelog and version number for this patch series tools/mab/Changelog | 19 +++++++++ tools/mab/Makefile | 6 +-- tools/mab/mab.c | 109 +++++++++++++++++++++++++++++++--------------------- tools/mab/mab.h | 5 ++- 4 files changed, 91 insertions(+), 48 deletions(-) -- 1.8.3.1

10 years, 8 months

Simple ACPI Boot Tests

by Graeme Gregory

For card LEG-583 I needed some simple ACPI tests to check that we have booted with ACPI support and have probably not corrupted the tables. I think the attached script should do it if anyone has any comments. Next I need to see how to get this into a LAVA test. Tests:- 1) Check presence of /sys/firmware/acpi 2) Check presence of /sys/firmware/acpi/tables/DSDT 3) If iasl is installed test decompile of /sys/firmware/acpi/tables/DSDT I think this is simple enough to be a boot test but enough confidence that the bootloader correctly passed us some tables? iasl should thanks to Naresh be part of released OE images soon. Thanks Graeme

10 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi August 2013