From d4afc623ae3ca529ff16cc2cf5de9293310de3e6 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 24 Sep 2006 18:38:12 +0000 Subject: [PATCH] moved PCI, MP and ACPI init to bios git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2167 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios.bin | Bin 65536 -> 131072 bytes pc-bios/bios.diff | 3068 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 2835 insertions(+), 233 deletions(-) diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index 64be517b248ec359e109217b9021517050ec30e3..051fdbb1483a22a58ddbe6cf9d6edf51c31bff87 100644 GIT binary patch literal 131072 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 #Ad=5eCBZw-f4wM&NIvOy`(f?&qFA8Y?VGjR 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 AR{#J2 diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index e87592784a..e70499017d 100644 --- a/pc-bios/bios.diff +++ b/pc-bios/bios.diff @@ -1,270 +1,2872 @@ -Index: apmbios.S -=================================================================== -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 3 May 2006 21:22:46 -0000 -@@ -225,6 +225,7 @@ - APMSYM(05): - cmp al, #0x05 - jne APMSYM(07) -+ sti - hlt - jmp APMSYM(ok) +diff -ruN --exclude Makefile bios/acpi-dsdt.dsl bios.new/acpi-dsdt.dsl +--- bios/acpi-dsdt.dsl 1970-01-01 01:00:00.000000000 +0100 ++++ bios.new/acpi-dsdt.dsl 2006-09-24 20:27:54.000000000 +0200 +@@ -0,0 +1,559 @@ ++/* ++ * QEMU ACPI DSDT ASL definition ++ * ++ * Copyright (c) 2006 Fabrice Bellard ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License version 2 as published by the Free Software Foundation. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++DefinitionBlock ( ++ "acpi-dsdt.aml", // Output Filename ++ "DSDT", // Signature ++ 0x01, // DSDT Compliance Revision ++ "QEMU", // OEMID ++ "QEMUDSDT", // TABLE ID ++ 0x1 // OEM Revision ++ ) ++{ ++ Scope (\) ++ { ++ /* CMOS memory access */ ++ OperationRegion (CMS, SystemIO, 0x70, 0x02) ++ Field (CMS, ByteAcc, NoLock, Preserve) ++ { ++ CMSI, 8, ++ CMSD, 8 ++ } ++ Method (CMRD, 1, NotSerialized) ++ { ++ Store (Arg0, CMSI) ++ Store (CMSD, Local0) ++ Return (Local0) ++ } ++ ++ /* Debug Output */ ++ OperationRegion (DBG, SystemIO, 0xb044, 0x04) ++ Field (DBG, DWordAcc, NoLock, Preserve) ++ { ++ DBGL, 32, ++ } ++ } ++ ++ ++ /* PCI Bus definition */ ++ Scope(\_SB) { ++ Device(PCI0) { ++ Name (_HID, EisaId ("PNP0A03")) ++ Name (_ADR, 0x00) ++ Name (_UID, 1) ++ Name(_PRT, Package() { ++ /* PCI IRQ routing table, example from ACPI 2.0a specification, ++ section 6.2.8.1 */ ++ /* Note: we provide the same info as the PCI routing ++ table of the Bochs BIOS */ ++ ++ // PCI Slot 0 ++ Package() {0x0000ffff, 0, LNKD, 0}, ++ Package() {0x0000ffff, 1, LNKA, 0}, ++ Package() {0x0000ffff, 2, LNKB, 0}, ++ Package() {0x0000ffff, 3, LNKC, 0}, ++ ++ // PCI Slot 1 ++ Package() {0x0001ffff, 0, LNKA, 0}, ++ Package() {0x0001ffff, 1, LNKB, 0}, ++ Package() {0x0001ffff, 2, LNKC, 0}, ++ Package() {0x0001ffff, 3, LNKD, 0}, ++ ++ // PCI Slot 2 ++ Package() {0x0002ffff, 0, LNKB, 0}, ++ Package() {0x0002ffff, 1, LNKC, 0}, ++ Package() {0x0002ffff, 2, LNKD, 0}, ++ Package() {0x0002ffff, 3, LNKA, 0}, ++ ++ // PCI Slot 3 ++ Package() {0x0003ffff, 0, LNKC, 0}, ++ Package() {0x0003ffff, 1, LNKD, 0}, ++ Package() {0x0003ffff, 2, LNKA, 0}, ++ Package() {0x0003ffff, 3, LNKB, 0}, ++ ++ // PCI Slot 4 ++ Package() {0x0004ffff, 0, LNKD, 0}, ++ Package() {0x0004ffff, 1, LNKA, 0}, ++ Package() {0x0004ffff, 2, LNKB, 0}, ++ Package() {0x0004ffff, 3, LNKC, 0}, ++ ++ // PCI Slot 5 ++ Package() {0x0005ffff, 0, LNKA, 0}, ++ Package() {0x0005ffff, 1, LNKB, 0}, ++ Package() {0x0005ffff, 2, LNKC, 0}, ++ Package() {0x0005ffff, 3, LNKD, 0}, ++ }) ++ ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (MEMP, ResourceTemplate () ++ { ++ WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode, ++ 0x0000, // Address Space Granularity ++ 0x0000, // Address Range Minimum ++ 0x00FF, // Address Range Maximum ++ 0x0000, // Address Translation Offset ++ 0x0100, // Address Length ++ ,, ) ++ IO (Decode16, ++ 0x0CF8, // Address Range Minimum ++ 0x0CF8, // Address Range Maximum ++ 0x01, // Address Alignment ++ 0x08, // Address Length ++ ) ++ WordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange, ++ 0x0000, // Address Space Granularity ++ 0x0000, // Address Range Minimum ++ 0x0CF7, // Address Range Maximum ++ 0x0000, // Address Translation Offset ++ 0x0CF8, // Address Length ++ ,, , TypeStatic) ++ WordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange, ++ 0x0000, // Address Space Granularity ++ 0x0D00, // Address Range Minimum ++ 0xFFFF, // Address Range Maximum ++ 0x0000, // Address Translation Offset ++ 0xF300, // Address Length ++ ,, , TypeStatic) ++ DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite, ++ 0x00000000, // Address Space Granularity ++ 0x000A0000, // Address Range Minimum ++ 0x000BFFFF, // Address Range Maximum ++ 0x00000000, // Address Translation Offset ++ 0x00020000, // Address Length ++ ,, , AddressRangeMemory, TypeStatic) ++ DWordMemory (ResourceProducer, PosDecode, MinNotFixed, MaxFixed, NonCacheable, ReadWrite, ++ 0x00000000, // Address Space Granularity ++ 0x00000000, // Address Range Minimum ++ 0xFEBFFFFF, // Address Range Maximum ++ 0x00000000, // Address Translation Offset ++ 0x00000000, // Address Length ++ ,, MEMF, AddressRangeMemory, TypeStatic) ++ }) ++ CreateDWordField (MEMP, \_SB.PCI0._CRS.MEMF._MIN, PMIN) ++ CreateDWordField (MEMP, \_SB.PCI0._CRS.MEMF._MAX, PMAX) ++ CreateDWordField (MEMP, \_SB.PCI0._CRS.MEMF._LEN, PLEN) ++ /* compute available RAM */ ++ Add(CMRD(0x34), ShiftLeft(CMRD(0x35), 8), Local0) ++ ShiftLeft(Local0, 16, Local0) ++ Add(Local0, 0x1000000, Local0) ++ /* update field of last region */ ++ Store(Local0, PMIN) ++ Subtract (PMAX, PMIN, PLEN) ++ Increment (PLEN) ++ Return (MEMP) ++ } ++ } ++ } ++ ++ Scope(\_SB.PCI0) { ++ ++ /* PIIX3 ISA bridge */ ++ Device (ISA) { ++ Name (_ADR, 0x00010000) ++ ++ /* PIIX PCI to ISA irq remapping */ ++ OperationRegion (P40C, PCI_Config, 0x60, 0x04) ++ ++ ++ /* Keyboard seems to be important for WinXP install */ ++ Device (KBD) ++ { ++ Name (_HID, EisaId ("PNP0303")) ++ Method (_STA, 0, NotSerialized) ++ { ++ Return (0x0f) ++ } ++ ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (TMP, ResourceTemplate () ++ { ++ IO (Decode16, ++ 0x0060, // Address Range Minimum ++ 0x0060, // Address Range Maximum ++ 0x01, // Address Alignment ++ 0x01, // Address Length ++ ) ++ IO (Decode16, ++ 0x0064, // Address Range Minimum ++ 0x0064, // Address Range Maximum ++ 0x01, // Address Alignment ++ 0x01, // Address Length ++ ) ++ IRQNoFlags () ++ {1} ++ }) ++ Return (TMP) ++ } ++ } ++ ++ /* PS/2 mouse */ ++ Device (MOU) ++ { ++ Name (_HID, EisaId ("PNP0F13")) ++ Method (_STA, 0, NotSerialized) ++ { ++ Return (0x0f) ++ } ++ ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (TMP, ResourceTemplate () ++ { ++ IRQNoFlags () {12} ++ }) ++ Return (TMP) ++ } ++ } ++ ++ /* PS/2 floppy controller */ ++ Device (FDC0) ++ { ++ Name (_HID, EisaId ("PNP0700")) ++ Method (_STA, 0, NotSerialized) ++ { ++ Return (0x0F) ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (BUF0, ResourceTemplate () ++ { ++ IO (Decode16, 0x03F2, 0x03F2, 0x00, 0x04) ++ IO (Decode16, 0x03F7, 0x03F7, 0x00, 0x01) ++ IRQNoFlags () {6} ++ DMA (Compatibility, NotBusMaster, Transfer8) {2} ++ }) ++ Return (BUF0) ++ } ++ } ++ ++ /* Parallel port */ ++ Device (LPT) ++ { ++ Name (_HID, EisaId ("PNP0400")) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (\_SB.PCI0.PX13.DRSA, Local0) ++ And (Local0, 0x80000000, Local0) ++ If (LEqual (Local0, 0)) ++ { ++ Return (0x00) ++ } ++ Else ++ { ++ Return (0x0F) ++ } ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (BUF0, ResourceTemplate () ++ { ++ IO (Decode16, 0x0378, 0x0378, 0x08, 0x08) ++ IRQNoFlags () {7} ++ }) ++ Return (BUF0) ++ } ++ } ++ ++ /* Serial Ports */ ++ Device (COM1) ++ { ++ Name (_HID, EisaId ("PNP0501")) ++ Name (_UID, 0x01) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (\_SB.PCI0.PX13.DRSC, Local0) ++ And (Local0, 0x08000000, Local0) ++ If (LEqual (Local0, 0)) ++ { ++ Return (0x00) ++ } ++ Else ++ { ++ Return (0x0F) ++ } ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (BUF0, ResourceTemplate () ++ { ++ IO (Decode16, 0x03F8, 0x03F8, 0x00, 0x08) ++ IRQNoFlags () {4} ++ }) ++ Return (BUF0) ++ } ++ } ++ ++ Device (COM2) ++ { ++ Name (_HID, EisaId ("PNP0501")) ++ Name (_UID, 0x02) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (\_SB.PCI0.PX13.DRSC, Local0) ++ And (Local0, 0x80000000, Local0) ++ If (LEqual (Local0, 0)) ++ { ++ Return (0x00) ++ } ++ Else ++ { ++ Return (0x0F) ++ } ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (BUF0, ResourceTemplate () ++ { ++ IO (Decode16, 0x02F8, 0x02F8, 0x00, 0x08) ++ IRQNoFlags () {3} ++ }) ++ Return (BUF0) ++ } ++ } ++ } ++ ++ /* PIIX4 PM */ ++ Device (PX13) { ++ Name (_ADR, 0x00010003) ++ ++ OperationRegion (P13C, PCI_Config, 0x5c, 0x24) ++ Field (P13C, DWordAcc, NoLock, Preserve) ++ { ++ DRSA, 32, ++ DRSB, 32, ++ DRSC, 32, ++ DRSE, 32, ++ DRSF, 32, ++ DRSG, 32, ++ DRSH, 32, ++ DRSI, 32, ++ DRSJ, 32 ++ } ++ } ++ } ++ ++ /* PCI IRQs */ ++ Scope(\_SB) { ++ Field (\_SB.PCI0.ISA.P40C, ByteAcc, NoLock, Preserve) ++ { ++ PRQ0, 8, ++ PRQ1, 8, ++ PRQ2, 8, ++ PRQ3, 8 ++ } ++ ++ Device(LNKA){ ++ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link ++ Name(_UID, 1) ++ Name(_PRS, ResourceTemplate(){ ++ IRQ (Level, ActiveLow, Shared) ++ {3,4,5,6,7,9,10,11,12} ++ }) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (0x0B, Local0) ++ If (And (0x80, PRQ0, Local1)) ++ { ++ Store (0x09, Local0) ++ } ++ Return (Local0) ++ } ++ Method (_DIS, 0, NotSerialized) ++ { ++ Or (PRQ0, 0x80, PRQ0) ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (PRR0, ResourceTemplate () ++ { ++ IRQ (Level, ActiveLow, Shared) ++ {1} ++ }) ++ CreateWordField (PRR0, 0x01, TMP) ++ Store (PRQ0, Local0) ++ If (LLess (Local0, 0x80)) ++ { ++ ShiftLeft (One, Local0, TMP) ++ } ++ Else ++ { ++ Store (Zero, TMP) ++ } ++ Return (PRR0) ++ } ++ Method (_SRS, 1, NotSerialized) ++ { ++ CreateWordField (Arg0, 0x01, TMP) ++ FindSetRightBit (TMP, Local0) ++ Decrement (Local0) ++ Store (Local0, PRQ0) ++ } ++ } ++ Device(LNKB){ ++ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link ++ Name(_UID, 2) ++ Name(_PRS, ResourceTemplate(){ ++ IRQ (Level, ActiveLow, Shared) ++ {3,4,5,6,7,9,10,11,12} ++ }) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (0x0B, Local0) ++ If (And (0x80, PRQ1, Local1)) ++ { ++ Store (0x09, Local0) ++ } ++ Return (Local0) ++ } ++ Method (_DIS, 0, NotSerialized) ++ { ++ Or (PRQ1, 0x80, PRQ1) ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (PRR0, ResourceTemplate () ++ { ++ IRQ (Level, ActiveLow, Shared) ++ {1} ++ }) ++ CreateWordField (PRR0, 0x01, TMP) ++ Store (PRQ1, Local0) ++ If (LLess (Local0, 0x80)) ++ { ++ ShiftLeft (One, Local0, TMP) ++ } ++ Else ++ { ++ Store (Zero, TMP) ++ } ++ Return (PRR0) ++ } ++ Method (_SRS, 1, NotSerialized) ++ { ++ CreateWordField (Arg0, 0x01, TMP) ++ FindSetRightBit (TMP, Local0) ++ Decrement (Local0) ++ Store (Local0, PRQ1) ++ } ++ } ++ Device(LNKC){ ++ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link ++ Name(_UID, 3) ++ Name(_PRS, ResourceTemplate(){ ++ IRQ (Level, ActiveLow, Shared) ++ {3,4,5,6,7,9,10,11,12} ++ }) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (0x0B, Local0) ++ If (And (0x80, PRQ2, Local1)) ++ { ++ Store (0x09, Local0) ++ } ++ Return (Local0) ++ } ++ Method (_DIS, 0, NotSerialized) ++ { ++ Or (PRQ2, 0x80, PRQ2) ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (PRR0, ResourceTemplate () ++ { ++ IRQ (Level, ActiveLow, Shared) ++ {1} ++ }) ++ CreateWordField (PRR0, 0x01, TMP) ++ Store (PRQ2, Local0) ++ If (LLess (Local0, 0x80)) ++ { ++ ShiftLeft (One, Local0, TMP) ++ } ++ Else ++ { ++ Store (Zero, TMP) ++ } ++ Return (PRR0) ++ } ++ Method (_SRS, 1, NotSerialized) ++ { ++ CreateWordField (Arg0, 0x01, TMP) ++ FindSetRightBit (TMP, Local0) ++ Decrement (Local0) ++ Store (Local0, PRQ2) ++ } ++ } ++ Device(LNKD){ ++ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link ++ Name(_UID, 4) ++ Name(_PRS, ResourceTemplate(){ ++ IRQ (Level, ActiveLow, Shared) ++ {3,4,5,6,7,9,10,11,12} ++ }) ++ Method (_STA, 0, NotSerialized) ++ { ++ Store (0x0B, Local0) ++ If (And (0x80, PRQ3, Local1)) ++ { ++ Store (0x09, Local0) ++ } ++ Return (Local0) ++ } ++ Method (_DIS, 0, NotSerialized) ++ { ++ Or (PRQ3, 0x80, PRQ3) ++ } ++ Method (_CRS, 0, NotSerialized) ++ { ++ Name (PRR0, ResourceTemplate () ++ { ++ IRQ (Level, ActiveLow, Shared) ++ {1} ++ }) ++ CreateWordField (PRR0, 0x01, TMP) ++ Store (PRQ3, Local0) ++ If (LLess (Local0, 0x80)) ++ { ++ ShiftLeft (One, Local0, TMP) ++ } ++ Else ++ { ++ Store (Zero, TMP) ++ } ++ Return (PRR0) ++ } ++ Method (_SRS, 1, NotSerialized) ++ { ++ CreateWordField (Arg0, 0x01, TMP) ++ FindSetRightBit (TMP, Local0) ++ Decrement (Local0) ++ Store (Local0, PRQ3) ++ } ++ } ++ } ++ ++ /* S5 = power off state */ ++ Name (_S5, Package (4) { ++ 0x00, // PM1a_CNT.SLP_TYP ++ 0x00, // PM2a_CNT.SLP_TYP ++ 0x00, // reserved ++ 0x00, // reserved ++ }) ++} +diff -ruN --exclude Makefile bios/acpi-dsdt.hex bios.new/acpi-dsdt.hex +--- bios/acpi-dsdt.hex 1970-01-01 01:00:00.000000000 +0100 ++++ bios.new/acpi-dsdt.hex 2006-09-24 20:27:54.000000000 +0200 +@@ -0,0 +1,278 @@ ++/* ++ * ++ * Intel ACPI Component Architecture ++ * ASL Optimizing Compiler version 20060421 [Apr 29 2006] ++ * Copyright (C) 2000 - 2006 Intel Corporation ++ * Supports ACPI Specification Revision 3.0a ++ * ++ * Compilation of "/usr/local/home/bellard/qemu-current/hw/acpi-dsdt.dsl" - Wed Jun 14 20:09:53 2006 ++ * ++ * C source code output ++ * ++ */ ++unsigned char AmlCode[] = ++{ ++ 0x44,0x53,0x44,0x54,0x32,0x08,0x00,0x00, /* 00000000 "DSDT2..." */ ++ 0x01,0x5B,0x51,0x45,0x4D,0x55,0x00,0x00, /* 00000008 ".[QEMU.." */ ++ 0x51,0x45,0x4D,0x55,0x44,0x53,0x44,0x54, /* 00000010 "QEMUDSDT" */ ++ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ ++ 0x21,0x04,0x06,0x20,0x10,0x4F,0x04,0x5C, /* 00000020 "!.. .O.\" */ ++ 0x00,0x5B,0x80,0x43,0x4D,0x53,0x5F,0x01, /* 00000028 ".[.CMS_." */ ++ 0x0A,0x70,0x0A,0x02,0x5B,0x81,0x10,0x43, /* 00000030 ".p..[..C" */ ++ 0x4D,0x53,0x5F,0x01,0x43,0x4D,0x53,0x49, /* 00000038 "MS_.CMSI" */ ++ 0x08,0x43,0x4D,0x53,0x44,0x08,0x14,0x14, /* 00000040 ".CMSD..." */ ++ 0x43,0x4D,0x52,0x44,0x01,0x70,0x68,0x43, /* 00000048 "CMRD.phC" */ ++ 0x4D,0x53,0x49,0x70,0x43,0x4D,0x53,0x44, /* 00000050 "MSIpCMSD" */ ++ 0x60,0xA4,0x60,0x5B,0x80,0x44,0x42,0x47, /* 00000058 "`.`[.DBG" */ ++ 0x5F,0x01,0x0B,0x44,0xB0,0x0A,0x04,0x5B, /* 00000060 "_..D...[" */ ++ 0x81,0x0B,0x44,0x42,0x47,0x5F,0x03,0x44, /* 00000068 "..DBG_.D" */ ++ 0x42,0x47,0x4C,0x20,0x10,0x4E,0x25,0x5F, /* 00000070 "BGL .N%_" */ ++ 0x53,0x42,0x5F,0x5B,0x82,0x46,0x25,0x50, /* 00000078 "SB_[.F%P" */ ++ 0x43,0x49,0x30,0x08,0x5F,0x48,0x49,0x44, /* 00000080 "CI0._HID" */ ++ 0x0C,0x41,0xD0,0x0A,0x03,0x08,0x5F,0x41, /* 00000088 ".A...._A" */ ++ 0x44,0x52,0x00,0x08,0x5F,0x55,0x49,0x44, /* 00000090 "DR.._UID" */ ++ 0x01,0x08,0x5F,0x50,0x52,0x54,0x12,0x47, /* 00000098 ".._PRT.G" */ ++ 0x15,0x18,0x12,0x0B,0x04,0x0B,0xFF,0xFF, /* 000000A0 "........" */ ++ 0x00,0x4C,0x4E,0x4B,0x44,0x00,0x12,0x0B, /* 000000A8 ".LNKD..." */ ++ 0x04,0x0B,0xFF,0xFF,0x01,0x4C,0x4E,0x4B, /* 000000B0 ".....LNK" */ ++ 0x41,0x00,0x12,0x0C,0x04,0x0B,0xFF,0xFF, /* 000000B8 "A......." */ ++ 0x0A,0x02,0x4C,0x4E,0x4B,0x42,0x00,0x12, /* 000000C0 "..LNKB.." */ ++ 0x0C,0x04,0x0B,0xFF,0xFF,0x0A,0x03,0x4C, /* 000000C8 ".......L" */ ++ 0x4E,0x4B,0x43,0x00,0x12,0x0D,0x04,0x0C, /* 000000D0 "NKC....." */ ++ 0xFF,0xFF,0x01,0x00,0x00,0x4C,0x4E,0x4B, /* 000000D8 ".....LNK" */ ++ 0x41,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 000000E0 "A......." */ ++ 0x01,0x00,0x01,0x4C,0x4E,0x4B,0x42,0x00, /* 000000E8 "...LNKB." */ ++ 0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x01,0x00, /* 000000F0 "........" */ ++ 0x0A,0x02,0x4C,0x4E,0x4B,0x43,0x00,0x12, /* 000000F8 "..LNKC.." */ ++ 0x0E,0x04,0x0C,0xFF,0xFF,0x01,0x00,0x0A, /* 00000100 "........" */ ++ 0x03,0x4C,0x4E,0x4B,0x44,0x00,0x12,0x0D, /* 00000108 ".LNKD..." */ ++ 0x04,0x0C,0xFF,0xFF,0x02,0x00,0x00,0x4C, /* 00000110 ".......L" */ ++ 0x4E,0x4B,0x42,0x00,0x12,0x0D,0x04,0x0C, /* 00000118 "NKB....." */ ++ 0xFF,0xFF,0x02,0x00,0x01,0x4C,0x4E,0x4B, /* 00000120 ".....LNK" */ ++ 0x43,0x00,0x12,0x0E,0x04,0x0C,0xFF,0xFF, /* 00000128 "C......." */ ++ 0x02,0x00,0x0A,0x02,0x4C,0x4E,0x4B,0x44, /* 00000130 "....LNKD" */ ++ 0x00,0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x02, /* 00000138 "........" */ ++ 0x00,0x0A,0x03,0x4C,0x4E,0x4B,0x41,0x00, /* 00000140 "...LNKA." */ ++ 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x03,0x00, /* 00000148 "........" */ ++ 0x00,0x4C,0x4E,0x4B,0x43,0x00,0x12,0x0D, /* 00000150 ".LNKC..." */ ++ 0x04,0x0C,0xFF,0xFF,0x03,0x00,0x01,0x4C, /* 00000158 ".......L" */ ++ 0x4E,0x4B,0x44,0x00,0x12,0x0E,0x04,0x0C, /* 00000160 "NKD....." */ ++ 0xFF,0xFF,0x03,0x00,0x0A,0x02,0x4C,0x4E, /* 00000168 "......LN" */ ++ 0x4B,0x41,0x00,0x12,0x0E,0x04,0x0C,0xFF, /* 00000170 "KA......" */ ++ 0xFF,0x03,0x00,0x0A,0x03,0x4C,0x4E,0x4B, /* 00000178 ".....LNK" */ ++ 0x42,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 00000180 "B......." */ ++ 0x04,0x00,0x00,0x4C,0x4E,0x4B,0x44,0x00, /* 00000188 "...LNKD." */ ++ 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x04,0x00, /* 00000190 "........" */ ++ 0x01,0x4C,0x4E,0x4B,0x41,0x00,0x12,0x0E, /* 00000198 ".LNKA..." */ ++ 0x04,0x0C,0xFF,0xFF,0x04,0x00,0x0A,0x02, /* 000001A0 "........" */ ++ 0x4C,0x4E,0x4B,0x42,0x00,0x12,0x0E,0x04, /* 000001A8 "LNKB...." */ ++ 0x0C,0xFF,0xFF,0x04,0x00,0x0A,0x03,0x4C, /* 000001B0 ".......L" */ ++ 0x4E,0x4B,0x43,0x00,0x12,0x0D,0x04,0x0C, /* 000001B8 "NKC....." */ ++ 0xFF,0xFF,0x05,0x00,0x00,0x4C,0x4E,0x4B, /* 000001C0 ".....LNK" */ ++ 0x41,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 000001C8 "A......." */ ++ 0x05,0x00,0x01,0x4C,0x4E,0x4B,0x42,0x00, /* 000001D0 "...LNKB." */ ++ 0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x05,0x00, /* 000001D8 "........" */ ++ 0x0A,0x02,0x4C,0x4E,0x4B,0x43,0x00,0x12, /* 000001E0 "..LNKC.." */ ++ 0x0E,0x04,0x0C,0xFF,0xFF,0x05,0x00,0x0A, /* 000001E8 "........" */ ++ 0x03,0x4C,0x4E,0x4B,0x44,0x00,0x14,0x4C, /* 000001F0 ".LNKD..L" */ ++ 0x0D,0x5F,0x43,0x52,0x53,0x00,0x08,0x4D, /* 000001F8 "._CRS..M" */ ++ 0x45,0x4D,0x50,0x11,0x42,0x07,0x0A,0x6E, /* 00000200 "EMP.B..n" */ ++ 0x88,0x0D,0x00,0x02,0x0C,0x00,0x00,0x00, /* 00000208 "........" */ ++ 0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x01, /* 00000210 "........" */ ++ 0x47,0x01,0xF8,0x0C,0xF8,0x0C,0x01,0x08, /* 00000218 "G......." */ ++ 0x88,0x0D,0x00,0x01,0x0C,0x03,0x00,0x00, /* 00000220 "........" */ ++ 0x00,0x00,0xF7,0x0C,0x00,0x00,0xF8,0x0C, /* 00000228 "........" */ ++ 0x88,0x0D,0x00,0x01,0x0C,0x03,0x00,0x00, /* 00000230 "........" */ ++ 0x00,0x0D,0xFF,0xFF,0x00,0x00,0x00,0xF3, /* 00000238 "........" */ ++ 0x87,0x17,0x00,0x00,0x0C,0x03,0x00,0x00, /* 00000240 "........" */ ++ 0x00,0x00,0x00,0x00,0x0A,0x00,0xFF,0xFF, /* 00000248 "........" */ ++ 0x0B,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000250 "........" */ ++ 0x02,0x00,0x87,0x17,0x00,0x00,0x08,0x01, /* 00000258 "........" */ ++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000260 "........" */ ++ 0xFF,0xFF,0xBF,0xFE,0x00,0x00,0x00,0x00, /* 00000268 "........" */ ++ 0x00,0x00,0x00,0x00,0x79,0x00,0x8A,0x4D, /* 00000270 "....y..M" */ ++ 0x45,0x4D,0x50,0x0A,0x5C,0x50,0x4D,0x49, /* 00000278 "EMP.\PMI" */ ++ 0x4E,0x8A,0x4D,0x45,0x4D,0x50,0x0A,0x60, /* 00000280 "N.MEMP.`" */ ++ 0x50,0x4D,0x41,0x58,0x8A,0x4D,0x45,0x4D, /* 00000288 "PMAX.MEM" */ ++ 0x50,0x0A,0x68,0x50,0x4C,0x45,0x4E,0x72, /* 00000290 "P.hPLENr" */ ++ 0x43,0x4D,0x52,0x44,0x0A,0x34,0x79,0x43, /* 00000298 "CMRD.4yC" */ ++ 0x4D,0x52,0x44,0x0A,0x35,0x0A,0x08,0x00, /* 000002A0 "MRD.5..." */ ++ 0x60,0x79,0x60,0x0A,0x10,0x60,0x72,0x60, /* 000002A8 "`y`..`r`" */ ++ 0x0C,0x00,0x00,0x00,0x01,0x60,0x70,0x60, /* 000002B0 ".....`p`" */ ++ 0x50,0x4D,0x49,0x4E,0x74,0x50,0x4D,0x41, /* 000002B8 "PMINtPMA" */ ++ 0x58,0x50,0x4D,0x49,0x4E,0x50,0x4C,0x45, /* 000002C0 "XPMINPLE" */ ++ 0x4E,0x75,0x50,0x4C,0x45,0x4E,0xA4,0x4D, /* 000002C8 "NuPLEN.M" */ ++ 0x45,0x4D,0x50,0x10,0x42,0x26,0x2E,0x5F, /* 000002D0 "EMP.B&._" */ ++ 0x53,0x42,0x5F,0x50,0x43,0x49,0x30,0x5B, /* 000002D8 "SB_PCI0[" */ ++ 0x82,0x43,0x20,0x49,0x53,0x41,0x5F,0x08, /* 000002E0 ".C ISA_." */ ++ 0x5F,0x41,0x44,0x52,0x0C,0x00,0x00,0x01, /* 000002E8 "_ADR...." */ ++ 0x00,0x5B,0x80,0x50,0x34,0x30,0x43,0x02, /* 000002F0 ".[.P40C." */ ++ 0x0A,0x60,0x0A,0x04,0x5B,0x82,0x44,0x04, /* 000002F8 ".`..[.D." */ ++ 0x4B,0x42,0x44,0x5F,0x08,0x5F,0x48,0x49, /* 00000300 "KBD_._HI" */ ++ 0x44,0x0C,0x41,0xD0,0x03,0x03,0x14,0x09, /* 00000308 "D.A....." */ ++ 0x5F,0x53,0x54,0x41,0x00,0xA4,0x0A,0x0F, /* 00000310 "_STA...." */ ++ 0x14,0x29,0x5F,0x43,0x52,0x53,0x00,0x08, /* 00000318 ".)_CRS.." */ ++ 0x54,0x4D,0x50,0x5F,0x11,0x18,0x0A,0x15, /* 00000320 "TMP_...." */ ++ 0x47,0x01,0x60,0x00,0x60,0x00,0x01,0x01, /* 00000328 "G.`.`..." */ ++ 0x47,0x01,0x64,0x00,0x64,0x00,0x01,0x01, /* 00000330 "G.d.d..." */ ++ 0x22,0x02,0x00,0x79,0x00,0xA4,0x54,0x4D, /* 00000338 ""..y..TM" */ ++ 0x50,0x5F,0x5B,0x82,0x33,0x4D,0x4F,0x55, /* 00000340 "P_[.3MOU" */ ++ 0x5F,0x08,0x5F,0x48,0x49,0x44,0x0C,0x41, /* 00000348 "_._HID.A" */ ++ 0xD0,0x0F,0x13,0x14,0x09,0x5F,0x53,0x54, /* 00000350 "....._ST" */ ++ 0x41,0x00,0xA4,0x0A,0x0F,0x14,0x19,0x5F, /* 00000358 "A......_" */ ++ 0x43,0x52,0x53,0x00,0x08,0x54,0x4D,0x50, /* 00000360 "CRS..TMP" */ ++ 0x5F,0x11,0x08,0x0A,0x05,0x22,0x00,0x10, /* 00000368 "_....".." */ ++ 0x79,0x00,0xA4,0x54,0x4D,0x50,0x5F,0x5B, /* 00000370 "y..TMP_[" */ ++ 0x82,0x47,0x04,0x46,0x44,0x43,0x30,0x08, /* 00000378 ".G.FDC0." */ ++ 0x5F,0x48,0x49,0x44,0x0C,0x41,0xD0,0x07, /* 00000380 "_HID.A.." */ ++ 0x00,0x14,0x09,0x5F,0x53,0x54,0x41,0x00, /* 00000388 "..._STA." */ ++ 0xA4,0x0A,0x0F,0x14,0x2C,0x5F,0x43,0x52, /* 00000390 "....,_CR" */ ++ 0x53,0x00,0x08,0x42,0x55,0x46,0x30,0x11, /* 00000398 "S..BUF0." */ ++ 0x1B,0x0A,0x18,0x47,0x01,0xF2,0x03,0xF2, /* 000003A0 "...G...." */ ++ 0x03,0x00,0x04,0x47,0x01,0xF7,0x03,0xF7, /* 000003A8 "...G...." */ ++ 0x03,0x00,0x01,0x22,0x40,0x00,0x2A,0x04, /* 000003B0 "..."@.*." */ ++ 0x00,0x79,0x00,0xA4,0x42,0x55,0x46,0x30, /* 000003B8 ".y..BUF0" */ ++ 0x5B,0x82,0x4B,0x05,0x4C,0x50,0x54,0x5F, /* 000003C0 "[.K.LPT_" */ ++ 0x08,0x5F,0x48,0x49,0x44,0x0C,0x41,0xD0, /* 000003C8 "._HID.A." */ ++ 0x04,0x00,0x14,0x28,0x5F,0x53,0x54,0x41, /* 000003D0 "...(_STA" */ ++ 0x00,0x70,0x5E,0x5E,0x5E,0x2E,0x50,0x58, /* 000003D8 ".p^^^.PX" */ ++ 0x31,0x33,0x44,0x52,0x53,0x41,0x60,0x7B, /* 000003E0 "13DRSA`{" */ ++ 0x60,0x0C,0x00,0x00,0x00,0x80,0x60,0xA0, /* 000003E8 "`.....`." */ ++ 0x06,0x93,0x60,0x00,0xA4,0x00,0xA1,0x04, /* 000003F0 "..`....." */ ++ 0xA4,0x0A,0x0F,0x14,0x21,0x5F,0x43,0x52, /* 000003F8 "....!_CR" */ ++ 0x53,0x00,0x08,0x42,0x55,0x46,0x30,0x11, /* 00000400 "S..BUF0." */ ++ 0x10,0x0A,0x0D,0x47,0x01,0x78,0x03,0x78, /* 00000408 "...G.x.x" */ ++ 0x03,0x08,0x08,0x22,0x80,0x00,0x79,0x00, /* 00000410 "..."..y." */ ++ 0xA4,0x42,0x55,0x46,0x30,0x5B,0x82,0x41, /* 00000418 ".BUF0[.A" */ ++ 0x06,0x43,0x4F,0x4D,0x31,0x08,0x5F,0x48, /* 00000420 ".COM1._H" */ ++ 0x49,0x44,0x0C,0x41,0xD0,0x05,0x01,0x08, /* 00000428 "ID.A...." */ ++ 0x5F,0x55,0x49,0x44,0x01,0x14,0x28,0x5F, /* 00000430 "_UID..(_" */ ++ 0x53,0x54,0x41,0x00,0x70,0x5E,0x5E,0x5E, /* 00000438 "STA.p^^^" */ ++ 0x2E,0x50,0x58,0x31,0x33,0x44,0x52,0x53, /* 00000440 ".PX13DRS" */ ++ 0x43,0x60,0x7B,0x60,0x0C,0x00,0x00,0x00, /* 00000448 "C`{`...." */ ++ 0x08,0x60,0xA0,0x06,0x93,0x60,0x00,0xA4, /* 00000450 ".`...`.." */ ++ 0x00,0xA1,0x04,0xA4,0x0A,0x0F,0x14,0x21, /* 00000458 ".......!" */ ++ 0x5F,0x43,0x52,0x53,0x00,0x08,0x42,0x55, /* 00000460 "_CRS..BU" */ ++ 0x46,0x30,0x11,0x10,0x0A,0x0D,0x47,0x01, /* 00000468 "F0....G." */ ++ 0xF8,0x03,0xF8,0x03,0x00,0x08,0x22,0x10, /* 00000470 "......"." */ ++ 0x00,0x79,0x00,0xA4,0x42,0x55,0x46,0x30, /* 00000478 ".y..BUF0" */ ++ 0x5B,0x82,0x42,0x06,0x43,0x4F,0x4D,0x32, /* 00000480 "[.B.COM2" */ ++ 0x08,0x5F,0x48,0x49,0x44,0x0C,0x41,0xD0, /* 00000488 "._HID.A." */ ++ 0x05,0x01,0x08,0x5F,0x55,0x49,0x44,0x0A, /* 00000490 "..._UID." */ ++ 0x02,0x14,0x28,0x5F,0x53,0x54,0x41,0x00, /* 00000498 "..(_STA." */ ++ 0x70,0x5E,0x5E,0x5E,0x2E,0x50,0x58,0x31, /* 000004A0 "p^^^.PX1" */ ++ 0x33,0x44,0x52,0x53,0x43,0x60,0x7B,0x60, /* 000004A8 "3DRSC`{`" */ ++ 0x0C,0x00,0x00,0x00,0x80,0x60,0xA0,0x06, /* 000004B0 ".....`.." */ ++ 0x93,0x60,0x00,0xA4,0x00,0xA1,0x04,0xA4, /* 000004B8 ".`......" */ ++ 0x0A,0x0F,0x14,0x21,0x5F,0x43,0x52,0x53, /* 000004C0 "...!_CRS" */ ++ 0x00,0x08,0x42,0x55,0x46,0x30,0x11,0x10, /* 000004C8 "..BUF0.." */ ++ 0x0A,0x0D,0x47,0x01,0xF8,0x02,0xF8,0x02, /* 000004D0 "..G....." */ ++ 0x00,0x08,0x22,0x08,0x00,0x79,0x00,0xA4, /* 000004D8 ".."..y.." */ ++ 0x42,0x55,0x46,0x30,0x5B,0x82,0x40,0x05, /* 000004E0 "BUF0[.@." */ ++ 0x50,0x58,0x31,0x33,0x08,0x5F,0x41,0x44, /* 000004E8 "PX13._AD" */ ++ 0x52,0x0C,0x03,0x00,0x01,0x00,0x5B,0x80, /* 000004F0 "R.....[." */ ++ 0x50,0x31,0x33,0x43,0x02,0x0A,0x5C,0x0A, /* 000004F8 "P13C..\." */ ++ 0x24,0x5B,0x81,0x33,0x50,0x31,0x33,0x43, /* 00000500 "$[.3P13C" */ ++ 0x03,0x44,0x52,0x53,0x41,0x20,0x44,0x52, /* 00000508 ".DRSA DR" */ ++ 0x53,0x42,0x20,0x44,0x52,0x53,0x43,0x20, /* 00000510 "SB DRSC " */ ++ 0x44,0x52,0x53,0x45,0x20,0x44,0x52,0x53, /* 00000518 "DRSE DRS" */ ++ 0x46,0x20,0x44,0x52,0x53,0x47,0x20,0x44, /* 00000520 "F DRSG D" */ ++ 0x52,0x53,0x48,0x20,0x44,0x52,0x53,0x49, /* 00000528 "RSH DRSI" */ ++ 0x20,0x44,0x52,0x53,0x4A,0x20,0x10,0x4F, /* 00000530 " DRSJ .O" */ ++ 0x2E,0x5F,0x53,0x42,0x5F,0x5B,0x81,0x24, /* 00000538 "._SB_[.$" */ ++ 0x2F,0x03,0x50,0x43,0x49,0x30,0x49,0x53, /* 00000540 "/.PCI0IS" */ ++ 0x41,0x5F,0x50,0x34,0x30,0x43,0x01,0x50, /* 00000548 "A_P40C.P" */ ++ 0x52,0x51,0x30,0x08,0x50,0x52,0x51,0x31, /* 00000550 "RQ0.PRQ1" */ ++ 0x08,0x50,0x52,0x51,0x32,0x08,0x50,0x52, /* 00000558 ".PRQ2.PR" */ ++ 0x51,0x33,0x08,0x5B,0x82,0x4E,0x0A,0x4C, /* 00000560 "Q3.[.N.L" */ ++ 0x4E,0x4B,0x41,0x08,0x5F,0x48,0x49,0x44, /* 00000568 "NKA._HID" */ ++ 0x0C,0x41,0xD0,0x0C,0x0F,0x08,0x5F,0x55, /* 00000570 ".A...._U" */ ++ 0x49,0x44,0x01,0x08,0x5F,0x50,0x52,0x53, /* 00000578 "ID.._PRS" */ ++ 0x11,0x09,0x0A,0x06,0x23,0xF8,0x1E,0x18, /* 00000580 "....#..." */ ++ 0x79,0x00,0x14,0x1A,0x5F,0x53,0x54,0x41, /* 00000588 "y..._STA" */ ++ 0x00,0x70,0x0A,0x0B,0x60,0xA0,0x0D,0x7B, /* 00000590 ".p..`..{" */ ++ 0x0A,0x80,0x50,0x52,0x51,0x30,0x61,0x70, /* 00000598 "..PRQ0ap" */ ++ 0x0A,0x09,0x60,0xA4,0x60,0x14,0x11,0x5F, /* 000005A0 "..`.`.._" */ ++ 0x44,0x49,0x53,0x00,0x7D,0x50,0x52,0x51, /* 000005A8 "DIS.}PRQ" */ ++ 0x30,0x0A,0x80,0x50,0x52,0x51,0x30,0x14, /* 000005B0 "0..PRQ0." */ ++ 0x3F,0x5F,0x43,0x52,0x53,0x00,0x08,0x50, /* 000005B8 "?_CRS..P" */ ++ 0x52,0x52,0x30,0x11,0x09,0x0A,0x06,0x23, /* 000005C0 "RR0....#" */ ++ 0x02,0x00,0x18,0x79,0x00,0x8B,0x50,0x52, /* 000005C8 "...y..PR" */ ++ 0x52,0x30,0x01,0x54,0x4D,0x50,0x5F,0x70, /* 000005D0 "R0.TMP_p" */ ++ 0x50,0x52,0x51,0x30,0x60,0xA0,0x0C,0x95, /* 000005D8 "PRQ0`..." */ ++ 0x60,0x0A,0x80,0x79,0x01,0x60,0x54,0x4D, /* 000005E0 "`..y.`TM" */ ++ 0x50,0x5F,0xA1,0x07,0x70,0x00,0x54,0x4D, /* 000005E8 "P_..p.TM" */ ++ 0x50,0x5F,0xA4,0x50,0x52,0x52,0x30,0x14, /* 000005F0 "P_.PRR0." */ ++ 0x1B,0x5F,0x53,0x52,0x53,0x01,0x8B,0x68, /* 000005F8 "._SRS..h" */ ++ 0x01,0x54,0x4D,0x50,0x5F,0x82,0x54,0x4D, /* 00000600 ".TMP_.TM" */ ++ 0x50,0x5F,0x60,0x76,0x60,0x70,0x60,0x50, /* 00000608 "P_`v`p`P" */ ++ 0x52,0x51,0x30,0x5B,0x82,0x4F,0x0A,0x4C, /* 00000610 "RQ0[.O.L" */ ++ 0x4E,0x4B,0x42,0x08,0x5F,0x48,0x49,0x44, /* 00000618 "NKB._HID" */ ++ 0x0C,0x41,0xD0,0x0C,0x0F,0x08,0x5F,0x55, /* 00000620 ".A...._U" */ ++ 0x49,0x44,0x0A,0x02,0x08,0x5F,0x50,0x52, /* 00000628 "ID..._PR" */ ++ 0x53,0x11,0x09,0x0A,0x06,0x23,0xF8,0x1E, /* 00000630 "S....#.." */ ++ 0x18,0x79,0x00,0x14,0x1A,0x5F,0x53,0x54, /* 00000638 ".y..._ST" */ ++ 0x41,0x00,0x70,0x0A,0x0B,0x60,0xA0,0x0D, /* 00000640 "A.p..`.." */ ++ 0x7B,0x0A,0x80,0x50,0x52,0x51,0x31,0x61, /* 00000648 "{..PRQ1a" */ ++ 0x70,0x0A,0x09,0x60,0xA4,0x60,0x14,0x11, /* 00000650 "p..`.`.." */ ++ 0x5F,0x44,0x49,0x53,0x00,0x7D,0x50,0x52, /* 00000658 "_DIS.}PR" */ ++ 0x51,0x31,0x0A,0x80,0x50,0x52,0x51,0x31, /* 00000660 "Q1..PRQ1" */ ++ 0x14,0x3F,0x5F,0x43,0x52,0x53,0x00,0x08, /* 00000668 ".?_CRS.." */ ++ 0x50,0x52,0x52,0x30,0x11,0x09,0x0A,0x06, /* 00000670 "PRR0...." */ ++ 0x23,0x02,0x00,0x18,0x79,0x00,0x8B,0x50, /* 00000678 "#...y..P" */ ++ 0x52,0x52,0x30,0x01,0x54,0x4D,0x50,0x5F, /* 00000680 "RR0.TMP_" */ ++ 0x70,0x50,0x52,0x51,0x31,0x60,0xA0,0x0C, /* 00000688 "pPRQ1`.." */ ++ 0x95,0x60,0x0A,0x80,0x79,0x01,0x60,0x54, /* 00000690 ".`..y.`T" */ ++ 0x4D,0x50,0x5F,0xA1,0x07,0x70,0x00,0x54, /* 00000698 "MP_..p.T" */ ++ 0x4D,0x50,0x5F,0xA4,0x50,0x52,0x52,0x30, /* 000006A0 "MP_.PRR0" */ ++ 0x14,0x1B,0x5F,0x53,0x52,0x53,0x01,0x8B, /* 000006A8 ".._SRS.." */ ++ 0x68,0x01,0x54,0x4D,0x50,0x5F,0x82,0x54, /* 000006B0 "h.TMP_.T" */ ++ 0x4D,0x50,0x5F,0x60,0x76,0x60,0x70,0x60, /* 000006B8 "MP_`v`p`" */ ++ 0x50,0x52,0x51,0x31,0x5B,0x82,0x4F,0x0A, /* 000006C0 "PRQ1[.O." */ ++ 0x4C,0x4E,0x4B,0x43,0x08,0x5F,0x48,0x49, /* 000006C8 "LNKC._HI" */ ++ 0x44,0x0C,0x41,0xD0,0x0C,0x0F,0x08,0x5F, /* 000006D0 "D.A...._" */ ++ 0x55,0x49,0x44,0x0A,0x03,0x08,0x5F,0x50, /* 000006D8 "UID..._P" */ ++ 0x52,0x53,0x11,0x09,0x0A,0x06,0x23,0xF8, /* 000006E0 "RS....#." */ ++ 0x1E,0x18,0x79,0x00,0x14,0x1A,0x5F,0x53, /* 000006E8 "..y..._S" */ ++ 0x54,0x41,0x00,0x70,0x0A,0x0B,0x60,0xA0, /* 000006F0 "TA.p..`." */ ++ 0x0D,0x7B,0x0A,0x80,0x50,0x52,0x51,0x32, /* 000006F8 ".{..PRQ2" */ ++ 0x61,0x70,0x0A,0x09,0x60,0xA4,0x60,0x14, /* 00000700 "ap..`.`." */ ++ 0x11,0x5F,0x44,0x49,0x53,0x00,0x7D,0x50, /* 00000708 "._DIS.}P" */ ++ 0x52,0x51,0x32,0x0A,0x80,0x50,0x52,0x51, /* 00000710 "RQ2..PRQ" */ ++ 0x32,0x14,0x3F,0x5F,0x43,0x52,0x53,0x00, /* 00000718 "2.?_CRS." */ ++ 0x08,0x50,0x52,0x52,0x30,0x11,0x09,0x0A, /* 00000720 ".PRR0..." */ ++ 0x06,0x23,0x02,0x00,0x18,0x79,0x00,0x8B, /* 00000728 ".#...y.." */ ++ 0x50,0x52,0x52,0x30,0x01,0x54,0x4D,0x50, /* 00000730 "PRR0.TMP" */ ++ 0x5F,0x70,0x50,0x52,0x51,0x32,0x60,0xA0, /* 00000738 "_pPRQ2`." */ ++ 0x0C,0x95,0x60,0x0A,0x80,0x79,0x01,0x60, /* 00000740 "..`..y.`" */ ++ 0x54,0x4D,0x50,0x5F,0xA1,0x07,0x70,0x00, /* 00000748 "TMP_..p." */ ++ 0x54,0x4D,0x50,0x5F,0xA4,0x50,0x52,0x52, /* 00000750 "TMP_.PRR" */ ++ 0x30,0x14,0x1B,0x5F,0x53,0x52,0x53,0x01, /* 00000758 "0.._SRS." */ ++ 0x8B,0x68,0x01,0x54,0x4D,0x50,0x5F,0x82, /* 00000760 ".h.TMP_." */ ++ 0x54,0x4D,0x50,0x5F,0x60,0x76,0x60,0x70, /* 00000768 "TMP_`v`p" */ ++ 0x60,0x50,0x52,0x51,0x32,0x5B,0x82,0x4F, /* 00000770 "`PRQ2[.O" */ ++ 0x0A,0x4C,0x4E,0x4B,0x44,0x08,0x5F,0x48, /* 00000778 ".LNKD._H" */ ++ 0x49,0x44,0x0C,0x41,0xD0,0x0C,0x0F,0x08, /* 00000780 "ID.A...." */ ++ 0x5F,0x55,0x49,0x44,0x0A,0x04,0x08,0x5F, /* 00000788 "_UID..._" */ ++ 0x50,0x52,0x53,0x11,0x09,0x0A,0x06,0x23, /* 00000790 "PRS....#" */ ++ 0xF8,0x1E,0x18,0x79,0x00,0x14,0x1A,0x5F, /* 00000798 "...y..._" */ ++ 0x53,0x54,0x41,0x00,0x70,0x0A,0x0B,0x60, /* 000007A0 "STA.p..`" */ ++ 0xA0,0x0D,0x7B,0x0A,0x80,0x50,0x52,0x51, /* 000007A8 "..{..PRQ" */ ++ 0x33,0x61,0x70,0x0A,0x09,0x60,0xA4,0x60, /* 000007B0 "3ap..`.`" */ ++ 0x14,0x11,0x5F,0x44,0x49,0x53,0x00,0x7D, /* 000007B8 ".._DIS.}" */ ++ 0x50,0x52,0x51,0x33,0x0A,0x80,0x50,0x52, /* 000007C0 "PRQ3..PR" */ ++ 0x51,0x33,0x14,0x3F,0x5F,0x43,0x52,0x53, /* 000007C8 "Q3.?_CRS" */ ++ 0x00,0x08,0x50,0x52,0x52,0x30,0x11,0x09, /* 000007D0 "..PRR0.." */ ++ 0x0A,0x06,0x23,0x02,0x00,0x18,0x79,0x00, /* 000007D8 "..#...y." */ ++ 0x8B,0x50,0x52,0x52,0x30,0x01,0x54,0x4D, /* 000007E0 ".PRR0.TM" */ ++ 0x50,0x5F,0x70,0x50,0x52,0x51,0x33,0x60, /* 000007E8 "P_pPRQ3`" */ ++ 0xA0,0x0C,0x95,0x60,0x0A,0x80,0x79,0x01, /* 000007F0 "...`..y." */ ++ 0x60,0x54,0x4D,0x50,0x5F,0xA1,0x07,0x70, /* 000007F8 "`TMP_..p" */ ++ 0x00,0x54,0x4D,0x50,0x5F,0xA4,0x50,0x52, /* 00000800 ".TMP_.PR" */ ++ 0x52,0x30,0x14,0x1B,0x5F,0x53,0x52,0x53, /* 00000808 "R0.._SRS" */ ++ 0x01,0x8B,0x68,0x01,0x54,0x4D,0x50,0x5F, /* 00000810 "..h.TMP_" */ ++ 0x82,0x54,0x4D,0x50,0x5F,0x60,0x76,0x60, /* 00000818 ".TMP_`v`" */ ++ 0x70,0x60,0x50,0x52,0x51,0x33,0x08,0x5F, /* 00000820 "p`PRQ3._" */ ++ 0x53,0x35,0x5F,0x12,0x06,0x04,0x00,0x00, /* 00000828 "S5_....." */ ++ 0x00,0x00, ++}; +Binary files bios/BIOS-bochs-latest and bios.new/BIOS-bochs-latest differ +diff -ruN --exclude Makefile bios/Makefile.in bios.new/Makefile.in +--- bios/Makefile.in 2006-01-13 18:36:27.000000000 +0100 ++++ bios.new/Makefile.in 2006-09-24 20:26:39.000000000 +0200 +@@ -61,7 +61,8 @@ -Index: rombios.c -=================================================================== -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 3 May 2006 21:22:48 -0000 -@@ -1816,6 +1816,7 @@ - { - printf(BX_APPNAME" BIOS - build: %s\n%s\nOptions: ", - BIOS_BUILD_DATE, bios_cvs_version_string); -+#if 0 - printf( - #ifdef BX_APM - "apmbios " -@@ -1827,6 +1828,9 @@ - "eltorito " - #endif - "\n\n"); -+#else -+ printf("apmbios pcibios eltorito \n\n"); -+#endif - } + clean: + @RMCOMMAND@ *.o *.a *.s _rombios*_.c rombios*.txt rombios*.sym +- @RMCOMMAND@ usage biossums ++ @RMCOMMAND@ usage biossums rombios16.bin ++ @RMCOMMAND@ rombios32.bin rombios32.out pad tmp32.bin - //-------------------------------------------------------------------------- -@@ -3999,6 +4003,29 @@ - } - #endif + dist-clean: clean + @RMCOMMAND@ Makefile +@@ -69,15 +70,35 @@ + bios-clean: + @RMCOMMAND@ BIOS-bochs-* + +-BIOS-bochs-latest: rombios.c apmbios.S biossums ++rombios16.bin: rombios.c apmbios.S biossums + $(GCC) $(BIOS_BUILD_DATE) -E -P $< > _rombios_.c + $(BCC) -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c + sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s + $(AS86) _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt + -perl ${srcdir}/makesym.perl < rombios.txt > rombios.sym +- mv tmp.bin BIOS-bochs-latest +- ./biossums BIOS-bochs-latest ++ mv tmp.bin rombios16.bin ++ ./biossums rombios16.bin + rm -f _rombios_.s + -+void set_e820_range(ES, DI, start, end, type) -+ Bit16u ES; -+ Bit16u DI; -+ Bit32u start; -+ Bit32u end; -+ Bit16u type; ++rombios32.bin: rombios32.out pad ++ objcopy -O binary $< tmp32.bin ++ ./pad < tmp32.bin > $@ 65536 0xff ++ ++rombios32.out: rombios32start.o rombios32.o rombios32.ld ++ ld -o $@ -T rombios32.ld rombios32start.o rombios32.o ++ ++rombios32.o: rombios32.c ++ $(GCC) -O2 -Wall -c -o $@ $< ++ ++rombios32start.o: rombios32start.S ++ $(GCC) -c -o $@ $< ++ ++BIOS-bochs-latest: rombios16.bin rombios32.bin ++ cat rombios32.bin rombios16.bin > $@ ++ ++pad: pad.c ++ $(GCC) -o $@ $< ++ + biossums: biossums.c + $(GCC) -o biossums biossums.c +diff -ruN --exclude Makefile bios/pad.c bios.new/pad.c +--- bios/pad.c 1970-01-01 01:00:00.000000000 +0100 ++++ bios.new/pad.c 2006-09-24 20:22:58.000000000 +0200 +@@ -0,0 +1,20 @@ ++#include ++#include ++ ++int main(int argc, char **argv) +{ -+ 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); ++ int len, val, i, c; ++ ++ len = strtol(argv[1], NULL, 0); ++ val = strtol(argv[2], NULL, 0); ++ for(i = 0 ; i < len; i++) { ++ c = getchar(); ++ if (c == EOF) ++ break; ++ putchar(c); ++ } ++ for( ; i < len; i++) { ++ putchar(val); ++ } ++ return 0; ++} +diff -ruN --exclude Makefile bios/rombios32.c bios.new/rombios32.c +--- bios/rombios32.c 1970-01-01 01:00:00.000000000 +0100 ++++ bios.new/rombios32.c 2006-09-24 20:22:58.000000000 +0200 +@@ -0,0 +1,1324 @@ ++// 32 bit Bochs BIOS init code ++// Copyright (C) 2006 Fabrice Bellard ++// ++// This library is free software; you can redistribute it and/or ++// modify it under the terms of the GNU Lesser General Public ++// License as published by the Free Software Foundation; either ++// version 2 of the License, or (at your option) any later version. ++// ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++// Lesser General Public License for more details. ++// ++// You should have received a copy of the GNU Lesser General Public ++// License along with this library; if not, write to the Free Software ++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++#include ++#include ++ ++typedef signed char int8_t; ++typedef short int16_t; ++typedef int int32_t; ++typedef long long int64_t; ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned int uint32_t; ++typedef unsigned long long uint64_t; ++ ++/* if true, put the MP float table and ACPI RSDT in EBDA and the MP ++ table in RAM. Unfortunately, Linux has bugs with that, so we prefer ++ to modify the BIOS in shadow RAM */ ++//#define BX_USE_EBDA_TABLES ++ ++/* define it if the (emulated) hardware supports SMM mode */ ++#define BX_USE_SMM ++ ++#define BX_INFO(fmt, args...) bios_printf(0, fmt, ## args); ++ ++#define INFO_PORT 0x402 ++ ++#define cpuid(index, eax, ebx, ecx, edx) \ ++ asm volatile ("cpuid" \ ++ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) \ ++ : "0" (index)) ++ ++#define CPUID_APIC (1 << 9) ++ ++#define APIC_BASE ((uint8_t *)0xfee00000) ++#define APIC_ICR_LOW 0x300 ++#define APIC_SVR 0x0F0 ++#define APIC_ID 0x020 ++#define APIC_LVT3 0x370 ++ ++#define APIC_ENABLED 0x0100 ++ ++#define CPU_COUNT_ADDR 0xf000 ++#define AP_BOOT_ADDR 0x10000 ++ ++#define MPTABLE_MAX_SIZE 0x00002000 ++#define ACPI_DATA_SIZE 0x00010000 ++#define SMI_CMD_IO_ADDR 0xb2 ++#define PM_IO_BASE 0xb000 ++ ++#define BIOS_TMP_STORAGE 0x00030000 /* 64 KB used to copy the BIOS to shadow RAM */ ++ ++static inline void outl(int addr, int val) ++{ ++ asm volatile ("outl %1, %w0" : : "d" (addr), "a" (val)); +} + - void - int15_function32(regs, ES, DS, FLAGS) - pushad_regs_t regs; // REGS pushed via pushad -@@ -4063,19 +4090,8 @@ ++static inline void outw(int addr, int val) ++{ ++ asm volatile ("outw %w1, %w0" : : "d" (addr), "a" (val)); ++} ++ ++static inline void outb(int addr, int val) ++{ ++ asm volatile ("outb %b1, %w0" : : "d" (addr), "a" (val)); ++} ++ ++static inline uint32_t inl(int addr) ++{ ++ uint32_t val; ++ asm volatile ("inl %w1, %0" : "=a" (val) : "d" (addr)); ++ return val; ++} ++ ++static inline uint16_t inw(int addr) ++{ ++ uint16_t val; ++ asm volatile ("inw %w1, %w0" : "=a" (val) : "d" (addr)); ++ return val; ++} ++ ++static inline uint8_t inb(int addr) ++{ ++ uint8_t val; ++ asm volatile ("inb %w1, %b0" : "=a" (val) : "d" (addr)); ++ return val; ++} ++ ++static inline void writel(void *addr, uint32_t val) ++{ ++ *(volatile uint32_t *)addr = val; ++} ++ ++static inline void writew(void *addr, uint16_t val) ++{ ++ *(volatile uint16_t *)addr = val; ++} ++ ++static inline void writeb(void *addr, uint8_t val) ++{ ++ *(volatile uint8_t *)addr = val; ++} ++ ++static inline uint32_t readl(const void *addr) ++{ ++ return *(volatile const uint32_t *)addr; ++} ++ ++static inline uint16_t readw(const void *addr) ++{ ++ return *(volatile const uint16_t *)addr; ++} ++ ++static inline uint8_t readb(const void *addr) ++{ ++ return *(volatile const uint8_t *)addr; ++} ++ ++static inline void putc(int c) ++{ ++ outb(INFO_PORT, c); ++} ++ ++static inline int isdigit(int c) ++{ ++ return c >= '0' && c <= '9'; ++} ++ ++void *memset(void *d1, int val, size_t len) ++{ ++ uint8_t *d = d1; ++ ++ while (len--) { ++ *d++ = val; ++ } ++ return d1; ++} ++ ++void *memcpy(void *d1, const void *s1, size_t len) ++{ ++ uint8_t *d = d1; ++ const uint8_t *s = s1; ++ ++ while (len--) { ++ *d++ = *s++; ++ } ++ return d1; ++} ++ ++void *memmove(void *d1, const void *s1, size_t len) ++{ ++ uint8_t *d = d1; ++ const uint8_t *s = s1; ++ ++ if (d <= s) { ++ while (len--) { ++ *d++ = *s++; ++ } ++ } else { ++ d += len; ++ s += len; ++ while (len--) { ++ *--d = *--s; ++ } ++ } ++ return d1; ++} ++ ++size_t strlen(const char *s) ++{ ++ const char *s1; ++ for(s1 = s; *s1 != '\0'; s1++); ++ return s1 - s; ++} ++ ++/* from BSD ppp sources */ ++int vsnprintf(char *buf, int buflen, const char *fmt, va_list args) ++{ ++ int c, i, n; ++ int width, prec, fillch; ++ int base, len, neg; ++ unsigned long val = 0; ++ const char *f; ++ char *str, *buf0; ++ char num[32]; ++ static const char hexchars[] = "0123456789abcdef"; ++ ++ buf0 = buf; ++ --buflen; ++ while (buflen > 0) { ++ for (f = fmt; *f != '%' && *f != 0; ++f) ++ ; ++ if (f > fmt) { ++ len = f - fmt; ++ if (len > buflen) ++ len = buflen; ++ memcpy(buf, fmt, len); ++ buf += len; ++ buflen -= len; ++ fmt = f; ++ } ++ if (*fmt == 0) ++ break; ++ c = *++fmt; ++ width = prec = 0; ++ fillch = ' '; ++ if (c == '0') { ++ fillch = '0'; ++ c = *++fmt; ++ } ++ if (c == '*') { ++ width = va_arg(args, int); ++ c = *++fmt; ++ } else { ++ while (isdigit(c)) { ++ width = width * 10 + c - '0'; ++ c = *++fmt; ++ } ++ } ++ if (c == '.') { ++ c = *++fmt; ++ if (c == '*') { ++ prec = va_arg(args, int); ++ c = *++fmt; ++ } else { ++ while (isdigit(c)) { ++ prec = prec * 10 + c - '0'; ++ c = *++fmt; ++ } ++ } ++ } ++ /* modifiers */ ++ switch(c) { ++ case 'l': ++ c = *++fmt; ++ break; ++ default: ++ break; ++ } ++ str = 0; ++ base = 0; ++ neg = 0; ++ ++fmt; ++ switch (c) { ++ case 'd': ++ i = va_arg(args, int); ++ if (i < 0) { ++ neg = 1; ++ val = -i; ++ } else ++ val = i; ++ base = 10; ++ break; ++ case 'o': ++ val = va_arg(args, unsigned int); ++ base = 8; ++ break; ++ case 'x': ++ case 'X': ++ val = va_arg(args, unsigned int); ++ base = 16; ++ break; ++ case 'p': ++ val = (unsigned long) va_arg(args, void *); ++ base = 16; ++ neg = 2; ++ break; ++ case 's': ++ str = va_arg(args, char *); ++ break; ++ case 'c': ++ num[0] = va_arg(args, int); ++ num[1] = 0; ++ str = num; ++ break; ++ default: ++ *buf++ = '%'; ++ if (c != '%') ++ --fmt; /* so %z outputs %z etc. */ ++ --buflen; ++ continue; ++ } ++ if (base != 0) { ++ str = num + sizeof(num); ++ *--str = 0; ++ while (str > num + neg) { ++ *--str = hexchars[val % base]; ++ val = val / base; ++ if (--prec <= 0 && val == 0) ++ break; ++ } ++ switch (neg) { ++ case 1: ++ *--str = '-'; ++ break; ++ case 2: ++ *--str = 'x'; ++ *--str = '0'; ++ break; ++ } ++ len = num + sizeof(num) - 1 - str; ++ } else { ++ len = strlen(str); ++ if (prec > 0 && len > prec) ++ len = prec; ++ } ++ if (width > 0) { ++ if (width > buflen) ++ width = buflen; ++ if ((n = width - len) > 0) { ++ buflen -= n; ++ for (; n > 0; --n) ++ *buf++ = fillch; ++ } ++ } ++ if (len > buflen) ++ len = buflen; ++ memcpy(buf, str, len); ++ buf += len; ++ buflen -= len; ++ } ++ *buf = 0; ++ return buf - buf0; ++} ++ ++void bios_printf(int flags, const char *fmt, ...) ++{ ++ va_list ap; ++ char buf[1024]; ++ const char *s; ++ ++ va_start(ap, fmt); ++ vsnprintf(buf, sizeof(buf), fmt, ap); ++ s = buf; ++ while (*s) ++ putc(*s++); ++ va_end(ap); ++} ++ ++/* approximative ! */ ++void delay_ms(int n) ++{ ++ int i, j; ++ for(i = 0; i < n; i++) { ++ for(j = 0; j < 1000000; j++); ++ } ++} ++ ++int smp_cpus; ++uint32_t cpuid_features; ++uint32_t cpuid_ext_features; ++unsigned long ram_size; ++#ifdef BX_USE_EBDA_TABLES ++unsigned long ebda_cur_addr; ++#endif ++int acpi_enabled; ++uint32_t pm_io_base; ++int pm_sci_int; ++unsigned long bios_table_cur_addr; ++unsigned long bios_table_end_addr; ++ ++void cpu_probe(void) ++{ ++ uint32_t eax, ebx, ecx, edx; ++ cpuid(1, eax, ebx, ecx, edx); ++ cpuid_features = edx; ++ cpuid_ext_features = ecx; ++} ++ ++static int cmos_readb(int addr) ++{ ++ outb(0x70, addr); ++ return inb(0x71); ++} ++ ++void ram_probe(void) ++{ ++ ram_size = (cmos_readb(0x34) | (cmos_readb(0x35) << 8)) * 65536 + ++ 16 * 1024 * 1024; ++#ifdef BX_USE_EBDA_TABLES ++ ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380; ++#endif ++ BX_INFO("ram_size=0x%08lx\n"); ++} ++ ++/****************************************************/ ++/* SMP probe */ ++ ++extern uint8_t smp_ap_boot_code_start; ++extern uint8_t smp_ap_boot_code_end; ++ ++/* find the number of CPUs by launching a SIPI to them */ ++void smp_probe(void) ++{ ++ uint32_t val, sipi_vector; ++ ++ smp_cpus = 1; ++ if (cpuid_features & CPUID_APIC) { ++ ++ /* enable local APIC */ ++ val = readl(APIC_BASE + APIC_SVR); ++ val |= APIC_ENABLED; ++ writel(APIC_BASE + APIC_SVR, val); ++ ++ writew((void *)CPU_COUNT_ADDR, 1); ++ /* copy AP boot code */ ++ memcpy((void *)AP_BOOT_ADDR, &smp_ap_boot_code_start, ++ &smp_ap_boot_code_end - &smp_ap_boot_code_start); ++ ++ /* broadcast SIPI */ ++ writel(APIC_BASE + APIC_ICR_LOW, 0x000C4500); ++ sipi_vector = AP_BOOT_ADDR >> 12; ++ writel(APIC_BASE + APIC_ICR_LOW, 0x000C4600 | sipi_vector); ++ ++ delay_ms(10); ++ ++ smp_cpus = readw((void *)CPU_COUNT_ADDR); ++ } ++ BX_INFO("Found %d cpus\n", smp_cpus); ++} ++ ++/****************************************************/ ++/* PCI init */ ++ ++#define PCI_ADDRESS_SPACE_MEM 0x00 ++#define PCI_ADDRESS_SPACE_IO 0x01 ++#define PCI_ADDRESS_SPACE_MEM_PREFETCH 0x08 ++ ++#define PCI_ROM_SLOT 6 ++#define PCI_NUM_REGIONS 7 ++ ++#define PCI_DEVICES_MAX 64 ++ ++#define PCI_VENDOR_ID 0x00 /* 16 bits */ ++#define PCI_DEVICE_ID 0x02 /* 16 bits */ ++#define PCI_COMMAND 0x04 /* 16 bits */ ++#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ ++#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ ++#define PCI_CLASS_DEVICE 0x0a /* Device class */ ++#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ ++#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ ++#define PCI_MIN_GNT 0x3e /* 8 bits */ ++#define PCI_MAX_LAT 0x3f /* 8 bits */ ++ ++typedef struct PCIDevice { ++ int bus; ++ int devfn; ++} PCIDevice; ++ ++static uint32_t pci_bios_io_addr; ++static uint32_t pci_bios_mem_addr; ++/* host irqs corresponding to PCI irqs A-D */ ++static uint8_t pci_irqs[4] = { 11, 9, 11, 9 }; ++static PCIDevice i440_pcidev; ++ ++static void pci_config_writel(PCIDevice *d, uint32_t addr, uint32_t val) ++{ ++ outl(0xcf8, 0x80000000 | (d->bus << 16) | (d->devfn << 8) | (addr & 0xfc)); ++ outl(0xcfc, val); ++} ++ ++static void pci_config_writew(PCIDevice *d, uint32_t addr, uint32_t val) ++{ ++ outl(0xcf8, 0x80000000 | (d->bus << 16) | (d->devfn << 8) | (addr & 0xfc)); ++ outw(0xcfc + (addr & 2), val); ++} ++ ++static void pci_config_writeb(PCIDevice *d, uint32_t addr, uint32_t val) ++{ ++ outl(0xcf8, 0x80000000 | (d->bus << 16) | (d->devfn << 8) | (addr & 0xfc)); ++ outb(0xcfc + (addr & 3), val); ++} ++ ++static uint32_t pci_config_readl(PCIDevice *d, uint32_t addr) ++{ ++ outl(0xcf8, 0x80000000 | (d->bus << 16) | (d->devfn << 8) | (addr & 0xfc)); ++ return inl(0xcfc); ++} ++ ++static uint32_t pci_config_readw(PCIDevice *d, uint32_t addr) ++{ ++ outl(0xcf8, 0x80000000 | (d->bus << 16) | (d->devfn << 8) | (addr & 0xfc)); ++ return inw(0xcfc + (addr & 2)); ++} ++ ++static uint32_t pci_config_readb(PCIDevice *d, uint32_t addr) ++{ ++ outl(0xcf8, 0x80000000 | (d->bus << 16) | (d->devfn << 8) | (addr & 0xfc)); ++ return inb(0xcfc + (addr & 3)); ++} ++ ++static void pci_set_io_region_addr(PCIDevice *d, int region_num, uint32_t addr) ++{ ++ uint16_t cmd; ++ uint32_t ofs, old_addr; ++ ++ if ( region_num == PCI_ROM_SLOT ) { ++ ofs = 0x30; ++ }else{ ++ ofs = 0x10 + region_num * 4; ++ } ++ ++ old_addr = pci_config_readl(d, ofs); ++ ++ pci_config_writel(d, ofs, addr); ++ BX_INFO("region %d: 0x%08x\n", region_num, addr); ++ ++ /* enable memory mappings */ ++ cmd = pci_config_readw(d, PCI_COMMAND); ++ if ( region_num == PCI_ROM_SLOT ) ++ cmd |= 2; ++ else if (old_addr & PCI_ADDRESS_SPACE_IO) ++ cmd |= 1; ++ else ++ cmd |= 2; ++ pci_config_writew(d, PCI_COMMAND, cmd); ++} ++ ++/* return the global irq number corresponding to a given device irq ++ pin. We could also use the bus number to have a more precise ++ mapping. */ ++static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num) ++{ ++ int slot_addend; ++ slot_addend = (pci_dev->devfn >> 3) - 1; ++ return (irq_num + slot_addend) & 3; ++} ++ ++static int find_bios_table_area(void) ++{ ++ unsigned long addr; ++ for(addr = 0xf0000; addr < 0x100000; addr += 16) { ++ if (*(uint32_t *)addr == 0xaafb4442) { ++ bios_table_cur_addr = addr + 8; ++ bios_table_end_addr = bios_table_cur_addr + *(uint32_t *)(addr + 4); ++ BX_INFO("bios_table_addr: 0x%08lx end=0x%08lx\n", ++ bios_table_cur_addr, bios_table_end_addr); ++ return 0; ++ } ++ } ++ return -1; ++} ++ ++static void bios_shadow_init(PCIDevice *d) ++{ ++ int v; ++ ++ if (find_bios_table_area() < 0) ++ return; ++ ++ /* remap the BIOS to shadow RAM an keep it read/write while we ++ are writing tables */ ++ memcpy((void *)BIOS_TMP_STORAGE, (void *)0x000f0000, 0x10000); ++ v = pci_config_readb(d, 0x67); ++ v = (v & 0x0f) | (0x30); ++ pci_config_writeb(d, 0x67, v); ++ memcpy((void *)0x000f0000, (void *)BIOS_TMP_STORAGE, 0x10000); ++ ++ i440_pcidev = *d; ++} ++ ++static void bios_lock_shadow_ram(void) ++{ ++ PCIDevice *d = &i440_pcidev; ++ int v; ++ ++ v = pci_config_readb(d, 0x67); ++ v = (v & 0x0f) | (0x20); ++ pci_config_writeb(d, 0x67, v); ++} ++ ++static void pci_bios_init_bridges(PCIDevice *d) ++{ ++ uint16_t vendor_id, device_id; ++ ++ vendor_id = pci_config_readw(d, PCI_VENDOR_ID); ++ device_id = pci_config_readw(d, PCI_DEVICE_ID); ++ ++ if (vendor_id == 0x8086 && device_id == 0x7000) { ++ int i, irq; ++ uint8_t elcr[2]; ++ ++ /* PIIX3 bridge */ ++ ++ elcr[0] = 0x00; ++ elcr[1] = 0x00; ++ for(i = 0; i < 4; i++) { ++ irq = pci_irqs[i]; ++ /* set to trigger level */ ++ elcr[irq >> 3] |= (1 << (irq & 7)); ++ /* activate irq remapping in PIIX */ ++ pci_config_writeb(d, 0x60 + i, irq); ++ } ++ outb(0x4d0, elcr[0]); ++ outb(0x4d1, elcr[1]); ++ BX_INFO("PIIX3 init: elcr=%02x %02x\n", ++ elcr[0], elcr[1]); ++ } else if (vendor_id == 0x8086 && device_id == 0x1237) { ++ /* i440 PCI bridge */ ++ bios_shadow_init(d); ++ } ++} ++ ++extern uint8_t smm_relocation_start, smm_relocation_end; ++extern uint8_t smm_code_start, smm_code_end; ++ ++#ifdef BX_USE_SMM ++static void smm_init(void) ++{ ++ /* copy the SMM relocation code */ ++ memcpy((void *)0x38000, &smm_relocation_start, ++ &smm_relocation_end - &smm_relocation_start); ++ /* raise an SMI interrupt */ ++ outb(0xb2, 00); ++ ++ /* enable the SMM memory window */ ++ pci_config_writel(&i440_pcidev, 0x6c, (1 << 26) | 0x000a); ++ ++ /* copy the SMM code */ ++ memcpy((void *)0xa8000, &smm_code_start, ++ &smm_code_end - &smm_code_start); ++ ++ /* close the SMM memory window and enable normal SMM */ ++ pci_config_writel(&i440_pcidev, 0x6c, (1 << 31) | 0x000a); ++} ++#endif ++ ++static void pci_bios_init_device(PCIDevice *d) ++{ ++ int class; ++ uint32_t *paddr; ++ int i, pin, pic_irq, vendor_id, device_id; ++ ++ class = pci_config_readw(d, PCI_CLASS_DEVICE); ++ vendor_id = pci_config_readw(d, PCI_VENDOR_ID); ++ device_id = pci_config_readw(d, PCI_DEVICE_ID); ++ BX_INFO("PCI: bus=%d devfn=0x%02x: vendor_id=0x%04x device_id=0x%04x\n", ++ d->bus, d->devfn, vendor_id, device_id); ++ switch(class) { ++ case 0x0101: ++ if (vendor_id == 0x8086 && device_id == 0x7010) { ++ /* PIIX3 IDE */ ++ pci_config_writew(d, 0x40, 0x8000); // enable IDE0 ++ pci_config_writew(d, 0x42, 0x8000); // enable IDE1 ++ goto default_map; ++ } else { ++ /* IDE: we map it as in ISA mode */ ++ pci_set_io_region_addr(d, 0, 0x1f0); ++ pci_set_io_region_addr(d, 1, 0x3f4); ++ pci_set_io_region_addr(d, 2, 0x170); ++ pci_set_io_region_addr(d, 3, 0x374); ++ } ++ break; ++ case 0x0300: ++ if (vendor_id != 0x1234) ++ goto default_map; ++ /* VGA: map frame buffer to default Bochs VBE address */ ++ pci_set_io_region_addr(d, 0, 0xE0000000); ++ break; ++ case 0x0800: ++ /* PIC */ ++ if (vendor_id == 0x1014) { ++ /* IBM */ ++ if (device_id == 0x0046 || device_id == 0xFFFF) { ++ /* MPIC & MPIC2 */ ++ pci_set_io_region_addr(d, 0, 0x80800000 + 0x00040000); ++ } ++ } ++ break; ++ case 0xff00: ++ if (vendor_id == 0x0106b && ++ (device_id == 0x0017 || device_id == 0x0022)) { ++ /* macio bridge */ ++ pci_set_io_region_addr(d, 0, 0x80800000); ++ } ++ break; ++ default: ++ default_map: ++ /* default memory mappings */ ++ for(i = 0; i < PCI_NUM_REGIONS; i++) { ++ int ofs; ++ uint32_t val, size ; ++ ++ if (i == PCI_ROM_SLOT) ++ ofs = 0x30; ++ else ++ ofs = 0x10 + i * 4; ++ pci_config_writel(d, ofs, 0xffffffff); ++ val = pci_config_readl(d, ofs); ++ if (val != 0) { ++ size = (~(val & ~0xf)) + 1; ++ if (val & PCI_ADDRESS_SPACE_IO) ++ paddr = &pci_bios_io_addr; ++ else ++ paddr = &pci_bios_mem_addr; ++ *paddr = (*paddr + size - 1) & ~(size - 1); ++ pci_set_io_region_addr(d, i, *paddr); ++ *paddr += size; ++ } ++ } ++ break; ++ } ++ ++ /* map the interrupt */ ++ pin = pci_config_readb(d, PCI_INTERRUPT_PIN); ++ if (pin != 0) { ++ pin = pci_slot_get_pirq(d, pin - 1); ++ pic_irq = pci_irqs[pin]; ++ pci_config_writeb(d, PCI_INTERRUPT_LINE, pic_irq); ++ } ++ ++ if (vendor_id == 0x8086 && device_id == 0x7113) { ++ /* PIIX4 Power Management device (for ACPI) */ ++ pm_io_base = PM_IO_BASE; ++ pci_config_writel(d, 0x40, pm_io_base | 1); ++ pci_config_writeb(d, 0x80, 0x01); /* enable PM io space */ ++ pm_sci_int = pci_config_readb(d, PCI_INTERRUPT_LINE); ++#ifdef BX_USE_SMM ++ smm_init(); ++#endif ++ acpi_enabled = 1; ++ } ++} ++ ++void pci_for_each_device(void (*init_func)(PCIDevice *d)) ++{ ++ PCIDevice d1, *d = &d1; ++ int bus, devfn; ++ uint16_t vendor_id, device_id; ++ ++ for(bus = 0; bus < 1; bus++) { ++ for(devfn = 0; devfn < 256; devfn++) { ++ d->bus = bus; ++ d->devfn = devfn; ++ vendor_id = pci_config_readw(d, PCI_VENDOR_ID); ++ device_id = pci_config_readw(d, PCI_DEVICE_ID); ++ if (vendor_id != 0xffff || device_id != 0xffff) { ++ init_func(d); ++ } ++ } ++ } ++} ++ ++void pci_bios_init(void) ++{ ++ pci_bios_io_addr = 0xc000; ++ pci_bios_mem_addr = 0xf0000000; ++ ++ pci_for_each_device(pci_bios_init_bridges); ++ ++ pci_for_each_device(pci_bios_init_device); ++} ++ ++/****************************************************/ ++/* Multi Processor table init */ ++ ++static void putb(uint8_t **pp, int val) ++{ ++ uint8_t *q; ++ q = *pp; ++ *q++ = val; ++ *pp = q; ++} ++ ++static void putstr(uint8_t **pp, const char *str) ++{ ++ uint8_t *q; ++ q = *pp; ++ while (*str) ++ *q++ = *str++; ++ *pp = q; ++} ++ ++static void putle16(uint8_t **pp, int val) ++{ ++ uint8_t *q; ++ q = *pp; ++ *q++ = val; ++ *q++ = val >> 8; ++ *pp = q; ++} ++ ++static void putle32(uint8_t **pp, int val) ++{ ++ uint8_t *q; ++ q = *pp; ++ *q++ = val; ++ *q++ = val >> 8; ++ *q++ = val >> 16; ++ *q++ = val >> 24; ++ *pp = q; ++} ++ ++static int mpf_checksum(const uint8_t *data, int len) ++{ ++ int sum, i; ++ sum = 0; ++ for(i = 0; i < len; i++) ++ sum += data[i]; ++ return sum & 0xff; ++} ++ ++static unsigned long align(unsigned long addr, unsigned long v) ++{ ++ return (addr + v - 1) & ~(v - 1); ++} ++ ++static void mptable_init(void) ++{ ++ uint8_t *mp_config_table, *q, *float_pointer_struct; ++ int ioapic_id, i, len; ++ int mp_config_table_size; ++ ++ if (smp_cpus <= 1) ++ return; ++ ++#ifdef BX_USE_EBDA_TABLES ++ mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE); ++#else ++ bios_table_cur_addr = align(bios_table_cur_addr, 16); ++ mp_config_table = (uint8_t *)bios_table_cur_addr; ++#endif ++ q = mp_config_table; ++ putstr(&q, "PCMP"); /* "PCMP signature */ ++ putle16(&q, 0); /* table length (patched later) */ ++ putb(&q, 4); /* spec rev */ ++ putb(&q, 0); /* checksum (patched later) */ ++ putstr(&q, "QEMUCPU "); /* OEM id */ ++ putstr(&q, "0.1 "); /* vendor id */ ++ putle32(&q, 0); /* OEM table ptr */ ++ putle16(&q, 0); /* OEM table size */ ++ putle16(&q, 20); /* entry count */ ++ putle32(&q, 0xfee00000); /* local APIC addr */ ++ putle16(&q, 0); /* ext table length */ ++ putb(&q, 0); /* ext table checksum */ ++ putb(&q, 0); /* reserved */ ++ ++ for(i = 0; i < smp_cpus; i++) { ++ putb(&q, 0); /* entry type = processor */ ++ putb(&q, i); /* APIC id */ ++ putb(&q, 0x11); /* local APIC version number */ ++ if (i == 0) ++ putb(&q, 3); /* cpu flags: enabled, bootstrap cpu */ ++ else ++ putb(&q, 1); /* cpu flags: enabled */ ++ putb(&q, 0); /* cpu signature */ ++ putb(&q, 6); ++ putb(&q, 0); ++ putb(&q, 0); ++ putle16(&q, 0x201); /* feature flags */ ++ putle16(&q, 0); ++ ++ putle16(&q, 0); /* reserved */ ++ putle16(&q, 0); ++ putle16(&q, 0); ++ putle16(&q, 0); ++ } ++ ++ /* isa bus */ ++ putb(&q, 1); /* entry type = bus */ ++ putb(&q, 0); /* bus ID */ ++ putstr(&q, "ISA "); ++ ++ /* ioapic */ ++ ioapic_id = smp_cpus; ++ putb(&q, 2); /* entry type = I/O APIC */ ++ putb(&q, ioapic_id); /* apic ID */ ++ putb(&q, 0x11); /* I/O APIC version number */ ++ putb(&q, 1); /* enable */ ++ putle32(&q, 0xfec00000); /* I/O APIC addr */ ++ ++ /* irqs */ ++ for(i = 0; i < 16; i++) { ++ putb(&q, 3); /* entry type = I/O interrupt */ ++ putb(&q, 0); /* interrupt type = vectored interrupt */ ++ putb(&q, 0); /* flags: po=0, el=0 */ ++ putb(&q, 0); ++ putb(&q, 0); /* source bus ID = ISA */ ++ putb(&q, i); /* source bus IRQ */ ++ putb(&q, ioapic_id); /* dest I/O APIC ID */ ++ putb(&q, i); /* dest I/O APIC interrupt in */ ++ } ++ /* patch length */ ++ len = q - mp_config_table; ++ mp_config_table[4] = len; ++ mp_config_table[5] = len >> 8; ++ ++ mp_config_table[7] = -mpf_checksum(mp_config_table, q - mp_config_table); ++ ++ mp_config_table_size = q - mp_config_table; ++ ++#ifndef BX_USE_EBDA_TABLES ++ bios_table_cur_addr += mp_config_table_size; ++#endif ++ ++ /* floating pointer structure */ ++#ifdef BX_USE_EBDA_TABLES ++ ebda_cur_addr = align(ebda_cur_addr, 16); ++ float_pointer_struct = (uint8_t *)ebda_cur_addr; ++#else ++ bios_table_cur_addr = align(bios_table_cur_addr, 16); ++ float_pointer_struct = (uint8_t *)bios_table_cur_addr; ++#endif ++ q = float_pointer_struct; ++ putstr(&q, "_MP_"); ++ /* pointer to MP config table */ ++ putle32(&q, (unsigned long)mp_config_table); ++ ++ putb(&q, 1); /* length in 16 byte units */ ++ putb(&q, 4); /* MP spec revision */ ++ putb(&q, 0); /* checksum (patched later) */ ++ putb(&q, 0); /* MP feature byte 1 */ ++ ++ putb(&q, 0); ++ putb(&q, 0); ++ putb(&q, 0); ++ putb(&q, 0); ++ float_pointer_struct[10] = ++ -mpf_checksum(float_pointer_struct, q - float_pointer_struct); ++#ifdef BX_USE_EBDA_TABLES ++ ebda_cur_addr += (q - float_pointer_struct); ++#else ++ bios_table_cur_addr += (q - float_pointer_struct); ++#endif ++ BX_INFO("MP table addr=0x%08lx MPC table addr=0x%08lx size=0x%x\n", ++ (unsigned long)float_pointer_struct, ++ (unsigned long)mp_config_table, ++ mp_config_table_size); ++} ++ ++/****************************************************/ ++/* ACPI tables init */ ++ ++/* Table structure from Linux kernel (the ACPI tables are under the ++ BSD license) */ ++ ++#define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \ ++ uint8_t signature [4]; /* ACPI signature (4 ASCII characters) */\ ++ uint32_t length; /* Length of table, in bytes, including header */\ ++ uint8_t revision; /* ACPI Specification minor version # */\ ++ uint8_t checksum; /* To make sum of entire table == 0 */\ ++ uint8_t oem_id [6]; /* OEM identification */\ ++ uint8_t oem_table_id [8]; /* OEM table identification */\ ++ uint32_t oem_revision; /* OEM revision number */\ ++ uint8_t asl_compiler_id [4]; /* ASL compiler vendor ID */\ ++ uint32_t asl_compiler_revision; /* ASL compiler revision number */ ++ ++ ++struct acpi_table_header /* ACPI common table header */ ++{ ++ ACPI_TABLE_HEADER_DEF ++}; ++ ++struct rsdp_descriptor /* Root System Descriptor Pointer */ ++{ ++ uint8_t signature [8]; /* ACPI signature, contains "RSD PTR " */ ++ uint8_t checksum; /* To make sum of struct == 0 */ ++ uint8_t oem_id [6]; /* OEM identification */ ++ uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */ ++ uint32_t rsdt_physical_address; /* 32-bit physical address of RSDT */ ++ uint32_t length; /* XSDT Length in bytes including hdr */ ++ uint64_t xsdt_physical_address; /* 64-bit physical address of XSDT */ ++ uint8_t extended_checksum; /* Checksum of entire table */ ++ uint8_t reserved [3]; /* Reserved field must be 0 */ ++}; ++ ++/* ++ * ACPI 1.0 Root System Description Table (RSDT) ++ */ ++struct rsdt_descriptor_rev1 ++{ ++ ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ++ uint32_t table_offset_entry [2]; /* Array of pointers to other */ ++ /* ACPI tables */ ++}; ++ ++/* ++ * ACPI 1.0 Firmware ACPI Control Structure (FACS) ++ */ ++struct facs_descriptor_rev1 ++{ ++ uint8_t signature[4]; /* ACPI Signature */ ++ uint32_t length; /* Length of structure, in bytes */ ++ uint32_t hardware_signature; /* Hardware configuration signature */ ++ uint32_t firmware_waking_vector; /* ACPI OS waking vector */ ++ uint32_t global_lock; /* Global Lock */ ++ uint32_t S4bios_f : 1; /* Indicates if S4BIOS support is present */ ++ uint32_t reserved1 : 31; /* Must be 0 */ ++ uint8_t resverved3 [40]; /* Reserved - must be zero */ ++}; ++ ++ ++/* ++ * ACPI 1.0 Fixed ACPI Description Table (FADT) ++ */ ++struct fadt_descriptor_rev1 ++{ ++ ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ++ uint32_t firmware_ctrl; /* Physical address of FACS */ ++ uint32_t dsdt; /* Physical address of DSDT */ ++ uint8_t model; /* System Interrupt Model */ ++ uint8_t reserved1; /* Reserved */ ++ uint16_t sci_int; /* System vector of SCI interrupt */ ++ uint32_t smi_cmd; /* Port address of SMI command port */ ++ uint8_t acpi_enable; /* Value to write to smi_cmd to enable ACPI */ ++ uint8_t acpi_disable; /* Value to write to smi_cmd to disable ACPI */ ++ uint8_t S4bios_req; /* Value to write to SMI CMD to enter S4BIOS state */ ++ uint8_t reserved2; /* Reserved - must be zero */ ++ uint32_t pm1a_evt_blk; /* Port address of Power Mgt 1a acpi_event Reg Blk */ ++ uint32_t pm1b_evt_blk; /* Port address of Power Mgt 1b acpi_event Reg Blk */ ++ uint32_t pm1a_cnt_blk; /* Port address of Power Mgt 1a Control Reg Blk */ ++ uint32_t pm1b_cnt_blk; /* Port address of Power Mgt 1b Control Reg Blk */ ++ uint32_t pm2_cnt_blk; /* Port address of Power Mgt 2 Control Reg Blk */ ++ uint32_t pm_tmr_blk; /* Port address of Power Mgt Timer Ctrl Reg Blk */ ++ uint32_t gpe0_blk; /* Port addr of General Purpose acpi_event 0 Reg Blk */ ++ uint32_t gpe1_blk; /* Port addr of General Purpose acpi_event 1 Reg Blk */ ++ uint8_t pm1_evt_len; /* Byte length of ports at pm1_x_evt_blk */ ++ uint8_t pm1_cnt_len; /* Byte length of ports at pm1_x_cnt_blk */ ++ uint8_t pm2_cnt_len; /* Byte Length of ports at pm2_cnt_blk */ ++ uint8_t pm_tmr_len; /* Byte Length of ports at pm_tm_blk */ ++ uint8_t gpe0_blk_len; /* Byte Length of ports at gpe0_blk */ ++ uint8_t gpe1_blk_len; /* Byte Length of ports at gpe1_blk */ ++ uint8_t gpe1_base; /* Offset in gpe model where gpe1 events start */ ++ uint8_t reserved3; /* Reserved */ ++ uint16_t plvl2_lat; /* Worst case HW latency to enter/exit C2 state */ ++ uint16_t plvl3_lat; /* Worst case HW latency to enter/exit C3 state */ ++ uint16_t flush_size; /* Size of area read to flush caches */ ++ uint16_t flush_stride; /* Stride used in flushing caches */ ++ uint8_t duty_offset; /* Bit location of duty cycle field in p_cnt reg */ ++ uint8_t duty_width; /* Bit width of duty cycle field in p_cnt reg */ ++ uint8_t day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */ ++ uint8_t mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */ ++ uint8_t century; /* Index to century in RTC CMOS RAM */ ++ uint8_t reserved4; /* Reserved */ ++ uint8_t reserved4a; /* Reserved */ ++ uint8_t reserved4b; /* Reserved */ ++#if 0 ++ uint32_t wb_invd : 1; /* The wbinvd instruction works properly */ ++ uint32_t wb_invd_flush : 1; /* The wbinvd flushes but does not invalidate */ ++ uint32_t proc_c1 : 1; /* All processors support C1 state */ ++ uint32_t plvl2_up : 1; /* C2 state works on MP system */ ++ uint32_t pwr_button : 1; /* Power button is handled as a generic feature */ ++ uint32_t sleep_button : 1; /* Sleep button is handled as a generic feature, or not present */ ++ uint32_t fixed_rTC : 1; /* RTC wakeup stat not in fixed register space */ ++ uint32_t rtcs4 : 1; /* RTC wakeup stat not possible from S4 */ ++ uint32_t tmr_val_ext : 1; /* The tmr_val width is 32 bits (0 = 24 bits) */ ++ uint32_t reserved5 : 23; /* Reserved - must be zero */ ++#else ++ uint32_t flags; ++#endif ++}; ++ ++/* ++ * MADT values and structures ++ */ ++ ++/* Values for MADT PCATCompat */ ++ ++#define DUAL_PIC 0 ++#define MULTIPLE_APIC 1 ++ ++ ++/* Master MADT */ ++ ++struct multiple_apic_table ++{ ++ ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ++ uint32_t local_apic_address; /* Physical address of local APIC */ ++#if 0 ++ uint32_t PCATcompat : 1; /* A one indicates system also has dual 8259s */ ++ uint32_t reserved1 : 31; ++#else ++ uint32_t flags; ++#endif ++}; ++ ++ ++/* Values for Type in APIC_HEADER_DEF */ ++ ++#define APIC_PROCESSOR 0 ++#define APIC_IO 1 ++#define APIC_XRUPT_OVERRIDE 2 ++#define APIC_NMI 3 ++#define APIC_LOCAL_NMI 4 ++#define APIC_ADDRESS_OVERRIDE 5 ++#define APIC_IO_SAPIC 6 ++#define APIC_LOCAL_SAPIC 7 ++#define APIC_XRUPT_SOURCE 8 ++#define APIC_RESERVED 9 /* 9 and greater are reserved */ ++ ++/* ++ * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) ++ */ ++#define APIC_HEADER_DEF /* Common APIC sub-structure header */\ ++ uint8_t type; \ ++ uint8_t length; ++ ++/* Sub-structures for MADT */ ++ ++struct madt_processor_apic ++{ ++ APIC_HEADER_DEF ++ uint8_t processor_id; /* ACPI processor id */ ++ uint8_t local_apic_id; /* Processor's local APIC id */ ++#if 0 ++ uint32_t processor_enabled: 1; /* Processor is usable if set */ ++ uint32_t reserved2 : 31; /* Reserved, must be zero */ ++#else ++ uint32_t flags; ++#endif ++}; ++ ++struct madt_io_apic ++{ ++ APIC_HEADER_DEF ++ uint8_t io_apic_id; /* I/O APIC ID */ ++ uint8_t reserved; /* Reserved - must be zero */ ++ uint32_t address; /* APIC physical address */ ++ uint32_t interrupt; /* Global system interrupt where INTI ++ * lines start */ ++}; ++ ++#include "acpi-dsdt.hex" ++ ++static inline uint16_t cpu_to_le16(uint16_t x) ++{ ++ return x; ++} ++ ++static inline uint32_t cpu_to_le32(uint32_t x) ++{ ++ return x; ++} ++ ++static int acpi_checksum(const uint8_t *data, int len) ++{ ++ int sum, i; ++ sum = 0; ++ for(i = 0; i < len; i++) ++ sum += data[i]; ++ return (-sum) & 0xff; ++} ++ ++static void acpi_build_table_header(struct acpi_table_header *h, ++ char *sig, int len) ++{ ++ memcpy(h->signature, sig, 4); ++ h->length = cpu_to_le32(len); ++ h->revision = 0; ++ memcpy(h->oem_id, "QEMU ", 6); ++ memcpy(h->oem_table_id, "QEMU", 4); ++ memcpy(h->oem_table_id + 4, sig, 4); ++ h->oem_revision = cpu_to_le32(1); ++ memcpy(h->asl_compiler_id, "QEMU", 4); ++ h->asl_compiler_revision = cpu_to_le32(1); ++ h->checksum = acpi_checksum((void *)h, len); ++} ++ ++/* base_addr must be a multiple of 4KB */ ++void acpi_bios_init(void) ++{ ++ struct rsdp_descriptor *rsdp; ++ struct rsdt_descriptor_rev1 *rsdt; ++ struct fadt_descriptor_rev1 *fadt; ++ struct facs_descriptor_rev1 *facs; ++ struct multiple_apic_table *madt; ++ uint8_t *dsdt; ++ uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr; ++ uint32_t acpi_tables_size, madt_addr, madt_size; ++ int i; ++ ++ /* reserve memory space for tables */ ++#ifdef BX_USE_EBDA_TABLES ++ ebda_cur_addr = align(ebda_cur_addr, 16); ++ rsdp = (void *)(ebda_cur_addr); ++ ebda_cur_addr += sizeof(*rsdp); ++#else ++ bios_table_cur_addr = align(bios_table_cur_addr, 16); ++ rsdp = (void *)(bios_table_cur_addr); ++ bios_table_cur_addr += sizeof(*rsdp); ++#endif ++ ++ addr = base_addr = ram_size - ACPI_DATA_SIZE; ++ rsdt_addr = addr; ++ rsdt = (void *)(addr); ++ addr += sizeof(*rsdt); ++ ++ fadt_addr = addr; ++ fadt = (void *)(addr); ++ addr += sizeof(*fadt); ++ ++ /* XXX: FACS should be in RAM */ ++ addr = (addr + 63) & ~63; /* 64 byte alignment for FACS */ ++ facs_addr = addr; ++ facs = (void *)(addr); ++ addr += sizeof(*facs); ++ ++ dsdt_addr = addr; ++ dsdt = (void *)(addr); ++ addr += sizeof(AmlCode); ++ ++ addr = (addr + 7) & ~7; ++ madt_addr = addr; ++ madt_size = sizeof(*madt) + ++ sizeof(struct madt_processor_apic) * smp_cpus + ++ sizeof(struct madt_io_apic); ++ madt = (void *)(addr); ++ addr += madt_size; ++ ++ acpi_tables_size = addr - base_addr; ++ ++ BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n", ++ (unsigned long)rsdp, ++ (unsigned long)rsdt, acpi_tables_size); ++ ++ /* RSDP */ ++ memset(rsdp, 0, sizeof(*rsdp)); ++ memcpy(rsdp->signature, "RSD PTR ", 8); ++ memcpy(rsdp->oem_id, "QEMU ", 6); ++ rsdp->rsdt_physical_address = cpu_to_le32(rsdt_addr); ++ rsdp->checksum = acpi_checksum((void *)rsdp, 20); ++ ++ /* RSDT */ ++ rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr); ++ rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr); ++ acpi_build_table_header((struct acpi_table_header *)rsdt, ++ "RSDT", sizeof(*rsdt)); ++ ++ /* FADT */ ++ memset(fadt, 0, sizeof(*fadt)); ++ fadt->firmware_ctrl = cpu_to_le32(facs_addr); ++ fadt->dsdt = cpu_to_le32(dsdt_addr); ++ fadt->model = 1; ++ fadt->reserved1 = 0; ++ fadt->sci_int = cpu_to_le16(pm_sci_int); ++ fadt->smi_cmd = cpu_to_le32(SMI_CMD_IO_ADDR); ++ fadt->acpi_enable = 0xf1; ++ fadt->acpi_disable = 0xf0; ++ fadt->pm1a_evt_blk = cpu_to_le32(pm_io_base); ++ fadt->pm1a_cnt_blk = cpu_to_le32(pm_io_base + 0x04); ++ fadt->pm_tmr_blk = cpu_to_le32(pm_io_base + 0x08); ++ 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); ++ /* 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", ++ sizeof(*fadt)); ++ ++ /* FACS */ ++ memset(facs, 0, sizeof(*facs)); ++ memcpy(facs->signature, "FACS", 4); ++ facs->length = cpu_to_le32(sizeof(*facs)); ++ ++ /* DSDT */ ++ memcpy(dsdt, AmlCode, sizeof(AmlCode)); ++ ++ /* MADT */ ++ { ++ struct madt_processor_apic *apic; ++ struct madt_io_apic *io_apic; ++ ++ memset(madt, 0, madt_size); ++ madt->local_apic_address = cpu_to_le32(0xfee00000); ++ madt->flags = cpu_to_le32(1); ++ apic = (void *)(madt + 1); ++ for(i=0;itype = APIC_PROCESSOR; ++ apic->length = sizeof(*apic); ++ apic->processor_id = i; ++ apic->local_apic_id = i; ++ apic->flags = cpu_to_le32(1); ++ apic++; ++ } ++ io_apic = (void *)apic; ++ io_apic->type = APIC_IO; ++ io_apic->length = sizeof(*io_apic); ++ io_apic->io_apic_id = smp_cpus; ++ io_apic->address = cpu_to_le32(0xfec00000); ++ io_apic->interrupt = cpu_to_le32(0); ++ ++ acpi_build_table_header((struct acpi_table_header *)madt, ++ "APIC", madt_size); ++ } ++} ++ ++void rombios32_init(void) ++{ ++ BX_INFO("Starting rombios32\n"); ++ ++ ram_probe(); ++ ++ cpu_probe(); ++ ++ smp_probe(); ++ ++ pci_bios_init(); ++ ++ if (bios_table_cur_addr != 0) { ++ ++ mptable_init(); ++ ++ if (acpi_enabled) ++ acpi_bios_init(); ++ ++ bios_lock_shadow_ram(); ++ } ++} +diff -ruN --exclude Makefile bios/rombios32.ld bios.new/rombios32.ld +--- bios/rombios32.ld 1970-01-01 01:00:00.000000000 +0100 ++++ bios.new/rombios32.ld 2006-09-24 20:28:05.000000000 +0200 +@@ -0,0 +1,19 @@ ++OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") ++OUTPUT_ARCH(i386) ++ENTRY(_start); ++SECTIONS ++{ ++ . = 0x00040000; ++ .text : { *(.text) } ++ .rodata : { *(.rodata) } ++ . = ALIGN(4096); ++ .data : { *(.data) } ++ __bss_start = . ; ++ .bss : { *(.bss) *(COMMON) } ++ _end = . ; ++ /DISCARD/ : { *(.stab) ++ *(.stabstr) ++ *(.comment) ++ *(.note) ++ } ++} +diff -ruN --exclude Makefile bios/rombios32start.S bios.new/rombios32start.S +--- bios/rombios32start.S 1970-01-01 01:00:00.000000000 +0100 ++++ bios.new/rombios32start.S 2006-09-24 20:22:58.000000000 +0200 +@@ -0,0 +1,76 @@ ++.globl _start ++.globl smp_ap_boot_code_start ++.globl smp_ap_boot_code_end ++.global smm_relocation_start ++.global smm_relocation_end ++.global smm_code_start ++.global smm_code_end ++ ++#define PM_IO_BASE 0xb000 ++ ++_start: ++ /* clear bss section */ ++ xor %eax, %eax ++ mov $__bss_start, %edi ++ mov $_end, %ecx ++ sub %edi, %ecx ++ rep stosb ++ ++ jmp rombios32_init ++ ++#define CPU_COUNT 0xf000 ++ ++ .code16 ++smp_ap_boot_code_start: ++ xor %ax, %ax ++ mov %ax, %ds ++ incw CPU_COUNT ++1: ++ hlt ++ jmp 1b ++smp_ap_boot_code_end: ++ ++/* code to relocate SMBASE to 0xa0000 */ ++smm_relocation_start: ++ mov $0x38000 + 0x7efc, %ebx ++ mov (%ebx), %al /* revision ID to see if x86_64 or x86 */ ++ cmp $0x64, %al ++ je 1f ++ mov $0x38000 + 0x7ef8, %ebx ++ jmp 2f ++1: ++ mov $0x38000 + 0x7f00, %ebx ++2: ++ movl $0xa0000, %eax ++ movl %eax, (%ebx) ++ rsm ++smm_relocation_end: ++ ++/* minimal SMM code to enable or disable ACPI */ ++smm_code_start: ++ movw $0xb2, %dx ++ inb %dx, %al ++ cmp $0xf0, %al ++ jne 1f ++ ++ /* ACPI disable */ ++ mov $PM_IO_BASE + 0x04, %dx /* PMCNTRL */ ++ inw %dx, %ax ++ andw $~1, %ax ++ outw %ax, %dx ++ ++ jmp 2f ++ ++1: ++ cmp $0xf1, %al ++ jne 2f ++ ++ /* ACPI enable */ ++ mov $PM_IO_BASE + 0x04, %dx /* PMCNTRL */ ++ inw %dx, %ax ++ orw $1, %ax ++ outw %ax, %dx ++ ++2: ++ rsm ++smm_code_end: +diff -ruN --exclude Makefile bios/rombios.c bios.new/rombios.c +--- bios/rombios.c 2006-08-11 19:34:12.000000000 +0200 ++++ bios.new/rombios.c 2006-09-24 20:35:47.000000000 +0200 +@@ -24,7 +24,7 @@ + // License along with this library; if not, write to the Free Software + // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +-// ROM BIOS for use with Bochs/Plex x86 emulation environment ++// ROM BIOS for use with Bochs/Plex x86/QEMU emulation environment + + + // ROM BIOS compatability entry points: +@@ -143,6 +143,7 @@ + #define BX_FLOPPY_ON_CNT 37 /* 2 seconds */ + #define BX_PCIBIOS 1 + #define BX_APM 1 ++#define BX_ROMBIOS32 1 + + #define BX_USE_ATADRV 1 + #define BX_ELTORITO_BOOT 1 +@@ -159,6 +160,9 @@ + #define BIOS_REVISION 1 + #define BIOS_CONFIG_TABLE 0xe6f5 + ++/* define it to include QEMU specific code */ ++#define BX_QEMU ++ + #ifndef BIOS_BUILD_DATE + # define BIOS_BUILD_DATE "06/23/99" + #endif +@@ -170,7 +174,9 @@ + #define BASE_MEM_IN_K (640 - EBDA_SIZE) + + // Define the application NAME +-#ifdef PLEX86 ++#if defined(BX_QEMU) ++# define BX_APPNAME "QEMU" ++#elif defined(PLEX86) + # define BX_APPNAME "Plex86" + #else + # define BX_APPNAME "Bochs" +@@ -1826,6 +1832,9 @@ + #ifdef BX_ELTORITO_BOOT + "eltorito " + #endif ++#ifdef BX_ROMBIOS32 ++ "rombios32 " ++#endif + "\n\n"); + } + +@@ -4085,6 +4094,24 @@ + case 0x20: // coded by osmaker aka K.J. + if(regs.u.r32.edx == 0x534D4150) + { ++ extended_memory_size = inb_cmos(0x35); ++ extended_memory_size <<= 8; ++ extended_memory_size |= inb_cmos(0x34); ++ extended_memory_size *= 64; ++ // greater than EFF00000??? ++ if(extended_memory_size > 0x3bc000) { ++ extended_memory_size = 0x3bc000; // everything after this is reserved memory until we get to 0x100000000 ++ } ++ extended_memory_size *= 1024; ++ extended_memory_size += (16L * 1024 * 1024); ++ ++ if(extended_memory_size <= (16L * 1024 * 1024)) { ++ extended_memory_size = inb_cmos(0x31); ++ extended_memory_size <<= 8; ++ extended_memory_size |= inb_cmos(0x30); ++ extended_memory_size *= 1024; ++ } ++ 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 @@ +@@ -4115,27 +4142,9 @@ return; break; - case 1: + case 3: +- extended_memory_size = inb_cmos(0x35); +- extended_memory_size <<= 8; +- extended_memory_size |= inb_cmos(0x34); +- extended_memory_size *= 64; +- if(extended_memory_size > 0x3bc000) // greater than EFF00000??? +- { +- extended_memory_size = 0x3bc000; // everything after this is reserved memory until we get to 0x100000000 +- } +- extended_memory_size *= 1024; +- extended_memory_size += (16L * 1024 * 1024); +- +- if(extended_memory_size <= (16L * 1024 * 1024)) +- { +- extended_memory_size = inb_cmos(0x31); +- extended_memory_size <<= 8; +- extended_memory_size |= inb_cmos(0x30); +- extended_memory_size *= 1024; +- } +- + set_e820_range(ES, regs.u.r16.di, +- 0x00100000L, extended_memory_size, 1); ++ 0x00100000L, ++ extended_memory_size - 0x10000L, 1); + regs.u.r32.ebx = 4; + regs.u.r32.eax = 0x534D4150; + regs.u.r32.ecx = 0x14; +@@ -4143,6 +4152,16 @@ + return; + break; + case 4: + set_e820_range(ES, regs.u.r16.di, -+ 0x0009fc00L, 0x000a0000L, 2); -+ regs.u.r32.ebx = 2; ++ extended_memory_size - 0x10000L, ++ extended_memory_size, 3); // ACPI RAM ++ regs.u.r32.ebx = 5; + 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 @@ ++ case 5: + /* 256KB BIOS area at the end of 4 GB */ + set_e820_range(ES, regs.u.r16.di, + 0xfffc0000L, 0x00000000L, 2); +@@ -8757,6 +8776,9 @@ + unknown_service: mov al, #0x80 bios32_end: ++#ifdef BX_QEMU ++ and dword ptr[esp+8],0xfffffffc ;; reset CS.RPL for kqemu ++#endif popf -+ and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu retf - .align 16 -@@ -8823,17 +8853,17 @@ +@@ -8868,6 +8890,9 @@ pci_pro_fail: pop edi pop esi -- sti ++#ifdef BX_QEMU ++ and dword ptr[esp+8],0xfffffffc ;; reset CS.RPL for kqemu ++#endif popf stc -+ and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu retf - pci_pro_ok: +@@ -8875,6 +8900,9 @@ xor ah, ah pop edi pop esi -- sti ++#ifdef BX_QEMU ++ and dword ptr[esp+8],0xfffffffc ;; reset CS.RPL for kqemu ++#endif popf clc -+ and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu retf - - pci_pro_select_reg: -@@ -8971,7 +9001,7 @@ - jmp pci_real_ok - pci_real_f0d: ;; write configuration dword - cmp al, #0x0d -- jne pci_real_unknown -+ jne pci_real_f0e - call pci_real_select_reg - push dx - mov dx, #0x0cfc -@@ -8979,6 +9009,46 @@ - out dx, eax - pop dx - jmp pci_real_ok -+pci_real_f0e: ;; get irq routing options -+ cmp al, #0x0e -+ jne pci_real_unknown -+ SEG ES -+ cmp word ptr [di], #pci_routing_table_structure_end - pci_routing_table_structure_start -+ jb pci_real_too_small -+ SEG ES -+ mov word ptr [di], #pci_routing_table_structure_end - pci_routing_table_structure_start -+ pushf -+ push ds -+ push es -+ push cx -+ push si -+ push di -+ cld -+ mov si, #pci_routing_table_structure_start -+ push cs -+ pop ds -+ SEG ES -+ mov cx, [di+2] -+ SEG ES -+ mov es, [di+4] -+ mov di, cx -+ mov cx, #pci_routing_table_structure_end - pci_routing_table_structure_start -+ rep -+ movsb -+ pop di -+ pop si -+ pop cx -+ pop es -+ pop ds -+ popf -+ mov bx, #(1 << 9) | (1 << 11) ;; irq 9 and 11 are used -+ jmp pci_real_ok -+pci_real_too_small: -+ SEG ES -+ mov word ptr [di], #pci_routing_table_structure_end - pci_routing_table_structure_start -+ mov ah, #0x89 -+ jmp pci_real_fail -+ - pci_real_unknown: - mov ah, #0x81 - pci_real_fail: -@@ -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 -+pci_routing_table_structure_start: - ;; first slot entry PCI-to-ISA (embedded) - db 0 ;; pci bus number - db 0x08 ;; pci device number (bit 7-3) -@@ -9097,6 +9168,7 @@ - dw 0xdef8 ;; IRQ bitmap INTD# - db 5 ;; physical slot (0 = embedded) +@@ -9183,227 +9211,118 @@ db 0 ;; reserved -+pci_routing_table_structure_end: + pci_routing_table_structure_end: - pci_irq_list: - db 11, 10, 9, 5; +-pci_irq_list: +- db 11, 10, 9, 5; ++#endif // BX_PCIBIOS + +-pcibios_init_sel_reg: +- push eax +- mov eax, #0x800000 +- mov ax, bx +- shl eax, #8 +- and dl, #0xfc +- or al, dl +- mov dx, #0x0cf8 +- out dx, eax +- pop eax +- ret +- +-pcibios_init_iomem_bases: +- push bp +- mov bp, sp +- mov eax, #0xe0000000 ;; base for memory init +- push eax +- mov ax, #0xc000 ;; base for i/o init +- push ax +- mov ax, #0x0010 ;; start at base address #0 ++#if BX_ROMBIOS32 ++rombios32_init: ++ ;; save a20 and enable it ++ in al, 0x92 + push ax +- mov bx, #0x0008 +-pci_init_io_loop1: +- mov dl, #0x00 +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- in ax, dx +- cmp ax, #0xffff +- jz next_pci_dev +- mov dl, #0x04 ;; disable i/o and memory space access +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- in al, dx +- and al, #0xfc +- out dx, al +-pci_init_io_loop2: +- mov dl, [bp-8] +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- in eax, dx +- test al, #0x01 +- jnz init_io_base +- mov ecx, eax +- mov eax, #0xffffffff +- out dx, eax +- in eax, dx +- cmp eax, ecx +- je next_pci_base +- xor eax, #0xffffffff +- mov ecx, eax +- mov eax, [bp-4] +- out dx, eax +- add eax, ecx ;; calculate next free mem base +- add eax, #0x01000000 +- and eax, #0xff000000 +- mov [bp-4], eax +- jmp next_pci_base +-init_io_base: +- mov cx, ax +- mov ax, #0xffff +- out dx, ax +- in ax, dx +- cmp ax, cx +- je next_pci_base +- xor ax, #0xfffe +- mov cx, ax +- mov ax, [bp-6] +- out dx, ax +- add ax, cx ;; calculate next free i/o base +- add ax, #0x0100 +- and ax, #0xff00 +- mov [bp-6], ax +-next_pci_base: +- mov al, [bp-8] +- add al, #0x04 +- cmp al, #0x28 +- je enable_iomem_space +- mov byte ptr[bp-8], al +- jmp pci_init_io_loop2 +-enable_iomem_space: +- mov dl, #0x04 ;; enable i/o and memory space access if available +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- in al, dx +- or al, #0x07 +- out dx, al +-next_pci_dev: +- mov byte ptr[bp-8], #0x10 +- inc bx +- cmp bx, #0x0100 +- jne pci_init_io_loop1 +- mov sp, bp +- pop bp +- ret ++ or al, #0x02 ++ out 0x92, al + +-pcibios_init_set_elcr: +- push ax +- push cx +- mov dx, #0x04d0 +- test al, #0x08 +- jz is_master_pic +- inc dx +- and al, #0x07 +-is_master_pic: +- mov cl, al +- mov bl, #0x01 +- shl bl, cl +- in al, dx +- or al, bl +- out dx, al +- pop cx +- pop ax +- ret ++ ;; save SS:SP to the BDA ++ xor ax, ax ++ mov ds, ax ++ mov 0x0469, ss ++ mov 0x0467, sp + +-pcibios_init_irqs: +- push ds +- push bp +- mov ax, #0xf000 +- mov ds, ax +- mov dx, #0x04d0 ;; reset ELCR1 + ELCR2 +- mov al, #0x00 +- out dx, al +- inc dx +- out dx, al +- mov si, #pci_routing_table_structure +- mov bh, [si+8] +- mov bl, [si+9] +- mov dl, #0x00 +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- in eax, dx +- cmp eax, [si+12] ;; check irq router +- jne pci_init_end +- mov dl, [si+34] +- call pcibios_init_sel_reg +- push bx ;; save irq router bus + devfunc +- mov dx, #0x0cfc +- mov ax, #0x8080 +- out dx, ax ;; reset PIRQ route control +- inc dx +- inc dx +- out dx, ax +- mov ax, [si+6] +- sub ax, #0x20 +- shr ax, #4 +- mov cx, ax +- add si, #0x20 ;; set pointer to 1st entry +- mov bp, sp +- mov ax, #pci_irq_list +- push ax +- xor ax, ax +- push ax +-pci_init_irq_loop1: +- mov bh, [si] +- mov bl, [si+1] +-pci_init_irq_loop2: +- mov dl, #0x00 +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- in ax, dx +- cmp ax, #0xffff +- jnz pci_test_int_pin +- test bl, #0x07 +- jz next_pir_entry +- jmp next_pci_func +-pci_test_int_pin: +- mov dl, #0x3c +- call pcibios_init_sel_reg +- mov dx, #0x0cfd +- in al, dx +- and al, #0x07 +- jz next_pci_func +- dec al ;; determine pirq reg +- mov dl, #0x03 +- mul al, dl +- add al, #0x02 +- xor ah, ah +- mov bx, ax +- mov al, [si+bx] +- mov dl, al +- mov bx, [bp] +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- and al, #0x03 +- add dl, al +- in al, dx +- cmp al, #0x80 +- jb pirq_found +- mov bx, [bp-2] ;; pci irq list pointer +- mov al, [bx] +- out dx, al +- inc bx +- mov [bp-2], bx +- call pcibios_init_set_elcr +-pirq_found: +- mov bh, [si] +- mov bl, [si+1] +- add bl, [bp-3] ;; pci function number +- mov dl, #0x3c +- call pcibios_init_sel_reg +- mov dx, #0x0cfc +- out dx, al +-next_pci_func: +- inc byte ptr[bp-3] +- inc bl +- test bl, #0x07 +- jnz pci_init_irq_loop2 +-next_pir_entry: +- add si, #0x10 +- mov byte ptr[bp-3], #0x00 +- loop pci_init_irq_loop1 +- mov sp, bp +- pop bx +-pci_init_end: +- pop bp +- pop ds ++ SEG CS ++ lidt [pmode_IDT_info] ++ SEG CS ++ lgdt [rombios32_gdt_48] ++ ;; set PE bit in CR0 ++ mov eax, cr0 ++ or al, #0x01 ++ mov cr0, eax ++ ;; start protected mode code: ljmpl 0x10:rombios32_init1 ++ db 0x66, 0xea ++ dw rombios32_05 ++ dw 0x000f ;; high 16 bit address ++ dw 0x0010 ++ ++use32 386 ++rombios32_05: ++ ;; init data segments ++ mov eax, #0x18 ++ mov ds, ax ++ mov es, ax ++ mov ss, ax ++ xor eax, eax ++ mov fs, ax ++ mov gs, ax ++ cld ++ ++ ;; copy rombios32 code to ram (ram offset = 1MB) ++ mov esi, #0xfffe0000 ++ mov edi, #0x00040000 ++ mov ecx, #0x10000 / 4 ++ rep ++ movsd ++ ++ ;; init the stack pointer ++ mov esp, #0x00080000 ++ ++ ;; call rombios32 code ++ mov eax, #0x00040000 ++ call eax ++ ++ ;; return to 16 bit protected mode first ++ db 0xea ++ dd rombios32_10 ++ dw 0x20 ++ ++use16 386 ++rombios32_10: ++ ;; restore data segment limits to 0xffff ++ mov ax, #0x28 ++ mov ds, ax ++ mov es, ax ++ mov ss, ax ++ mov fs, ax ++ mov gs, ax ++ ++ ;; reset PE bit in CR0 ++ mov eax, cr0 ++ and al, #0xFE ++ mov cr0, eax ++ ++ ;; far jump to flush CPU queue after transition to real mode ++ JMP_AP(0xf000, rombios32_real_mode) ++ ++rombios32_real_mode: ++ ;; restore IDT to normal real-mode defaults ++ SEG CS ++ lidt [rmode_IDT_info] ++ ++ xor ax, ax ++ mov ds, ax ++ mov es, ax ++ mov fs, ax ++ mov gs, ax ++ ++ ;; restore SS:SP from the BDA ++ mov ss, 0x0469 ++ mov sp, 0x0467 ++ ;; restore a20 ++ pop ax ++ out 0x92, al + ret +-#endif // BX_PCIBIOS ++ ++rombios32_gdt_48: ++ dw 0x30 ++ dw rombios32_gdt ++ dw 0x000f ++ ++rombios32_gdt: ++ dw 0, 0, 0, 0 ++ dw 0, 0, 0, 0 ++ dw 0xffff, 0, 0x9b00, 0x00cf ; 32 bit flat code segment (0x10) ++ dw 0xffff, 0, 0x9300, 0x00cf ; 32 bit flat data segment (0x18) ++ dw 0xffff, 0, 0x9b0f, 0x0000 ; 16 bit code segment base=0xf0000 limit=0xffff ++ dw 0xffff, 0, 0x9300, 0x0000 ; 16 bit data segment base=0x0 limit=0xffff ++#endif ++ + + ; parallel port detection: base address in DX, index in BX, timeout in CL + detect_parport: +@@ -9535,10 +9454,17 @@ + ;; DATA_SEG_DEFS_HERE + + ++;; the following area can be used to write dynamically generated tables ++ .align 16 ++bios_table_area_start: ++ dd 0xaafb4442 ++ dd bios_table_area_end - bios_table_area_start - 8; ++ + ;-------- + ;- POST - + ;-------- + .org 0xe05b ; POST Entry Point ++bios_table_area_end: + post: + + xor ax, ax +@@ -9802,9 +9728,9 @@ + #endif + out 0xa1, AL ;slave pic: unmask IRQ 12, 13, 14 + +- call pcibios_init_iomem_bases +- call pcibios_init_irqs +- ++#if BX_ROMBIOS32 ++ call rombios32_init ++#endif + call rom_scan + + call _print_bios_banner