diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-05-21 03:13:46 +0200 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2013-06-07 02:49:31 +0200 |
| commit | 4062f179a755ca3b303f444ee3ef812fb287f9f1 (patch) | |
| tree | c1793626863c88d6bfeeb28b89c4143a40d1bf6d | |
| parent | 7ed739445ba7ba6ffcf38d647426a44f905ac087 (diff) | |
Lenovo X60: Add int15 handler
Without that commit, with CONFIG_PCI_OPTION_ROM_RUN_YABEL,
The VGA option rom doesn't init the right display:
it initializes the external display, where we have
a black scren(with backlight on).
This commit is based on the code of mainboard.c in
src/mainboard/roda/rk886ex.
Change-Id: I8457aaf0503e0efdf0fcba9ff5e8a07ac04c5ca6
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Reviewed-on: http://review.coreboot.org/3265
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/mainboard/lenovo/x60/mainboard.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index 032d64160a..d2d0733487 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -28,6 +28,7 @@ #include <device/pci_ops.h> #include <device/pci_ids.h> #include <arch/io.h> +#include <arch/interrupt.h> #include <ec/lenovo/pmh7/pmh7.h> #include <ec/acpi/ec.h> #include <ec/lenovo/h8/h8.h> @@ -35,6 +36,8 @@ #include <pc80/mc146818rtc.h> #include "dock.h" #include <arch/x86/include/arch/acpigen.h> +#include <x86emu/x86emu.h> +#define PANEL INT15_5F35_CL_DISPLAY_DEFAULT int i915lightup(unsigned int physbase, unsigned int iobase, unsigned int mmio, unsigned int gfx); @@ -45,6 +48,37 @@ static acpi_cstate_t cst_entries[] = { { 2, 17, 250, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV3, 0 } }, }; +#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE +static int int15_handler(void) +{ + /* The right way to do this is to move this handler code into + * the mainboard or northbridge code. + * TODO: completely move to mainboards / chipsets. + */ + printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n", + __func__, X86_AX, X86_BX, X86_CX, X86_DX); + + switch (X86_AX) { + case 0x5f35: /* Boot Display */ + X86_AX = 0x005f; // Success + X86_CL = PANEL; + break; + case 0x5f40: /* Boot Panel Type */ + X86_AX = 0x005f; // Success + X86_CL = 3; + printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_CL); + break; + default: + /* Interrupt was not handled */ + printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX); + return 0; + } + + /* Interrupt handled */ + return 1; +} +#endif + int get_cst_entries(acpi_cstate_t **entries) { *entries = cst_entries; @@ -61,6 +95,12 @@ static void mainboard_enable(device_t dev) ec_set_bit(0x03, 2); ec_write(0x0c, 0x88); } + +#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE + /* Install custom int15 handler for VGA OPROM */ + mainboard_interrupt_handlers(0x15, &int15_handler); +#endif + /* If we're resuming from suspend, blink suspend LED */ dev0 = dev_find_slot(0, PCI_DEVFN(0,0)); if (dev0 && pci_read_config32(dev0, SKPAD) == SKPAD_ACPI_S3_MAGIC) |