qemu: copy dsdt tables from SeaBIOS, adapt for coreboot and enable acpi
First copy over from SeaBIOS git repo, then adapt for coreboot: Disable cpu/pci hotplug bits. Disable dynamic pci window. Both depend on stuff in the SSDT tables created by SeaBIOS. Bits are left in, but deactivated via #if 0, so it's easier to see the differences when diffing the coreboot tables with the SeaBIOS tables. Adapt dsdt DefinitionBlock. Enable acpi table generation in acpi_tables.c. With this patch linux boots successfully with ACPI enabled. It's not bug-free though. Missing cpu detection leads to funky messages like this one: weird, boot CPU (#0) not listed by the BIOS. and SMP most likely wouldn't work either. Change-Id: Ic3803a6f1ef6d54c11cc4ca3844d3032a374ae6b Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-on: http://review.coreboot.org/3342 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
This commit is contained in:
Gerd Hoffmann
Stefan Reinauer
parent
7bb02512d9
commit
8130b1ec1b
|
|
@ -0,0 +1,78 @@
|
||||||
|
/****************************************************************
|
||||||
|
* CPU hotplug
|
||||||
|
****************************************************************/
|
||||||
|
|
||||||
|
Scope(\_SB) {
|
||||||
|
/* Objects filled in by run-time generated SSDT */
|
||||||
|
External(NTFY, MethodObj)
|
||||||
|
External(CPON, PkgObj)
|
||||||
|
|
||||||
|
/* Methods called by run-time generated SSDT Processor objects */
|
||||||
|
Method(CPMA, 1, NotSerialized) {
|
||||||
|
// _MAT method - create an madt apic buffer
|
||||||
|
// Arg0 = Processor ID = Local APIC ID
|
||||||
|
// Local0 = CPON flag for this cpu
|
||||||
|
Store(DerefOf(Index(CPON, Arg0)), Local0)
|
||||||
|
// Local1 = Buffer (in madt apic form) to return
|
||||||
|
Store(Buffer(8) {0x00, 0x08, 0x00, 0x00, 0x00, 0, 0, 0}, Local1)
|
||||||
|
// Update the processor id, lapic id, and enable/disable status
|
||||||
|
Store(Arg0, Index(Local1, 2))
|
||||||
|
Store(Arg0, Index(Local1, 3))
|
||||||
|
Store(Local0, Index(Local1, 4))
|
||||||
|
Return (Local1)
|
||||||
|
}
|
||||||
|
Method(CPST, 1, NotSerialized) {
|
||||||
|
// _STA method - return ON status of cpu
|
||||||
|
// Arg0 = Processor ID = Local APIC ID
|
||||||
|
// Local0 = CPON flag for this cpu
|
||||||
|
Store(DerefOf(Index(CPON, Arg0)), Local0)
|
||||||
|
If (Local0) {
|
||||||
|
Return (0xF)
|
||||||
|
} Else {
|
||||||
|
Return (0x0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Method(CPEJ, 2, NotSerialized) {
|
||||||
|
// _EJ0 method - eject callback
|
||||||
|
Sleep(200)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* CPU hotplug notify method */
|
||||||
|
OperationRegion(PRST, SystemIO, 0xaf00, 32)
|
||||||
|
Field(PRST, ByteAcc, NoLock, Preserve) {
|
||||||
|
PRS, 256
|
||||||
|
}
|
||||||
|
Method(PRSC, 0) {
|
||||||
|
// Local5 = active cpu bitmap
|
||||||
|
Store(PRS, Local5)
|
||||||
|
// Local2 = last read byte from bitmap
|
||||||
|
Store(Zero, Local2)
|
||||||
|
// Local0 = Processor ID / APIC ID iterator
|
||||||
|
Store(Zero, Local0)
|
||||||
|
While (LLess(Local0, SizeOf(CPON))) {
|
||||||
|
// Local1 = CPON flag for this cpu
|
||||||
|
Store(DerefOf(Index(CPON, Local0)), Local1)
|
||||||
|
If (And(Local0, 0x07)) {
|
||||||
|
// Shift down previously read bitmap byte
|
||||||
|
ShiftRight(Local2, 1, Local2)
|
||||||
|
} Else {
|
||||||
|
// Read next byte from cpu bitmap
|
||||||
|
Store(DerefOf(Index(Local5, ShiftRight(Local0, 3))), Local2)
|
||||||
|
}
|
||||||
|
// Local3 = active state for this cpu
|
||||||
|
Store(And(Local2, 1), Local3)
|
||||||
|
|
||||||
|
If (LNotEqual(Local1, Local3)) {
|
||||||
|
// State change - update CPON with new state
|
||||||
|
Store(Local3, Index(CPON, Local0))
|
||||||
|
// Do CPU notify
|
||||||
|
If (LEqual(Local3, 1)) {
|
||||||
|
NTFY(Local0, 1)
|
||||||
|
} Else {
|
||||||
|
NTFY(Local0, 3)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Increment(Local0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
/****************************************************************
|
||||||
|
* Debugging
|
||||||
|
****************************************************************/
|
||||||
|
|
||||||
|
Scope(\) {
|
||||||
|
/* Debug Output */
|
||||||
|
OperationRegion(DBG, SystemIO, 0x0402, 0x01)
|
||||||
|
Field(DBG, ByteAcc, NoLock, Preserve) {
|
||||||
|
DBGB, 8,
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Debug method - use this method to send output to the QEMU
|
||||||
|
* BIOS debug port. This method handles strings, integers,
|
||||||
|
* and buffers. For example: DBUG("abc") DBUG(0x123) */
|
||||||
|
Method(DBUG, 1) {
|
||||||
|
ToHexString(Arg0, Local0)
|
||||||
|
ToBuffer(Local0, Local0)
|
||||||
|
Subtract(SizeOf(Local0), 1, Local1)
|
||||||
|
Store(Zero, Local2)
|
||||||
|
While (LLess(Local2, Local1)) {
|
||||||
|
Store(DerefOf(Index(Local0, Local2)), DBGB)
|
||||||
|
Increment(Local2)
|
||||||
|
}
|
||||||
|
Store(0x0A, DBGB)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
/****************************************************************
|
||||||
|
* HPET
|
||||||
|
****************************************************************/
|
||||||
|
|
||||||
|
Scope(\_SB) {
|
||||||
|
Device(HPET) {
|
||||||
|
Name(_HID, EISAID("PNP0103"))
|
||||||
|
Name(_UID, 0)
|
||||||
|
OperationRegion(HPTM, SystemMemory, 0xFED00000, 0x400)
|
||||||
|
Field(HPTM, DWordAcc, Lock, Preserve) {
|
||||||
|
VEND, 32,
|
||||||
|
PRD, 32,
|
||||||
|
}
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Store(VEND, Local0)
|
||||||
|
Store(PRD, Local1)
|
||||||
|
ShiftRight(Local0, 16, Local0)
|
||||||
|
If (LOr(LEqual(Local0, 0), LEqual(Local0, 0xffff))) {
|
||||||
|
Return (0x0)
|
||||||
|
}
|
||||||
|
If (LOr(LEqual(Local1, 0), LGreater(Local1, 100000000))) {
|
||||||
|
Return (0x0)
|
||||||
|
}
|
||||||
|
Return (0x0F)
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
#if 0 /* This makes WinXP BSOD for not yet figured reasons. */
|
||||||
|
IRQNoFlags() {2, 8}
|
||||||
|
#endif
|
||||||
|
Memory32Fixed(ReadOnly,
|
||||||
|
0xFED00000, // Address Base
|
||||||
|
0x00000400, // Address Length
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,102 @@
|
||||||
|
/* Common legacy ISA style devices. */
|
||||||
|
Scope(\_SB.PCI0.ISA) {
|
||||||
|
|
||||||
|
Device(RTC) {
|
||||||
|
Name(_HID, EisaId("PNP0B00"))
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IO(Decode16, 0x0070, 0x0070, 0x10, 0x02)
|
||||||
|
IRQNoFlags() { 8 }
|
||||||
|
IO(Decode16, 0x0072, 0x0072, 0x02, 0x06)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Device(KBD) {
|
||||||
|
Name(_HID, EisaId("PNP0303"))
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Return (0x0f)
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IO(Decode16, 0x0060, 0x0060, 0x01, 0x01)
|
||||||
|
IO(Decode16, 0x0064, 0x0064, 0x01, 0x01)
|
||||||
|
IRQNoFlags() { 1 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Device(MOU) {
|
||||||
|
Name(_HID, EisaId("PNP0F13"))
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Return (0x0f)
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IRQNoFlags() { 12 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Device(FDC0) {
|
||||||
|
Name(_HID, EisaId("PNP0700"))
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Store(FDEN, Local0)
|
||||||
|
If (LEqual(Local0, 0)) {
|
||||||
|
Return (0x00)
|
||||||
|
} Else {
|
||||||
|
Return (0x0F)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IO(Decode16, 0x03F2, 0x03F2, 0x00, 0x04)
|
||||||
|
IO(Decode16, 0x03F7, 0x03F7, 0x00, 0x01)
|
||||||
|
IRQNoFlags() { 6 }
|
||||||
|
DMA(Compatibility, NotBusMaster, Transfer8) { 2 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Device(LPT) {
|
||||||
|
Name(_HID, EisaId("PNP0400"))
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Store(LPEN, Local0)
|
||||||
|
If (LEqual(Local0, 0)) {
|
||||||
|
Return (0x00)
|
||||||
|
} Else {
|
||||||
|
Return (0x0F)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IO(Decode16, 0x0378, 0x0378, 0x08, 0x08)
|
||||||
|
IRQNoFlags() { 7 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Device(COM1) {
|
||||||
|
Name(_HID, EisaId("PNP0501"))
|
||||||
|
Name(_UID, 0x01)
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Store(CAEN, Local0)
|
||||||
|
If (LEqual(Local0, 0)) {
|
||||||
|
Return (0x00)
|
||||||
|
} Else {
|
||||||
|
Return (0x0F)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IO(Decode16, 0x03F8, 0x03F8, 0x00, 0x08)
|
||||||
|
IRQNoFlags() { 4 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
Device(COM2) {
|
||||||
|
Name(_HID, EisaId("PNP0501"))
|
||||||
|
Name(_UID, 0x02)
|
||||||
|
Method(_STA, 0, NotSerialized) {
|
||||||
|
Store(CBEN, Local0)
|
||||||
|
If (LEqual(Local0, 0)) {
|
||||||
|
Return (0x00)
|
||||||
|
} Else {
|
||||||
|
Return (0x0F)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
IO(Decode16, 0x02F8, 0x02F8, 0x00, 0x08)
|
||||||
|
IRQNoFlags() { 3 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,94 @@
|
||||||
|
/* PCI CRS (current resources) definition. */
|
||||||
|
Scope(\_SB.PCI0) {
|
||||||
|
|
||||||
|
Name(CRES, 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, MinFixed, MaxFixed, NonCacheable, ReadWrite,
|
||||||
|
0x00000000, // Address Space Granularity
|
||||||
|
0xE0000000, // Address Range Minimum
|
||||||
|
0xFEBFFFFF, // Address Range Maximum
|
||||||
|
0x00000000, // Address Translation Offset
|
||||||
|
0x1EC00000, // Address Length
|
||||||
|
,, PW32, AddressRangeMemory, TypeStatic)
|
||||||
|
})
|
||||||
|
|
||||||
|
Name(CR64, ResourceTemplate() {
|
||||||
|
QWordMemory(ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
|
||||||
|
0x00000000, // Address Space Granularity
|
||||||
|
0x8000000000, // Address Range Minimum
|
||||||
|
0xFFFFFFFFFF, // Address Range Maximum
|
||||||
|
0x00000000, // Address Translation Offset
|
||||||
|
0x8000000000, // Address Length
|
||||||
|
,, PW64, AddressRangeMemory, TypeStatic)
|
||||||
|
})
|
||||||
|
|
||||||
|
Method(_CRS, 0) {
|
||||||
|
#if 0
|
||||||
|
/* Fields provided by dynamically created ssdt */
|
||||||
|
External(P0S, IntObj)
|
||||||
|
External(P0E, IntObj)
|
||||||
|
External(P1V, IntObj)
|
||||||
|
External(P1S, BuffObj)
|
||||||
|
External(P1E, BuffObj)
|
||||||
|
External(P1L, BuffObj)
|
||||||
|
|
||||||
|
/* fixup 32bit pci io window */
|
||||||
|
CreateDWordField(CRES, \_SB.PCI0.PW32._MIN, PS32)
|
||||||
|
CreateDWordField(CRES, \_SB.PCI0.PW32._MAX, PE32)
|
||||||
|
CreateDWordField(CRES, \_SB.PCI0.PW32._LEN, PL32)
|
||||||
|
Store(P0S, PS32)
|
||||||
|
Store(P0E, PE32)
|
||||||
|
Store(Add(Subtract(P0E, P0S), 1), PL32)
|
||||||
|
|
||||||
|
If (LEqual(P1V, Zero)) {
|
||||||
|
Return (CRES)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* fixup 64bit pci io window */
|
||||||
|
CreateQWordField(CR64, \_SB.PCI0.PW64._MIN, PS64)
|
||||||
|
CreateQWordField(CR64, \_SB.PCI0.PW64._MAX, PE64)
|
||||||
|
CreateQWordField(CR64, \_SB.PCI0.PW64._LEN, PL64)
|
||||||
|
Store(P1S, PS64)
|
||||||
|
Store(P1E, PE64)
|
||||||
|
Store(P1L, PL64)
|
||||||
|
/* add window and return result */
|
||||||
|
ConcatenateResTemplate(CRES, CR64, Local0)
|
||||||
|
Return (Local0)
|
||||||
|
#else
|
||||||
|
Return (CRES)
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -73,7 +73,6 @@ unsigned long acpi_fill_srat(unsigned long current)
|
||||||
#define ALIGN_CURRENT current = (ALIGN(current, 16))
|
#define ALIGN_CURRENT current = (ALIGN(current, 16))
|
||||||
unsigned long write_acpi_tables(unsigned long start)
|
unsigned long write_acpi_tables(unsigned long start)
|
||||||
{
|
{
|
||||||
#ifdef ACPI
|
|
||||||
unsigned long current;
|
unsigned long current;
|
||||||
acpi_rsdp_t *rsdp;
|
acpi_rsdp_t *rsdp;
|
||||||
acpi_rsdt_t *rsdt;
|
acpi_rsdt_t *rsdt;
|
||||||
|
|
@ -187,7 +186,4 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||||
printk(BIOS_DEBUG, "current = %lx\n", current);
|
printk(BIOS_DEBUG, "current = %lx\n", current);
|
||||||
printk(BIOS_INFO, "ACPI: done.\n");
|
printk(BIOS_INFO, "ACPI: done.\n");
|
||||||
return current;
|
return current;
|
||||||
#else
|
|
||||||
return start;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue