Changeset 12233 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Sep 8, 2008 3:41:38 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36221

Message:

Support for more than 4G RAM in guest, may not really work, but shouldn't break
regular configs. UI still doesn't allow setting more than 3.5G of RAM,
could someone with powerful enough machine check if it really works and let me
know, so that I can enable it in UI?

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/rombios.c (modified) (10 diffs)
• DevPcBios.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -4548 +4548 @@
 
 
-void set_e820_range(ES, DI, start, end, type)
+void set_e820_range(ES, DI, start, end, extra_start, extra_end, type)
      Bit16u ES;
      Bit16u DI;
      Bit32u start;
      Bit32u end;
+     Bit8u  extra_start;
+     Bit8u  extra_end;
      Bit16u type;
 {
@@ -4558 +4560 @@
     write_word(ES, DI+2, start >> 16);
     write_word(ES, DI+4, 0x00);
+    write_word(ES, DI+4, extra_start);
     write_word(ES, DI+6, 0x00);
 
     end -= start;
+    extra_end -= extra_start;
     write_word(ES, DI+8, end);
     write_word(ES, DI+10, end >> 16);
@@ -4567 +4571 @@
         write_word(ES, DI+12, 0x0001);
     else
-        write_word(ES, DI+12, 0x0000);
+        // XXX: nike - is it really correct? see QEMU BIOS patch
+        write_word(ES, DI+12, extra_end);
 #else /* !VBOX */
     write_word(ES, DI+12, 0x0000);
@@ -4583 +4588 @@
 {
   Bit32u  extended_memory_size=0; // 64bits long
+  Bit32u  extra_lowbits_memory_size=0;
   Bit16u  CX,DX;
+  Bit8u   extra_highbits_memory_size=0;
 
 BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax);
@@ -4657 +4664 @@
                 }
 
+                extra_lowbits_memory_size = inb_cmos(0x61);
+                extra_lowbits_memory_size <<= 8;
+                extra_lowbits_memory_size |= inb_cmos(0x62);
+                extra_lowbits_memory_size *= 64;
+                extra_lowbits_memory_size *= 1024;
+                extra_highbits_memory_size = inb_cmos(0x63);
+
                 switch(regs.u.r16.bx)
                 {
                     case 0:
                         set_e820_range(ES, regs.u.r16.di,
-                                       0x0000000L, 0x0009fc00L, 1);
+                                       0x0000000L, 0x0009fc00L, 0, 0, 1);
                         regs.u.r32.ebx = 1;
                         regs.u.r32.eax = 0x534D4150;
@@ -4670 +4684 @@
                     case 1:
                         set_e820_range(ES, regs.u.r16.di,
-                                       0x0009fc00L, 0x000a0000L, 2);
+                                       0x0009fc00L, 0x000a0000L, 0, 0, 2);
                         regs.u.r32.ebx = 2;
                         regs.u.r32.eax = 0x534D4150;
@@ -4688 +4702 @@
                          * A 128K area starting from 0xd0000 works. */
                         set_e820_range(ES, regs.u.r16.di,
-                                       0x000f0000L, 0x00100000L, 2);
+                                       0x000f0000L, 0x00100000L, 0, 0, 2);
 #else /* !VBOX */
                         set_e820_range(ES, regs.u.r16.di,
-                                       0x000e8000L, 0x00100000L, 2);
+                                       0x000e8000L, 0x00100000L, 0, 0, 2);
 #endif /* !VBOX */
                         regs.u.r32.ebx = 3;
@@ -4702 +4716 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0x00100000L,
-                                       extended_memory_size - ACPI_DATA_SIZE, 1);
+                                       extended_memory_size - ACPI_DATA_SIZE ,0, 0, 1);
                         regs.u.r32.ebx = 4;
                         regs.u.r32.eax = 0x534D4150;
@@ -4712 +4726 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        extended_memory_size - ACPI_DATA_SIZE,
-                                       extended_memory_size, 3); // ACPI RAM
+                                       extended_memory_size, 0, 0, 3); // ACPI RAM
                         regs.u.r32.ebx = 5;
                         regs.u.r32.eax = 0x534D4150;
