sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify and clean up remaining INT15 handlers

Browse Source 
Some handlers still had 2 variants, others were
incorrectly guarded by CONFIG_ variables. This
patch straightens them out.

This does not touch the siemens/sitemp_g1p1 which
provides an interestingly complex solution for the
int15 handler.

Signed-off-by: Stefan Reinauer <reinauer@google.com>

Change-Id: I5d74fdf7c2ab1faa96ebc2b5ca5c69398449b069
Reviewed-on: https://gerrit.chromium.org/gerrit/48979
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Commit-Queue: Stefan Reinauer <reinauer@google.com>
Tested-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/4140
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer
2013-04-23 15:23:15 -07:00
committed by Stefan Reinauer
parent 98e4d8aabb
commit 454744fd86
7 changed files with 74 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/ibase/mb899/mainboard.c
View File

@@ -20,13 +20,14 @@
#include <types.h> #include <types.h>
#include <device/device.h> #include <device/device.h>
#include <console/console.h> #include <console/console.h>
#if 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>
#include <arch/io.h> #include <arch/io.h>
#include <arch/interrupt.h>
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
#define BOOT_DISPLAY_DEFAULT 0 #define BOOT_DISPLAY_DEFAULT 0
@@ -213,7 +214,7 @@ 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 #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

2
src/mainboard/intel/emeraldlake2/mainboard.c
View File

@@ -156,7 +156,7 @@ 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 */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

4
src/mainboard/kontron/986lcd-m/mainboard.c
View File

@@ -37,7 +37,7 @@
#define BOOT_DISPLAY_EFP2 (1 << 6) #define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7) #define BOOT_DISPLAY_LCD2 (1 << 7)
#if CONFIG_VGA_ROM_RUN #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
/* This int15 handler is Intel IGD. specific. Other chipsets need other /* This int15 handler is Intel IGD. specific. Other chipsets need other
@@ -221,7 +221,7 @@ 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 */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

4
src/mainboard/roda/rk886ex/mainboard.c
View File

@@ -60,7 +60,7 @@ static void backlight_enable(void)
#define BOOT_DISPLAY_EFP2 (1 << 6) #define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7) #define BOOT_DISPLAY_LCD2 (1 << 7)
#if CONFIG_VGA_ROM_RUN #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
/* This int15 handler is Intel IGD. specific. Other chipsets need other /* This int15 handler is Intel IGD. specific. Other chipsets need other
@@ -124,7 +124,7 @@ static void mainboard_enable(device_t dev)
/* Disable Dummy DCC -> GP45 = 1 */ /* Disable Dummy DCC -> GP45 = 1 */
outb(inb(0x60f) | (1 << 5), 0x60f); outb(inb(0x60f) | (1 << 5), 0x60f);
#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 */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

140
src/mainboard/samsung/lumpy/mainboard.c
View File

@@ -49,111 +49,15 @@ void mainboard_suspend_resume(void)
send_ec_command(EC_ACPI_ENABLE); send_ec_command(EC_ACPI_ENABLE);
} }
#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(void) static int int15_handler(void)
{ {
int res=0; int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n", printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
__func__, X86_EAX & 0xffff); __func__, X86_AX);
switch(X86_EAX & 0xffff) { switch(X86_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)
* 0 = video bios default
*/
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffffff00;
X86_ECX |= 0x00;
res = 1;
break;
case 0x5f35:
/*
* Boot Display Device Hook:
* bit 0 = CRT
* bit 1 = TV
* bit 2 = EFP *
* bit 3 = LFP
* bit 4 = CRT2
* bit 5 = TV2
* bit 6 = EFP2 *
* bit 7 = LFP2
*/
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
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
*/
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0001;
res = 1;
break;
case 0x5f70:
switch ((X86_ECX >> 8) & 0xff) {
case 0:
/* Get Mux */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
break;
case 1:
/* Set Mux */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
break;
default:
/* FIXME: Interrupt was not handled, but return success? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
((X86_ECX >> 8) & 0xff));
return 1;
}
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
X86_EAX & 0xffff);
break;
}
return res;
}
#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__, X86_AX, X86_BX, X86_CX, X86_DX);
switch (X86_AX) {
case 0x5f34: case 0x5f34:
/* /*
* Set Panel Fitting Hook: * Set Panel Fitting Hook:
@@ -164,6 +68,7 @@ static int int15_handler(void)
*/ */
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CL = 0x00; X86_CL = 0x00;
res = 1;
break; break;
case 0x5f35: case 0x5f35:
/* /*
@@ -179,6 +84,7 @@ static int int15_handler(void)
*/ */
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CX = 0x0000; X86_CX = 0x0000;
res = 1;
break; break;
case 0x5f51: case 0x5f51:
/* /*
@@ -189,44 +95,42 @@ static int int15_handler(void)
* 03h = eDP, LFP Driven by Int-DisplayPort encoder * 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/ */
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CX = 1; X86_CX = 0x0001;
res = 1;
break; break;
case 0x5f70: case 0x5f70:
switch (X86_CH) { switch (X86_CH) {
case 0: case 0:
/* Get Mux */ /* Get Mux */
printk(BIOS_DEBUG, "Get Mux\n");
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CL = 0; X86_CX = 0x0000;
res = 1;
break; break;
case 1: case 1:
printk(BIOS_DEBUG, "Set Mux\n");
/* Set Mux */ /* Set Mux */
X86_AX = 0x005f; X86_EAX = 0x005f;
X86_CX = 0; X86_ECX = 0x0000;
res = 1;
break; break;
case 2: case 2:
printk(BIOS_DEBUG, "Get SG Mode\n");
/* Get SG/Non-SG mode */ /* Get SG/Non-SG mode */
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CX = 0; X86_CX = 0x0000;
res = 1;
break; break;
default: default:
/* Interrupt was not handled */ /* FIXME: Interrupt was not handled, but return success? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n", printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
X86_CH); X86_CH);
return 0; return 1;
} }
break; break;
default:
/* Interrupt was not handled */
printk(BIOS_DEBUG, "Unknown INT15 function: 0x%04x\n",
X86_AX);
return 0;
}
/* Interrupt handled */ default:
return 1; printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX);
break;
}
return res;
} }
#endif #endif
@@ -302,7 +206,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = lumpy_onboard_smbios_data; dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
#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 */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

