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

Timestamp:

Jul 12, 2012 3:21:46 PM (13 years ago)

Author:

vboxsync

Message:

BIOS: Updating PCI BIOS service.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• Makefile.kmk (modified) (1 diff)
• inlines.h (modified) (2 diffs)
• makefile (modified) (4 diffs)
• orgs.asm (modified) (3 diffs)
• pci32.c (added)
• pcibio32.asm (modified) (1 diff)
• pcibios.c (modified) (13 diffs)

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -75 +75 @@
         system.c \
         timepci.c \
+        pcibios.c \
         ps2mouse.c \
         parallel.c \

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

@@ -69 +69 @@
     parm [es di] [dx si] [cx];
 
+#ifndef __386__
+
 char __far *rep_insb(char __far *buffer, unsigned nbytes, unsigned port);
 #pragma aux rep_insb = ".286" "rep insb" parm [es di] [cx] [dx] value [es di] modify exact [cx di];
@@ -96 +98 @@
     "xchg   ax, dx"     \
     parm [dx ax] value [dx ax] modify exact [dx ax] nomemory;
+
+#endif

trunk/src/VBox/Devices/PC/BIOS/makefile

@@ -10 +10 @@
 #
 !ifdef __UNIX__
-QUOTE=\"
+Q=\"
 !else
-QUOTE="
+Q="
 !endif
-CFLAGS = -q -0 -wx -zu -s -oas -d1+ -ms
-DEFS   = -DVBOX -DVBOX_LANBOOT_SEG=0xE200 -DVBOX_VERSION_STRING=$(QUOTE)0.9$(QUOTE) &
+CFLAGS   = -q -0 -wx -zu -s -oas -d1+ -ms
+CFLAGS32 = -q -wx -zu -s -oas -d1+ -nt=BIOS32 -nd=BIOS32
+
+DEFS = -DVBOX -DVBOX_LANBOOT_SEG=0xE200 -DVBOX_VERSION_STRING=$(Q)0.9$(Q) &
  -DVBOX_WITH_SCSI -DVBOX_WITH_AHCI
 
 AFLAGS = -q -0 -wx
 
-INCLS  = -I$(QUOTE)../../../../../include$(QUOTE)
+INCLS  = -I$(Q)../../../../../include$(Q)
 
 .c.obj : .autodepend
@@ -31 +33 @@
         keyboard.obj disk.obj serial.obj system.obj timepci.obj &
         ps2mouse.obj parallel.obj logo.obj scsi.obj ahci.obj &
-        pciutil.obj vds.obj pcibio32.obj orgs.obj
+        pcibios.obj pciutil.obj vds.obj pcibio32.obj pci32.obj orgs.obj
 
 vbxbios.rom : vbxbios.bin
@@ -43 +45 @@
          clname CODE &
          segment _TEXT segaddr=0xF000 offset=0x1600 &
-         segment BIOS32 segaddr=0xF000 offset=0xDE00 &
+         segment BIOS32 segaddr=0xF000 offset=0xDB00 &
          segment BIOSSEG segaddr=0xF000 offset=0xE000 &
          file { $(OBJS) } &
@@ -52 +54 @@
         wcc -fo=.obj $(INCLS) $(CFLAGS) $(DEFS) -DVBOX_PC_BIOS $<
 
+pci32.obj : pci32.c .autodepend
+        wcc386 -fo=.obj $(INCLS) $(DEFS) $(CFLAGS32) $<
+
 clean : .symbolic
         @rm -f *.obj *.err

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -111 +111 @@
 extrn           _int1a_function:near
 extrn           _int1a_function_pci:near
+extrn           _pci16_function:near
 extrn           _int70_function:near
 extrn           _int74_function:near
@@ -1645 +1646 @@
                 jne     int1a_normal
 
+if 0
                 call    pcibios_real
                 jc      pcibios_error
@@ -1660 +1662 @@
                 popa
                 iret
+else
+                push    es
+                push    ds
+                C_SETUP
+                .386
+                pushad
+                call    _pci16_function
+                popad
+                .286
+                pop     ds
+                pop     es
+                iret
+endif
 
 int1a_normal:

trunk/src/VBox/Devices/PC/BIOS/pcibio32.asm

@@ -108 +108 @@
 align 16
 pcibios_protected:
+if 1
+;; The old implementation of pcibios_protected will eventually go,
+;; replaced by C code.
+else
+
+extrn   _pci32_function:near
+
+                pushfd
+                pushad
+                call    _pci32_function
+                popad
+                popfd
+                retf
+endif
                 pushfd
                 cli

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

@@ -63 +63 @@
 #define BP      r.gr.u.r16.bp
 #define SP      r.gr.u.r16.sp
-#define FLAGS   r.ra.flags.u.r16.flags
 #define EAX     r.gr.u.r32.eax
 #define EBX     r.gr.u.r32.ebx
@@ -90 +89 @@
 #define PCI_CFG_ADDR    0xCF8
 #define PCI_CFG_DATA    0xCFC
+
+#ifdef __386__
+
+#define PCIxx(x)    pci32_##x
+
+/* The stack layout is different in 32-bit mode. */
+typedef struct {
+    pushad_regs_t   gr;
+    uint32_t        flags;
+} pci_regs_t;
+
+#define FLAGS   r.flags
+
+/* In 32-bit mode, don't do any output; not technically impossible but needs
+ * a lot of extra code.
+ */
+#undef  BX_INFO
+#define BX_INFO(...)
+#undef  BX_DEBUG_PCI
+#define BX_DEBUG_PCI(...)
+
+#else
+
+#define PCIxx(x)    pci16_##x
+
+typedef struct {
+    pushad_regs_t   gr;
+    uint16_t        es;
+    uint16_t        ds;
+    iret_addr_t     ra;
+} pci_regs_t;
+
+#define FLAGS   r.ra.flags.u.r16.flags
+
+#endif
+
+#ifdef __386__
+
+/* 32-bit code can just use the compiler intrinsics. */
+extern unsigned inpd(unsigned port);
+extern unsigned outpd(unsigned port, unsigned value);
+#pragma intrinsic(inpd,outpd)
+
+#else
 
 //@todo: merge with AHCI code
