August 2011 - coreboot - mail.coreboot.org

New patch to review: 6bd82fc buildgcc: improve portability
by Jonathan A. Kollasch Aug. 11, 2011

Aug. 11, 2011

Jonathan A. Kollasch (jakllsch(a)kollasch.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/150 -gerrit commit 6bd82fc8b8a6b274bd565798d697ae5a88867c67 Author: Jonathan A. Kollasch <jakllsch(a)kollasch.net> Date: Thu Aug 11 14:44:55 2011 -0500 buildgcc: improve portability `cp --remove-destination` isn't as portable as `rm -f` and `cp`. Change-Id: Ib05bfc121f7a0b467f8104920e14fbd02191585f Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> --- util/crossgcc/buildgcc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index e97a651..e58b23e 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -463,7 +463,8 @@ printf "Building IASL ${IASL_VERSION} ... " rm -f .failed CFLAGS="$HOSTCFLAGS" $MAKE || touch .failed - cp --remove-destination iasl* $DESTDIR$TARGETDIR/bin || touch .failed + rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed + cp iasl $DESTDIR$TARGETDIR/bin || touch .failed if [ ! -f .failed ]; then touch .success; fi ) &> $IASL_DIR/compiler/crossgcc-build.log test -r $IASL_DIR/compiler/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"

1 0

Patch set updated: 071f750 X60: use new acpi code
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/149 -gerrit commit 071f7502bf104035e6c42d1b3f0281d5607bbeea Author: Sven Schnelle <svens(a)stackframe.org> Date: Wed Aug 10 22:47:20 2011 +0200 X60: use new acpi code Change-Id: Id2d7e8fe9e8218eccaef6ad426f40209506a345a Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/mainboard/lenovo/x60/acpi_tables.c | 193 +++----------------------------- src/mainboard/lenovo/x60/mainboard.c | 4 + 2 files changed, 19 insertions(+), 178 deletions(-) diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c index 3742c20..af214fb 100644 --- a/src/mainboard/lenovo/x60/acpi_tables.c +++ b/src/mainboard/lenovo/x60/acpi_tables.c @@ -32,9 +32,6 @@ #include "dmi.h" extern const unsigned char AmlCode[]; -#if CONFIG_HAVE_ACPI_SLIC -unsigned long acpi_create_slic(unsigned long current); -#endif #include "southbridge/intel/i82801gx/nvs.h" static void acpi_create_gnvs(global_nvs_t *gnvs) @@ -56,38 +53,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) gnvs->did[4] = 0x00000005; } -static void acpi_create_intel_hpet(acpi_hpet_t * hpet) -{ -#define HPET_ADDR 0xfed00000ULL - acpi_header_t *header = &(hpet->header); - acpi_addr_t *addr = &(hpet->addr); - - memset((void *) hpet, 0, sizeof(acpi_hpet_t)); - - /* fill out header fields */ - memcpy(header->signature, "HPET", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, "COREBOOT", 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->length = sizeof(acpi_hpet_t); - header->revision = 1; - - /* fill out HPET address */ - addr->space_id = 0; /* Memory */ - addr->bit_width = 64; - addr->bit_offset = 0; - addr->addrl = HPET_ADDR & 0xffffffff; - addr->addrh = HPET_ADDR >> 32; - - hpet->id = 0x8086a201; /* Intel */ - hpet->number = 0x00; - hpet->min_tick = 0x0080; - - header->checksum = - acpi_checksum((void *) hpet, sizeof(acpi_hpet_t)); -} - unsigned long acpi_fill_madt(unsigned long current) { /* Local APICs */ @@ -136,129 +101,31 @@ unsigned long acpi_fill_srat(unsigned long current) void smm_setup_structures(void *gnvs, void *tcg, void *smi1); -#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10) -unsigned long write_acpi_tables(unsigned long start) + +void acpi_patch_dsdt(acpi_header_t *dsdt, unsigned long *current) { - unsigned long current; int i; - acpi_rsdp_t *rsdp; - acpi_rsdt_t *rsdt; - acpi_xsdt_t *xsdt; - acpi_hpet_t *hpet; - acpi_madt_t *madt; - acpi_mcfg_t *mcfg; - acpi_fadt_t *fadt; - acpi_facs_t *facs; -#if CONFIG_HAVE_ACPI_SLIC - acpi_header_t *slic; -#endif - acpi_header_t *ssdt; - acpi_header_t *dsdt; void *gnvs; - current = start; - - /* Align ACPI tables to 16byte */ - ALIGN_CURRENT; - - printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start); - - /* We need at least an RSDP and an RSDT Table */ - rsdp = (acpi_rsdp_t *) current; - current += sizeof(acpi_rsdp_t); - ALIGN_CURRENT; - rsdt = (acpi_rsdt_t *) current; - current += sizeof(acpi_rsdt_t); - ALIGN_CURRENT; - xsdt = (acpi_xsdt_t *) current; - current += sizeof(acpi_xsdt_t); - ALIGN_CURRENT; - - /* clear all table memory */ - memset((void *) start, 0, current - start); - - acpi_write_rsdp(rsdp, rsdt, xsdt); - acpi_write_rsdt(rsdt); - acpi_write_xsdt(xsdt); - - /* - * We explicitly add these tables later on: - */ - printk(BIOS_DEBUG, "ACPI: * HPET\n"); - - hpet = (acpi_hpet_t *) current; - current += sizeof(acpi_hpet_t); - ALIGN_CURRENT; - acpi_create_intel_hpet(hpet); - acpi_add_table(rsdp, hpet); - - /* If we want to use HPET Timers Linux wants an MADT */ - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - - madt = (acpi_madt_t *) current; - acpi_create_madt(madt); - current += madt->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, madt); - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *) current; - acpi_create_mcfg(mcfg); - current += mcfg->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, mcfg); - - printk(BIOS_DEBUG, "ACPI: * FACS\n"); - facs = (acpi_facs_t *) current; - current += sizeof(acpi_facs_t); - ALIGN_CURRENT; - acpi_create_facs(facs); - - dsdt = (acpi_header_t *) current; - memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); - current += dsdt->length; - memcpy(dsdt, &AmlCode, dsdt->length); - - /* Fix up global NVS region for SMI handler. The GNVS region lives - * in the (high) table area. The low memory map looks like this: - * - * 0x00000000 - 0x000003ff Real Mode IVT - * 0x00000020 - 0x0000019c Low MP Table (XXX conflict?) - * 0x00000400 - 0x000004ff BDA (somewhat unused) - * 0x00000500 - 0x0000052f Moved GDT - * 0x00000530 - 0x00000b64 coreboot table - * 0x0007c000 - 0x0007dfff OS boot sector (unused?) - * 0x0007e000 - 0x0007ffff free to use (so no good for acpi+smi) - * 0x00080000 - 0x0009fbff usable ram - * 0x0009fc00 - 0x0009ffff EBDA (unused?) - * 0x000a0000 - 0x000bffff VGA memory - * 0x000c0000 - 0x000cffff VGA option rom - * 0x000d0000 - 0x000dffff free for other option roms? - * 0x000e0000 - 0x000fffff SeaBIOS? (conflict with low tables:) - * 0x000f0000 - 0x000f03ff PIRQ table - * 0x000f0400 - 0x000f66?? ACPI tables - * 0x000f66?? - 0x000f???? DMI tables - */ - - ALIGN_CURRENT; + *current = ALIGN(*current, 64); /* Pack GNVS into the ACPI table area */ for (i=0; i < dsdt->length; i++) { if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) { - printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)current); - *(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes + printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)*current); + *(u32*)(((u32)dsdt) + i) = *current; // 0x92 bytes break; } } /* And fill it */ - acpi_create_gnvs((global_nvs_t *)current); + acpi_create_gnvs((global_nvs_t *)*current); /* Keep pointer around */ - gnvs = (void *)current; + gnvs = (void *)*current; - current += 0x100; - ALIGN_CURRENT; + *current += 0x100; + *current = ALIGN(*current, 64); /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL); @@ -266,48 +133,18 @@ unsigned long write_acpi_tables(unsigned long start) /* We patched up the DSDT, so we need to recalculate the checksum */ dsdt->checksum = 0; dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length); +} - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, - dsdt->length); - -#if CONFIG_HAVE_ACPI_SLIC - printk(BIOS_DEBUG, "ACPI: * SLIC\n"); - slic = (acpi_header_t *)current; - current += acpi_create_slic(current); - ALIGN_CURRENT; - acpi_add_table(rsdp, slic); -#endif - - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - fadt = (acpi_fadt_t *) current; - current += sizeof(acpi_fadt_t); - ALIGN_CURRENT; - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - acpi_create_ssdt_generator(ssdt, "COREBOOT"); - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - ALIGN_CURRENT; - - printk(BIOS_DEBUG, "current = %lx\n", current); - +void acpi_dmi_workaround(unsigned long *current) +{ printk(BIOS_DEBUG, "ACPI: * DMI (Linux workaround)\n"); memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE); #if CONFIG_WRITE_HIGH_TABLES == 1 - memcpy((void *)current, dmi_table, DMI_TABLE_SIZE); - current += DMI_TABLE_SIZE; - ALIGN_CURRENT; + memcpy((void *)*current, dmi_table, DMI_TABLE_SIZE); + *current += DMI_TABLE_SIZE; + *current = ALIGN(*current, 64); #endif - printk(BIOS_INFO, "ACPI: done.\n"); - /* Enable Dummy DCC ON# for DVI */ - printk(BIOS_DEBUG, "Laptop handling...\n"); - outb(inb(0x60f) & ~(1 << 5), 0x60f); - return current; } diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index bf3d8d3..53a2937 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -80,6 +80,10 @@ static void mainboard_enable(device_t dev) set_option("volume", &(u8[]){ 0x03 }); set_option("cmos_defaults_loaded", &(u8[]){ 0x01 }); } + + /* Enable Dummy DCC ON# for DVI */ + printk(BIOS_DEBUG, "Laptop handling...\n"); + outb(inb(0x60f) & ~(1 << 5), 0x60f); } struct chip_operations mainboard_ops = {

1 0

Patch set updated: d3a81c2 Implemented functions for writing most of the ACPI tables
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/76 -gerrit commit d3a81c2da0cbfdc4d185388c8b69d131716ddf52 Author: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Date: Sat Jul 2 01:07:35 2011 +0300 Implemented functions for writing most of the ACPI tables Fixed compilation failures in the SILC code, but Intel xe7501devkit still fails to compile due to incomplete southbrige code that does not implement FADT generation as of yet. Change-Id: Ib84c845d3f004708a90fd3122485f00b7d20fdbc Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/arch/x86/boot/acpi.c | 244 ++++++++++++++++++++++++++++++++++---- src/arch/x86/boot/tables.c | 10 +- src/arch/x86/include/arch/acpi.h | 28 ++++- 3 files changed, 248 insertions(+), 34 deletions(-) diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 8be7437..97110ea 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -16,13 +16,15 @@ */ /* - * Each system port implementing ACPI has to provide two functions: - * - * write_acpi_tables() - * acpi_dump_apics() - * - * See Kontron 986LCD-M port for a good example of an ACPI implementation - * in coreboot. + * Currently each system port implementing ACPI has to provide the following functions: + * - acpi_fill_mcfg() + * - acpi_fill_madt() + * - acpi_fill_slit() + * - acpi_fill_srat() + * Optional + * - acpi_fill_ssdt_generator() + * - acpi_patch_dsdt() + * - acpi_dmi_workaround() */ #include <console/console.h> @@ -32,6 +34,8 @@ #include <device/pci.h> #include <cbmem.h> +extern const unsigned char AmlCode[]; + u8 acpi_checksum(u8 *table, u32 length) { u8 ret = 0; @@ -42,16 +46,43 @@ u8 acpi_checksum(u8 *table, u32 length) return -ret; } +#if CONFIG_DEBUG_ACPI == 1 +static void dump_mem(void *start, unsigned int cnt) +{ + int i; + + for (i = 0; i < cnt; i++) { + if (!(i & 0x0f)) + printk(BIOS_DEBUG, "\n%08x:", (unsigned int)start + i); + if (!(i & 0x03)) { + printk(BIOS_DEBUG, " "); + if (!(i & 0x07)) + printk(BIOS_DEBUG, " "); + } + printk(BIOS_DEBUG, " %02x", ((u8 *)start)[i]); + } + printk(BIOS_DEBUG,"\n"); +} +#endif + /** * Add an ACPI table to the RSDT (and XSDT) structure, recalculate length * and checksum. */ void acpi_add_table(acpi_rsdp_t *rsdp, void *table) { + acpi_header_t *hdr = (acpi_header_t *)table; int i, entries_num; acpi_rsdt_t *rsdt; acpi_xsdt_t *xsdt = NULL; + printk(BIOS_DEBUG, "Adding %4.4s @ %p len %d\n", hdr->signature, table, hdr->length); + + hdr->checksum = 0; + hdr->checksum = acpi_checksum(table, hdr->length); +#if CONFIG_DEBUG_ACPI == 1 + dump_mem(table, hdr->length); +#endif /* The RSDT is mandatory... */ rsdt = (acpi_rsdt_t *)rsdp->rsdt_address; @@ -211,8 +242,6 @@ void acpi_create_madt(acpi_madt_t *madt) /* (Re)calculate length and checksum. */ header->length = current - (unsigned long)madt; - - header->checksum = acpi_checksum((void *)madt, header->length); } /* MCFG is defined in the PCI Firmware Specification 3.0. */ @@ -236,7 +265,6 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg) /* (Re)calculate length and checksum. */ header->length = current - (unsigned long)mcfg; - header->checksum = acpi_checksum((void *)mcfg, header->length); } /* @@ -249,6 +277,18 @@ unsigned long __attribute__((weak)) acpi_fill_ssdt_generator( return current; } +/* stub functions that might be implemented in the mainboard code, if needed */ +void __attribute__((weak)) acpi_patch_dsdt( + acpi_header_t *dsdt, unsigned long *current) +{ +} + +void __attribute__((weak)) acpi_dmi_workaround(unsigned long *current) +{ +} + + + void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); @@ -269,7 +309,6 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) /* (Re)calculate length and checksum. */ ssdt->length = current - (unsigned long)ssdt; - ssdt->checksum = acpi_checksum((void *)ssdt, ssdt->length); } int acpi_create_srat_lapic(acpi_srat_lapic_t *lapic, u8 node, u8 apic) @@ -324,7 +363,6 @@ void acpi_create_srat(acpi_srat_t *srat) /* (Re)calculate length and checksum. */ header->length = current - (unsigned long)srat; - header->checksum = acpi_checksum((void *)srat, header->length); } /* http://h21007.www2.hp.com/portal/download/files/unprot/Itanium/slit.pdf */ @@ -348,7 +386,6 @@ void acpi_create_slit(acpi_slit_t *slit) /* (Re)calculate length and checksum. */ header->length = current - (unsigned long)slit; - header->checksum = acpi_checksum((void *)slit, header->length); } /* http://www.intel.com/hardwaredesign/hpetspec_1.pdf */ @@ -390,8 +427,6 @@ void acpi_create_hpet(acpi_hpet_t *hpet) hpet->min_tick = 0x90; #endif hpet->number = 0; - - header->checksum = acpi_checksum((void *)hpet, sizeof(acpi_hpet_t)); } void acpi_create_facs(acpi_facs_t *facs) @@ -409,10 +444,11 @@ void acpi_create_facs(acpi_facs_t *facs) facs->version = 1; /* ACPI 1.0: 0, ACPI 2.0/3.0: 1, ACPI 4.0: 2 */ } -void acpi_write_rsdt(acpi_rsdt_t *rsdt) +acpi_rsdt_t *acpi_write_rsdt(unsigned long *current) { + acpi_rsdt_t *rsdt = (acpi_rsdt_t *)*current; acpi_header_t *header = &(rsdt->header); - + memset(rsdt, 0, sizeof(acpi_rsdt_t)); /* Fill out header fields. */ memcpy(header->signature, "RSDT", 4); memcpy(header->oem_id, OEM_ID, 6); @@ -423,13 +459,14 @@ void acpi_write_rsdt(acpi_rsdt_t *rsdt) header->revision = 1; /* ACPI 1.0/2.0/3.0/4.0: 1 */ /* Entries are filled in later, we come with an empty set. */ - - /* Fix checksum. */ - header->checksum = acpi_checksum((void *)rsdt, sizeof(acpi_rsdt_t)); + *current += sizeof(acpi_rsdt_t); + *current = ALIGN(*current, 64); + return rsdt; } -void acpi_write_xsdt(acpi_xsdt_t *xsdt) +acpi_xsdt_t *acpi_write_xsdt(unsigned long *current) { + acpi_xsdt_t *xsdt = (acpi_xsdt_t *)*current; acpi_header_t *header = &(xsdt->header); /* Fill out header fields. */ @@ -443,12 +480,15 @@ void acpi_write_xsdt(acpi_xsdt_t *xsdt) /* Entries are filled in later, we come with an empty set. */ - /* Fix checksum. */ - header->checksum = acpi_checksum((void *)xsdt, sizeof(acpi_xsdt_t)); + *current += sizeof(acpi_xsdt_t); + *current = ALIGN(*current, 64); + return xsdt; } -void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt) + +acpi_rsdp_t *acpi_write_rsdp(acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt, unsigned long *current) { + acpi_rsdp_t *rsdp = (acpi_rsdp_t *)*current; memset(rsdp, 0, sizeof(acpi_rsdp_t)); memcpy(rsdp->signature, RSDP_SIG, 8); @@ -474,6 +514,162 @@ void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt) /* Calculate checksums. */ rsdp->checksum = acpi_checksum((void *)rsdp, 20); rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); + *current += sizeof(acpi_rsdp_t); + *current = ALIGN(*current, 64); + return rsdp; +} + + + +acpi_header_t *acpi_write_dsdt(acpi_rsdp_t *rsdp, const acpi_header_t *src, unsigned long *current) +{ + acpi_header_t *dsdt = (acpi_header_t *)*current; + int len = src->length; + + memcpy(dsdt, src, len); + *current += len; + *current = ALIGN(*current, 64); + acpi_patch_dsdt(dsdt, current); + return dsdt; +} + +acpi_facs_t *acpi_write_facs(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_facs_t *facs = (acpi_facs_t *)*current; + *current += sizeof(acpi_facs_t); + *current = ALIGN(*current, 64); + acpi_create_facs(facs); + return facs; +} + + +acpi_fadt_t *acpi_write_fadt(acpi_facs_t *facs, acpi_header_t *dsdt, acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_fadt_t *fadt = (acpi_fadt_t *)*current; + *current += sizeof(acpi_fadt_t); + *current = ALIGN(*current, 64); + acpi_create_fadt(fadt, facs, dsdt); + acpi_add_table(rsdp, fadt); + return fadt; +} + +acpi_hpet_t *acpi_write_hpet(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_hpet_t *hpet = (acpi_hpet_t *)*current; + hpet = (acpi_hpet_t *) *current; + *current += sizeof(acpi_hpet_t); + acpi_create_hpet(hpet); + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, hpet); + return hpet; +} + +acpi_madt_t *acpi_write_madt(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_madt_t *madt = (acpi_madt_t *)*current; + acpi_create_madt(madt); + *current += madt->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, madt); + return madt; +} + +acpi_srat_t *acpi_write_srat(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_srat_t *srat; + *current = ALIGN(*current, 64); + srat = (acpi_srat_t *) *current; + acpi_create_srat(srat); + *current += srat->header.length; + acpi_add_table(rsdp, srat); + return srat; +} + +acpi_slit_t *acpi_write_slit(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_slit_t *slit; + slit = (acpi_slit_t *) *current; + acpi_create_slit(slit); + *current += slit->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, slit); + return slit; +} + +acpi_mcfg_t *acpi_write_mcfg(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_mcfg_t *mcfg = (acpi_mcfg_t *)*current; + acpi_create_mcfg(mcfg); + *current += mcfg->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, mcfg); + return mcfg; +} + +#if CONFIG_HAVE_ACPI_SLIC +acpi_header_t *void acpi_write_slic(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_header_t *slic = (acpi_header_t *)*current; + *current += acpi_create_slic(*current); + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, slic); + return slic; +} +#endif + + +acpi_header_t *acpi_write_ssdt_generated(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_header_t *ssdt = (acpi_header_t *)*current; + acpi_create_ssdt_generator(ssdt, "DYNADATA"); + *current += ssdt->length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, ssdt); + return ssdt; +} + +unsigned long acpi_write_tables(unsigned long current) +{ + acpi_rsdp_t *rsdp; + acpi_rsdt_t *rsdt; + acpi_fadt_t *fadt; + acpi_facs_t *facs; + acpi_xsdt_t *xsdt; +#if CONFIG_HAVE_ACPI_SLIC + acpi_header_t *slic; +#endif + acpi_header_t *ssdt, *dsdt; + + /* Align ACPI tables to 16 bytes */ + current = ALIGN(current, 16); + + printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", current); + + rsdt = acpi_write_rsdt(&current); + xsdt = acpi_write_xsdt(&current); + rsdp = acpi_write_rsdp(rsdt, xsdt, &current); + acpi_write_hpet(rsdp, &current); + acpi_write_madt(rsdp, &current); + acpi_write_mcfg(rsdp, &current); + acpi_write_srat(rsdp, &current); + acpi_write_slit(rsdp, &current); + + dsdt = acpi_write_dsdt(rsdp, (acpi_header_t *)AmlCode, &current); + facs = acpi_write_facs(rsdp, &current); + fadt = acpi_write_fadt(facs, dsdt, rsdp, &current); + +#if CONFIG_HAVE_ACPI_SLIC + slic = acpi_write_slic(rsdp, &current); +#endif + + ssdt = acpi_write_ssdt_generated(rsdp, &current); + + printk(BIOS_DEBUG, "current = %lx\n", current); + + acpi_dmi_workaround(&current); + + printk(BIOS_INFO, "ACPI: done.\n"); + return current; } #if CONFIG_HAVE_ACPI_RESUME == 1 diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index d816e76..2d3184a 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -141,7 +141,7 @@ struct lb_memory *write_tables(void) unsigned long new_high_table_pointer; rom_table_end = ALIGN(rom_table_end, 16); - new_high_table_pointer = write_acpi_tables(high_table_pointer); + new_high_table_pointer = acpi_write_tables(high_table_pointer); if (new_high_table_pointer > ( high_table_pointer + MAX_ACPI_SIZE)) { printk(BIOS_ERR, "ERROR: Increase ACPI size\n"); } @@ -165,15 +165,15 @@ struct lb_memory *write_tables(void) acpi_rsdp_t *low_rsdp = (acpi_rsdp_t *)rom_table_end, *high_rsdp = (acpi_rsdp_t *)acpi_start; - acpi_write_rsdp(low_rsdp, - (acpi_rsdt_t *)(high_rsdp->rsdt_address), - (acpi_xsdt_t *)((unsigned long)high_rsdp->xsdt_address)); + unsigned long current = (unsigned long)low_rsdp; + acpi_write_rsdp((acpi_rsdt_t *)(high_rsdp->rsdt_address), + (acpi_xsdt_t *)((unsigned long)high_rsdp->xsdt_address), &current); } else { printk(BIOS_ERR, "ERROR: Didn't find RSDP in high table.\n"); } rom_table_end = ALIGN(rom_table_end + sizeof(acpi_rsdp_t), 16); } else { - rom_table_end = write_acpi_tables(rom_table_end); + rom_table_end = acpi_write_tables(rom_table_end); rom_table_end = ALIGN(rom_table_end, 1024); } diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 030745d..d6eabab 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -357,14 +357,15 @@ typedef struct acpi_ecdt { u8 ec_id[]; /* EC ID */ } __attribute__ ((packed)) acpi_ecdt_t; -/* These are implemented by the target port or north/southbridge. */ +/* This is implemented by the target port or north/southbridge. */ unsigned long write_acpi_tables(unsigned long addr); + unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_fill_mcfg(unsigned long current); unsigned long acpi_fill_srat(unsigned long current); unsigned long acpi_fill_slit(unsigned long current); unsigned long acpi_fill_ssdt_generator(unsigned long current, - const char *oem_table_id); + const char *oem_table_id); void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id); void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt); @@ -406,11 +407,28 @@ void acpi_create_facs(acpi_facs_t *facs); #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); +acpi_header_t *acpi_write_slic(acpi_rsdp_t *rsdp, unsigned long *current); #endif -void acpi_write_rsdt(acpi_rsdt_t *rsdt); -void acpi_write_xsdt(acpi_xsdt_t *xsdt); -void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt); +acpi_rsdt_t *acpi_write_rsdt(unsigned long *current); +acpi_xsdt_t *acpi_write_xsdt(unsigned long *current); +acpi_rsdp_t *acpi_write_rsdp(acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt, unsigned long *current); +acpi_header_t *acpi_write_dsdt(acpi_rsdp_t *rsdp, const acpi_header_t *dsdt, unsigned long *current); +void acpi_patch_dsdt(acpi_header_t *dsdt, unsigned long *current); +void acpi_dmi_workaround(unsigned long *current); + +acpi_facs_t *acpi_write_facs(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_fadt_t *acpi_write_fadt(acpi_facs_t *facs, acpi_header_t *dsdt, acpi_rsdp_t *rsdp, unsigned long *current); + +acpi_hpet_t *acpi_write_hpet(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_madt_t *acpi_write_madt(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_srat_t *acpi_write_srat(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_slit_t *acpi_write_slit(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_mcfg_t *acpi_write_mcfg(acpi_rsdp_t *rsdp, unsigned long *current); + +acpi_header_t *acpi_write_ssdt_generated(acpi_rsdp_t *rsdp, unsigned long *current); + +unsigned long acpi_write_tables(unsigned long start); #if CONFIG_HAVE_ACPI_RESUME /* 0 = S0, 1 = S1 ...*/

1 0

Patch set updated: aa6b35d usage example of the simplified ACPI code
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/77 -gerrit commit aa6b35d011e3a66d9a97dfe5032f50360abf0513 Author: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Date: Sat Jul 2 01:11:11 2011 +0300 usage example of the simplified ACPI code Change-Id: I7dcbf14a327fb347973b4cd9b7b3a4d6cdb31d7f Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> --- src/mainboard/asus/m2v-mx_se/acpi_tables.c | 100 +-------------- src/mainboard/lenovo/t60/acpi_tables.c | 194 +++------------------------- 2 files changed, 20 insertions(+), 274 deletions(-) diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c index 73e3768..1471ad9 100644 --- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c +++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c @@ -94,103 +94,5 @@ unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_ta unsigned long write_acpi_tables(unsigned long start) { - unsigned long current; - acpi_rsdp_t *rsdp; - acpi_srat_t *srat; - acpi_rsdt_t *rsdt; - acpi_mcfg_t *mcfg; - acpi_hpet_t *hpet; - acpi_madt_t *madt; - acpi_fadt_t *fadt; - acpi_facs_t *facs; - acpi_slit_t *slit; - acpi_header_t *ssdt; - acpi_header_t *dsdt; - - /* Align ACPI tables to 16 byte. */ - start = (start + 0x0f) & -0x10; - current = start; - - printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start); - - /* We need at least an RSDP and an RSDT table. */ - rsdp = (acpi_rsdp_t *) current; - current += sizeof(acpi_rsdp_t); - rsdt = (acpi_rsdt_t *) current; - current += sizeof(acpi_rsdt_t); - - /* Clear all table memory. */ - memset((void *) start, 0, current - start); - - acpi_write_rsdp(rsdp, rsdt, NULL); - acpi_write_rsdt(rsdt); - - /* We explicitly add these tables later on: */ - printk(BIOS_DEBUG, "ACPI: * FACS\n"); - - /* we should align FACS to 64B as per ACPI specs */ - - current = ALIGN(current, 64); - facs = (acpi_facs_t *) current; - current += sizeof(acpi_facs_t); - acpi_create_facs(facs); - - dsdt = (acpi_header_t *) current; - memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); - current += dsdt->length; - memcpy(dsdt, &AmlCode, dsdt->length); - dsdt->checksum = 0; /* Don't trust iasl to get this right. */ - dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, - dsdt->length); - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - - fadt = (acpi_fadt_t *) current; - current += sizeof(acpi_fadt_t); - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - printk(BIOS_DEBUG, "ACPI: * HPET\n"); - hpet = (acpi_hpet_t *) current; - current += sizeof(acpi_hpet_t); - acpi_create_hpet(hpet); - acpi_add_table(rsdp, hpet); - - /* If we want to use HPET timers Linux wants an MADT. */ - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - madt = (acpi_madt_t *) current; - acpi_create_madt(madt); - current += madt->header.length; - acpi_add_table(rsdp, madt); - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *) current; - acpi_create_mcfg(mcfg); - current += mcfg->header.length; - acpi_add_table(rsdp, mcfg); - - printk(BIOS_DEBUG, "ACPI: * SRAT\n"); - srat = (acpi_srat_t *) current; - acpi_create_srat(srat); - current += srat->header.length; - acpi_add_table(rsdp, srat); - - /* SLIT */ - printk(BIOS_DEBUG, "ACPI: * SLIT\n"); - slit = (acpi_slit_t *) current; - acpi_create_slit(slit); - current+=slit->header.length; - acpi_add_table(rsdp,slit); - - /* SSDT */ - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - - acpi_create_ssdt_generator(ssdt, "DYNADATA"); - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - - printk(BIOS_INFO, "ACPI: done.\n"); - return current; + return acpi_write_tables(start, AmlCode); } diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c index 3742c20..4056e75 100644 --- a/src/mainboard/lenovo/t60/acpi_tables.c +++ b/src/mainboard/lenovo/t60/acpi_tables.c @@ -32,9 +32,6 @@ #include "dmi.h" extern const unsigned char AmlCode[]; -#if CONFIG_HAVE_ACPI_SLIC -unsigned long acpi_create_slic(unsigned long current); -#endif #include "southbridge/intel/i82801gx/nvs.h" static void acpi_create_gnvs(global_nvs_t *gnvs) @@ -56,38 +53,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) gnvs->did[4] = 0x00000005; } -static void acpi_create_intel_hpet(acpi_hpet_t * hpet) -{ -#define HPET_ADDR 0xfed00000ULL - acpi_header_t *header = &(hpet->header); - acpi_addr_t *addr = &(hpet->addr); - - memset((void *) hpet, 0, sizeof(acpi_hpet_t)); - - /* fill out header fields */ - memcpy(header->signature, "HPET", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, "COREBOOT", 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->length = sizeof(acpi_hpet_t); - header->revision = 1; - - /* fill out HPET address */ - addr->space_id = 0; /* Memory */ - addr->bit_width = 64; - addr->bit_offset = 0; - addr->addrl = HPET_ADDR & 0xffffffff; - addr->addrh = HPET_ADDR >> 32; - - hpet->id = 0x8086a201; /* Intel */ - hpet->number = 0x00; - hpet->min_tick = 0x0080; - - header->checksum = - acpi_checksum((void *) hpet, sizeof(acpi_hpet_t)); -} - unsigned long acpi_fill_madt(unsigned long current) { /* Local APICs */ @@ -136,129 +101,31 @@ unsigned long acpi_fill_srat(unsigned long current) void smm_setup_structures(void *gnvs, void *tcg, void *smi1); -#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10) -unsigned long write_acpi_tables(unsigned long start) + +void acpi_patch_dsdt(acpi_header_t *dsdt, unsigned long *current) { - unsigned long current; int i; - acpi_rsdp_t *rsdp; - acpi_rsdt_t *rsdt; - acpi_xsdt_t *xsdt; - acpi_hpet_t *hpet; - acpi_madt_t *madt; - acpi_mcfg_t *mcfg; - acpi_fadt_t *fadt; - acpi_facs_t *facs; -#if CONFIG_HAVE_ACPI_SLIC - acpi_header_t *slic; -#endif - acpi_header_t *ssdt; - acpi_header_t *dsdt; void *gnvs; - current = start; - - /* Align ACPI tables to 16byte */ - ALIGN_CURRENT; - - printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start); - - /* We need at least an RSDP and an RSDT Table */ - rsdp = (acpi_rsdp_t *) current; - current += sizeof(acpi_rsdp_t); - ALIGN_CURRENT; - rsdt = (acpi_rsdt_t *) current; - current += sizeof(acpi_rsdt_t); - ALIGN_CURRENT; - xsdt = (acpi_xsdt_t *) current; - current += sizeof(acpi_xsdt_t); - ALIGN_CURRENT; - - /* clear all table memory */ - memset((void *) start, 0, current - start); - - acpi_write_rsdp(rsdp, rsdt, xsdt); - acpi_write_rsdt(rsdt); - acpi_write_xsdt(xsdt); - - /* - * We explicitly add these tables later on: - */ - printk(BIOS_DEBUG, "ACPI: * HPET\n"); - - hpet = (acpi_hpet_t *) current; - current += sizeof(acpi_hpet_t); - ALIGN_CURRENT; - acpi_create_intel_hpet(hpet); - acpi_add_table(rsdp, hpet); - - /* If we want to use HPET Timers Linux wants an MADT */ - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - - madt = (acpi_madt_t *) current; - acpi_create_madt(madt); - current += madt->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, madt); - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *) current; - acpi_create_mcfg(mcfg); - current += mcfg->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, mcfg); - - printk(BIOS_DEBUG, "ACPI: * FACS\n"); - facs = (acpi_facs_t *) current; - current += sizeof(acpi_facs_t); - ALIGN_CURRENT; - acpi_create_facs(facs); - - dsdt = (acpi_header_t *) current; - memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); - current += dsdt->length; - memcpy(dsdt, &AmlCode, dsdt->length); - - /* Fix up global NVS region for SMI handler. The GNVS region lives - * in the (high) table area. The low memory map looks like this: - * - * 0x00000000 - 0x000003ff Real Mode IVT - * 0x00000020 - 0x0000019c Low MP Table (XXX conflict?) - * 0x00000400 - 0x000004ff BDA (somewhat unused) - * 0x00000500 - 0x0000052f Moved GDT - * 0x00000530 - 0x00000b64 coreboot table - * 0x0007c000 - 0x0007dfff OS boot sector (unused?) - * 0x0007e000 - 0x0007ffff free to use (so no good for acpi+smi) - * 0x00080000 - 0x0009fbff usable ram - * 0x0009fc00 - 0x0009ffff EBDA (unused?) - * 0x000a0000 - 0x000bffff VGA memory - * 0x000c0000 - 0x000cffff VGA option rom - * 0x000d0000 - 0x000dffff free for other option roms? - * 0x000e0000 - 0x000fffff SeaBIOS? (conflict with low tables:) - * 0x000f0000 - 0x000f03ff PIRQ table - * 0x000f0400 - 0x000f66?? ACPI tables - * 0x000f66?? - 0x000f???? DMI tables - */ - - ALIGN_CURRENT; + *current = ALIGN(*current, 64); /* Pack GNVS into the ACPI table area */ for (i=0; i < dsdt->length; i++) { if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) { - printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)current); - *(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes + printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)*current); + *(u32*)(((u32)dsdt) + i) = *current; // 0x92 bytes break; } } /* And fill it */ - acpi_create_gnvs((global_nvs_t *)current); + acpi_create_gnvs((global_nvs_t *)*current); /* Keep pointer around */ - gnvs = (void *)current; + gnvs = (void *)*current; - current += 0x100; - ALIGN_CURRENT; + *current += 0x100; + *current = ALIGN(*current, 64); /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL); @@ -266,48 +133,25 @@ unsigned long write_acpi_tables(unsigned long start) /* We patched up the DSDT, so we need to recalculate the checksum */ dsdt->checksum = 0; dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length); +} - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, - dsdt->length); - -#if CONFIG_HAVE_ACPI_SLIC - printk(BIOS_DEBUG, "ACPI: * SLIC\n"); - slic = (acpi_header_t *)current; - current += acpi_create_slic(current); - ALIGN_CURRENT; - acpi_add_table(rsdp, slic); -#endif - - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - fadt = (acpi_fadt_t *) current; - current += sizeof(acpi_fadt_t); - ALIGN_CURRENT; - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - acpi_create_ssdt_generator(ssdt, "COREBOOT"); - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - ALIGN_CURRENT; - - printk(BIOS_DEBUG, "current = %lx\n", current); - +void acpi_dmi_workaround(unsigned long *current) +{ printk(BIOS_DEBUG, "ACPI: * DMI (Linux workaround)\n"); memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE); #if CONFIG_WRITE_HIGH_TABLES == 1 - memcpy((void *)current, dmi_table, DMI_TABLE_SIZE); - current += DMI_TABLE_SIZE; - ALIGN_CURRENT; + memcpy((void *)*current, dmi_table, DMI_TABLE_SIZE); + *current += DMI_TABLE_SIZE; + *current = ALIGN(*current, 64); #endif - printk(BIOS_INFO, "ACPI: done.\n"); +} +unsigned long write_acpi_tables(unsigned long start) +{ /* Enable Dummy DCC ON# for DVI */ printk(BIOS_DEBUG, "Laptop handling...\n"); outb(inb(0x60f) & ~(1 << 5), 0x60f); - return current; + return acpi_write_tables(start, AmlCode); }