151
src/mainboard/samsung/stumpy/mainboard.c
View File

@@ -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(void) static int int15_handler(void)
{ {
int res=0; int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n", printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
__func__, X86_EAX & 0xffff); __func__, X86_AX);
switch(X86_EAX & 0xffff) { switch(X86_AX) {
case 0x5f34: case 0x5f34:
/* /*
* Set Panel Fitting Hook: * Set Panel Fitting Hook:
@@ -59,103 +59,9 @@ static int int15_handler(void)
* 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
*/ */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffffff00;
X86_ECX |= 0x01;
res = 1;
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
*/
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
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
*/
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0003;
res = 1;
break;
case 0x5f70:
switch ((X86_ECX >> 8) & 0xff) {
case 0:
/* Get Mux */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
break;
case 1:
/* Set Mux */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
X86_EAX &= 0xffff0000;
X86_EAX |= 0x005f;
X86_ECX &= 0xffff0000;
X86_ECX |= 0x0000;
res = 1;
break;
default:
/* FIXME: Interrupt was not handled, but return sucess? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
((X86_ECX >> 8) & 0xff));
return 1;
}
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
X86_EAX & 0xffff);
break;
}
return res;
}
#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__, X86_AX, X86_BX, X86_CX, X86_DX);
switch (X86_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)
*/
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CX = 0x0001; X86_CL = 0x01;
res = 1;
break; break;
case 0x5f35: case 0x5f35:
/* /*
@@ -171,6 +77,7 @@ static int int15_handler(void)
*/ */
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CX = 0x0000; X86_CX = 0x0000;
res = 1;
break; break;
case 0x5f51: case 0x5f51:
/* /*
@@ -181,22 +88,42 @@ static int int15_handler(void)
* 03h = eDP, LFP Driven by Int-DisplayPort encoder * 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/ */
X86_AX = 0x005f; X86_AX = 0x005f;
X86_CX = 3; X86_CX = 0x0003;
res = 1;
break; break;
case 0x5f70: case 0x5f70:
/* Unknown */ switch (X86_CH) {
X86_AX = 0x005f; case 0:
X86_CX = 0; /* Get Mux */
X86_AX = 0x005f;
X86_CX = 0x0000;
res = 1;
break;
case 1:
/* Set Mux */
X86_AX = 0x005f;
X86_CX = 0x0000;
res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
X86_AX = 0x005f;
X86_CX = 0x0000;
res = 1;
break;
default:
/* FIXME: Interrupt was not handled, but return sucess? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
X86_CH);
return 1;
}
break; break;
default:
/* Interrupt was not handled */
printk(BIOS_DEBUG, "Unknown INT15 function: 0x%04x\n",
X86_AX);
return 0;
}
/* Interrupt handled */ default:
return 1; printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX);
break;
}
return res;
} }
#endif #endif
@@ -220,7 +147,7 @@ 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 */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

7
src/mainboard/thomson/ip1000/mainboard.c
View File

@@ -21,10 +21,11 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <delay.h> #include <delay.h>
#if 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 <arch/io.h> #include <arch/io.h>
#include <arch/interrupt.h>
// setting the bit disables the led. // setting the bit disables the led.
#define PARPORT_GPIO_LED_GREEN (1 << 0) #define PARPORT_GPIO_LED_GREEN (1 << 0)
@@ -86,7 +87,7 @@ static void flash_gpios(void)
} }
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
#define BOOT_DISPLAY_DEFAULT 0 #define BOOT_DISPLAY_DEFAULT 0
@@ -141,7 +142,7 @@ static void mainboard_init(device_t dev)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif