Commit 8dcf525a authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

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 99fd437d (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 99fd437d, 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: default avatarGabriel L. Somlo <gsomlo@gmail.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

Also update generated dsdt and pcihp hex dump files.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f53f3d0a

hw/i386/acpi-build.c

+119 −24
Original line number Diff line number Diff line
@@ -643,6 +643,21 @@ static inline char acpi_get_hex(uint32_t val) 
#define ACPI_PCIHP_SIZEOF (*ssdt_pcihp_end - *ssdt_pcihp_start)

#define ACPI_PCIHP_AML (ssdp_pcihp_aml + *ssdt_pcihp_start)



#define ACPI_PCINOHP_OFFSET_HEX (*ssdt_pcinohp_name - *ssdt_pcinohp_start + 1)

#define ACPI_PCINOHP_OFFSET_ADR (*ssdt_pcinohp_adr - *ssdt_pcinohp_start)

#define ACPI_PCINOHP_SIZEOF (*ssdt_pcinohp_end - *ssdt_pcinohp_start)

#define ACPI_PCINOHP_AML (ssdp_pcihp_aml + *ssdt_pcinohp_start)



#define ACPI_PCIVGA_OFFSET_HEX (*ssdt_pcivga_name - *ssdt_pcivga_start + 1)

#define ACPI_PCIVGA_OFFSET_ADR (*ssdt_pcivga_adr - *ssdt_pcivga_start)

#define ACPI_PCIVGA_SIZEOF (*ssdt_pcivga_end - *ssdt_pcivga_start)

#define ACPI_PCIVGA_AML (ssdp_pcihp_aml + *ssdt_pcivga_start)



#define ACPI_PCIQXL_OFFSET_HEX (*ssdt_pciqxl_name - *ssdt_pciqxl_start + 1)

#define ACPI_PCIQXL_OFFSET_ADR (*ssdt_pciqxl_adr - *ssdt_pciqxl_start)

#define ACPI_PCIQXL_SIZEOF (*ssdt_pciqxl_end - *ssdt_pciqxl_start)

#define ACPI_PCIQXL_AML (ssdp_pcihp_aml + *ssdt_pciqxl_start)



#define ACPI_SSDT_SIGNATURE 0x54445353 /* SSDT */

#define ACPI_SSDT_HEADER_LENGTH 36
@@ -677,6 +692,33 @@ static void patch_pcihp(int slot, uint8_t *ssdt_ptr) 
    ssdt_ptr[ACPI_PCIHP_OFFSET_ADR + 2] = slot;

}



static void patch_pcinohp(int slot, uint8_t *ssdt_ptr)

{

    unsigned devfn = PCI_DEVFN(slot, 0);



    ssdt_ptr[ACPI_PCINOHP_OFFSET_HEX] = acpi_get_hex(devfn >> 4);

    ssdt_ptr[ACPI_PCINOHP_OFFSET_HEX + 1] = acpi_get_hex(devfn);

    ssdt_ptr[ACPI_PCINOHP_OFFSET_ADR + 2] = slot;

}



static void patch_pcivga(int slot, uint8_t *ssdt_ptr)

{

    unsigned devfn = PCI_DEVFN(slot, 0);



    ssdt_ptr[ACPI_PCIVGA_OFFSET_HEX] = acpi_get_hex(devfn >> 4);

    ssdt_ptr[ACPI_PCIVGA_OFFSET_HEX + 1] = acpi_get_hex(devfn);

    ssdt_ptr[ACPI_PCIVGA_OFFSET_ADR + 2] = slot;

}



static void patch_pciqxl(int slot, uint8_t *ssdt_ptr)

{

    unsigned devfn = PCI_DEVFN(slot, 0);



    ssdt_ptr[ACPI_PCIQXL_OFFSET_HEX] = acpi_get_hex(devfn >> 4);

    ssdt_ptr[ACPI_PCIQXL_OFFSET_HEX + 1] = acpi_get_hex(devfn);

    ssdt_ptr[ACPI_PCIQXL_OFFSET_ADR + 2] = slot;

}



