Changeset 106051 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 13, 2024 4:03:16 PM (6 months ago)

Author:

vboxsync

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

164810

Message:

BIOS: Don't allocate AHCI data in EBDA, it can't be sagely relocated as it requires 1K alignment (see bugref:6549).

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ahci.c (modified) (11 diffs)
• biosint.h (modified) (1 diff)
• ebda.h (modified) (1 diff)
• post.c (modified) (4 diffs)
• scsi.c (modified) (1 diff)

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

@@ -348 +348 @@
 static uint16_t ahci_cmd_data(bio_dsk_t __far *bios_dsk, uint8_t cmd)
 {
-    ahci_t __far    *ahci  = (read_word(0x0040, 0x000E) + bios_dsk->ahci_ofs) :> 0;
+    ahci_t __far    *ahci  = bios_dsk->ahci_seg :> 0;
     uint16_t        n_sect = bios_dsk->drqp.nsect;
     uint16_t        sectsz = bios_dsk->drqp.sect_sz;
@@ -524 +524 @@
     uint16_t        device_id;
     uint16_t        rc;
-    uint16_t        ahci_seg = read_word(0x0040, 0x000E) + bios_dsk->ahci_ofs;
 
     device_id = VBOX_GET_AHCI_DEVICE(bios_dsk->drqp.dev_id);
@@ -534 +533 @@
              device_id, bios_dsk->ahcidev[device_id].port);
 
-    high_bits_save(ahci_seg :> 0);
-    ahci_port_init(ahci_seg :> 0, bios_dsk->ahcidev[device_id].port);
+    high_bits_save(bios_dsk->ahci_seg :> 0);
+    ahci_port_init(bios_dsk->ahci_seg :> 0, bios_dsk->ahcidev[device_id].port);
     rc = ahci_cmd_data(bios_dsk, AHCI_CMD_READ_DMA_EXT);
     DBG_AHCI("%s: transferred %lu bytes\n", __func__, ((ahci_t __far *)(bios_dsk->ahci_seg :> 0))->aCmdHdr[1]);
@@ -542 +541 @@
     rep_movsw(bios_dsk->drqp.buffer, bios_dsk->drqp.buffer, bios_dsk->drqp.nsect * 512 / 2);
 #endif
-    high_bits_restore(ahci_seg :> 0);
+    high_bits_restore(bios_dsk->ahci_seg :> 0);
     return rc;
 }
@@ -557 +556 @@
     uint16_t        device_id;
     uint16_t        rc;
-    uint16_t        ahci_seg = read_word(0x0040, 0x000E) + bios_dsk->ahci_ofs;
 
     device_id = VBOX_GET_AHCI_DEVICE(bios_dsk->drqp.dev_id);
@@ -567 +565 @@
              bios_dsk->ahcidev[device_id].port);
 
-    high_bits_save(ahci_seg :> 0);
-    ahci_port_init(ahci_seg :> 0, bios_dsk->ahcidev[device_id].port);
+    high_bits_save(bios_dsk->ahci_seg :> 0);
+    ahci_port_init(bios_dsk->ahci_seg :> 0, bios_dsk->ahcidev[device_id].port);
     rc = ahci_cmd_data(bios_dsk, AHCI_CMD_WRITE_DMA_EXT);
     DBG_AHCI("%s: transferred %lu bytes\n", __func__, ((ahci_t __far *)(bios_dsk->ahci_seg :> 0))->aCmdHdr[1]);
     bios_dsk->drqp.trsfsectors = bios_dsk->drqp.nsect;
-    high_bits_restore(ahci_seg :> 0);
+    high_bits_restore(bios_dsk->ahci_seg :> 0);
     return rc;
 }