@@ -4722 +4736 @@
                         /* 256KB BIOS area at the end of 4 GB */
                         set_e820_range(ES, regs.u.r16.di,
-                                       0xfffc0000L, 0x00000000L, 2);
+                                       0xfffc0000L, 0x00000000L, 0, 0, 2);
+                        if (extra_highbits_memory_size || extra_lowbits_memory_size)
+                            regs.u.r32.ebx = 6;
+                        else
+                            regs.u.r32.ebx = 0;
+                        regs.u.r32.eax = 0x534D4150;
+                        regs.u.r32.ecx = 0x14;
+                        CLEAR_CF();
+                        return;
+                    case 6:
+                        /* Maping of memory above 4 GB */
+                        set_e820_range(ES, regs.u.r16.di, 
+                                       0x00000000L, extra_lowbits_memory_size, 
+                                       1, extra_highbits_memory_size + 1, 1);
                         regs.u.r32.ebx = 0;
                         regs.u.r32.eax = 0x534D4150;

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -154 +154 @@
     /** PXE debug logging enabled? */
     uint8_t        u8PXEDebug;
+    /** Number of logical CPUs in guest */
+    uint16_t       u16numCPUs;
 } DEVPCBIOS, *PDEVPCBIOS;
 
@@ -500 +502 @@
      * Memory sizes.
      */
+    uint64_t ramInK = pThis->cbRam / _1K;
+    uint64_t above4GInK, below4GInK;
+    if (ramInK > 0xe0000000)
+    {
+        above4GInK = ramInK - 0xe0000000;
+        below4GInK = 0xe0000000;
+    }
+    else
+    {
+        above4GInK = 0;
+        below4GInK = ramInK;
+    }
+
+
     /* base memory. */
-    u32 = pThis->cbRam > 640 ? 640 : (uint32_t)pThis->cbRam / _1K;
+    u32 = below4GInK > 640 ? 640 : (uint32_t)below4GInK;
     pcbiosCmosWrite(pDevIns, 0x15, u32 & 0xff);                                 /* 15h - Base Memory in K, Low Byte */
     pcbiosCmosWrite(pDevIns, 0x16, u32 >> 8);                                   /* 16h - Base Memory in K, High Byte */
 
     /* Extended memory, up to 65MB */
-    u32 = pThis->cbRam >= 65 * _1M ? 0xffff : ((uint32_t)pThis->cbRam - _1M) / _1K;
+    u32 = below4GInK >= 65 * _1K ? 0xffff : ((uint32_t)below4GInK - _1K);
     pcbiosCmosWrite(pDevIns, 0x17, u32 & 0xff);                                 /* 17h - Extended Memory in K, Low Byte */
     pcbiosCmosWrite(pDevIns, 0x18, u32 >> 8);                                   /* 18h - Extended Memory in K, High Byte */
@@ -513 +529 @@
 
     /* Bochs BIOS specific? Anyway, it's the amount of memory above 16MB */
-    if (pThis->cbRam > 16 * _1M)
-    {
-        u32 = (uint32_t)( (pThis->cbRam - 16 * _1M) / _64K );
+    if (below4GInK > 16 * _1K)
+    {
+        u32 = (uint32_t)( (below4GInK - 16 * _1K) / 64 );
         u32 = RT_MIN(u32, 0xffff);
     }
@@ -522 +538 @@
     pcbiosCmosWrite(pDevIns, 0x34, u32 & 0xff);
     pcbiosCmosWrite(pDevIns, 0x35, u32 >> 8);
+
+    /* RAM above 4G */
+    pcbiosCmosWrite(pDevIns, 0x61, above4GInK >> 16);
+    pcbiosCmosWrite(pDevIns, 0x62, above4GInK >> 24);
+    pcbiosCmosWrite(pDevIns, 0x63, above4GInK >> 32);
+
+    /*
+     * Number of CPUs.
+     */
+    pcbiosCmosWrite(pDevIns, 0x60, pThis->u16numCPUs & 0xff);
 
     /*