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

acpi: move aml builder code for floppy 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 avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20200619091905.21676-4-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent b20fdf2c

hw/block/fdc.c

+83 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/timer.h"

#include "hw/i386/pc.h"

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

#include "hw/irq.h"

#include "hw/isa/isa.h"

#include "hw/qdev-properties.h"
@@ -2768,6 +2770,85 @@ void isa_fdc_get_drive_max_chs(FloppyDriveType type, 
    (*maxc)--;

}



static Aml *build_fdinfo_aml(int idx, FloppyDriveType type)

{

    Aml *dev, *fdi;

    uint8_t maxc, maxh, maxs;



    isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs);



    dev = aml_device("FLP%c", 'A' + idx);



    aml_append(dev, aml_name_decl("_ADR", aml_int(idx)));



    fdi = aml_package(16);

    aml_append(fdi, aml_int(idx));  /* Drive Number */

    aml_append(fdi,

        aml_int(cmos_get_fd_drive_type(type)));  /* Device Type */

    /*

     * the values below are the limits of the drive, and are thus independent

     * of the inserted media

     */

    aml_append(fdi, aml_int(maxc));  /* Maximum Cylinder Number */

    aml_append(fdi, aml_int(maxs));  /* Maximum Sector Number */

    aml_append(fdi, aml_int(maxh));  /* Maximum Head Number */

    /*

     * SeaBIOS returns the below values for int 0x13 func 0x08 regardless of

     * the drive type, so shall we

     */

    aml_append(fdi, aml_int(0xAF));  /* disk_specify_1 */

    aml_append(fdi, aml_int(0x02));  /* disk_specify_2 */

    aml_append(fdi, aml_int(0x25));  /* disk_motor_wait */

    aml_append(fdi, aml_int(0x02));  /* disk_sector_siz */

    aml_append(fdi, aml_int(0x12));  /* disk_eot */

    aml_append(fdi, aml_int(0x1B));  /* disk_rw_gap */

    aml_append(fdi, aml_int(0xFF));  /* disk_dtl */

    aml_append(fdi, aml_int(0x6C));  /* disk_formt_gap */

    aml_append(fdi, aml_int(0xF6));  /* disk_fill */

    aml_append(fdi, aml_int(0x0F));  /* disk_head_sttl */

    aml_append(fdi, aml_int(0x08));  /* disk_motor_strt */



    aml_append(dev, aml_name_decl("_FDI", fdi));

    return dev;

}



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

{

    Aml *dev;

    Aml *crs;

    int i;



#define ACPI_FDE_MAX_FD 4

    uint32_t fde_buf[5] = {

        0, 0, 0, 0,     /* presence of floppy drives #0 - #3 */

        cpu_to_le32(2)  /* tape presence (2 == never present) */

    };



    crs = aml_resource_template();

    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));

    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));

    aml_append(crs, aml_irq_no_flags(6));

    aml_append(crs,

        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));



    dev = aml_device("FDC0");

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

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



    for (i = 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) {

        FloppyDriveType type = isa_fdc_get_drive_type(isadev, i);



        if (type < FLOPPY_DRIVE_TYPE_NONE) {

            fde_buf[i] = cpu_to_le32(1);  /* drive present */

            aml_append(dev, build_fdinfo_aml(i, type));

        }

    }

    aml_append(dev, aml_name_decl("_FDE",

               aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf)));



    aml_append(scope, dev);

}



static const VMStateDescription vmstate_isa_fdc ={

    .name = "fdc",

    .version_id = 2,
@@ -2801,11 +2882,13 @@ static Property isa_fdc_properties[] = { 
static void isabus_fdc_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);



    dc->realize = isabus_fdc_realize;

    dc->fw_name = "fdc";

    dc->reset = fdctrl_external_reset_isa;

    dc->vmsd = &vmstate_isa_fdc;

    isa->build_aml = fdc_isa_build_aml;

    device_class_set_props(dc, isa_fdc_properties);

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}

hw/i386/acpi-build.c

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

}



