2013-07-24 19:56:02 +04:00
|
|
|
/*
|
|
|
|
* Bochs/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
|
|
|
|
*/
|
|
|
|
|
|
|
|
ACPI_EXTRACT_ALL_CODE AcpiDsdtAmlCode
|
|
|
|
|
|
|
|
DefinitionBlock (
|
|
|
|
"acpi-dsdt.aml", // Output Filename
|
|
|
|
"DSDT", // Signature
|
|
|
|
0x01, // DSDT Compliance Revision
|
|
|
|
"BXPC", // OEMID
|
|
|
|
"BXDSDT", // TABLE ID
|
|
|
|
0x1 // OEM Revision
|
|
|
|
)
|
|
|
|
{
|
|
|
|
|
|
|
|
#include "acpi-dsdt-dbug.dsl"
|
|
|
|
|
|
|
|
Scope(\_SB) {
|
|
|
|
Device(PCI0) {
|
|
|
|
Name(_HID, EisaId("PNP0A03"))
|
|
|
|
Name(_ADR, 0x00)
|
|
|
|
Name(_UID, 1)
|
acpi-build: append description for non-hotplug
As reported in
http://article.gmane.org/gmane.comp.emulators.qemu/253987
Mac OSX actually requires describing all occupied slots
in ACPI - even if hotplug isn't enabled.
I didn't expect this so I dropped description of all
non hotpluggable slots from ACPI.
As a result: before
commit 99fd437dee468609de8218f0eb3b16621fb6a9c9 (enable
hotplug for pci bridges), PCI cards show up in the "device tree" of OS X
(System Information). E.g., on MountainLion users have:
Hardware -> PCI Cards:
Card Type Driver Installed Slot
*ethernet Ethernet Controller Yes PCI Slot 2
pci8086,2934 USB UHC Yes PCI Slot 29
ethernet:
Type: Ethernet Controller
Driver Installed: Yes
MSI: No
Bus: PCI
Slot PCI Slot 2
Vendor ID: 0x8086
Device ID: 0x100e
Subsystem Vendor ID: 0x1af4
Subsystem ID: 0x1100
Revision ID: 0x0003
Hardware -> Ethernet Cards
ethernet:
Type: Ethernet Controller
Bus: PCI
Slot PCI Slot 2
Vendor ID: 0x8086
Device ID: 0x100e
Subsystem Vendor ID: 0x1af4
Subsystem ID: 0x1100
Revision ID: 0x0003
BSD name: en0
Kext name: AppleIntel8254XEthernet.kext
Location: /System/Library/Extensions/...
Version: 3.1.1b1
After commit 99fd437dee468609de8218f0eb3b16621fb6a9c9, users get:
Hardware -> PCI Cards:
This computer doesn't contain any PCI cards. If you installed PCI
cards, make sure they're properly installed.
Hardware -> Ethernet Cards
ethernet:
Type: Ethernet Controller
Bus: PCI
Vendor ID: 0x8086
Device ID: 0x100e
Subsystem Vendor ID: 0x1af4
Subsystem ID: 0x1100
Revision ID: 0x0003
BSD name: en0
Kext name: AppleIntel8254XEthernet.kext
Location: /System/Library/Extensions/...
Version: 3.1.1b1
Ethernet still works, but it's not showing up on the PCI bus, and it
no longer thinks it's plugged in to slot #2, as it used to before the
change.
To fix, append description for all occupied non hotpluggable PCI slots.
One need to be careful when doing this: VGA devices
are now described in SSDT, so we need to drop description from DSDT.
And ISA devices are used in DSDT so drop them from SSDT.
Reported-by: Gabriel L. Somlo <gsomlo@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Also update generated dsdt and pcihp hex dump files.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2014-02-04 19:43:47 +04:00
|
|
|
//#define PX13 S0B_
|
|
|
|
// External(PX13, DeviceObj)
|
2013-07-24 19:56:02 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#include "acpi-dsdt-hpet.dsl"
|
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
* PIIX4 PM
|
|
|
|
****************************************************************/
|
|
|
|
|
|
|
|
Scope(\_SB.PCI0) {
|
|
|
|
Device(PX13) {
|
|
|
|
Name(_ADR, 0x00010003)
|
|
|
|
OperationRegion(P13C, PCI_Config, 0x00, 0xff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
* PIIX3 ISA bridge
|
|
|
|
****************************************************************/
|
|
|
|
|
|
|
|
Scope(\_SB.PCI0) {
|
acpi-build: append description for non-hotplug
As reported in
http://article.gmane.org/gmane.comp.emulators.qemu/253987
Mac OSX actually requires describing all occupied slots
in ACPI - even if hotplug isn't enabled.
I didn't expect this so I dropped description of all
non hotpluggable slots from ACPI.
As a result: before
commit 99fd437dee468609de8218f0eb3b16621fb6a9c9 (enable
hotplug for pci bridges), PCI cards show up in the "device tree" of OS X
(System Information). E.g., on MountainLion users have:
Hardware -> PCI Cards:
Card Type Driver Installed Slot
*ethernet Ethernet Controller Yes PCI Slot 2
pci8086,2934 USB UHC Yes PCI Slot 29
ethernet:
Type: Ethernet Controller
Driver Installed: Yes
MSI: No
Bus: PCI
Slot PCI Slot 2
Vendor ID: 0x8086
Device ID: 0x100e
Subsystem Vendor ID: 0x1af4
Subsystem ID: 0x1100
Revision ID: 0x0003
Hardware -> Ethernet Cards
ethernet:
Type: Ethernet Controller
Bus: PCI
Slot PCI Slot 2
Vendor ID: 0x8086
Device ID: 0x100e
Subsystem Vendor ID: 0x1af4
Subsystem ID: 0x1100
Revision ID: 0x0003
BSD name: en0
Kext name: AppleIntel8254XEthernet.kext
Location: /System/Library/Extensions/...
Version: 3.1.1b1
After commit 99fd437dee468609de8218f0eb3b16621fb6a9c9, users get:
Hardware -> PCI Cards:
This computer doesn't contain any PCI cards. If you installed PCI
cards, make sure they're properly installed.
Hardware -> Ethernet Cards
ethernet:
Type: Ethernet Controller
Bus: PCI
Vendor ID: 0x8086
Device ID: 0x100e
Subsystem Vendor ID: 0x1af4
Subsystem ID: 0x1100
Revision ID: 0x0003
BSD name: en0
Kext name: AppleIntel8254XEthernet.kext
Location: /System/Library/Extensions/...
Version: 3.1.1b1
Ethernet still works, but it's not showing up on the PCI bus, and it
no longer thinks it's plugged in to slot #2, as it used to before the
change.
To fix, append description for all occupied non hotpluggable PCI slots.
One need to be careful when doing this: VGA devices
are now described in SSDT, so we need to drop description from DSDT.
And ISA devices are used in DSDT so drop them from SSDT.
Reported-by: Gabriel L. Somlo <gsomlo@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Also update generated dsdt and pcihp hex dump files.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2014-02-04 19:43:47 +04:00
|
|
|
|
|
|
|
External(ISA, DeviceObj)
|
|
|
|
|
2013-07-24 19:56:02 +04:00
|
|
|
Device(ISA) {
|
|
|
|
Name(_ADR, 0x00010000)
|
|
|
|
|
|
|
|
/* PIIX PCI to ISA irq remapping */
|
|
|
|
OperationRegion(P40C, PCI_Config, 0x60, 0x04)
|
|
|
|
|
|
|
|
/* enable bits */
|
|
|
|
Field(\_SB.PCI0.PX13.P13C, AnyAcc, NoLock, Preserve) {
|
|
|
|
Offset(0x5f),
|
|
|
|
, 7,
|
|
|
|
LPEN, 1, // LPT
|
|
|
|
Offset(0x67),
|
|
|
|
, 3,
|
|
|
|
CAEN, 1, // COM1
|
|
|
|
, 3,
|
|
|
|
CBEN, 1, // COM2
|
|
|
|
}
|
|
|
|
Name(FDEN, 1)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#include "acpi-dsdt-isa.dsl"
|
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
* PCI hotplug
|
|
|
|
****************************************************************/
|
|
|
|
|
|
|
|
Scope(\_SB.PCI0) {
|
|
|
|
OperationRegion(PCST, SystemIO, 0xae00, 0x08)
|
|
|
|
Field(PCST, DWordAcc, NoLock, WriteAsZeros) {
|
|
|
|
PCIU, 32,
|
|
|
|
PCID, 32,
|
|
|
|
}
|
|
|
|
|
|
|
|
OperationRegion(SEJ, SystemIO, 0xae08, 0x04)
|
|
|
|
Field(SEJ, DWordAcc, NoLock, WriteAsZeros) {
|
|
|
|
B0EJ, 32,
|
|
|
|
}
|
|
|
|
|
2013-10-14 19:01:29 +04:00
|
|
|
OperationRegion(BNMR, SystemIO, 0xae10, 0x04)
|
|
|
|
Field(BNMR, DWordAcc, NoLock, WriteAsZeros) {
|
|
|
|
BNUM, 32,
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Lock to protect access to fields above. */
|
|
|
|
Mutex(BLCK, 0)
|
|
|
|
|
2013-07-24 19:56:02 +04:00
|
|
|
/* Methods called by bulk generated PCI devices below */
|
|
|
|
|
|
|
|
/* Methods called by hotplug devices */
|
2013-10-14 19:01:29 +04:00
|
|
|
Method(PCEJ, 2, NotSerialized) {
|
2013-07-24 19:56:02 +04:00
|
|
|
// _EJ0 method - eject callback
|
2013-10-14 19:01:29 +04:00
|
|
|
Acquire(BLCK, 0xFFFF)
|
|
|
|
Store(Arg0, BNUM)
|
|
|
|
Store(ShiftLeft(1, Arg1), B0EJ)
|
|
|
|
Release(BLCK)
|
2013-07-24 19:56:02 +04:00
|
|
|
Return (0x0)
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Hotplug notification method supplied by SSDT */
|
|
|
|
External(\_SB.PCI0.PCNT, MethodObj)
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
* PCI IRQs
|
|
|
|
****************************************************************/
|
|
|
|
|
|
|
|
Scope(\_SB) {
|
|
|
|
Scope(PCI0) {
|
2014-07-28 19:34:14 +04:00
|
|
|
Method (_PRT, 0) {
|
|
|
|
Store(Package(128) {}, Local0)
|
|
|
|
Store(Zero, Local1)
|
|
|
|
While(LLess(Local1, 128)) {
|
|
|
|
// slot = pin >> 2
|
|
|
|
Store(ShiftRight(Local1, 2), Local2)
|
|
|
|
|
|
|
|
// lnk = (slot + pin) & 3
|
|
|
|
Store(And(Add(Local1, Local2), 3), Local3)
|
|
|
|
If (LEqual(Local3, 0)) {
|
|
|
|
Store(Package(4) { Zero, Zero, LNKD, Zero }, Local4)
|
|
|
|
}
|
|
|
|
If (LEqual(Local3, 1)) {
|
|
|
|
// device 1 is the power-management device, needs SCI
|
|
|
|
If (LEqual(Local1, 4)) {
|
|
|
|
Store(Package(4) { Zero, Zero, LNKS, Zero }, Local4)
|
|
|
|
} Else {
|
|
|
|
Store(Package(4) { Zero, Zero, LNKA, Zero }, Local4)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
If (LEqual(Local3, 2)) {
|
|
|
|
Store(Package(4) { Zero, Zero, LNKB, Zero }, Local4)
|
|
|
|
}
|
|
|
|
If (LEqual(Local3, 3)) {
|
|
|
|
Store(Package(4) { Zero, Zero, LNKC, Zero }, Local4)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Complete the interrupt routing entry:
|
|
|
|
// Package(4) { 0x[slot]FFFF, [pin], [link], 0) }
|
|
|
|
|
|
|
|
Store(Or(ShiftLeft(Local2, 16), 0xFFFF), Index(Local4, 0))
|
|
|
|
Store(And(Local1, 3), Index(Local4, 1))
|
|
|
|
Store(Local4, Index(Local0, Local1))
|
|
|
|
|
|
|
|
Increment(Local1)
|
|
|
|
}
|
|
|
|
|
|
|
|
Return(Local0)
|
|
|
|
}
|
2013-07-24 19:56:02 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
Field(PCI0.ISA.P40C, ByteAcc, NoLock, Preserve) {
|
|
|
|
PRQ0, 8,
|
|
|
|
PRQ1, 8,
|
|
|
|
PRQ2, 8,
|
|
|
|
PRQ3, 8
|
|
|
|
}
|
|
|
|
|
|
|
|
Method(IQST, 1, NotSerialized) {
|
|
|
|
// _STA method - get status
|
|
|
|
If (And(0x80, Arg0)) {
|
|
|
|
Return (0x09)
|
|
|
|
}
|
|
|
|
Return (0x0B)
|
|
|
|
}
|
ACPI DSDT: Make control method `IQCR` serialized
Forward-port the following commit from seabios:
commit 995bbeef78b338370f426bf8d0399038c3fa259c
Author: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Thu Oct 3 11:30:52 2013 +0200
The ASL Optimizing Compiler version 20130823-32 [Sep 11 2013] issues the
following warning.
$ make
[…]
Compiling IASL out/src/fw/acpi-dsdt.hex
out/src/fw/acpi-dsdt.dsl.i 360: Method(IQCR, 1, NotSerialized) {
Remark 2120 - ^ Control Method should be made Serialized (due to creation of named objects within)
[…]
ASL Input: out/src/fw/acpi-dsdt.dsl.i - 475 lines, 19181 bytes, 316 keywords
AML Output: out/src/fw/acpi-dsdt.aml - 4407 bytes, 159 named objects, 157 executable opcodes
Listing File: out/src/fw/acpi-dsdt.lst - 143715 bytes
Hex Dump: out/src/fw/acpi-dsdt.hex - 41661 bytes
Compilation complete. 0 Errors, 0 Warnings, 1 Remarks, 246 Optimizations
[…]
After changing the parameter from `NotSerialized` to `Serialized`, the
remark is indeed gone and there is no size change.
The remark was added in ACPICA version 20130517 [1] and gives the
following explanation.
If a thread blocks within the method for any reason, and another thread
enters the method, the method will fail because an attempt will be
made to create the same (named) object twice.
In this case, issue a remark that the method should be marked
serialized. ACPICA BZ 909.
[1] https://github.com/acpica/acpica/commit/ba84d0fc18ba910a47a3f71c68a43543c06e6831
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reported-by: Marcel Apfelbaum <marcel.a@redhat.com>
Tested-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2013-11-14 16:12:47 +04:00
|
|
|
Method(IQCR, 1, Serialized) {
|
2013-07-24 19:56:02 +04:00
|
|
|
// _CRS method - get current settings
|
|
|
|
Name(PRR0, ResourceTemplate() {
|
|
|
|
Interrupt(, Level, ActiveHigh, Shared) { 0 }
|
|
|
|
})
|
|
|
|
CreateDWordField(PRR0, 0x05, PRRI)
|
|
|
|
If (LLess(Arg0, 0x80)) {
|
|
|
|
Store(Arg0, PRRI)
|
|
|
|
}
|
|
|
|
Return (PRR0)
|
|
|
|
}
|
|
|
|
|
|
|
|
#define define_link(link, uid, reg) \
|
|
|
|
Device(link) { \
|
|
|
|
Name(_HID, EISAID("PNP0C0F")) \
|
|
|
|
Name(_UID, uid) \
|
|
|
|
Name(_PRS, ResourceTemplate() { \
|
|
|
|
Interrupt(, Level, ActiveHigh, Shared) { \
|
|
|
|
5, 10, 11 \
|
|
|
|
} \
|
|
|
|
}) \
|
|
|
|
Method(_STA, 0, NotSerialized) { \
|
|
|
|
Return (IQST(reg)) \
|
|
|
|
} \
|
|
|
|
Method(_DIS, 0, NotSerialized) { \
|
|
|
|
Or(reg, 0x80, reg) \
|
|
|
|
} \
|
|
|
|
Method(_CRS, 0, NotSerialized) { \
|
|
|
|
Return (IQCR(reg)) \
|
|
|
|
} \
|
|
|
|
Method(_SRS, 1, NotSerialized) { \
|
|
|
|
CreateDWordField(Arg0, 0x05, PRRI) \
|
|
|
|
Store(PRRI, reg) \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
define_link(LNKA, 0, PRQ0)
|
|
|
|
define_link(LNKB, 1, PRQ1)
|
|
|
|
define_link(LNKC, 2, PRQ2)
|
|
|
|
define_link(LNKD, 3, PRQ3)
|
|
|
|
|
|
|
|
Device(LNKS) {
|
|
|
|
Name(_HID, EISAID("PNP0C0F"))
|
|
|
|
Name(_UID, 4)
|
|
|
|
Name(_PRS, ResourceTemplate() {
|
|
|
|
Interrupt(, Level, ActiveHigh, Shared) { 9 }
|
|
|
|
})
|
|
|
|
|
|
|
|
// The SCI cannot be disabled and is always attached to GSI 9,
|
|
|
|
// so these are no-ops. We only need this link to override the
|
|
|
|
// polarity to active high and match the content of the MADT.
|
|
|
|
Method(_STA, 0, NotSerialized) { Return (0x0b) }
|
|
|
|
Method(_DIS, 0, NotSerialized) { }
|
|
|
|
Method(_CRS, 0, NotSerialized) { Return (_PRS) }
|
|
|
|
Method(_SRS, 1, NotSerialized) { }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-02 17:25:15 +04:00
|
|
|
#include "hw/acpi/pc-hotplug.h"
|
2014-01-09 20:36:38 +04:00
|
|
|
#define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE
|
2013-07-24 19:56:02 +04:00
|
|
|
#include "acpi-dsdt-cpu-hotplug.dsl"
|
2014-10-15 11:45:44 +04:00
|
|
|
#include "acpi-dsdt-mem-hotplug.dsl"
|
2013-07-24 19:56:02 +04:00
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
* General purpose events
|
|
|
|
****************************************************************/
|
|
|
|
Scope(\_GPE) {
|
|
|
|
Name(_HID, "ACPI0006")
|
|
|
|
|
|
|
|
Method(_L00) {
|
|
|
|
}
|
|
|
|
Method(_E01) {
|
|
|
|
// PCI hotplug event
|
2013-10-14 19:01:29 +04:00
|
|
|
Acquire(\_SB.PCI0.BLCK, 0xFFFF)
|
|
|
|
\_SB.PCI0.PCNT()
|
|
|
|
Release(\_SB.PCI0.BLCK)
|
2013-07-24 19:56:02 +04:00
|
|
|
}
|
|
|
|
Method(_E02) {
|
|
|
|
// CPU hotplug event
|
|
|
|
\_SB.PRSC()
|
|
|
|
}
|
2014-06-02 17:25:29 +04:00
|
|
|
Method(_E03) {
|
|
|
|
// Memory hotplug event
|
2014-08-04 12:16:07 +04:00
|
|
|
\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD()
|
2013-07-24 19:56:02 +04:00
|
|
|
}
|
|
|
|
Method(_L04) {
|
|
|
|
}
|
|
|
|
Method(_L05) {
|
|
|
|
}
|
|
|
|
Method(_L06) {
|
|
|
|
}
|
|
|
|
Method(_L07) {
|
|
|
|
}
|
|
|
|
Method(_L08) {
|
|
|
|
}
|
|
|
|
Method(_L09) {
|
|
|
|
}
|
|
|
|
Method(_L0A) {
|
|
|
|
}
|
|
|
|
Method(_L0B) {
|
|
|
|
}
|
|
|
|
Method(_L0C) {
|
|
|
|
}
|
|
|
|
Method(_L0D) {
|
|
|
|
}
|
|
|
|
Method(_L0E) {
|
|
|
|
}
|
|
|
|
Method(_L0F) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|