@@ -584 +582 @@
                          uint32_t length, uint8_t inout, char __far *buffer)
 {
-    uint16_t        ebda_seg = read_word(0x0040, 0x000E);
-    bio_dsk_t __far *bios_dsk = ebda_seg :> &EbdaData->bdisk;
-    uint16_t        ahci_seg = ebda_seg + bios_dsk->ahci_ofs;
+    bio_dsk_t __far *bios_dsk = read_word(0x0040, 0x000E) :> &EbdaData->bdisk;
     ahci_t __far    *ahci;
 
@@ -608 +604 @@
 //    bios_dsk->drqp.sect_sz = 2048;
 
-    ahci = ahci_seg :> 0;
+    ahci = bios_dsk->ahci_seg :> 0;
     high_bits_save(ahci);
 
-    ahci_port_init(ahci_seg :> 0, bios_dsk->ahcidev[device_id].port);
+    ahci_port_init(bios_dsk->ahci_seg :> 0, bios_dsk->ahcidev[device_id].port);
 
     /* Copy the ATAPI command where the HBA can fetch it. */
@@ -836 +832 @@
     uint32_t            val;
     uint16_t            ebda_seg;
-    uint16_t            ahci_ofs;
     uint16_t            ahci_seg;
     bio_dsk_t __far     *bios_dsk;
     ahci_t __far        *ahci;
 
-    /* Allocate 1K of base memory (this will move the EBDA). */
-    ahci_ofs = ebda_mem_alloc(1/*KB*/);
-    if (ahci_ofs == 0)
+    /* Allocate 1K of base memory (this will move the EBDA).
+     * NB: The AHCI memory block must be 1K aligned. If the EBDA
+     * gets relocated, it will land on a paragraph aligned boundary;
+     * therefore the memory is allocated outside of the EBDA.
+     */
+    ahci_seg = conv_mem_alloc(1/*KB*/, 0/*in_ebda*/);
+    if (ahci_seg == 0)
     {
         DBG_AHCI("AHCI: Could not allocate 1K of memory\n");
@@ -850 +849 @@
 
     ebda_seg = read_word(0x0040, 0x000E);
-    ahci_seg = ebda_seg + ahci_ofs;
     bios_dsk = ebda_seg :> &EbdaData->bdisk;
 
@@ -858 +856 @@
              ahci_ctrl_extract_bits(val, 0x0000ffff,  0));
 
-    DBG_AHCI("AHCI: ahci_ofs=%04x, size=%04x, pointer at EBDA:%04x (EBDA size=%04x)\n",
-             ahci_ofs, sizeof(ahci_t), (uint16_t)&EbdaData->bdisk.ahci_ofs, sizeof(ebda_data_t));
-
-    bios_dsk->ahci_ofs    = ahci_ofs;
+    DBG_AHCI("AHCI: ahci_seg=%04x, size=%04x, pointer at EBDA:%04x (EBDA size=%04x)\n",
+             ahci_seg, sizeof(ahci_t), (uint16_t)&EbdaData->bdisk.ahci_seg, sizeof(ebda_data_t));
+
+    bios_dsk->ahci_seg    = ahci_seg;
     bios_dsk->ahci_devcnt = 0;
 

trunk/src/VBox/Devices/PC/BIOS/biosint.h

@@ -283 +283 @@
 extern  void        delay_boot(uint16_t secs);
 extern  bx_bool     set_enable_a20(bx_bool val);
-extern  uint16_t    ebda_mem_alloc(int n_kb);
+extern uint16_t     conv_mem_alloc(int n_kb, int in_ebda);
 
 #define printf(...)  bios_printf(BIOS_PRINTF_SCREEN, __VA_ARGS__)

trunk/src/VBox/Devices/PC/BIOS/ebda.h

@@ -285 +285 @@
     ahci_dev_t  ahcidev[BX_MAX_AHCI_DEVICES];
     uint8_t     ahci_devcnt;        /* Number of SATA devices. */
-    uint16_t    ahci_ofs;           /* Offset (in paragraphs) of AHCI data block within EBDA. */
+    uint16_t    ahci_seg;           /* Segment of AHCI data block. */
 #endif
 

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

@@ -219 +219 @@
 
 /**
- * Allocate n KB of conventional memory at the end of the EBDA.
+ * Allocate n KB of conventional memory, and either add it to
+ * the EBDA or just take it away from memory below 640K.
+ *
  * Returns offset (in paragraphs) to the allocated block within
- * the EBDA.
+ * the EBDA when adding to the EBDA, or segment address when
+ * allocating outside of the EBDA.
  *
  * NB: By default, the EBDA is 1KB in size, located at 639KB
@@ -237 +240 @@
  * shifted down.
  *
+ * To make relocating the EBDA practical, the EBDA must
+ * immediately follow the end of conventional memory. Therefore,
+ * new
+ *
  * WARNING: When successful, this function moves the EBDA!
  */
-uint16_t ebda_mem_alloc(int n_kb)
+uint16_t conv_mem_alloc(int n_kb, int in_ebda)
 {
     uint16_t        base_mem_kb;
@@ -247 +254 @@
     uint16_t        old_ebda_seg;
     uint16_t        new_ebda_seg;
+    uint16_t        ret_val;
 
     base_mem_kb = read_word(0x00, 0x0413);
@@ -271 +279 @@
     _fmemset(MK_FP(new_ebda_seg + user_ofs, 0), 0, user_size * 16);
 
-    /* Update the EBDA location and size. */
+    /* Update the EBDA location and possibly size. */
     write_word(0x0040, 0x000E, new_ebda_seg);
-    write_byte(new_ebda_seg, 0, ebda_kb + n_kb);
-
-    DPRINT("BIOS: added %04X paras at EBDA offset %04X\n", user_size, user_ofs);
-
-    return user_ofs;
-}
-
+    if (in_ebda) {
+        write_byte(new_ebda_seg, 0, ebda_kb + n_kb);
+        ret_val = user_ofs;
+    } else {
+        ret_val = new_ebda_seg + user_ofs;
+    }
+
+    DPRINT("BIOS: added %04X paras ofs or seg %04X\n", user_size, ret_val);
+    return ret_val;
+}
+

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

@@ -523 +523 @@
             uint8_t  u8Bus, u8DevFn;
             uint16_t hba_seg;
-            uint16_t hba_ofs = ebda_mem_alloc(1/*KB*/);
+            uint16_t hba_ofs = conv_mem_alloc(1/*KB*/, 1/*in_ebda*/);
             if (hba_ofs == 0) /* No point in trying the rest if we are out of memory. */
                 break;