Commit 1c8e93fb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-fwcfg' into staging 



* Updated fw_cfg option ROM to include DMA support

# gpg: Signature made Thu 14 Jul 2016 14:51:06 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream-fwcfg:
  Add optionrom compatible with fw_cfg DMA version

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 22e28174 b2a575a1

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ 
/pc-bios/optionrom/linuxboot.bin

/pc-bios/optionrom/linuxboot.raw

/pc-bios/optionrom/linuxboot.img

/pc-bios/optionrom/linuxboot_dma.asm

/pc-bios/optionrom/linuxboot_dma.bin

/pc-bios/optionrom/linuxboot_dma.raw

/pc-bios/optionrom/linuxboot_dma.img

/pc-bios/optionrom/multiboot.asm

/pc-bios/optionrom/multiboot.bin

/pc-bios/optionrom/multiboot.raw

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ 
efi-e1000e.rom efi-vmxnet3.rom \

qemu-icon.bmp qemu_logo_no_text.svg \

bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \

multiboot.bin linuxboot.bin kvmvapic.bin \

multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \

s390-ccw.img \

spapr-rtas.bin slof.bin \

palcode-clipper \

hw/i386/pc.c

+8 −2
Original line number Diff line number Diff line
@@ -998,8 +998,13 @@ static void load_linux(PCMachineState *pcms, 
    fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size);

    fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size);



    if (fw_cfg_dma_enabled(fw_cfg)) {

        option_rom[nb_option_roms].name = "linuxboot_dma.bin";

        option_rom[nb_option_roms].bootindex = 0;

    } else {

        option_rom[nb_option_roms].name = "linuxboot.bin";

        option_rom[nb_option_roms].bootindex = 0;

    }

    nb_option_roms++;

}
@@ -1291,6 +1296,7 @@ void xen_load_linux(PCMachineState *pcms) 
    load_linux(pcms, fw_cfg);

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

        assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||

               !strcmp(option_rom[i].name, "linuxboot_dma.bin") ||

               !strcmp(option_rom[i].name, "multiboot.bin"));

        rom_add_option(option_rom[i].name, option_rom[i].bootindex);

    }

hw/nvram/fw_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static bool is_version_1(void *opaque, int version_id) 
    return version_id == 1;

}



static bool fw_cfg_dma_enabled(void *opaque)

bool fw_cfg_dma_enabled(void *opaque)

{

    FWCfgState *s = opaque;

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -366,6 +366,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
#define PC_COMPAT_2_6 \

    HW_COMPAT_2_6 \

    {\

        .driver   = "fw_cfg_io",\

        .property = "dma_enabled",\

        .value    = "off",\

    },{\

        .driver   = TYPE_X86_CPU,\

        .property = "cpuid-0xb",\

        .value    = "off",\