1 0

New patch to review: 6a6c528 X60: use new acpi code
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/149 -gerrit commit 6a6c52824359ec2a0b94492911e89f48d2c75060 Author: Sven Schnelle <svens(a)stackframe.org> Date: Wed Aug 10 22:47:20 2011 +0200 X60: use new acpi code Change-Id: Id2d7e8fe9e8218eccaef6ad426f40209506a345a Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/mainboard/lenovo/x60/acpi_tables.c | 194 +++---------------------------- 1 files changed, 19 insertions(+), 175 deletions(-) diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c index 3742c20..4056e75 100644 --- a/src/mainboard/lenovo/x60/acpi_tables.c +++ b/src/mainboard/lenovo/x60/acpi_tables.c @@ -32,9 +32,6 @@ #include "dmi.h" extern const unsigned char AmlCode[]; -#if CONFIG_HAVE_ACPI_SLIC -unsigned long acpi_create_slic(unsigned long current); -#endif #include "southbridge/intel/i82801gx/nvs.h" static void acpi_create_gnvs(global_nvs_t *gnvs) @@ -56,38 +53,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) gnvs->did[4] = 0x00000005; } -static void acpi_create_intel_hpet(acpi_hpet_t * hpet) -{ -#define HPET_ADDR 0xfed00000ULL - acpi_header_t *header = &(hpet->header); - acpi_addr_t *addr = &(hpet->addr); - - memset((void *) hpet, 0, sizeof(acpi_hpet_t)); - - /* fill out header fields */ - memcpy(header->signature, "HPET", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, "COREBOOT", 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->length = sizeof(acpi_hpet_t); - header->revision = 1; - - /* fill out HPET address */ - addr->space_id = 0; /* Memory */ - addr->bit_width = 64; - addr->bit_offset = 0; - addr->addrl = HPET_ADDR & 0xffffffff; - addr->addrh = HPET_ADDR >> 32; - - hpet->id = 0x8086a201; /* Intel */ - hpet->number = 0x00; - hpet->min_tick = 0x0080; - - header->checksum = - acpi_checksum((void *) hpet, sizeof(acpi_hpet_t)); -} - unsigned long acpi_fill_madt(unsigned long current) { /* Local APICs */ @@ -136,129 +101,31 @@ unsigned long acpi_fill_srat(unsigned long current) void smm_setup_structures(void *gnvs, void *tcg, void *smi1); -#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10) -unsigned long write_acpi_tables(unsigned long start) + +void acpi_patch_dsdt(acpi_header_t *dsdt, unsigned long *current) { - unsigned long current; int i; - acpi_rsdp_t *rsdp; - acpi_rsdt_t *rsdt; - acpi_xsdt_t *xsdt; - acpi_hpet_t *hpet; - acpi_madt_t *madt; - acpi_mcfg_t *mcfg; - acpi_fadt_t *fadt; - acpi_facs_t *facs; -#if CONFIG_HAVE_ACPI_SLIC - acpi_header_t *slic; -#endif - acpi_header_t *ssdt; - acpi_header_t *dsdt; void *gnvs; - current = start; - - /* Align ACPI tables to 16byte */ - ALIGN_CURRENT; - - printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start); - - /* We need at least an RSDP and an RSDT Table */ - rsdp = (acpi_rsdp_t *) current; - current += sizeof(acpi_rsdp_t); - ALIGN_CURRENT; - rsdt = (acpi_rsdt_t *) current; - current += sizeof(acpi_rsdt_t); - ALIGN_CURRENT; - xsdt = (acpi_xsdt_t *) current; - current += sizeof(acpi_xsdt_t); - ALIGN_CURRENT; - - /* clear all table memory */ - memset((void *) start, 0, current - start); - - acpi_write_rsdp(rsdp, rsdt, xsdt); - acpi_write_rsdt(rsdt); - acpi_write_xsdt(xsdt); - - /* - * We explicitly add these tables later on: - */ - printk(BIOS_DEBUG, "ACPI: * HPET\n"); - - hpet = (acpi_hpet_t *) current; - current += sizeof(acpi_hpet_t); - ALIGN_CURRENT; - acpi_create_intel_hpet(hpet); - acpi_add_table(rsdp, hpet); - - /* If we want to use HPET Timers Linux wants an MADT */ - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - - madt = (acpi_madt_t *) current; - acpi_create_madt(madt); - current += madt->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, madt); - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *) current; - acpi_create_mcfg(mcfg); - current += mcfg->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, mcfg); - - printk(BIOS_DEBUG, "ACPI: * FACS\n"); - facs = (acpi_facs_t *) current; - current += sizeof(acpi_facs_t); - ALIGN_CURRENT; - acpi_create_facs(facs); - - dsdt = (acpi_header_t *) current; - memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); - current += dsdt->length; - memcpy(dsdt, &AmlCode, dsdt->length); - - /* Fix up global NVS region for SMI handler. The GNVS region lives - * in the (high) table area. The low memory map looks like this: - * - * 0x00000000 - 0x000003ff Real Mode IVT - * 0x00000020 - 0x0000019c Low MP Table (XXX conflict?) - * 0x00000400 - 0x000004ff BDA (somewhat unused) - * 0x00000500 - 0x0000052f Moved GDT - * 0x00000530 - 0x00000b64 coreboot table - * 0x0007c000 - 0x0007dfff OS boot sector (unused?) - * 0x0007e000 - 0x0007ffff free to use (so no good for acpi+smi) - * 0x00080000 - 0x0009fbff usable ram - * 0x0009fc00 - 0x0009ffff EBDA (unused?) - * 0x000a0000 - 0x000bffff VGA memory - * 0x000c0000 - 0x000cffff VGA option rom - * 0x000d0000 - 0x000dffff free for other option roms? - * 0x000e0000 - 0x000fffff SeaBIOS? (conflict with low tables:) - * 0x000f0000 - 0x000f03ff PIRQ table - * 0x000f0400 - 0x000f66?? ACPI tables - * 0x000f66?? - 0x000f???? DMI tables - */ - - ALIGN_CURRENT; + *current = ALIGN(*current, 64); /* Pack GNVS into the ACPI table area */ for (i=0; i < dsdt->length; i++) { if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) { - printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)current); - *(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes + printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)*current); + *(u32*)(((u32)dsdt) + i) = *current; // 0x92 bytes break; } } /* And fill it */ - acpi_create_gnvs((global_nvs_t *)current); + acpi_create_gnvs((global_nvs_t *)*current); /* Keep pointer around */ - gnvs = (void *)current; + gnvs = (void *)*current; - current += 0x100; - ALIGN_CURRENT; + *current += 0x100; + *current = ALIGN(*current, 64); /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL); @@ -266,48 +133,25 @@ unsigned long write_acpi_tables(unsigned long start) /* We patched up the DSDT, so we need to recalculate the checksum */ dsdt->checksum = 0; dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length); +} - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, - dsdt->length); - -#if CONFIG_HAVE_ACPI_SLIC - printk(BIOS_DEBUG, "ACPI: * SLIC\n"); - slic = (acpi_header_t *)current; - current += acpi_create_slic(current); - ALIGN_CURRENT; - acpi_add_table(rsdp, slic); -#endif - - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - fadt = (acpi_fadt_t *) current; - current += sizeof(acpi_fadt_t); - ALIGN_CURRENT; - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - acpi_create_ssdt_generator(ssdt, "COREBOOT"); - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - ALIGN_CURRENT; - - printk(BIOS_DEBUG, "current = %lx\n", current); - +void acpi_dmi_workaround(unsigned long *current) +{ printk(BIOS_DEBUG, "ACPI: * DMI (Linux workaround)\n"); memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE); #if CONFIG_WRITE_HIGH_TABLES == 1 - memcpy((void *)current, dmi_table, DMI_TABLE_SIZE); - current += DMI_TABLE_SIZE; - ALIGN_CURRENT; + memcpy((void *)*current, dmi_table, DMI_TABLE_SIZE); + *current += DMI_TABLE_SIZE; + *current = ALIGN(*current, 64); #endif - printk(BIOS_INFO, "ACPI: done.\n"); +} +unsigned long write_acpi_tables(unsigned long start) +{ /* Enable Dummy DCC ON# for DVI */ printk(BIOS_DEBUG, "Laptop handling...\n"); outb(inb(0x60f) & ~(1 << 5), 0x60f); - return current; + return acpi_write_tables(start, AmlCode); }