/* Assign BSEL property to all buses.  In the future, this can be changed

 * to only assign to buses that support hotplug.

 */
@@ -737,6 +779,10 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) 
    AcpiBuildPciBusHotplugState *parent = child->parent;

    GArray *bus_table = build_alloc_array();

    DECLARE_BITMAP(slot_hotplug_enable, PCI_SLOT_MAX);

    DECLARE_BITMAP(slot_device_present, PCI_SLOT_MAX);

    DECLARE_BITMAP(slot_device_system, PCI_SLOT_MAX);

    DECLARE_BITMAP(slot_device_vga, PCI_SLOT_MAX);

    DECLARE_BITMAP(slot_device_qxl, PCI_SLOT_MAX);

    uint8_t op;

    int i;

    QObject *bsel;
@@ -764,40 +810,82 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) 
        build_append_byte(bus_table, 0x08); /* NameOp */

        build_append_nameseg(bus_table, "BSEL");

        build_append_int(bus_table, qint_get_int(qobject_to_qint(bsel)));



        memset(slot_hotplug_enable, 0xff, sizeof slot_hotplug_enable);

    } else {

        /* No bsel - no slots are hot-pluggable */

        memset(slot_hotplug_enable, 0x00, sizeof slot_hotplug_enable);

    }



        for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) {

    memset(slot_device_present, 0x00, sizeof slot_device_present);

    memset(slot_device_system, 0x00, sizeof slot_device_present);

    memset(slot_device_vga, 0x00, sizeof slot_device_vga);

    memset(slot_device_qxl, 0x00, sizeof slot_device_qxl);



    for (i = 0; i < ARRAY_SIZE(bus->devices); i += PCI_FUNC_MAX) {

        DeviceClass *dc;

        PCIDeviceClass *pc;

        PCIDevice *pdev = bus->devices[i];

        int slot = PCI_SLOT(i);



        if (!pdev) {

            continue;

        }



        set_bit(slot, slot_device_present);

        pc = PCI_DEVICE_GET_CLASS(pdev);

        dc = DEVICE_GET_CLASS(pdev);



            if (!dc->hotpluggable || pc->is_bridge) {

                int slot = PCI_SLOT(i);

        if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {

            set_bit(slot, slot_device_system);

        }



        if (pc->class_id == PCI_CLASS_DISPLAY_VGA) {

            set_bit(slot, slot_device_vga);



            if (object_dynamic_cast(OBJECT(pdev), "qxl-vga")) {

                set_bit(slot, slot_device_qxl);

            }

        }



        if (!dc->hotpluggable || pc->is_bridge) {

            clear_bit(slot, slot_hotplug_enable);

        }

    }



        /* Append Device object for each slot which supports eject */

    /* Append Device object for each slot */

    for (i = 0; i < PCI_SLOT_MAX; i++) {

        bool can_eject = test_bit(i, slot_hotplug_enable);

        bool present = test_bit(i, slot_device_present);

        bool vga = test_bit(i, slot_device_vga);

        bool qxl = test_bit(i, slot_device_qxl);

        bool system = test_bit(i, slot_device_system);

        if (can_eject) {

            void *pcihp = acpi_data_push(bus_table,

                                         ACPI_PCIHP_SIZEOF);

            memcpy(pcihp, ACPI_PCIHP_AML, ACPI_PCIHP_SIZEOF);

            patch_pcihp(i, pcihp);

            bus_hotplug_support = true;

        } else if (qxl) {

            void *pcihp = acpi_data_push(bus_table,

                                         ACPI_PCIQXL_SIZEOF);

            memcpy(pcihp, ACPI_PCIQXL_AML, ACPI_PCIQXL_SIZEOF);

            patch_pciqxl(i, pcihp);

        } else if (vga) {

            void *pcihp = acpi_data_push(bus_table,

                                         ACPI_PCIVGA_SIZEOF);

            memcpy(pcihp, ACPI_PCIVGA_AML, ACPI_PCIVGA_SIZEOF);

            patch_pcivga(i, pcihp);

        } else if (system) {

            /* Nothing to do: system devices are in DSDT. */

        } else if (present) {

            void *pcihp = acpi_data_push(bus_table,

                                         ACPI_PCINOHP_SIZEOF);

            memcpy(pcihp, ACPI_PCINOHP_AML, ACPI_PCINOHP_SIZEOF);

            patch_pcinohp(i, pcihp);

        }

    }



    if (bsel) {

        method = build_alloc_method("DVNT", 2);



        for (i = 0; i < PCI_SLOT_MAX; i++) {
@@ -976,7 +1064,14 @@ build_ssdt(GArray *table_data, GArray *linker, 


        {

            AcpiBuildPciBusHotplugState hotplug_state;

            PCIBus *bus = find_i440fx(); /* TODO: Q35 support */

            Object *pci_host;

            PCIBus *bus = NULL;

            bool ambiguous;



            pci_host = object_resolve_path_type("", TYPE_PCI_HOST_BRIDGE, &ambiguous);

            if (!ambiguous && pci_host) {

                bus = PCI_HOST_BRIDGE(pci_host)->bus;

            }



            build_pci_bus_state_init(&hotplug_state, NULL);

hw/i386/acpi-dsdt.dsl

+5 −28
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ DefinitionBlock ( 
            Name(_HID, EisaId("PNP0A03"))

            Name(_ADR, 0x00)

            Name(_UID, 1)

//#define PX13 S0B_

//            External(PX13, DeviceObj)

        }

    }
@@ -87,34 +89,6 @@ DefinitionBlock ( 
#include "acpi-dsdt-hpet.dsl"





/****************************************************************

 * VGA

 ****************************************************************/



    Scope(\_SB.PCI0) {

        Device(VGA) {

            Name(_ADR, 0x00020000)

            OperationRegion(PCIC, PCI_Config, Zero, 0x4)

            Field(PCIC, DWordAcc, NoLock, Preserve) {

                VEND, 32

            }

            Method(_S1D, 0, NotSerialized) {

                Return (0x00)

            }

            Method(_S2D, 0, NotSerialized) {

                Return (0x00)

            }

            Method(_S3D, 0, NotSerialized) {

                If (LEqual(VEND, 0x1001b36)) {

                    Return (0x03)           // QXL

                } Else {

                    Return (0x00)

                }

            }

        }

    }





/****************************************************************

 * PIIX4 PM

 ****************************************************************/
@@ -132,6 +106,9 @@ DefinitionBlock ( 
 ****************************************************************/



    Scope(\_SB.PCI0) {



        External(ISA, DeviceObj)



        Device(ISA) {

            Name(_ADR, 0x00010000)

hw/i386/acpi-dsdt.hex.generated

+111 −113
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x53,

0x44,

0x54,

0x87,

0x85,

0x11,

0x0,

0x0,

0x1,

0xb8,

0x8b,

0x42,

0x58,

0x50,
@@ -146,7 +146,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x1,

0x10,

0x4e,

0x15,

0x18,

0x2e,

0x5f,

0x53,
@@ -163,9 +163,9 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x53,

0x11,

0x42,

0x7,

0xa,

0x6e,

0xa,

0x9e,

0x88,

0xd,

0x0,
@@ -217,11 +217,59 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x0,

0xd,

0xff,

0xad,

0x0,

0x0,

0x0,

0xa1,

0x88,

0xd,

0x0,

0x1,

0xc,

0x3,

0x0,

0x0,

0xf,

0xae,

0xff,

0xae,

0x0,

0x0,

0xf1,

0x0,

0x88,

0xd,

0x0,

0x1,

0xc,

0x3,

0x0,

0xf3,

0x0,

0x20,

0xaf,

0xdf,

0xaf,

0x0,

0x0,

0xc0,

0x0,

0x88,

0xd,

0x0,

0x1,

0xc,

0x3,

0x0,

0x0,

0xe4,

0xaf,

0xff,

0xff,

0x0,

0x0,

0x1c,

0x50,

0x87,

0x17,

0x0,
@@ -347,7 +395,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x45,

0x53,

0xa,

0x5c,

0x8c,

0x50,

0x53,

0x33,
@@ -358,7 +406,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x45,

0x53,

0xa,

0x60,

0x90,

0x50,

0x45,

0x33,
@@ -369,7 +417,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x45,

0x53,

0xa,

0x68,

0x98,

0x50,

0x4c,

0x33,
@@ -638,103 +686,6 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x79,

0x0,

0x10,

0x40,

0x6,

0x2e,

0x5f,

0x53,

0x42,

0x5f,

0x50,

0x43,

0x49,

0x30,

0x5b,

0x82,

0x43,

0x5,

0x56,

0x47,

0x41,

0x5f,

0x8,

0x5f,

0x41,

0x44,

0x52,

0xc,

0x0,

0x0,

0x2,

0x0,

0x5b,

0x80,

0x50,

0x43,

0x49,

0x43,

0x2,

0x0,

0xa,

0x4,

0x5b,

0x81,

0xb,

0x50,

0x43,

0x49,

0x43,

0x3,

0x56,

0x45,

0x4e,

0x44,

0x20,

0x14,

0x8,

0x5f,

0x53,

0x31,

0x44,

0x0,

0xa4,

0x0,

0x14,

0x8,

0x5f,

0x53,

0x32,

0x44,

0x0,

0xa4,

0x0,

0x14,

0x19,

0x5f,

0x53,

0x33,

0x44,

0x0,

0xa0,

0xe,

0x93,

0x56,

0x45,

0x4e,

0x44,

0xc,

0x36,

0x1b,

0x0,

0x1,

0xa4,

0xa,

0x3,

0xa1,

0x3,

0xa4,

0x0,

0x10,

0x25,

0x2e,

0x5f,
@@ -860,7 +811,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x4e,

0x1,

0x10,

0x4b,

0x4a,

0x1e,

0x2f,

0x3,
@@ -878,7 +829,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x5f,

0x5b,

0x82,

0x2d,

0x2c,

0x53,

0x4d,

0x43,
@@ -898,9 +849,8 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x53,

0x54,

0x41,

0xb,

0x0,

0xff,

0xa,

0xf0,

0x8,

0x5f,

0x43,
@@ -4061,7 +4011,7 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x1,

0x10,

0x47,

0xe,

0x11,

0x5f,

0x53,

0x42,
@@ -4291,6 +4241,54 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x3,

0x75,

0x60,

0x5b,

0x82,

0x2e,

0x50,

0x52,

0x45,

0x53,

0x8,

0x5f,

0x48,

0x49,

0x44,

0xd,

0x41,

0x43,

0x50,

0x49,

0x30,

0x30,

0x30,

0x34,

0x0,

0x8,

0x5f,

0x43,

0x52,

0x53,

0x11,

0xd,

0xa,

0xa,

0x47,

0x1,

0x0,

0xaf,

0x0,

0xaf,

0x0,

0x20,

0x79,

0x0,

0x8,

0x5f,

0x53,

0x54,

0x41,

0xa,

0xb,

0x10,

0x42,

0xc,
@@ -4488,5 +4486,5 @@ static unsigned char AcpiDsdtAmlCode[] = { 
0x0

};

static unsigned short piix_dsdt_applesmc_sta[] = {

0x384

0x353

};

hw/i386/q35-acpi-dsdt.dsl

+3 −22
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ DefinitionBlock ( 
            Name(_ADR, 0x00)

            Name(_UID, 1)



            External(ISA, DeviceObj)



            // _OSC: based on sample of ACPI3.0b spec

            Name(SUPP, 0) // PCI _OSC Support Field value

            Name(CTRL, 0) // PCI _OSC Control Field value
@@ -133,26 +135,6 @@ DefinitionBlock ( 
#include "acpi-dsdt-hpet.dsl"





/****************************************************************

 * VGA

 ****************************************************************/



    Scope(\_SB.PCI0) {

        Device(VGA) {

            Name(_ADR, 0x00010000)

            Method(_S1D, 0, NotSerialized) {

                Return (0x00)

            }

            Method(_S2D, 0, NotSerialized) {

                Return (0x00)

            }

            Method(_S3D, 0, NotSerialized) {

                Return (0x00)

            }

        }

    }





/****************************************************************

 * LPC ISA bridge

 ****************************************************************/
@@ -160,8 +142,7 @@ DefinitionBlock ( 
    Scope(\_SB.PCI0) {

        /* PCI D31:f0 LPC ISA bridge */

        Device(ISA) {

            /* PCI D31:f0 */

            Name(_ADR, 0x001f0000)

            Name (_ADR, 0x001F0000)  // _ADR: Address



            /* ICH9 PCI to ISA irq remapping */

            OperationRegion(PIRQ, PCI_Config, 0x60, 0x0C)

hw/i386/q35-acpi-dsdt.hex.generated

+60 −68
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x53,

0x44,

0x54,

0xdf,

0xd7,

0x1c,

0x0,

0x0,

0x1,

0xff,

0x3e,

0x42,

0x58,

0x50,
@@ -415,11 +415,11 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x0,

0x0,

0x0,

0xf7,

0xd7,

0xc,

0x0,

0x0,

0xf8,

0xd8,

0xc,

0x88,

0xd,
@@ -853,61 +853,6 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x79,

0x0,

0x10,

0x36,

0x2e,

0x5f,

0x53,

0x42,

0x5f,

0x50,

0x43,

0x49,

0x30,

0x5b,

0x82,

0x2a,

0x56,

0x47,

0x41,

0x5f,

0x8,

0x5f,

0x41,

0x44,

0x52,

0xc,

0x0,

0x0,

0x1,

0x0,

0x14,

0x8,

0x5f,

0x53,

0x31,

0x44,

0x0,

0xa4,

0x0,

0x14,

0x8,

0x5f,

0x53,

0x32,

0x44,

0x0,

0xa4,

0x0,

0x14,

0x8,

0x5f,

0x53,

0x33,

0x44,

0x0,

0xa4,

0x0,

0x10,

0x4c,

0x7,

0x2e,
@@ -1033,7 +978,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x4e,

0x1,

0x10,

0x4b,

0x4a,

0x1e,

0x2f,

0x3,
@@ -1051,7 +996,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x5f,

0x5b,

0x82,

0x2d,

0x2c,

0x53,

0x4d,

0x43,
@@ -1071,9 +1016,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x53,

0x54,

0x41,

0xb,

0x0,

0xff,

0xa,

0xf0,

0x8,

0x5f,

0x43,
@@ -7016,7 +6960,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x1,

0x10,

0x47,

0xe,

0x11,

0x5f,

0x53,

0x42,
@@ -7121,8 +7065,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x54,

0x1,

0xb,

0x0,

0xaf,

0xd8,

0xc,

0xa,

0x20,

0x5b,
@@ -7246,6 +7190,54 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x3,

0x75,

0x60,

0x5b,

0x82,

0x2e,

0x50,

0x52,

0x45,

0x53,

0x8,

0x5f,

0x48,

0x49,

0x44,

0xd,

0x41,

0x43,

0x50,

0x49,

0x30,

0x30,

0x30,

0x34,

0x0,

0x8,

0x5f,

0x43,

0x52,

0x53,

0x11,

0xd,

0xa,

0xa,

0x47,

0x1,

0xd8,

0xc,

0xd8,

0xc,

0x0,

0x20,

0x79,

0x0,

0x8,

0x5f,

0x53,

0x54,

0x41,

0xa,

0xb,

0x10,

0x4f,

0x8,
@@ -7392,5 +7384,5 @@ static unsigned char Q35AcpiDsdtAmlCode[] = { 
0x0

};

static unsigned short q35_dsdt_applesmc_sta[] = {

0x431

0x3fa

};