static Aml *build_fdinfo_aml(int idx, FloppyDriveType type)

{

    Aml *dev, *fdi;

    uint8_t maxc, maxh, maxs;



    isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs);



    dev = aml_device("FLP%c", 'A' + idx);



    aml_append(dev, aml_name_decl("_ADR", aml_int(idx)));



    fdi = aml_package(16);

    aml_append(fdi, aml_int(idx));  /* Drive Number */

    aml_append(fdi,

        aml_int(cmos_get_fd_drive_type(type)));  /* Device Type */

    /*

     * the values below are the limits of the drive, and are thus independent

     * of the inserted media

     */

    aml_append(fdi, aml_int(maxc));  /* Maximum Cylinder Number */

    aml_append(fdi, aml_int(maxs));  /* Maximum Sector Number */

    aml_append(fdi, aml_int(maxh));  /* Maximum Head Number */

    /*

     * SeaBIOS returns the below values for int 0x13 func 0x08 regardless of

     * the drive type, so shall we

     */

    aml_append(fdi, aml_int(0xAF));  /* disk_specify_1 */

    aml_append(fdi, aml_int(0x02));  /* disk_specify_2 */

    aml_append(fdi, aml_int(0x25));  /* disk_motor_wait */

    aml_append(fdi, aml_int(0x02));  /* disk_sector_siz */

    aml_append(fdi, aml_int(0x12));  /* disk_eot */

    aml_append(fdi, aml_int(0x1B));  /* disk_rw_gap */

    aml_append(fdi, aml_int(0xFF));  /* disk_dtl */

    aml_append(fdi, aml_int(0x6C));  /* disk_formt_gap */

    aml_append(fdi, aml_int(0xF6));  /* disk_fill */

    aml_append(fdi, aml_int(0x0F));  /* disk_head_sttl */

    aml_append(fdi, aml_int(0x08));  /* disk_motor_strt */



    aml_append(dev, aml_name_decl("_FDI", fdi));

    return dev;

}



static Aml *build_fdc_device_aml(ISADevice *fdc)

{

    int i;

    Aml *dev;

    Aml *crs;



#define ACPI_FDE_MAX_FD 4

    uint32_t fde_buf[5] = {

        0, 0, 0, 0,     /* presence of floppy drives #0 - #3 */

        cpu_to_le32(2)  /* tape presence (2 == never present) */

    };



    dev = aml_device("FDC0");

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



    crs = aml_resource_template();

    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));

    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));

    aml_append(crs, aml_irq_no_flags(6));

    aml_append(crs,

        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));

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



    for (i = 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) {

        FloppyDriveType type = isa_fdc_get_drive_type(fdc, i);



        if (type < FLOPPY_DRIVE_TYPE_NONE) {

            fde_buf[i] = cpu_to_le32(1);  /* drive present */

            aml_append(dev, build_fdinfo_aml(i, type));

        }

    }

    aml_append(dev, aml_name_decl("_FDE",

               aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf)));



    return dev;

}



static Aml *build_kbd_device_aml(void)

{

    Aml *dev;
@@ -1092,7 +1013,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) 


static void build_isa_devices_aml(Aml *table)

{

    ISADevice *fdc = pc_find_fdc0();

    VMBusBridge *vmbus_bridge = vmbus_bridge_find();

    bool ambiguous;
@@ -1101,9 +1021,6 @@ static void build_isa_devices_aml(Aml *table) 


    aml_append(scope, build_kbd_device_aml());

    aml_append(scope, build_mouse_device_aml());

    if (fdc) {

        aml_append(scope, build_fdc_device_aml(fdc));

    }



    if (ambiguous) {

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

stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
stub-obj-y += blk-commit-all.o

stub-obj-y += cmos.o

stub-obj-y += cpu-get-clock.o

stub-obj-y += cpu-get-icount.o

stub-obj-y += dump.o

stubs/cmos.c

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "hw/i386/pc.h"



int cmos_get_fd_drive_type(FloppyDriveType fd0)

{

    return 0;

}