1 0

Patch set updated: 55aacb4 added support for multiple vendors in the HPET code
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/75 -gerrit commit 55aacb4b76b37451df7215ddbe3d41f4ddd82a4f Author: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Date: Sat Jul 2 01:03:50 2011 +0300 added support for multiple vendors in the HPET code Change-Id: Id13709329c8cc2b3acb55b7ec78fc53c805543eb Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> --- src/arch/x86/boot/acpi.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index caf860e..8be7437 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -376,9 +376,20 @@ void acpi_create_hpet(acpi_hpet_t *hpet) addr->addrl = HPET_ADDR & 0xffffffff; addr->addrh = HPET_ADDR >> 32; - hpet->id = 0x102282a0; /* AMD! FIXME */ + /* XXX: Add other vendors */ +#if CONFIG_VENDOR_INTEL + hpet->id = 0x8086a201; + hpet->min_tick = 0x80; +#endif +#if CONFIG_VENDOR_AMD + hpet->id = 0x102282a0; + hpet->min_tick = 0x1000; +#endif +#if CONFIG_VENDOR_VIA + hpet->id = 0x11068201; + hpet->min_tick = 0x90; +#endif hpet->number = 0; - hpet->min_tick = 4096; header->checksum = acpi_checksum((void *)hpet, sizeof(acpi_hpet_t)); }

