From 43661a95207f5382efaba7c12ce9036b0c080864 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Thu, 21 Aug 2008 03:14:29 +0000 Subject: [PATCH] bios: update from bochs release 2.3.7 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5039 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/bios.diff | 99 +++++++++++----------------------------------- 2 files changed, 24 insertions(+), 75 deletions(-) diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index e34914661c7f23b26b32360cd354335f70795e58..715aed365a305ffc417295148b647564463997b1 100644 GIT binary patch delta 8051 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 Xvs8zAVRt&i=M@sg<<3g(+U@@hI4e97 delta 7931 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 diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index 4f40d7a7ae..da510db803 100644 --- a/pc-bios/bios.diff +++ b/pc-bios/bios.diff @@ -1,35 +1,17 @@ -? _rombios_.c -? _rombiosl_.c -? biossums -? rombios.s -? rombios.sym -? rombios.txt -? rombios16.bin -? rombios32.bin -? rombios32.out -? rombiosl.s -? rombiosl.sym -? rombiosl.txt -Index: BIOS-bochs-latest -=================================================================== -RCS file: /cvsroot/bochs/bochs/bios/BIOS-bochs-latest,v -retrieving revision 1.173 -diff -u -d -p -r1.173 BIOS-bochs-latest -Binary files /tmp/cvsItPJ31 and BIOS-bochs-latest differ -Index: BIOS-bochs-legacy -=================================================================== -RCS file: /cvsroot/bochs/bochs/bios/BIOS-bochs-legacy,v -retrieving revision 1.33 -diff -u -d -p -r1.33 BIOS-bochs-legacy -Binary files /tmp/cvsMYE2Kz and BIOS-bochs-legacy differ -Index: rombios.c -=================================================================== -RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v -retrieving revision 1.207 -diff -u -d -p -r1.207 rombios.c ---- rombios.c 21 Apr 2008 14:22:01 -0000 1.207 -+++ rombios.c 28 Apr 2008 07:53:57 -0000 -@@ -4404,22 +4404,25 @@ BX_DEBUG_INT15("case default:\n"); +--- bochs-2.3.7.orig/bios/rombios.h ++++ bochs-2.3.7/bios/rombios.h +@@ -19,7 +19,7 @@ + // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + /* define it to include QEMU specific code */ +-//#define BX_QEMU ++#define BX_QEMU + + #ifndef LEGACY + # define BX_ROMBIOS32 1 +--- bochs-2.3.7.orig/bios/rombios.c ++++ bochs-2.3.7/bios/rombios.c +@@ -4404,22 +4404,25 @@ #endif // BX_USE_PS2_MOUSE @@ -58,7 +40,7 @@ diff -u -d -p -r1.207 rombios.c write_word(ES, DI+14, 0x0000); write_word(ES, DI+16, type); -@@ -4432,7 +4435,9 @@ int15_function32(regs, ES, DS, FLAGS) +@@ -4432,7 +4435,9 @@ Bit16u ES, DS, FLAGS; { Bit32u extended_memory_size=0; // 64bits long @@ -68,7 +50,7 @@ diff -u -d -p -r1.207 rombios.c BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax); -@@ -4506,11 +4511,18 @@ ASM_END +@@ -4506,11 +4511,18 @@ extended_memory_size += (1L * 1024 * 1024); } @@ -88,7 +70,7 @@ diff -u -d -p -r1.207 rombios.c regs.u.r32.ebx = 1; regs.u.r32.eax = 0x534D4150; regs.u.r32.ecx = 0x14; -@@ -4519,7 +4531,7 @@ ASM_END +@@ -4519,7 +4531,7 @@ break; case 1: set_e820_range(ES, regs.u.r16.di, @@ -97,7 +79,7 @@ diff -u -d -p -r1.207 rombios.c regs.u.r32.ebx = 2; regs.u.r32.eax = 0x534D4150; regs.u.r32.ecx = 0x14; -@@ -4528,7 +4540,7 @@ ASM_END +@@ -4528,7 +4540,7 @@ break; case 2: set_e820_range(ES, regs.u.r16.di, @@ -106,7 +88,7 @@ diff -u -d -p -r1.207 rombios.c regs.u.r32.ebx = 3; regs.u.r32.eax = 0x534D4150; regs.u.r32.ecx = 0x14; -@@ -4539,7 +4551,7 @@ ASM_END +@@ -4539,7 +4551,7 @@ #if BX_ROMBIOS32 set_e820_range(ES, regs.u.r16.di, 0x00100000L, @@ -115,7 +97,7 @@ diff -u -d -p -r1.207 rombios.c regs.u.r32.ebx = 4; #else set_e820_range(ES, regs.u.r16.di, -@@ -4555,7 +4567,7 @@ ASM_END +@@ -4555,7 +4567,7 @@ case 4: set_e820_range(ES, regs.u.r16.di, extended_memory_size - ACPI_DATA_SIZE, @@ -124,7 +106,7 @@ diff -u -d -p -r1.207 rombios.c regs.u.r32.ebx = 5; regs.u.r32.eax = 0x534D4150; regs.u.r32.ecx = 0x14; -@@ -4565,7 +4577,20 @@ ASM_END +@@ -4565,7 +4577,20 @@ case 5: /* 256KB BIOS area at the end of 4 GB */ set_e820_range(ES, regs.u.r16.di, @@ -146,30 +128,9 @@ diff -u -d -p -r1.207 rombios.c regs.u.r32.ebx = 0; regs.u.r32.eax = 0x534D4150; regs.u.r32.ecx = 0x14; -Index: rombios.h -=================================================================== -RCS file: /cvsroot/bochs/bochs/bios/rombios.h,v -retrieving revision 1.6 -diff -u -d -p -r1.6 rombios.h ---- rombios.h 26 Jan 2008 09:15:27 -0000 1.6 -+++ rombios.h 28 Apr 2008 07:53:57 -0000 -@@ -19,7 +19,7 @@ - // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - /* define it to include QEMU specific code */ --//#define BX_QEMU -+#define BX_QEMU - - #ifndef LEGACY - # define BX_ROMBIOS32 1 -Index: rombios32.c -=================================================================== -RCS file: /cvsroot/bochs/bochs/bios/rombios32.c,v -retrieving revision 1.26 -diff -u -d -p -r1.26 rombios32.c ---- rombios32.c 8 Apr 2008 16:41:18 -0000 1.26 -+++ rombios32.c 28 Apr 2008 07:53:58 -0000 -@@ -478,7 +478,12 @@ void smp_probe(void) +--- bochs-2.3.7.orig/bios/rombios32.c ++++ bochs-2.3.7/bios/rombios32.c +@@ -479,7 +479,12 @@ sipi_vector = AP_BOOT_ADDR >> 12; writel(APIC_BASE + APIC_ICR_LOW, 0x000C4600 | sipi_vector); @@ -182,15 +143,3 @@ diff -u -d -p -r1.26 rombios32.c smp_cpus = readw((void *)CPU_COUNT_ADDR); } -@@ -1423,9 +1428,8 @@ void acpi_bios_init(void) - fadt->pm1_evt_len = 4; - fadt->pm1_cnt_len = 2; - fadt->pm_tmr_len = 4; -- fadt->plvl2_lat = cpu_to_le16(50); -- fadt->plvl3_lat = cpu_to_le16(50); -- fadt->plvl3_lat = cpu_to_le16(50); -+ fadt->plvl2_lat = cpu_to_le16(0x0fff); // C2 state not supported -+ fadt->plvl3_lat = cpu_to_le16(0x0fff); // C3 state not supported - /* WBINVD + PROC_C1 + PWR_BUTTON + SLP_BUTTON + FIX_RTC */ - fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 4) | (1 << 5) | (1 << 6)); - acpi_build_table_header((struct acpi_table_header *)fadt, "FACP",