GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haswell: Fix VGA option rom INT15 handler 

The format of this function changed but was not updated in
all mainboards.  This fixes BaskingRidge and WTM2.

The int15 handler no longer takes a regs structure as an
argument and instead uses global variables.  The yabel interface
is now similar enough that we can drop the duplicate handler.

Change-Id: Ia717ae14f99cee6d83ccdb1e26b9d7defe1638c4
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48896
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/3230
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Duncan Laurie 2013-04-23 08:39:19 -07:00 committed by Ronald G. Minnich
parent ec664bcfa4
commit c1ef740d88
2 changed files with 51 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/mainboard/intel/baskingridge/mainboard.c
View File

@ -2,7 +2,7 @@
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2007-2009 coresystems GmbH
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. * Copyright (C) 2011 Google Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,15 +42,15 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(struct eregs *regs) static int int15_handler(void)
{ {
int res=-1; int res=-1;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n", printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
__func__, regs->eax & 0xffff); __func__, X86_AX, X86_BX, X86_CX, X86_DX);
switch(regs->eax & 0xffff) { switch (X86_AX) {
case 0x5f34: case 0x5f34:
/* /*
* Set Panel Fitting Hook: * Set Panel Fitting Hook:
@ -59,10 +59,8 @@ static int int15_handler(struct eregs *regs)
* bit 0 = Centering (do not set with bit1 or bit2) * bit 0 = Centering (do not set with bit1 or bit2)
* 0 = video bios default * 0 = video bios default
*/ */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0001;
regs->ecx &= 0xffffff00;
regs->ecx |= 0x01;
res = 0; res = 0;
break; break;
case 0x5f35: case 0x5f35:
@ -77,10 +75,8 @@ static int int15_handler(struct eregs *regs)
* bit 6 = EFP2 * * bit 6 = EFP2 *
* bit 7 = LFP2 * bit 7 = LFP2
*/ */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
case 0x5f51: case 0x5f51:
@ -91,129 +87,47 @@ static int int15_handler(struct eregs *regs)
* 02h = SVDO-LVDS, LFP driven by SVDO decoder * 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder * 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/ */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0003;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0003;
res = 0; res = 0;
break; break;
case 0x5f70: case 0x5f70:
switch ((regs->ecx >> 8) & 0xff) { switch ((X86_CX >> 8) & 0xff) {
case 0: case 0:
/* Get Mux */ /* Get Mux */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
case 1: case 1:
/* Set Mux */ /* Set Mux */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
case 2: case 2:
/* Get SG/Non-SG mode */ /* Get SG/Non-SG mode */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
default: default:
/* Interrupt was not handled */ /* Interrupt was not handled */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n", printk(BIOS_DEBUG,
((regs->ecx >> 8) & 0xff)); "Unknown INT15 5f70 function: 0x%02x\n",
((X86_CX >> 8) & 0xff));
return 0; return 0;
} }
break; break;
default: default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX);
regs->eax & 0xffff);
break; break;
} }
return res; return res;
} }
#endif #endif
#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
static int int15_handler(void)
{
printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
__func__, M.x86.R_AX, M.x86.R_BX, M.x86.R_CX, M.x86.R_DX);
switch (M.x86.R_AX) {
case 0x5f34:
/*
* Set Panel Fitting Hook:
* bit 2 = Graphics Stretching
* bit 1 = Text Stretching
* bit 0 = Centering (do not set with bit1 or bit2)
*/
M.x86.R_AX = 0x005f;
M.x86.R_CX = 0x0001;
break;
case 0x5f35:
/*
* Boot Display Device Hook:
* bit 0 = CRT
* bit 1 = TV (eDP) *
* bit 2 = EFP *
* bit 3 = LFP
* bit 4 = CRT2
* bit 5 = TV2 (eDP) *
* bit 6 = EFP2 *
* bit 7 = LFP2
*/
M.x86.R_AX = 0x005f;
M.x86.R_CX = 0x0000;
break;
case 0x5f51:
/*
* Hook to select active LFP configuration:
* 00h = No LVDS, VBIOS does not enable LVDS
* 01h = Int-LVDS, LFP driven by integrated LVDS decoder
* 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/
M.x86.R_AX = 0x005f;
M.x86.R_CX = 3;
break;
case 0x5f70:
/* Unknown */
M.x86.R_AX = 0x005f;
M.x86.R_CX = 0;
break;
default:
/* Interrupt was not handled */
printk(BIOS_DEBUG, "Unknown INT15 function: 0x%04x\n",
M.x86.R_AX);
return 0;
}
/* Interrupt handled */
return 1;
}
#endif
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static void int15_install(void)
{
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
typedef int (* yabel_handleIntFunc)(void);
extern yabel_handleIntFunc yabel_intFuncArray[256];
yabel_intFuncArray[0x15] = int15_handler;
#endif
#ifdef CONFIG_PCI_OPTION_ROM_RUN_REALMODE
mainboard_interrupt_handlers(0x15, &int15_handler);
#endif
}
#endif
/* Audio Setup */ /* Audio Setup */
extern const u32 * cim_verb_data; extern const u32 * cim_verb_data;
@ -230,9 +144,9 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
int15_install(); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif
verb_setup(); verb_setup();
} }