1 0

Patch set updated: 9d4027a Implemented functions for writing most of the ACPI tables
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/76 -gerrit commit 9d4027a77dda60a64dd0f8af792f4f1c72f0187f Author: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Date: Sat Jul 2 01:07:35 2011 +0300 Implemented functions for writing most of the ACPI tables Fixed compilation failures in the SILC code, but Intel xe7501devkit still fails to compile due to incomplete southbrige code that does not implement FADT generation as of yet. Change-Id: Ib84c845d3f004708a90fd3122485f00b7d20fdbc Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/arch/x86/boot/acpi.c | 267 ++++++++++++++++++++++++++++++++++++-- src/arch/x86/boot/tables.c | 6 +- src/arch/x86/include/arch/acpi.h | 28 ++++- 3 files changed, 283 insertions(+), 18 deletions(-) diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 8be7437..d991ce1 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -16,13 +16,15 @@ */ /* - * Each system port implementing ACPI has to provide two functions: - * - * write_acpi_tables() - * acpi_dump_apics() - * - * See Kontron 986LCD-M port for a good example of an ACPI implementation - * in coreboot. + * Currently each system port implementing ACPI has to provide the following functions: + * - acpi_fill_mcfg() + * - acpi_fill_madt() + * - acpi_fill_slit() + * - acpi_fill_srat() + * Optional + * - acpi_fill_ssdt_generator() + * - acpi_patch_dsdt() + * - acpi_dmi_workaround() */ #include <console/console.h> @@ -249,6 +251,18 @@ unsigned long __attribute__((weak)) acpi_fill_ssdt_generator( return current; } +/* stub functions that might be implemented in the mainboard code, if needed */ +void __attribute__((weak)) acpi_patch_dsdt( + acpi_header_t *dsdt, unsigned long *current) +{ +} + +void __attribute__((weak)) acpi_dmi_workaround(unsigned long *current) +{ +} + + + void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); @@ -409,8 +423,9 @@ void acpi_create_facs(acpi_facs_t *facs) facs->version = 1; /* ACPI 1.0: 0, ACPI 2.0/3.0: 1, ACPI 4.0: 2 */ } -void acpi_write_rsdt(acpi_rsdt_t *rsdt) +acpi_rsdt_t *acpi_write_rsdt(unsigned long *current) { + acpi_rsdt_t *rsdt = (acpi_rsdt_t *)*current; acpi_header_t *header = &(rsdt->header); /* Fill out header fields. */ @@ -426,10 +441,14 @@ void acpi_write_rsdt(acpi_rsdt_t *rsdt) /* Fix checksum. */ header->checksum = acpi_checksum((void *)rsdt, sizeof(acpi_rsdt_t)); + *current += sizeof(acpi_rsdt_t); + *current = ALIGN(*current, 64); + return rsdt; } -void acpi_write_xsdt(acpi_xsdt_t *xsdt) +acpi_xsdt_t *acpi_write_xsdt(unsigned long *current) { + acpi_xsdt_t *xsdt = (acpi_xsdt_t *)*current; acpi_header_t *header = &(xsdt->header); /* Fill out header fields. */ @@ -445,10 +464,15 @@ void acpi_write_xsdt(acpi_xsdt_t *xsdt) /* Fix checksum. */ header->checksum = acpi_checksum((void *)xsdt, sizeof(acpi_xsdt_t)); + *current += sizeof(acpi_xsdt_t); + *current = ALIGN(*current, 64); + return xsdt; } -void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt) + +acpi_rsdp_t *acpi_write_rsdp(acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt, unsigned long *current) { + acpi_rsdp_t *rsdp = (acpi_rsdp_t *)*current; memset(rsdp, 0, sizeof(acpi_rsdp_t)); memcpy(rsdp->signature, RSDP_SIG, 8); @@ -474,6 +498,229 @@ void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt) /* Calculate checksums. */ rsdp->checksum = acpi_checksum((void *)rsdp, 20); rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); + *current += sizeof(acpi_rsdp_t); + *current = ALIGN(*current, 64); + return rsdp; +} + + + +acpi_header_t *acpi_write_dsdt(const unsigned char *AmlCode, unsigned long *current) +{ + acpi_header_t *dsdt = (acpi_header_t *)*current; + int len; + + len = ((acpi_header_t *)AmlCode)->length; + + printk(BIOS_DEBUG, "ACPI: * DSDT @ %p, len %d\n", dsdt, len); + memcpy(dsdt, AmlCode, len); + *current += len; + *current = ALIGN(*current, 64); + acpi_patch_dsdt(dsdt, current); + return dsdt; +} + +acpi_facs_t *acpi_write_facs(unsigned long *current) +{ + acpi_facs_t *facs = (acpi_facs_t *)*current; + printk(BIOS_DEBUG, "ACPI: * FACS at %lx\n", *current); + *current += sizeof(acpi_facs_t); + *current = ALIGN(*current, 64); + acpi_create_facs(facs); + return facs; +} + + +acpi_fadt_t *acpi_write_fadt(acpi_facs_t *facs, acpi_header_t *dsdt, acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_fadt_t *fadt = (acpi_fadt_t *)*current; + printk(BIOS_DEBUG, "ACPI: * FADT at %lx\n", *current); + *current += sizeof(acpi_fadt_t); + *current = ALIGN(*current, 64); + acpi_create_fadt(fadt, facs, dsdt); + acpi_add_table(rsdp, fadt); + return fadt; +} + +acpi_hpet_t *acpi_write_hpet(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_hpet_t *hpet = (acpi_hpet_t *)*current; + printk(BIOS_DEBUG, "ACPI: * HPET at %lx\n", *current); + hpet = (acpi_hpet_t *) *current; + *current += sizeof(acpi_hpet_t); + acpi_create_hpet(hpet); + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, hpet); + return hpet; +} + +acpi_madt_t *acpi_write_madt(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_madt_t *madt = (acpi_madt_t *)*current; + printk(BIOS_DEBUG, "ACPI: * MADT at %lx\n", *current); + acpi_create_madt(madt); + *current += madt->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, madt); + return madt; +} + +acpi_srat_t *acpi_write_srat(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_srat_t *srat; + *current = ALIGN(*current, 64); + printk(BIOS_DEBUG, "ACPI: * SRAT at %lx\n", *current); + srat = (acpi_srat_t *) *current; + acpi_create_srat(srat); + *current += srat->header.length; + acpi_add_table(rsdp, srat); + return srat; +} + +acpi_slit_t *acpi_write_slit(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_slit_t *slit; + printk(BIOS_DEBUG, "ACPI: * SLIT at %lx\n", *current); + slit = (acpi_slit_t *) *current; + acpi_create_slit(slit); + *current += slit->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, slit); + return slit; +} + +acpi_mcfg_t *acpi_write_mcfg(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_mcfg_t *mcfg = (acpi_mcfg_t *)*current; + printk(BIOS_DEBUG, "ACPI: * MCFG at %lx\n", *current); + acpi_create_mcfg(mcfg); + *current += mcfg->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, mcfg); + return mcfg; +} + +#if CONFIG_HAVE_ACPI_SLIC +acpi_header_t *void acpi_write_slic(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_header_t *slic = (acpi_header_t *)*current; + printk(BIOS_DEBUG, "ACPI: * SLIC at %lx\n", *current); + *current += acpi_create_slic(*current); + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, slic); + return slic; +} +#endif + + +acpi_header_t *acpi_write_ssdt_generated(acpi_rsdp_t *rsdp, unsigned long *current) +{ + acpi_header_t *ssdt = (acpi_header_t *)*current; + printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", *current); + + acpi_create_ssdt_generator(ssdt, "DYNADATA"); + *current += ssdt->length; + acpi_add_table(rsdp, ssdt); + *current = ALIGN(*current, 64); + return ssdt; +} + + +#if CONFIG_DEBUG_ACPI == 1 +static void dump_mem(void *start, unsigned int cnt) +{ + int i; + printk(BIOS_DEBUG,"dump_mem: %08x length %d", (int)start, cnt); + + for (i = 0; i < cnt; i++) { + if (!(i & 0x0f)) + printk(BIOS_DEBUG, "\n%08x:", (unsigned int)start + i); + if (!(i & 0x03)) { + printk(BIOS_DEBUG, " "); + if (!(i & 0x07)) + printk(BIOS_DEBUG, " "); + } + printk(BIOS_DEBUG, " %02x", ((u8 *)start)[i]); + } + printk(BIOS_DEBUG,"\n"); +} +#endif + +unsigned long acpi_write_tables(unsigned long start, const unsigned char AmlCode[]) +{ + unsigned long current; + acpi_rsdp_t *rsdp; + acpi_srat_t *srat; + acpi_rsdt_t *rsdt; + acpi_mcfg_t *mcfg; + acpi_hpet_t *hpet; + acpi_madt_t *madt; + acpi_fadt_t *fadt; + acpi_facs_t *facs; + acpi_xsdt_t *xsdt; +#if CONFIG_HAVE_ACPI_SLIC + acpi_header_t *slic; +#endif + acpi_slit_t *slit; + acpi_header_t *ssdt, *dsdt; + + /* Align ACPI tables to 16 bytes */ + start = ALIGN(start, 16); + current = start; + + printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start); + + rsdt = acpi_write_rsdt(&current); + xsdt = acpi_write_xsdt(&current); + rsdp = acpi_write_rsdp(rsdt, xsdt, &current); + dsdt = acpi_write_dsdt(AmlCode , &current); + facs = acpi_write_facs(&current); + fadt = acpi_write_fadt(facs, dsdt, rsdp, &current); + hpet = acpi_write_hpet(rsdp, &current); + madt = acpi_write_madt(rsdp, &current); + mcfg = acpi_write_mcfg(rsdp, &current); + srat = acpi_write_srat(rsdp, &current); + slit = acpi_write_slit(rsdp, &current); + +#if CONFIG_HAVE_ACPI_SLIC + slic = acpi_write_slic(rsdp, &current); +#endif + + ssdt = acpi_write_ssdt_generated(rsdp, &current); + + printk(BIOS_DEBUG, "current = %lx\n", current); + + acpi_dmi_workaround(&current); + +#if CONFIG_DEBUG_ACPI == 1 + printk(BIOS_DEBUG, "RSDP (checksum %s)\n", acpi_checksum((void *)rsdp, rsdp->length) ? "INVALID" : "OK"); + dump_mem(rsdp, rsdp->length); + + printk(BIOS_DEBUG, "RSDT (checksum %s)\n", acpi_checksum((void *)rsdt, rsdt->header.length) ? "INVALID" : "OK"); + dump_mem(rsdt, rsdt->header.length); + + printk(BIOS_DEBUG, "MADT (checksum %s)\n", acpi_checksum((void *)madt, madt->header.length) ? "INVALID" : "OK"); + dump_mem(madt, madt->header.length); + + printk(BIOS_DEBUG, "SRAT (checksum %s)\n", acpi_checksum((void *)srat, srat->header.length) ? "INVALID" : "OK"); + dump_mem(srat, srat->header.length); + + printk(BIOS_DEBUG, "SLIT (checksum %s)\n", acpi_checksum((void *)slit, slit->header.length) ? "INVALID" : "OK"); + dump_mem(slit, slit->header.length); + + printk(BIOS_DEBUG, "SSDT (checksum %s)\n", acpi_checksum((void *)ssdt, ssdt->length) ? "INVALID" : "OK"); + dump_mem(ssdt, ssdt->length); + + printk(BIOS_DEBUG, "FADT (checksum %s)\n", acpi_checksum((void *)fadt, fadt->header.length) ? "INVALID" : "OK"); + dump_mem(fadt, fadt->header.length); + + printk(BIOS_DEBUG, "DSDT (checksum %s)\n", acpi_checksum((void *)dsdt, dsdt->length) ? "INVALID" : "OK"); + dump_mem(dsdt, dsdt->length); + +#endif + + printk(BIOS_INFO, "ACPI: done.\n"); + return current; } #if CONFIG_HAVE_ACPI_RESUME == 1 diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index d816e76..fdde225 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -165,9 +165,9 @@ struct lb_memory *write_tables(void) acpi_rsdp_t *low_rsdp = (acpi_rsdp_t *)rom_table_end, *high_rsdp = (acpi_rsdp_t *)acpi_start; - acpi_write_rsdp(low_rsdp, - (acpi_rsdt_t *)(high_rsdp->rsdt_address), - (acpi_xsdt_t *)((unsigned long)high_rsdp->xsdt_address)); + unsigned long current = (unsigned long)low_rsdp; + acpi_write_rsdp((acpi_rsdt_t *)(high_rsdp->rsdt_address), + (acpi_xsdt_t *)((unsigned long)high_rsdp->xsdt_address), &current); } else { printk(BIOS_ERR, "ERROR: Didn't find RSDP in high table.\n"); } diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 030745d..4c28d23 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -357,14 +357,15 @@ typedef struct acpi_ecdt { u8 ec_id[]; /* EC ID */ } __attribute__ ((packed)) acpi_ecdt_t; -/* These are implemented by the target port or north/southbridge. */ +/* This is implemented by the target port or north/southbridge. */ unsigned long write_acpi_tables(unsigned long addr); + unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_fill_mcfg(unsigned long current); unsigned long acpi_fill_srat(unsigned long current); unsigned long acpi_fill_slit(unsigned long current); unsigned long acpi_fill_ssdt_generator(unsigned long current, - const char *oem_table_id); + const char *oem_table_id); void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id); void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt); @@ -406,11 +407,28 @@ void acpi_create_facs(acpi_facs_t *facs); #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); +acpi_header_t *acpi_write_slic(acpi_rsdp_t *rsdp, unsigned long *current); #endif -void acpi_write_rsdt(acpi_rsdt_t *rsdt); -void acpi_write_xsdt(acpi_xsdt_t *xsdt); -void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt); +acpi_rsdt_t *acpi_write_rsdt(unsigned long *current); +acpi_xsdt_t *acpi_write_xsdt(unsigned long *current); +acpi_rsdp_t *acpi_write_rsdp(acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt, unsigned long *current); +acpi_header_t *acpi_write_dsdt(const unsigned char AmlCode[], unsigned long *current); +void acpi_patch_dsdt(acpi_header_t *dsdt, unsigned long *current); +void acpi_dmi_workaround(unsigned long *current); + +acpi_facs_t *acpi_write_facs(unsigned long *current); +acpi_fadt_t *acpi_write_fadt(acpi_facs_t *facs, acpi_header_t *dsdt, acpi_rsdp_t *rsdp, unsigned long *current); + +acpi_hpet_t *acpi_write_hpet(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_madt_t *acpi_write_madt(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_srat_t *acpi_write_srat(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_slit_t *acpi_write_slit(acpi_rsdp_t *rsdp, unsigned long *current); +acpi_mcfg_t *acpi_write_mcfg(acpi_rsdp_t *rsdp, unsigned long *current); + +acpi_header_t *acpi_write_ssdt_generated(acpi_rsdp_t *rsdp, unsigned long *current); + +unsigned long acpi_write_tables(unsigned long start, const unsigned char AmlCode[]); #if CONFIG_HAVE_ACPI_RESUME /* 0 = S0, 1 = S1 ...*/