@@ -113 +156 @@
     parm [dx] [cx ax] modify nomemory;
 
+#endif
+
 /* Write the CONFIG_ADDRESS register to prepare for data access. Requires
  * the register offset to be DWORD aligned (low two bits clear). Warning:
@@ -131 +176 @@
  * This is largely a wrapper to avoid excessive inlining.
  */
-void pci16_select_reg(uint16_t bus_dev_fn, uint16_t ofs)
+void PCIxx(select_reg)(uint16_t bus_dev_fn, uint16_t ofs)
 {
     pci16_w_addr(bus_dev_fn, ofs & ~3, PCI_CFG_ADDR);
 }
 
+/* Selected configuration space offsets. */
 #define PCI_VEN_ID          0x00
 #define PCI_DEV_ID          0x02
@@ -141 +187 @@
 #define PCI_CLASS_CODE      0x09
 #define PCI_HEADER_TYPE     0x0E
-
+#define PCI_BRIDGE_SUBORD   0x1A
+
+/* To avoid problems with 16-bit code, we reserve the last possible
+ * bus/dev/fn combination (65,535). Upon reaching this location, the
+ * probing will end.
+ */
+#define INDEX_NOT_FOUND     0xFFFF
 
 /* Find a specified PCI device, either by vendor+device ID or class.
@@ -151 +203 @@
  * non-present devices.
  */
-uint16_t pci16_find_device(uint32_t search_item, uint16_t index, int search_class)
+uint16_t PCIxx(find_device)(uint32_t search_item, uint16_t index, int search_class)
 {
     uint32_t    data;
@@ -157 +209 @@
     uint8_t     max_bus;
     uint8_t     hdr_type;
+    uint8_t     subordinate;
     int         step;
     int         found;
@@ -179 +232 @@
          */
         if ((bus_dev_fn & 7) == 0) {
-            pci16_select_reg(bus_dev_fn, PCI_HEADER_TYPE);
+            PCIxx(select_reg)(bus_dev_fn, PCI_HEADER_TYPE);
             hdr_type = inp(PCI_CFG_DATA + (PCI_HEADER_TYPE & 3));
             if (hdr_type == 0xFF) {
@@ -196 +249 @@
          * there will be only the primary bus (i.e. bus 0) and we can avoid
          * looking at the remaining 255 theoretically present buses. This check
-         * only needs to be done on the primary bus (bridges must report all
-         * bridges behind them).
+         * only needs to be done on the primary bus, since bridges must report
+         * all bridges potentially behind them.
          */
         if ((hdr_type & 7) == 1 && (bus_dev_fn >> 8) == 0) {
+            /* Read the subordinate (last) bridge number. */
+            PCIxx(select_reg)(bus_dev_fn, PCI_BRIDGE_SUBORD);
+            subordinate = inp(PCI_CFG_DATA + (PCI_BRIDGE_SUBORD & 3));
+            if (subordinate > max_bus)
+                max_bus = subordinate;
         }
 
         /* Select the appropriate register. */
-        pci16_select_reg(bus_dev_fn, search_class ? PCI_REV_ID : PCI_VEN_ID);
+        PCIxx(select_reg)(bus_dev_fn, search_class ? PCI_REV_ID : PCI_VEN_ID);
         data  = inpd(PCI_CFG_DATA);
         found = 0;
@@ -226 +284 @@
     } while ((bus_dev_fn >> 8) <= max_bus);
 
-    if (index == ~0)
+    if (index == INDEX_NOT_FOUND)
         BX_DEBUG_PCI("PCI: Device found (%02X:%%02X:%01X)\n", bus_dev_fn >> 8,
                      bus_dev_fn >> 3 & 31, bus_dev_fn & 7);
 
-    return index == ~0 ? bus_dev_fn : ~0;
+    return index == INDEX_NOT_FOUND ? bus_dev_fn : INDEX_NOT_FOUND;
 }
 
-void BIOSCALL pci16_function(volatile pci_regs_t r)
+void BIOSCALL PCIxx(function)(volatile pci_regs_t r)
 {
     uint16_t    device;
@@ -254 +312 @@
          * be easily detected.
          */
-        if (DX == ~0) {
+        if (DX == 0xFFFF) {
             SET_AH(BAD_VENDOR_ID);
             SET_CF();
         } else {
-            device = pci16_find_device(DX | (uint32_t)CX << 16, SI, 0);
-            if (device == ~0) {
+            device = PCIxx(find_device)(DX | (uint32_t)CX << 16, SI, 0);
+            if (device == INDEX_NOT_FOUND) {
                 SET_AH(DEVICE_NOT_FOUND);
                 SET_CF();
@@ -268 +326 @@
         break;
     case FIND_PCI_CLASS_CODE:
-        device = pci16_find_device(ECX, SI, 1);
-        if (device == ~0) {
+        device = PCIxx(find_device)(ECX, SI, 1);
+        if (device == INDEX_NOT_FOUND) {
             SET_AH(DEVICE_NOT_FOUND);
             SET_CF();
@@ -286 +344 @@
             SET_CF();
         } else {
-            pci16_select_reg(BX, DI);
+            PCIxx(select_reg)(BX, DI);
             switch (GET_AL()) {
             case READ_CONFIG_BYTE: