Unify and clean up remaining INT15 handlers

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>

1 files changed, 19 insertions, 115 deletions

diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index be9a0464e5..c1749f7026 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -49,15 +49,15 @@ void mainboard_suspend_resume(void)
 	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)
 {
 	int res=0;
 
 	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:
@@ -66,10 +66,8 @@ static int int15_handler(void)
 		 *  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;
+		X86_AX = 0x005f;
+		X86_CL = 0x00;
 		res = 1;
 		break;
 	case 0x5f35:
@@ -84,10 +82,8 @@ static int int15_handler(void)
 		 *  bit 6 = EFP2 *
 		 *  bit 7 = LFP2
 		 */
-		X86_EAX &= 0xffff0000;
-		X86_EAX |= 0x005f;
-		X86_ECX &= 0xffff0000;
-		X86_ECX |= 0x0000;
+		X86_AX = 0x005f;
+		X86_CX = 0x0000;
 		res = 1;
 		break;
 	case 0x5f51:
@@ -98,138 +94,46 @@ static int int15_handler(void)
 		 *  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;
+		X86_AX = 0x005f;
+		X86_CX = 0x0001;
 		res = 1;
 		break;
 	case 0x5f70:
-		switch ((X86_ECX >> 8) & 0xff) {
+		switch (X86_CH) {
 		case 0:
 			/* Get Mux */
-			X86_EAX &= 0xffff0000;
-			X86_EAX |= 0x005f;
-			X86_ECX &= 0xffff0000;
-			X86_ECX |= 0x0000;
+			X86_AX = 0x005f;
+			X86_CX = 0x0000;
 			res = 1;
 			break;
 		case 1:
 			/* Set Mux */
-			X86_EAX &= 0xffff0000;
-			X86_EAX |= 0x005f;
-			X86_ECX &= 0xffff0000;
-			X86_ECX |= 0x0000;
+			X86_EAX = 0x005f;
+			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;
+			X86_AX = 0x005f;
+			X86_CX = 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));
+				X86_CH);
 			return 1;
 		}
 		break;
 
         default:
-		printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
-				X86_EAX & 0xffff);
+		printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX);
 		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)
-		 *  0     = video bios default
-		 */
-		X86_AX = 0x005f;
-		X86_CL = 0x00;
-		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_AX = 0x005f;
-		X86_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
-		 */
-		X86_AX = 0x005f;
-		X86_CX = 1;
-		break;
-	case 0x5f70:
-		switch (X86_CH) {
-		case 0:
-			/* Get Mux */
-			printk(BIOS_DEBUG, "Get Mux\n");
-			X86_AX = 0x005f;
-			X86_CL = 0;
-			break;
-		case 1:
-			printk(BIOS_DEBUG, "Set Mux\n");
-			/* Set Mux */
-			X86_AX = 0x005f;
-			X86_CX = 0;
-			break;
-		case 2:
-			printk(BIOS_DEBUG, "Get SG Mode\n");
-			/* Get SG/Non-SG mode */
-			X86_AX = 0x005f;
-			X86_CX = 0;
-			break;
-		default:
-			/* Interrupt was not handled */
-			printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
-				X86_CH);
-			return 0;
-		}
-		break;
-	default:
-		/* Interrupt was not handled */
-		printk(BIOS_DEBUG, "Unknown INT15 function: 0x%04x\n",
-			X86_AX);
-		return 0;
-	}
-
-	/* Interrupt handled */
-	return 1;
-}
-#endif
-
 /* Audio Setup */
 
 extern const u32 * cim_verb_data;
@@ -302,7 +206,7 @@ static void mainboard_enable(device_t dev)
 {
 	dev->ops->init = mainboard_init;
 	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 */
 	mainboard_interrupt_handlers(0x15, &int15_handler);
 #endif