Commit df0f3d13 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

acpi: move aml builder code for i8042 (kbd+mouse) device 



DSDT change: isa device order changes in case MI1 (ipmi) is present.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20200619091905.21676-7-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 89ed90e3

hw/i386/acpi-build.c

+0 −39
Original line number Diff line number Diff line
@@ -938,42 +938,6 @@ static void build_hpet_aml(Aml *table) 
    aml_append(table, scope);

}



static Aml *build_kbd_device_aml(void)

{

    Aml *dev;

    Aml *crs;



    dev = aml_device("KBD");

    aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0303")));



    aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));



    crs = aml_resource_template();

    aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01));

    aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01));

    aml_append(crs, aml_irq_no_flags(1));

    aml_append(dev, aml_name_decl("_CRS", crs));



    return dev;

}



static Aml *build_mouse_device_aml(void)

{

    Aml *dev;

    Aml *crs;



    dev = aml_device("MOU");

    aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0F13")));



    aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));



    crs = aml_resource_template();

    aml_append(crs, aml_irq_no_flags(12));

    aml_append(dev, aml_name_decl("_CRS", crs));



    return dev;

}



static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)

{

    Aml *dev;
@@ -1019,9 +983,6 @@ static void build_isa_devices_aml(Aml *table) 
    Aml *scope = aml_scope("_SB.PCI0.ISA");

    Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);



    aml_append(scope, build_kbd_device_aml());

    aml_append(scope, build_mouse_device_aml());



    if (ambiguous) {

        error_report("Multiple ISA busses, unable to define IPMI ACPI data");

    } else if (!obj) {

hw/input/pckbd.c

+31 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "qemu/log.h"

#include "hw/isa/isa.h"

#include "migration/vmstate.h"

#include "hw/acpi/aml-build.h"

#include "hw/input/ps2.h"

#include "hw/irq.h"

#include "hw/input/i8042.h"
@@ -561,12 +562,42 @@ static void i8042_realizefn(DeviceState *dev, Error **errp) 
    qemu_register_reset(kbd_reset, s);

}



static void i8042_build_aml(ISADevice *isadev, Aml *scope)

{

    Aml *kbd;

    Aml *mou;

    Aml *crs;



    crs = aml_resource_template();

    aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01));

    aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01));

    aml_append(crs, aml_irq_no_flags(1));



    kbd = aml_device("KBD");

    aml_append(kbd, aml_name_decl("_HID", aml_eisaid("PNP0303")));

    aml_append(kbd, aml_name_decl("_STA", aml_int(0xf)));

    aml_append(kbd, aml_name_decl("_CRS", crs));



    crs = aml_resource_template();

    aml_append(crs, aml_irq_no_flags(12));



    mou = aml_device("MOU");

    aml_append(mou, aml_name_decl("_HID", aml_eisaid("PNP0F13")));

    aml_append(mou, aml_name_decl("_STA", aml_int(0xf)));

    aml_append(mou, aml_name_decl("_CRS", crs));



    aml_append(scope, kbd);

    aml_append(scope, mou);

}



static void i8042_class_initfn(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);



    dc->realize = i8042_realizefn;

    dc->vmsd = &vmstate_kbd_isa;

    isa->build_aml = i8042_build_aml;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

}