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

acpi: factor out fw_cfg_add_acpi_dsdt() 



Add helper function to add fw_cfg device,
also move code to hw/i386/fw_cfg.c.

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-8-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent df0f3d13

hw/i386/acpi-build.c

+1 −23
Original line number Diff line number Diff line
@@ -1802,30 +1802,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 


    /* create fw_cfg node, unconditionally */

    {

        /* when using port i/o, the 8-bit data register *always* overlaps

         * with half of the 16-bit control register. Hence, the total size

         * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the

         * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 */

        uint8_t io_size = object_property_get_bool(OBJECT(x86ms->fw_cfg),

                                                   "dma_enabled", NULL) ?

                          ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) :

                          FW_CFG_CTL_SIZE;



        scope = aml_scope("\\_SB.PCI0");

        dev = aml_device("FWCF");



        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002")));



        /* device present, functioning, decoding, not shown in UI */

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



        crs = aml_resource_template();

        aml_append(crs,

            aml_io(AML_DECODE16, FW_CFG_IO_BASE, FW_CFG_IO_BASE, 0x01, io_size)

        );

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



        aml_append(scope, dev);

        fw_cfg_add_acpi_dsdt(scope, x86ms->fw_cfg);

        aml_append(dsdt, scope);

    }

hw/i386/fw_cfg.c

+28 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "qemu/osdep.h"

#include "sysemu/numa.h"

#include "hw/acpi/acpi.h"

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

#include "hw/firmware/smbios.h"

#include "hw/i386/fw_cfg.h"

#include "hw/timer/hpet.h"
@@ -179,3 +180,30 @@ void fw_cfg_build_feature_control(MachineState *ms, FWCfgState *fw_cfg) 
    *val = cpu_to_le64(feature_control_bits | FEATURE_CONTROL_LOCKED);

    fw_cfg_add_file(fw_cfg, "etc/msr_feature_control", val, sizeof(*val));

}



void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg)

{

    /*

     * when using port i/o, the 8-bit data register *always* overlaps

     * with half of the 16-bit control register. Hence, the total size

     * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the

     * DMA control register is located at FW_CFG_DMA_IO_BASE + 4

     */

    Object *obj = OBJECT(fw_cfg);

    uint8_t io_size = object_property_get_bool(obj, "dma_enabled", NULL) ?

        ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) :

        FW_CFG_CTL_SIZE;

    Aml *dev = aml_device("FWCF");

    Aml *crs = aml_resource_template();



    aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002")));



    /* device present, functioning, decoding, not shown in UI */

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



    aml_append(crs,

        aml_io(AML_DECODE16, FW_CFG_IO_BASE, FW_CFG_IO_BASE, 0x01, io_size));



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

    aml_append(scope, dev);

}

hw/i386/fw_cfg.h

+1 −0
Original line number Diff line number Diff line
@@ -25,5 +25,6 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms, 
                               uint16_t apic_id_limit);

void fw_cfg_build_smbios(MachineState *ms, FWCfgState *fw_cfg);

void fw_cfg_build_feature_control(MachineState *ms, FWCfgState *fw_cfg);

void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg);



#endif