1 0

Patch set updated: 12782b2 usage example of the simplified ACPI code
by Sven Schnelle Aug. 11, 2011

Aug. 11, 2011

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/77 -gerrit commit 12782b234da51bddd571a19c33cf7a3fd8197599 Author: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Date: Sat Jul 2 01:11:11 2011 +0300 usage example of the simplified ACPI code Change-Id: I7dcbf14a327fb347973b4cd9b7b3a4d6cdb31d7f Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> --- src/mainboard/asus/m2v-mx_se/acpi_tables.c | 100 +-------------- src/mainboard/lenovo/t60/acpi_tables.c | 194 +++------------------------- 2 files changed, 20 insertions(+), 274 deletions(-) diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c index 73e3768..1471ad9 100644 --- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c +++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c @@ -94,103 +94,5 @@ unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_ta unsigned long write_acpi_tables(unsigned long start) { - unsigned long current; - acpi_rsdp_t *rsdp; - acpi_srat_t *srat; - acpi_rsdt_t *rsdt; - acpi_mcfg_t *mcfg; - acpi_hpet_t *hpet; - acpi_madt_t *madt; - acpi_fadt_t *fadt; - acpi_facs_t *facs; - acpi_slit_t *slit; - acpi_header_t *ssdt; - acpi_header_t *dsdt; - - /* Align ACPI tables to 16 byte. */ - start = (start + 0x0f) & -0x10; - current = start; - - printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start); - - /* We need at least an RSDP and an RSDT table. */ - rsdp = (acpi_rsdp_t *) current; - current += sizeof(acpi_rsdp_t); - rsdt = (acpi_rsdt_t *) current; - current += sizeof(acpi_rsdt_t); - - /* Clear all table memory. */ - memset((void *) start, 0, current - start); - - acpi_write_rsdp(rsdp, rsdt, NULL); - acpi_write_rsdt(rsdt); - - /* We explicitly add these tables later on: */ - printk(BIOS_DEBUG, "ACPI: * FACS\n"); - - /* we should align FACS to 64B as per ACPI specs */ - - current = ALIGN(current, 64); - facs = (acpi_facs_t *) current; - current += sizeof(acpi_facs_t); - acpi_create_facs(facs); - - dsdt = (acpi_header_t *) current; - memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); - current += dsdt->length; - memcpy(dsdt, &AmlCode, dsdt->length); - dsdt->checksum = 0; /* Don't trust iasl to get this right. */ - dsdt->checksum = acpi_checksum((u8*)dsdt, dsdt->length); - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, - dsdt->length); - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - - fadt = (acpi_fadt_t *) current; - current += sizeof(acpi_fadt_t); - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - printk(BIOS_DEBUG, "ACPI: * HPET\n"); - hpet = (acpi_hpet_t *) current; - current += sizeof(acpi_hpet_t); - acpi_create_hpet(hpet); - acpi_add_table(rsdp, hpet); - - /* If we want to use HPET timers Linux wants an MADT. */ - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - madt = (acpi_madt_t *) current; - acpi_create_madt(madt); - current += madt->header.length; - acpi_add_table(rsdp, madt); - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *) current; - acpi_create_mcfg(mcfg); - current += mcfg->header.length; - acpi_add_table(rsdp, mcfg); - - printk(BIOS_DEBUG, "ACPI: * SRAT\n"); - srat = (acpi_srat_t *) current; - acpi_create_srat(srat); - current += srat->header.length; - acpi_add_table(rsdp, srat); - - /* SLIT */ - printk(BIOS_DEBUG, "ACPI: * SLIT\n"); - slit = (acpi_slit_t *) current; - acpi_create_slit(slit); - current+=slit->header.length; - acpi_add_table(rsdp,slit); - - /* SSDT */ - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - - acpi_create_ssdt_generator(ssdt, "DYNADATA"); - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - - printk(BIOS_INFO, "ACPI: done.\n"); - return current; + return acpi_write_tables(start, AmlCode); } diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c index 3742c20..4056e75 100644 --- a/src/mainboard/lenovo/t60/acpi_tables.c +++ b/src/mainboard/lenovo/t60/acpi_tables.c @@ -32,9 +32,6 @@ #include "dmi.h" extern const unsigned char AmlCode[]; -#if CONFIG_HAVE_ACPI_SLIC -unsigned long acpi_create_slic(unsigned long current); -#endif #include "southbridge/intel/i82801gx/nvs.h" static void acpi_create_gnvs(global_nvs_t *gnvs) @@ -56,38 +53,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) gnvs->did[4] = 0x00000005; } -static void acpi_create_intel_hpet(acpi_hpet_t * hpet) -{ -#define HPET_ADDR 0xfed00000ULL - acpi_header_t *header = &(hpet->header); - acpi_addr_t *addr = &(hpet->addr); - - memset((void *) hpet, 0, sizeof(acpi_hpet_t)); - - /* fill out header fields */ - memcpy(header->signature, "HPET", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, "COREBOOT", 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->length = sizeof(acpi_hpet_t); - header->revision = 1; - - /* fill out HPET address */ - addr->space_id = 0; /* Memory */ - addr->bit_width = 64; - addr->bit_offset = 0; - addr->addrl = HPET_ADDR & 0xffffffff; - addr->addrh = HPET_ADDR >> 32; - - hpet->id = 0x8086a201; /* Intel */ - hpet->number = 0x00; - hpet->min_tick = 0x0080; - - header->checksum = - acpi_checksum((void *) hpet, sizeof(acpi_hpet_t)); -} - unsigned long acpi_fill_madt(unsigned long current) { /* Local APICs */ @@ -136,129 +101,31 @@ unsigned long acpi_fill_srat(unsigned long current) void smm_setup_structures(void *gnvs, void *tcg, void *smi1); -#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10) -unsigned long write_acpi_tables(unsigned long start) + +void acpi_patch_dsdt(acpi_header_t *dsdt, unsigned long *current) { - unsigned long current; int i; - acpi_rsdp_t *rsdp; - acpi_rsdt_t *rsdt; - acpi_xsdt_t *xsdt; - acpi_hpet_t *hpet; - acpi_madt_t *madt; - acpi_mcfg_t *mcfg; - acpi_fadt_t *fadt; - acpi_facs_t *facs; -#if CONFIG_HAVE_ACPI_SLIC - acpi_header_t *slic; -#endif - acpi_header_t *ssdt; - acpi_header_t *dsdt; void *gnvs; - current = start; - - /* Align ACPI tables to 16byte */ - ALIGN_CURRENT; - - printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start); - - /* We need at least an RSDP and an RSDT Table */ - rsdp = (acpi_rsdp_t *) current; - current += sizeof(acpi_rsdp_t); - ALIGN_CURRENT; - rsdt = (acpi_rsdt_t *) current; - current += sizeof(acpi_rsdt_t); - ALIGN_CURRENT; - xsdt = (acpi_xsdt_t *) current; - current += sizeof(acpi_xsdt_t); - ALIGN_CURRENT; - - /* clear all table memory */ - memset((void *) start, 0, current - start); - - acpi_write_rsdp(rsdp, rsdt, xsdt); - acpi_write_rsdt(rsdt); - acpi_write_xsdt(xsdt); - - /* - * We explicitly add these tables later on: - */ - printk(BIOS_DEBUG, "ACPI: * HPET\n"); - - hpet = (acpi_hpet_t *) current; - current += sizeof(acpi_hpet_t); - ALIGN_CURRENT; - acpi_create_intel_hpet(hpet); - acpi_add_table(rsdp, hpet); - - /* If we want to use HPET Timers Linux wants an MADT */ - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - - madt = (acpi_madt_t *) current; - acpi_create_madt(madt); - current += madt->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, madt); - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *) current; - acpi_create_mcfg(mcfg); - current += mcfg->header.length; - ALIGN_CURRENT; - acpi_add_table(rsdp, mcfg); - - printk(BIOS_DEBUG, "ACPI: * FACS\n"); - facs = (acpi_facs_t *) current; - current += sizeof(acpi_facs_t); - ALIGN_CURRENT; - acpi_create_facs(facs); - - dsdt = (acpi_header_t *) current; - memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); - current += dsdt->length; - memcpy(dsdt, &AmlCode, dsdt->length); - - /* Fix up global NVS region for SMI handler. The GNVS region lives - * in the (high) table area. The low memory map looks like this: - * - * 0x00000000 - 0x000003ff Real Mode IVT - * 0x00000020 - 0x0000019c Low MP Table (XXX conflict?) - * 0x00000400 - 0x000004ff BDA (somewhat unused) - * 0x00000500 - 0x0000052f Moved GDT - * 0x00000530 - 0x00000b64 coreboot table - * 0x0007c000 - 0x0007dfff OS boot sector (unused?) - * 0x0007e000 - 0x0007ffff free to use (so no good for acpi+smi) - * 0x00080000 - 0x0009fbff usable ram - * 0x0009fc00 - 0x0009ffff EBDA (unused?) - * 0x000a0000 - 0x000bffff VGA memory - * 0x000c0000 - 0x000cffff VGA option rom - * 0x000d0000 - 0x000dffff free for other option roms? - * 0x000e0000 - 0x000fffff SeaBIOS? (conflict with low tables:) - * 0x000f0000 - 0x000f03ff PIRQ table - * 0x000f0400 - 0x000f66?? ACPI tables - * 0x000f66?? - 0x000f???? DMI tables - */ - - ALIGN_CURRENT; + *current = ALIGN(*current, 64); /* Pack GNVS into the ACPI table area */ for (i=0; i < dsdt->length; i++) { if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) { - printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)current); - *(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes + printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)*current); + *(u32*)(((u32)dsdt) + i) = *current; // 0x92 bytes break; } } /* And fill it */ - acpi_create_gnvs((global_nvs_t *)current); + acpi_create_gnvs((global_nvs_t *)*current); /* Keep pointer around */ - gnvs = (void *)current; + gnvs = (void *)*current; - current += 0x100; - ALIGN_CURRENT; + *current += 0x100; + *current = ALIGN(*current, 64); /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL); @@ -266,48 +133,25 @@ unsigned long write_acpi_tables(unsigned long start) /* We patched up the DSDT, so we need to recalculate the checksum */ dsdt->checksum = 0; dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length); +} - printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, - dsdt->length); - -#if CONFIG_HAVE_ACPI_SLIC - printk(BIOS_DEBUG, "ACPI: * SLIC\n"); - slic = (acpi_header_t *)current; - current += acpi_create_slic(current); - ALIGN_CURRENT; - acpi_add_table(rsdp, slic); -#endif - - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - fadt = (acpi_fadt_t *) current; - current += sizeof(acpi_fadt_t); - ALIGN_CURRENT; - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - acpi_create_ssdt_generator(ssdt, "COREBOOT"); - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - ALIGN_CURRENT; - - printk(BIOS_DEBUG, "current = %lx\n", current); - +void acpi_dmi_workaround(unsigned long *current) +{ printk(BIOS_DEBUG, "ACPI: * DMI (Linux workaround)\n"); memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE); #if CONFIG_WRITE_HIGH_TABLES == 1 - memcpy((void *)current, dmi_table, DMI_TABLE_SIZE); - current += DMI_TABLE_SIZE; - ALIGN_CURRENT; + memcpy((void *)*current, dmi_table, DMI_TABLE_SIZE); + *current += DMI_TABLE_SIZE; + *current = ALIGN(*current, 64); #endif - printk(BIOS_INFO, "ACPI: done.\n"); +} +unsigned long write_acpi_tables(unsigned long start) +{ /* Enable Dummy DCC ON# for DVI */ printk(BIOS_DEBUG, "Laptop handling...\n"); outb(inb(0x60f) & ~(1 << 5), 0x60f); - return current; + return acpi_write_tables(start, AmlCode); }

