From 107654552cb442b8b95c1f3ebc18dd64c6c0f0d5 Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 3 May 2006 21:24:55 +0000
Subject: [PATCH] more correct e820 ranges for ACPI compatibility

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1901 c046a42c-6fe2-441c-8c8c-71466251a162
---
 pc-bios/bios.bin  | Bin 65536 -> 65536 bytes
 pc-bios/bios.diff | 146 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 138 insertions(+), 8 deletions(-)

diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index 537851abbd2efdac93913844455002989b16515c..64be517b248ec359e109217b9021517050ec30e3 100644
GIT binary patch
delta 11814
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
F{tqsKZtnm9

delta 11866
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

diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff
index 647025b8898..e87592784a2 100644
--- a/pc-bios/bios.diff
+++ b/pc-bios/bios.diff
@@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/apmbios.S,v
 retrieving revision 1.4
 diff -u -w -r1.4 apmbios.S
 --- apmbios.S	26 Dec 2005 10:35:51 -0000	1.4
-+++ apmbios.S	28 Apr 2006 22:41:19 -0000
++++ apmbios.S	3 May 2006 21:22:46 -0000
 @@ -225,6 +225,7 @@
  APMSYM(05):
    cmp al, #0x05
@@ -19,7 +19,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
 retrieving revision 1.160
 diff -u -w -r1.160 rombios.c
 --- rombios.c	25 Jan 2006 17:51:49 -0000	1.160
-+++ rombios.c	28 Apr 2006 22:41:21 -0000
++++ rombios.c	3 May 2006 21:22:48 -0000
 @@ -1816,6 +1816,7 @@
  {
    printf(BX_APPNAME" BIOS - build: %s\n%s\nOptions: ",
@@ -38,7 +38,137 @@ diff -u -w -r1.160 rombios.c
  }
  
  //--------------------------------------------------------------------------
-@@ -8713,6 +8717,7 @@
+@@ -3999,6 +4003,29 @@
+ }
+ #endif
+ 
++
++void set_e820_range(ES, DI, start, end, type)
++     Bit16u ES; 
++     Bit16u DI;
++     Bit32u start;
++     Bit32u end; 
++     Bit16u type;
++{
++    write_word(ES, DI, start);
++    write_word(ES, DI+2, start >> 16);
++    write_word(ES, DI+4, 0x00);
++    write_word(ES, DI+6, 0x00);
++    
++    end -= start;
++    write_word(ES, DI+8, end);
++    write_word(ES, DI+10, end >> 16);
++    write_word(ES, DI+12, 0x0000);
++    write_word(ES, DI+14, 0x0000);
++    
++    write_word(ES, DI+16, type);
++    write_word(ES, DI+18, 0x0);
++}
++
+   void
+ int15_function32(regs, ES, DS, FLAGS)
+   pushad_regs_t regs; // REGS pushed via pushad
+@@ -4063,19 +4090,8 @@
+                 switch(regs.u.r16.bx)
+                 {
+                     case 0:
+-                        write_word(ES, regs.u.r16.di, 0x00);
+-                        write_word(ES, regs.u.r16.di+2, 0x00);
+-                        write_word(ES, regs.u.r16.di+4, 0x00);
+-                        write_word(ES, regs.u.r16.di+6, 0x00);
+-
+-                        write_word(ES, regs.u.r16.di+8, 0xFC00);
+-                        write_word(ES, regs.u.r16.di+10, 0x0009);
+-                        write_word(ES, regs.u.r16.di+12, 0x0000);
+-                        write_word(ES, regs.u.r16.di+14, 0x0000);
+-
+-                        write_word(ES, regs.u.r16.di+16, 0x1);
+-                        write_word(ES, regs.u.r16.di+18, 0x0);
+-
++                        set_e820_range(ES, regs.u.r16.di, 
++                                       0x0000000L, 0x0009fc00L, 1);
+                         regs.u.r32.ebx = 1;
+                         regs.u.r32.eax = 0x534D4150;
+                         regs.u.r32.ecx = 0x14;
+@@ -4083,6 +4099,24 @@
+                         return;
+                         break;
+                     case 1:
++                        set_e820_range(ES, regs.u.r16.di, 
++                                       0x0009fc00L, 0x000a0000L, 2);
++                        regs.u.r32.ebx = 2;
++                        regs.u.r32.eax = 0x534D4150;
++                        regs.u.r32.ecx = 0x14;
++                        CLEAR_CF();
++                        return;
++                        break;
++                    case 2:
++                        set_e820_range(ES, regs.u.r16.di, 
++                                       0x000e8000L, 0x00100000L, 2);
++                        regs.u.r32.ebx = 3;
++                        regs.u.r32.eax = 0x534D4150;
++                        regs.u.r32.ecx = 0x14;
++                        CLEAR_CF();
++                        return;
++                        break;
++                    case 3:
+                         extended_memory_size = inb_cmos(0x35);
+                         extended_memory_size <<= 8;
+                         extended_memory_size |= inb_cmos(0x34);
+@@ -4092,9 +4126,9 @@
+                             extended_memory_size = 0x3bc000; // everything after this is reserved memory until we get to 0x100000000
+                         }
+                         extended_memory_size *= 1024;
+-                        extended_memory_size += 15728640; // make up for the 16mb of memory that is chopped off
++                        extended_memory_size += (16L * 1024 * 1024);
+ 
+-                        if(extended_memory_size <= 15728640)
++                        if(extended_memory_size <= (16L * 1024 * 1024))
+                         {
+                             extended_memory_size = inb_cmos(0x31);
+                             extended_memory_size <<= 8;
+@@ -4102,28 +4136,23 @@
+                             extended_memory_size *= 1024;
+                         }
+ 
+-                        write_word(ES, regs.u.r16.di, 0x0000);
+-                        write_word(ES, regs.u.r16.di+2, 0x0010);
+-                        write_word(ES, regs.u.r16.di+4, 0x0000);
+-                        write_word(ES, regs.u.r16.di+6, 0x0000);
+-
+-                        write_word(ES, regs.u.r16.di+8, extended_memory_size);
+-                        extended_memory_size >>= 16;
+-                        write_word(ES, regs.u.r16.di+10, extended_memory_size);
+-                        extended_memory_size >>= 16;
+-                        write_word(ES, regs.u.r16.di+12, extended_memory_size);
+-                        extended_memory_size >>= 16;
+-                        write_word(ES, regs.u.r16.di+14, extended_memory_size);
+-
+-                        write_word(ES, regs.u.r16.di+16, 0x1);
+-                        write_word(ES, regs.u.r16.di+18, 0x0);
+-
+-                        regs.u.r32.ebx = 0;
++                        set_e820_range(ES, regs.u.r16.di, 
++                                       0x00100000L, extended_memory_size, 1);
++                        regs.u.r32.ebx = 4;
+                         regs.u.r32.eax = 0x534D4150;
+                         regs.u.r32.ecx = 0x14;
+                         CLEAR_CF();
+                         return;
+                         break;
++                    case 4:
++                        /* 256KB BIOS area at the end of 4 GB */
++                        set_e820_range(ES, regs.u.r16.di, 
++                                       0xfffc0000L, 0x00000000L, 2);
++                        regs.u.r32.ebx = 0;
++                        regs.u.r32.eax = 0x534D4150;
++                        regs.u.r32.ecx = 0x14;
++                        CLEAR_CF();
++                        return;
+                     default:  /* AX=E820, DX=534D4150, BX unrecognized */
+                         goto int15_unimplemented;
+                         break;
+@@ -8713,6 +8742,7 @@
    mov al, #0x80
  bios32_end:
    popf
@@ -46,7 +176,7 @@ diff -u -w -r1.160 rombios.c
    retf
  
  .align 16
-@@ -8823,17 +8828,17 @@
+@@ -8823,17 +8853,17 @@
  pci_pro_fail:
    pop edi
    pop esi
@@ -66,7 +196,7 @@ diff -u -w -r1.160 rombios.c
    retf
  
  pci_pro_select_reg:
-@@ -8971,7 +8976,7 @@
+@@ -8971,7 +9001,7 @@
    jmp pci_real_ok
  pci_real_f0d: ;; write configuration dword
    cmp al, #0x0d
@@ -75,7 +205,7 @@ diff -u -w -r1.160 rombios.c
    call pci_real_select_reg
    push dx
    mov dx, #0x0cfc
-@@ -8979,6 +8984,46 @@
+@@ -8979,6 +9009,46 @@
    out dx, eax
    pop dx
    jmp pci_real_ok
@@ -122,7 +252,7 @@ diff -u -w -r1.160 rombios.c
  pci_real_unknown:
    mov ah, #0x81
  pci_real_fail:
-@@ -9019,6 +9064,7 @@
+@@ -9019,6 +9089,7 @@
    dw 0,0 ;; Miniport data
    db 0,0,0,0,0,0,0,0,0,0,0 ;; reserved
    db 0x07 ;; checksum
@@ -130,7 +260,7 @@ diff -u -w -r1.160 rombios.c
    ;; first slot entry PCI-to-ISA (embedded)
    db 0 ;; pci bus number
    db 0x08 ;; pci device number (bit 7-3)
-@@ -9097,6 +9143,7 @@
+@@ -9097,6 +9168,7 @@
    dw 0xdef8 ;; IRQ bitmap INTD#
    db 5 ;; physical slot (0 = embedded)
    db 0 ;; reserved
-- 
2.39.5