coreboot June 2011

coreboot@coreboot.org

55 participants
274 discussions

Patch merged into master: b554950 X60/T60: disable USB power during suspend
by gerrit＠coreboot.org 16 Jun '11

16 Jun '11

the following patch was just integrated into master: commit b554950511184ed5132f7e54ff5bd1c57efea117 Author: Sven Schnelle <svens(a)stackframe.org> Date: Thu Jun 16 16:43:46 2011 +0200 X60/T60: disable USB power during suspend Change-Id: I11afba5d7531132a0274e55e8a478985a0ef956f Signed-off-by: Sven Schnelle <svens(a)stackframe.org> See http://review.coreboot.org/38 for details. -gerrit

1 0

Patch merged into master: 5ec011a Lenovo H8 EC: add usb_power_enable()
by gerrit＠coreboot.org 16 Jun '11

16 Jun '11

the following patch was just integrated into master: commit 5ec011a230a23bdc51e2c37c0b799cb44560fb6f Author: Sven Schnelle <svens(a)stackframe.org> Date: Thu Jun 16 16:43:04 2011 +0200 Lenovo H8 EC: add usb_power_enable() Can be used to disable/enable Power output on USB ports. Change-Id: I5eb52b33c9e3359b0e5874bda2c0c8d75c196bc2 Signed-off-by: Sven Schnelle <svens(a)stackframe.org> See http://review.coreboot.org/37 for details. -gerrit

1 0

New patch to review: b554950 X60/T60: disable USB power during suspend
by Sven Schnelle 16 Jun '11

16 Jun '11

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/38 -gerrit commit b554950511184ed5132f7e54ff5bd1c57efea117 Author: Sven Schnelle <svens(a)stackframe.org> Date: Thu Jun 16 16:43:46 2011 +0200 X60/T60: disable USB power during suspend Change-Id: I11afba5d7531132a0274e55e8a478985a0ef956f Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/mainboard/lenovo/t60/acpi/platform.asl | 1 + src/mainboard/lenovo/x60/acpi/platform.asl | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mainboard/lenovo/t60/acpi/platform.asl b/src/mainboard/lenovo/t60/acpi/platform.asl index 85a987b..de76dea 100644 --- a/src/mainboard/lenovo/t60/acpi/platform.asl +++ b/src/mainboard/lenovo/t60/acpi/platform.asl @@ -68,6 +68,7 @@ Method(_PIC, 1) Method(_PTS,1) { \_SB.PCI0.LPCB.EC.MUTE(1) + \_SB.PCI0.LPCB.EC.USBP(0) } /* The _WAK method is called on system wakeup */ diff --git a/src/mainboard/lenovo/x60/acpi/platform.asl b/src/mainboard/lenovo/x60/acpi/platform.asl index 85a987b..de76dea 100644 --- a/src/mainboard/lenovo/x60/acpi/platform.asl +++ b/src/mainboard/lenovo/x60/acpi/platform.asl @@ -68,6 +68,7 @@ Method(_PIC, 1) Method(_PTS,1) { \_SB.PCI0.LPCB.EC.MUTE(1) + \_SB.PCI0.LPCB.EC.USBP(0) } /* The _WAK method is called on system wakeup */

1 0

New patch to review: 5ec011a Lenovo H8 EC: add usb_power_enable()
by Sven Schnelle 16 Jun '11