1 0

Re: [coreboot] libpci accesses in CAR, I need a suggestion
by Stefan Reinauer Aug. 11, 2011

Aug. 11, 2011

On 8/1/11 1:28 PM, Marc Jones wrote: > Tadas, > > > On Mon, Aug 1, 2011 at 1:08 PM, Tadas Slotkus<devtadas(a)gmail.com> wrote: >> Hi, thank you both for the answers. I have studied libpci from >> libpayload and removed that device list generation with mallocs. Done a >> bunch of trial-error cleanup and now chipset enable and probing for >> flash works in ramstage's top of hardwaremain function with this line >> included: >> x86_setup_mtrrs(36); //from cpu init routine >> see attached log: ramstage_with_mtrr.txt. >> Also attaching nonworking logs in romstage and ramstage. >> >> Now the question is how these mtrrs should be set in cache_as_ram.inc or >> maybe I'm totally wrong? :) > You will need the MTRR setup from CAR. You will want your code to > execute in the XIP area, so that it may be cashed. You may still have > stack/mem issues. That may be the first place you look for problems. > You may need to find a way to optimize for resources. There will be a problem leaving the XIP area cached while trying to write to the flash. At the least this means it's not possible to write the whole flash. Is this intended? What's the plan here? Stefan

3 3

Patch merged into master: f2e37b8 Add iasl to buldgcc and rev the version.
by gerrit＠coreboot.org Aug. 10, 2011

Aug. 10, 2011

the following patch was just integrated into master: commit f2e37b80a556336edad95724b2d62e4024d5b678 Author: Marc Jones <marcj303(a)gmail.com> Date: Mon Aug 8 16:07:50 2011 -0600 Add iasl to buldgcc and rev the version. Change-Id: If9144cdf088f16bc3974a1784a442a1fd12ac75b Signed-off-by: Marc Jones <marcj303(a)gmail.com> See http://review.coreboot.org/147 for details. -gerrit

1 0