136
src/mainboard/intel/wtm2/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,15 +42,15 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(struct eregs *regs) static int int15_handler(void)
{ {
int res=-1; int res=-1;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n", printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
__func__, regs->eax & 0xffff); __func__, X86_AX, X86_BX, X86_CX, X86_DX);
switch(regs->eax & 0xffff) { switch (X86_AX) {
case 0x5f34: case 0x5f34:
/* /*
* Set Panel Fitting Hook: * Set Panel Fitting Hook:
@ -59,10 +59,8 @@ static int int15_handler(struct eregs *regs)
* bit 0 = Centering (do not set with bit1 or bit2) * bit 0 = Centering (do not set with bit1 or bit2)
* 0 = video bios default * 0 = video bios default
*/ */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0001;
regs->ecx &= 0xffffff00;
regs->ecx |= 0x01;
res = 0; res = 0;
break; break;
case 0x5f35: case 0x5f35:
@ -77,10 +75,8 @@ static int int15_handler(struct eregs *regs)
* bit 6 = EFP2 * * bit 6 = EFP2 *
* bit 7 = LFP2 * bit 7 = LFP2
*/ */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
case 0x5f51: case 0x5f51:
@ -91,129 +87,47 @@ static int int15_handler(struct eregs *regs)
* 02h = SVDO-LVDS, LFP driven by SVDO decoder * 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder * 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/ */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0003;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0003;
res = 0; res = 0;
break; break;
case 0x5f70: case 0x5f70:
switch ((regs->ecx >> 8) & 0xff) { switch ((X86_CX >> 8) & 0xff) {
case 0: case 0:
/* Get Mux */ /* Get Mux */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
case 1: case 1:
/* Set Mux */ /* Set Mux */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
case 2: case 2:
/* Get SG/Non-SG mode */ /* Get SG/Non-SG mode */
regs->eax &= 0xffff0000; X86_AX = 0x005f;
regs->eax |= 0x005f; X86_CX = 0x0000;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
res = 0; res = 0;
break; break;
default: default:
/* Interrupt was not handled */ /* Interrupt was not handled */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n", printk(BIOS_DEBUG,
((regs->ecx >> 8) & 0xff)); "Unknown INT15 5f70 function: 0x%02x\n",
((X86_CX >> 8) & 0xff));
return 0; return 0;
} }
break; break;
default: default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX);
regs->eax & 0xffff);
break; break;
} }
return res; return res;
} }
#endif #endif
#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
static int int15_handler(void)
{
printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
__func__, M.x86.R_AX, M.x86.R_BX, M.x86.R_CX, M.x86.R_DX);
switch (M.x86.R_AX) {
case 0x5f34:
/*
* Set Panel Fitting Hook:
* bit 2 = Graphics Stretching
* bit 1 = Text Stretching
* bit 0 = Centering (do not set with bit1 or bit2)
*/
M.x86.R_AX = 0x005f;
M.x86.R_CX = 0x0001;
break;
case 0x5f35:
/*
* Boot Display Device Hook:
* bit 0 = CRT
* bit 1 = TV (eDP) *
* bit 2 = EFP *
* bit 3 = LFP
* bit 4 = CRT2
* bit 5 = TV2 (eDP) *
* bit 6 = EFP2 *
* bit 7 = LFP2
*/
M.x86.R_AX = 0x005f;
M.x86.R_CX = 0x0000;
break;
case 0x5f51:
/*
* Hook to select active LFP configuration:
* 00h = No LVDS, VBIOS does not enable LVDS
* 01h = Int-LVDS, LFP driven by integrated LVDS decoder
* 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/
M.x86.R_AX = 0x005f;
M.x86.R_CX = 3;
break;
case 0x5f70:
/* Unknown */
M.x86.R_AX = 0x005f;
M.x86.R_CX = 0;
break;
default:
/* Interrupt was not handled */
printk(BIOS_DEBUG, "Unknown INT15 function: 0x%04x\n",
M.x86.R_AX);
return 0;
}
/* Interrupt handled */
return 1;
}
#endif
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static void int15_install(void)
{
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
typedef int (* yabel_handleIntFunc)(void);
extern yabel_handleIntFunc yabel_intFuncArray[256];
yabel_intFuncArray[0x15] = int15_handler;
#endif
#ifdef CONFIG_PCI_OPTION_ROM_RUN_REALMODE
mainboard_interrupt_handlers(0x15, &int15_handler);
#endif
}
#endif
/* Audio Setup */ /* Audio Setup */
extern const u32 * cim_verb_data; extern const u32 * cim_verb_data;
@ -230,9 +144,9 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
int15_install(); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif
verb_setup(); verb_setup();
} }