| From f7572e4bdfc5c0c57d6a37712c6f5b79cc86e063 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> |
| Date: Wed, 13 Dec 2017 13:38:39 +0100 |
| Subject: [PATCH 08/41] Enable fw_cfg DMA interface for x86 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com> |
| Message-id: <20171213133912.26176-9-marcandre.lureau@redhat.com> |
| Patchwork-id: 78357 |
| O-Subject: [RHEL-7.5 qemu-kvm PATCH v3 08/41] Enable fw_cfg DMA interface for x86 |
| Bugzilla: 1411490 |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Michael S. Tsirkin <mst@redhat.com> |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| From: Marc Marí <markmb@redhat.com> |
| |
| Enable the fw_cfg DMA interface for all the x86 platforms. |
| |
| Based on Gerd Hoffman's initial implementation. |
| |
| Signed-off-by: Marc Marí <markmb@redhat.com> |
| Reviewed-by: Laszlo Ersek <lersek@redhat.com> |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| |
| (cherry picked from commit c886fc4c20ff8456b2f788a1404dd321b8b59243) |
| Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| hw/i386/pc.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/hw/i386/pc.c b/hw/i386/pc.c |
| index 29d6588..e2fd732 100644 |
| |
| |
| @@ -600,7 +600,7 @@ static unsigned int pc_apic_id_limit(unsigned int max_cpus) |
| return x86_cpu_apic_id_from_index(max_cpus - 1) + 1; |
| } |
| |
| -static FWCfgState *bochs_bios_init(void) |
| +static FWCfgState *bochs_bios_init(AddressSpace *as) |
| { |
| FWCfgState *fw_cfg; |
| uint8_t *smbios_table; |
| @@ -609,7 +609,7 @@ static FWCfgState *bochs_bios_init(void) |
| int i, j; |
| unsigned int apic_id_limit = pc_apic_id_limit(max_cpus); |
| |
| - fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0); |
| + fw_cfg = fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, as); |
| /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: |
| * |
| * SeaBIOS needs FW_CFG_MAX_CPUS for CPU hotplug, but the CPU hotplug |
| @@ -1172,7 +1172,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, |
| option_rom_mr, |
| 1); |
| |
| - fw_cfg = bochs_bios_init(); |
| + fw_cfg = bochs_bios_init(&address_space_memory); |
| rom_set_fw(fw_cfg); |
| |
| if (linux_boot) { |
| -- |
| 1.8.3.1 |
| |