summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2012-11-22 10:48:18 +0100
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-11-24 20:06:24 +0100
commit503af721a1f2c831fb360d1c1b2af38e0866fc35 (patch)
tree9dc68c4b43e29ce22d66247f0c2bafcbce5a4fe7 /src/mainboard
parent3e77eb6d1e0a3ff9c0a32504a5221dc57b10506c (diff)
x86 realmode: Adapt to x86emu/YABEL style return codes
realmode int handlers must return the same codes as the YABEL int handlers now: 1 for "interrupt handled", 0 for "not handled" (ie. error). Change-Id: Idc01cf64e2c97150fc4643671a0bc4cca2ae6668 Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Reviewed-on: http://review.coreboot.org/1890 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/intel/emeraldlake2/mainboard.c18
-rw-r--r--src/mainboard/kontron/986lcd-m/mainboard.c6
-rw-r--r--src/mainboard/roda/rk886ex/mainboard.c6
-rw-r--r--src/mainboard/samsung/lumpy/mainboard.c18
-rw-r--r--src/mainboard/samsung/stumpy/mainboard.c18
-rw-r--r--src/mainboard/technexion/tim5690/vgabios.c6
6 files changed, 36 insertions, 36 deletions
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index f65a0642b7..ae7f72a95f 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -45,7 +45,7 @@ void mainboard_suspend_resume(void)
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static int int15_handler(struct eregs *regs)
{
- int res=-1;
+ int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
__func__, regs->eax & 0xffff);
@@ -63,7 +63,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffffff00;
regs->ecx |= 0x01;
- res = 0;
+ res = 1;
break;
case 0x5f35:
/*
@@ -81,7 +81,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 0x5f51:
/*
@@ -95,7 +95,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0003;
- res = 0;
+ res = 1;
break;
case 0x5f70:
switch ((regs->ecx >> 8) & 0xff) {
@@ -105,7 +105,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 1:
/* Set Mux */
@@ -113,7 +113,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
@@ -121,13 +121,13 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
default:
- /* Interrupt was not handled */
+ /* FIXME: Interrupt was not handled, but return success? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
((regs->ecx >> 8) & 0xff));
- return 0;
+ return 1;
}
break;
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index cde43898cf..3951ce663f 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -66,7 +66,7 @@ static int int15_handler(void)
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static int int15_handler(struct eregs *regs)
{
- int res = -1;
+ int res = 0;
/* This int15 handler is Intel IGD. specific. Other chipsets need other
* handlers. The right way to do this is to move this handler code into
@@ -87,13 +87,13 @@ static int int15_handler(struct eregs *regs)
case 0x5f35:
regs->eax = 0x5f;
regs->ecx = BOOT_DISPLAY_DEFAULT;
- res = 0;
+ res = 1;
break;
case 0x5f40:
regs->eax = 0x5f;
regs->ecx = 3; // This is mainboard specific
printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx);
- res = 0;
+ res = 1;
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 4b35e7b538..f4e43bda0d 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -93,7 +93,7 @@ static int int15_handler(void)
#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static int int15_handler(struct eregs *regs)
{
- int res = -1;
+ int res = 0;
/* This int15 handler is Intel IGD. specific. Other chipsets need other
* handlers. The right way to do this is to move this handler code into
@@ -114,13 +114,13 @@ static int int15_handler(struct eregs *regs)
case 0x5f35:
regs->eax = 0x5f;
regs->ecx = BOOT_DISPLAY_DEFAULT;
- res = 0;
+ res = 1;
break;
case 0x5f40:
regs->eax = 0x5f;
regs->ecx = 3; // This is mainboard specific
printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx);
- res = 0;
+ res = 1;
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index a8b8b3a47e..3408248c96 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -52,7 +52,7 @@ void mainboard_suspend_resume(void)
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static int int15_handler(struct eregs *regs)
{
- int res=-1;
+ int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
__func__, regs->eax & 0xffff);
@@ -70,7 +70,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffffff00;
regs->ecx |= 0x00;
- res = 0;
+ res = 1;
break;
case 0x5f35:
/*
@@ -88,7 +88,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 0x5f51:
/*
@@ -102,7 +102,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0001;
- res = 0;
+ res = 1;
break;
case 0x5f70:
switch ((regs->ecx >> 8) & 0xff) {
@@ -112,7 +112,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 1:
/* Set Mux */
@@ -120,7 +120,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
@@ -128,13 +128,13 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
default:
- /* Interrupt was not handled */
+ /* FIXME: Interrupt was not handled, but return success? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
((regs->ecx >> 8) & 0xff));
- return 0;
+ return 1;
}
break;
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index eab75f4ab1..fe70948f10 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -45,7 +45,7 @@ void mainboard_suspend_resume(void)
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
static int int15_handler(struct eregs *regs)
{
- int res=-1;
+ int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
__func__, regs->eax & 0xffff);
@@ -63,7 +63,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffffff00;
regs->ecx |= 0x01;
- res = 0;
+ res = 1;
break;
case 0x5f35:
/*
@@ -81,7 +81,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 0x5f51:
/*
@@ -95,7 +95,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0003;
- res = 0;
+ res = 1;
break;
case 0x5f70:
switch ((regs->ecx >> 8) & 0xff) {
@@ -105,7 +105,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 1:
/* Set Mux */
@@ -113,7 +113,7 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
@@ -121,13 +121,13 @@ static int int15_handler(struct eregs *regs)
regs->eax |= 0x005f;
regs->ecx &= 0xffff0000;
regs->ecx |= 0x0000;
- res = 0;
+ res = 1;
break;
default:
- /* Interrupt was not handled */
+ /* FIXME: Interrupt was not handled, but return sucess? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
((regs->ecx >> 8) & 0xff));
- return 0;
+ return 1;
}
break;
diff --git a/src/mainboard/technexion/tim5690/vgabios.c b/src/mainboard/technexion/tim5690/vgabios.c
index 372c4b6647..6c9b45e639 100644
--- a/src/mainboard/technexion/tim5690/vgabios.c
+++ b/src/mainboard/technexion/tim5690/vgabios.c
@@ -40,7 +40,7 @@ static void vbios_fun_init(rs690_vbios_regs *vbios_regs)
/* BIOS int15 function */
int tim5690_int15_handler(struct eregs *regs)
{
- int res = -1;
+ int res = 0;
printk(BIOS_DEBUG, "tim5690_int15_handler\n");
@@ -50,12 +50,12 @@ int tim5690_int15_handler(struct eregs *regs)
case 0x00:
regs->eax &= ~(0xff);
regs->ebx = (regs->ebx & ~(0xff)) | vbios_regs_local.int15_regs.fun00_panel_id;
- res = 0;
+ res = 1;
break;
case 0x05:
regs->eax &= ~(0xff);
regs->ebx = (regs->ebx & ~(0xff)) | vbios_regs_local.int15_regs.fun05_tv_standard;
- res = 0;
+ res = 1;
break;
}
break;