16 Jun '11

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/37 -gerrit commit 5ec011a230a23bdc51e2c37c0b799cb44560fb6f Author: Sven Schnelle <svens(a)stackframe.org> Date: Thu Jun 16 16:43:04 2011 +0200 Lenovo H8 EC: add usb_power_enable() Can be used to disable/enable Power output on USB ports. Change-Id: I5eb52b33c9e3359b0e5874bda2c0c8d75c196bc2 Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/ec/lenovo/h8/acpi/ec.asl | 8 ++++++++ src/ec/lenovo/h8/h8.c | 9 +++++++++ src/ec/lenovo/h8/h8.h | 1 + 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl index 0bcf441..3ba4aa9 100644 --- a/src/ec/lenovo/h8/acpi/ec.asl +++ b/src/ec/lenovo/h8/acpi/ec.asl @@ -40,6 +40,8 @@ Device(EC) Offset (0x3B), , 1, KBLT, 1, /* Keyboard Light */ + , 2, + USPW, 1, /* USB Power enable */ Offset (0x4e), WAKE, 16, Offset (0x78), @@ -73,6 +75,12 @@ Device(EC) Store(Arg0, AMUT) } + Method (USBP, 1, NotSerialized) + { + Store(Arg0, USPW) + } + + /* Sleep Button pressed */ Method(_Q13, 0, NotSerialized) { diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index ef308b1..2c25d29 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -88,6 +88,14 @@ void h8_disable_event(int event) } +void h8_usb_power_enable(int onoff) +{ + if (onoff) + ec_set_bit(0x3b, 4); + else + ec_clr_bit(0x3b, 4); +} + int h8_ultrabay_device_present(void) { return ec_read(H8_STATUS1) & 0x5 ? 0 : 1; @@ -129,6 +137,7 @@ static void h8_enable(device_t dev) ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); h8_wlan_enable(conf->wlan_enable); h8_trackpoint_enable(conf->trackpoint_enable); + h8_usb_power_enable(1); if (!get_option(&val, "volume")) ec_write(H8_VOLUME_CONTROL, val); diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h index c87ace4..717c0ce 100644 --- a/src/ec/lenovo/h8/h8.h +++ b/src/ec/lenovo/h8/h8.h @@ -23,6 +23,7 @@ void h8_trackpoint_enable(int on); void h8_wlan_enable(int on); void h8_set_audio_mute(int on); +void h8_usb_power_enable(int on); void h8_enable_event(int event); void h8_disable_event(int event); int h8_ultrabay_device_present(void);

1 0

New patch to review: fa59d35 ACPI cleanup proposal
by Cristian Măgherușan-Stanciu 16 Jun '11

16 Jun '11

Cristian Măgherușan-Stanciu (cristi.magherusan(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/36 -gerrit commit fa59d35dc23c02c325f5de5976c327595441a380 Author: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> Date: Thu Jun 16 02:12:55 2011 +0200 ACPI cleanup proposal This is the evolution of the patch I sent a couple of weeks ago about ACPI code cleanup/deduplication, done during the hackathon in Prague. The current version should in theory support most of the AMD and i945 motherboards, but I only ported it to two boards as a reference implementation. Compilation is known to fail in case of the motherboards where we don't automatically generate the ACPI SSDT table. This should be fixed on a per-motherboard basis. It wasn't yet tested on real hardware, so there's a high chance to be broken in the current state even on those supported boards. Change-Id: Ie6296f5652196c6258aa6902d84dd86c17e224cb Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> --- src/Kconfig | 17 ++ src/arch/x86/boot/acpi.c | 278 ++++++++++++++++++++++++++-- src/arch/x86/include/arch/acpi.h | 16 ++- src/mainboard/asus/m2v-mx_se/acpi_tables.c | 100 +---------- src/mainboard/lenovo/t60/acpi_tables.c | 194 ++----------------- 5 files changed, 312 insertions(+), 293 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 9abbc21..1eb3fb4 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -645,6 +645,23 @@ config DEBUG_MALLOC If unsure, say N. endif +config DEBUG_ACPI + def_bool n + +# Only visible if debug level is DEBUG (7) or SPEW (8) as it does additional +# printk(BIOS_DEBUG, ...) calls. +if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8 +config DEBUG_ACPI + bool "Output verbose ACPI debug messages" + default n + help + This option enables additional ACPI related debug messages. + + Note: This option will slightly increase the size of the coreboot image. + + If unsure, say N. +endif + config REALMODE_DEBUG def_bool n depends on PCI_OPTION_ROM_RUN_REALMODE diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 957ec45..ee9d2ac 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() + * - acpi_fill_ssdt_generator() + * Optional + * - acpi_patch_dsdt() + * - acpi_dmi_workaround() */ #include <console/console.h> @@ -69,7 +71,7 @@ void acpi_add_table(acpi_rsdp_t *rsdp, void *table) if (i >= entries_num) { printk(BIOS_ERR, "ACPI: Error: Could not add ACPI table, " - "too many tables.\n"); + "too many tables.\n"); return; } @@ -93,20 +95,20 @@ void acpi_add_table(acpi_rsdp_t *rsdp, void *table) /* Fix XSDT length. */ xsdt->header.length = sizeof(acpi_header_t) + - (sizeof(u64) * (i + 1)); + (sizeof(u64) * (i + 1)); /* Re-calculate checksum. */ xsdt->header.checksum = 0; xsdt->header.checksum = acpi_checksum((u8 *)xsdt, - xsdt->header.length); + xsdt->header.length); } printk(BIOS_DEBUG, "ACPI: added table %d/%d, length now %d\n", - i + 1, entries_num, rsdt->header.length); + i + 1, entries_num, rsdt->header.length); } int acpi_create_mcfg_mmconfig(acpi_mcfg_mmconfig_t *mmconfig, u32 base, - u16 seg_nr, u8 start, u8 end) + u16 seg_nr, u8 start, u8 end) { mmconfig->base_address = base; mmconfig->base_reserved = 0; @@ -135,7 +137,7 @@ unsigned long acpi_create_madt_lapics(unsigned long current) for (cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { continue; } if (!cpu->enabled) @@ -149,7 +151,7 @@ unsigned long acpi_create_madt_lapics(unsigned long current) } int acpi_create_madt_ioapic(acpi_madt_ioapic_t *ioapic, u8 id, u32 addr, - u32 gsi_base) + u32 gsi_base) { ioapic->type = 1; /* I/O APIC structure */ ioapic->length = sizeof(acpi_madt_ioapic_t); @@ -175,7 +177,7 @@ int acpi_create_madt_irqoverride(acpi_madt_irqoverride_t *irqoverride, } int acpi_create_madt_lapic_nmi(acpi_madt_lapic_nmi_t *lapic_nmi, u8 cpu, - u16 flags, u8 lint) + u16 flags, u8 lint) { lapic_nmi->type = 4; /* Local APIC NMI structure */ lapic_nmi->length = sizeof(acpi_madt_lapic_nmi_t); @@ -243,11 +245,26 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg) * This can be overriden by platform ACPI setup code, if it calls * acpi_create_ssdt_generator(). */ +/* let's enforce the implementation of the DSDT generator in the motherboard code*/ +#if 0 unsigned long __attribute__((weak)) acpi_fill_ssdt_generator( unsigned long current, const char *oem_table_id) { return current; } +#endif + +/* 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) { @@ -287,7 +304,7 @@ int acpi_create_srat_lapic(acpi_srat_lapic_t *lapic, u8 node, u8 apic) } int acpi_create_srat_mem(acpi_srat_mem_t *mem, u8 node, u32 basek, u32 sizek, - u32 flags) + u32 flags) { mem->type = 1; /* Memory affinity structure */ mem->length = sizeof(acpi_srat_mem_t); @@ -376,9 +393,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)); } @@ -465,6 +493,220 @@ void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt) rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); } + + +void acpi_write_dsdt(acpi_header_t *dsdt, const unsigned char AmlCode[], unsigned long *current) +{ + printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", *current); + dsdt = (acpi_header_t *) *current; // it will used by fadt + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + *current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); + *current = ALIGN(*current, 64); + + acpi_patch_dsdt(dsdt, current); + + printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); +} + +void acpi_write_facs(acpi_facs_t *facs, unsigned long *current) +{ + /* FACS */ // it needs 64 bit alignment + printk(BIOS_DEBUG, "ACPI: * FACS at %lx\n", *current); + facs = (acpi_facs_t *) *current; // it will be used by fadt + *current += sizeof(acpi_facs_t); + *current = ALIGN(*current, 64); + acpi_create_facs(facs); +} + + +void acpi_write_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, acpi_header_t *dsdt, acpi_rsdp_t *rsdp, unsigned long *current) +{ + printk(BIOS_DEBUG, "ACPI: * FADT at %lx\n", *current); + 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); +} + +void acpi_write_hpet(acpi_hpet_t *hpet, acpi_rsdp_t *rsdp, unsigned long *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); +} + +void acpi_write_madt(acpi_madt_t *madt, acpi_rsdp_t *rsdp, unsigned long *current) +{ + printk(BIOS_DEBUG, "ACPI: * MADT at %lx\n", *current); + madt = (acpi_madt_t *) *current; + acpi_create_madt(madt); + *current += madt->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, madt); +} + +void acpi_write_srat(acpi_srat_t *srat, acpi_rsdp_t *rsdp, unsigned long *current) +{ + *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); +} + +void acpi_write_slit(acpi_slit_t *slit, acpi_rsdp_t *rsdp, unsigned long *current) +{ + 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); +} +void acpi_write_mcfg(acpi_mcfg_t *mcfg, acpi_rsdp_t *rsdp, unsigned long *current) +{ + printk(BIOS_DEBUG, "ACPI: * MCFG at %lx\n", *current); + mcfg = (acpi_mcfg_t *) *current; + acpi_create_mcfg(mcfg); + *current += mcfg->header.length; + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, mcfg); +} + +#if CONFIG_HAVE_ACPI_SLIC +void acpi_write_slic(acpi_header_t *slic, acpi_rsdp_t *rsdp, unsigned long *current) + printk(BIOS_DEBUG, "ACPI: * SLIC\n"); + slic = (acpi_header_t *)*current; + *current += acpi_create_slic(*current); + *current = ALIGN(*current, 64); + acpi_add_table(rsdp, slic); +#endif + + +void acpi_write_ssdt_generated(acpi_header_t *ssdt, acpi_rsdp_t *rsdp, unsigned long *current) +{ + 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); + *current = ALIGN(*current, 64); +} + + +#if CONFIG_DEBUG_ACPI == 1 +static void dump_mem(void *start, void *end) +{ + int i; + printk(BIOS_DEBUG,"dump_mem:"); + for (i = (unsigned int)start; i < (unsigned int)end; i++) { + if ((i & 0xf) == 0) { + printk(BIOS_DEBUG, "\n%08x:", (unsigned int)i); + } + printk(BIOS_DEBUG, " %02x", (u8)*((u8 *)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 = NULL; + acpi_srat_t *srat = NULL; + acpi_rsdt_t *rsdt = NULL; + acpi_mcfg_t *mcfg = NULL; + acpi_hpet_t *hpet = NULL; + acpi_madt_t *madt = NULL; + acpi_fadt_t *fadt = NULL; + acpi_facs_t *facs = NULL; + acpi_xsdt_t *xsdt = NULL; +#if CONFIG_HAVE_ACPI_SLIC + acpi_header_t *slic = NULL; +#endif + acpi_slit_t *slit = NULL; + acpi_header_t *ssdt = NULL; + acpi_header_t *dsdt = NULL; + + /* Align ACPI tables to 16 bytes */ + start = ALIGN(start, 16); + 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); + + current = ALIGN(current, 64); + rsdt = (acpi_rsdt_t *) current; + current += sizeof(acpi_rsdt_t); + + current = ALIGN(current, 64); + xsdt = (acpi_xsdt_t *) current; + current += sizeof(acpi_xsdt_t); + + /* clear all table memory */ + memset((void *)start, 0, current - start); + + acpi_write_rsdp(rsdp, rsdt, xsdt); + acpi_write_rsdt(rsdt); + acpi_write_xsdt(xsdt); + + acpi_write_dsdt(dsdt, AmlCode , &current); + + acpi_write_facs(facs, &current); + acpi_write_fadt(fadt, facs, dsdt, rsdp, &current); + acpi_write_hpet(hpet, rsdp, &current); + + acpi_write_madt(madt, rsdp, &current); + + acpi_write_mcfg(mcfg, rsdp, &current); + + acpi_write_srat(srat, rsdp, &current); + acpi_write_slit(slit, rsdp, &current); + + + acpi_write_ssdt_generated(ssdt, rsdp, &current); + + printk(BIOS_DEBUG, "current = %lx\n", current); + + acpi_dmi_workaround(&current); + +#if CONFIG_DEBUG_ACPI == 1 + printk(BIOS_DEBUG, "rsdp\n"); + dump_mem(rsdp, ((void *)rsdp) + sizeof(acpi_rsdp_t)); + + printk(BIOS_DEBUG, "rsdt\n"); + dump_mem(rsdt, ((void *)rsdt) + sizeof(acpi_rsdt_t)); + + printk(BIOS_DEBUG, "madt\n"); + dump_mem(madt, ((void *)madt) + madt->header.length); + + printk(BIOS_DEBUG, "srat\n"); + dump_mem(srat, ((void *)srat) + srat->header.length); + + printk(BIOS_DEBUG, "slit\n"); + dump_mem(slit, ((void *)slit) + slit->header.length); + + printk(BIOS_DEBUG, "ssdt\n"); + dump_mem(ssdt, ((void *)ssdt) + ssdt->length); + + printk(BIOS_DEBUG, "fadt\n"); + dump_mem(fadt, ((void *)fadt) + fadt->header.length); +#endif + + printk(BIOS_INFO, "ACPI: done.\n"); + return current; +} + #if CONFIG_HAVE_ACPI_RESUME == 1 void suspend_resume(void) { diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 030745d..09de3a6 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -357,8 +357,9 @@ 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); @@ -411,6 +412,19 @@ unsigned long acpi_create_slic(unsigned long current); 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); +void acpi_write_dsdt(acpi_header_t *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); + +void acpi_write_facs(acpi_facs_t *facs, unsigned long *current); +void acpi_write_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, acpi_header_t *dsdt, acpi_rsdp_t *rsdp, unsigned long *current); +void acpi_write_hpet(acpi_hpet_t *hpet, acpi_rsdp_t *rsdp, unsigned long *current); +void acpi_write_madt(acpi_madt_t *madt, acpi_rsdp_t *rsdp, unsigned long *current); +void acpi_write_srat(acpi_srat_t *srat, acpi_rsdp_t *rsdp, unsigned long *current); +void acpi_write_slit(acpi_slit_t *slit, acpi_rsdp_t *rsdp, unsigned long *current); +void acpi_write_ssdt_generated(acpi_header_t *ssdt, acpi_rsdp_t *rsdp, unsigned long *current); +void acpi_write_mcfg(acpi_mcfg_t *mcfg, 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 ...*/ 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

Patch merged into master: bcfeb89 SMM: don't overwrite SMM memory on resume
by gerrit＠coreboot.org 15 Jun '11

15 Jun '11

the following patch was just integrated into master: commit bcfeb894551d4858d301ce5a51eded851d57629e Author: Sven Schnelle <svens(a)stackframe.org> Date: Tue Jun 14 20:55:54 2011 +0200 SMM: don't overwrite SMM memory on resume Overwriting the SMM Area on resume leaves us with all variables cleared out, i.e., the GNVS pointer is no longer available, which makes SMIF function calls impossible. Change-Id: I08ab4ffd41df0922d63c017822de1f89a3ff254d Signed-off-by: Sven Schnelle <svens(a)stackframe.org> See http://review.coreboot.org/34 for details. -gerrit

1 0

gerrit patch email content
by Marc Jones 15 Jun '11

15 Jun '11

It would be nice if gerrit would send the entire commit message and the list of files in the patch emails. That would be helpful in parsing what patches require attention. Marc -- http://se-eng.com

2 2

Re: [coreboot] gerrit: patch iterations in email [was: differences between patchset iterations]
by Uwe Hermann 15 Jun '11

15 Jun '11

On Wed, Jun 08, 2011 at 07:24:39PM -0700, David Hendricks wrote: > On Wed, Jun 8, 2011 at 5:16 PM, Peter Stuge <peter(a)stuge.se> wrote: > > > Paul Menzel wrote: > > > > http://review.coreboot.org/12 > > > > > > opening that URL I see that Sven uploaded a second iteration. > > > > I think I would like to get later iterations in follow-up emails.. Yep, me too. > If you add yourself as a reviewer, you should get e-mails for comments and > iterations. > > (Note: I haven't verified this with Coreboot's gerrit setup) I'd prefer to see all changes for all issues on the mailing list, I don't think I want to go to the web interface for every new patch submission someone does and add myself there just in order to get the notifications. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

3 3

Patch merged into master: 645314c i945 GMA: restore tft brightness from cmos
by gerrit＠coreboot.org 15 Jun '11

15 Jun '11

the following patch was just integrated into master: commit 645314c5e045be3934c26654b87d474688454a0e Author: Sven Schnelle <svens(a)stackframe.org> Date: Sun Jun 12 14:30:10 2011 +0200 i945 GMA: restore tft brightness from cmos Change-Id: Iaf10f125425a1abcf17ffca1d6e246f955f941cc Signed-off-by: Sven Schnelle <svens(a)stackframe.org> See http://review.coreboot.org/24 for details. -gerrit

1 0

Patch set updated: 645314c i945 GMA: restore tft brightness from cmos
by Sven Schnelle 15 Jun '11

15 Jun '11

Sven Schnelle (svens(a)stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/24 -gerrit commit 645314c5e045be3934c26654b87d474688454a0e Author: Sven Schnelle <svens(a)stackframe.org> Date: Sun Jun 12 14:30:10 2011 +0200 i945 GMA: restore tft brightness from cmos Change-Id: Iaf10f125425a1abcf17ffca1d6e246f955f941cc Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/mainboard/lenovo/t60/romstage.c | 2 -- src/mainboard/lenovo/x60/romstage.c | 2 -- src/northbridge/intel/i945/gma.c | 7 +++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c index aa92765..252ae40 100644 --- a/src/mainboard/lenovo/t60/romstage.c +++ b/src/mainboard/lenovo/t60/romstage.c @@ -336,6 +336,4 @@ void main(unsigned long bist) pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC); } #endif - /* Set legacy Brightness control to full brightness */ - pci_write_config8(PCI_DEV(0, 2, 1), 0xf4, 0xff); } diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c index c993a35..2aa506f 100644 --- a/src/mainboard/lenovo/x60/romstage.c +++ b/src/mainboard/lenovo/x60/romstage.c @@ -338,6 +338,4 @@ void main(unsigned long bist) pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC); } #endif - /* Set legacy Brightness control to full brightness */ - pci_write_config8(PCI_DEV(0, 2, 1), 0xf4, 0xff); } diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index a43ef25..340ddcd 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -21,6 +21,7 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> +#include <pc80/mc146818rtc.h> static void gma_func0_init(struct device *dev) { @@ -36,11 +37,17 @@ static void gma_func0_init(struct device *dev) static void gma_func1_init(struct device *dev) { u32 reg32; + u8 val; /* IGD needs to be Bus Master, also enable IO accesss */ reg32 = pci_read_config32(dev, PCI_COMMAND); pci_write_config32(dev, PCI_COMMAND, reg32 | PCI_COMMAND_MASTER | PCI_COMMAND_IO); + + if (!get_option(&val, "tft_brightness")) + pci_write_config8(dev, 0xf4, val); + else + pci_write_config8(dev, 0xf4, 0xff); } static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot June 2011