From nobody Sat May 18 21:26:50 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554991083; cv=none; d=zoho.com; s=zohoarc; b=kq/rWqM3fdkcJeIcGpf0JuSB1PG00XVIfBMNiigEUqZ7ETcZtWJtW3MfQPO8uaemKHrBcZasFWkEyxToVmqOrn/6w0LhLaGrc5tsCtxCeQjQI6sfBreul2JCzwzHwrG0147ZePsOkbDVet7N9P/a5/BnzkikPKrckjxsa1o5asI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554991083; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=i8AL1FO1VMztc5Fth9yWWlptgw9pTABvh5e9l2Xwh/w=; b=jx5OL0OySdbSYT+roH9psctiRdDFZ81Uaii1kfd6+6GQ0TdE5jic7TfV83lfBXFQDbQrJu+kWe8kTqMZyc+vFTNSdCrlKfS88y0AS85m/YED4AoHQBYQib/goWuRn/KsD0/CvNJo5jj/xFDSiZqgxnUvLmrk/MNqs5aajyYU0Rc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554991083437852.8099137178706; Thu, 11 Apr 2019 06:58:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:49322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEaD4-0002GW-JB for importer@patchew.org; Thu, 11 Apr 2019 09:57:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEaBb-0001Ga-Nd for qemu-devel@nongnu.org; Thu, 11 Apr 2019 09:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEaBZ-0005lB-Pd for qemu-devel@nongnu.org; Thu, 11 Apr 2019 09:56:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46144) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEaBR-0005fa-S8; Thu, 11 Apr 2019 09:56:06 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 577053084294; Thu, 11 Apr 2019 13:56:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B25C018A51; Thu, 11 Apr 2019 13:56:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 46FDD1132BB6; Thu, 11 Apr 2019 15:56:02 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 15:56:01 +0200 Message-Id: <20190411135602.21725-2-armbru@redhat.com> In-Reply-To: <20190411135602.21725-1-armbru@redhat.com> References: <20190411135602.21725-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 11 Apr 2019 13:56:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-block@nongnu.org, mreitz@redhat.com, qemu-arm@nongnu.org, lersek@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Factored out of pc_system_firmware_init() so the next commit can reuse it in hw/arm/virt.c. Signed-off-by: Markus Armbruster Reviewed-by: Laszlo Ersek --- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 16dfae14b8..eba01b1447 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -44,9 +44,12 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h" =20 @@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) return &fl->mem; } =20 +/* + * Handle -drive if=3Dpflash for machines that use machine properties. + * Map unit#i (0 < i <=3D @ndev) to @dev[i]'s property "drive". + */ +void pflash_cfi01_legacy_drive(PFlashCFI01 *dev[], int ndev) +{ + int i; + DriveInfo *dinfo; + Location loc; + + for (i =3D 0; i < ndev; i++) { + dinfo =3D drive_get(IF_PFLASH, 0, i); + if (!dinfo) { + continue; + } + loc_push_none(&loc); + qemu_opts_loc_restore(dinfo->opts); + if (dev[i]->blk) { + error_report("clashes with -machine"); + exit(1); + } + qdev_prop_set_drive(DEVICE(dev[i]), "drive", + blk_by_legacy_dinfo(dinfo), &error_fatal); + loc_pop(&loc); + } +} + static void postload_update_cb(void *opaque, int running, RunState state) { PFlashCFI01 *pfl =3D opaque; diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index c628540774..d58e47184c 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, { PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); int i; - DriveInfo *pflash_drv; BlockBackend *pflash_blk[ARRAY_SIZE(pcms->flash)]; - Location loc; =20 if (!pcmc->pci_enabled) { old_pc_system_rom_init(rom_memory, true); return; } =20 - /* Map legacy -drive if=3Dpflash to machine properties */ + pflash_cfi01_legacy_drive(pcms->flash, ARRAY_SIZE(pcms->flash)); + for (i =3D 0; i < ARRAY_SIZE(pcms->flash); i++) { pflash_blk[i] =3D pflash_cfi01_get_blk(pcms->flash[i]); - pflash_drv =3D drive_get(IF_PFLASH, 0, i); - if (!pflash_drv) { - continue; - } - loc_push_none(&loc); - qemu_opts_loc_restore(pflash_drv->opts); - if (pflash_blk[i]) { - error_report("clashes with -machine"); - exit(1); - } - pflash_blk[i] =3D blk_by_legacy_dinfo(pflash_drv); - qdev_prop_set_drive(DEVICE(pcms->flash[i]), - "drive", pflash_blk[i], &error_fatal); - loc_pop(&loc); } =20 /* Reject gaps */ diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index a0f488732a..f6a68c2a4c 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -24,6 +24,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, int be); BlockBackend *pflash_cfi01_get_blk(PFlashCFI01 *fl); MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl); +void pflash_cfi01_legacy_drive(PFlashCFI01 *dev[], int ndev); =20 /* pflash_cfi02.c */ =20 --=20 2.17.2 From nobody Sat May 18 21:26:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554991162; cv=none; d=zoho.com; s=zohoarc; b=nVNtZWHasfWarfZBoZoKNV2ivCoFqGIylmSXnHHXwaGStyGoJc26wxC2HnmL9sSrU4qj/YpgsY5r7KKf10OFpSWIsK4diVGqGfftkkj4/c2MfTdgJHz6ipIbdNjasC1Qi3nMeUUyzjZVkmfbp9HWLE2TF1xRT6b5BRsM1rhST8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554991162; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=F84SawSwRsLm2byf4yFzrDLnexV/UYCvJi/EyY/nFik=; b=XJCdjgGa0Zp/Ng/r+zpCMpmtrNq+q2rj9JkFD+SfQvPPcpg1CnYP5neqYDzLLY7IZOtjPYmYazhCRCzx3cvPudLs4EG4RpQaN8M0y9OWf3FRRlGvZRzSYNFS8RYaDTbhjVSVx0walkc1z3B7SRxlJpQUA4aArwpZoZLl1LgFSLo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554991162581940.0286668987153; Thu, 11 Apr 2019 06:59:22 -0700 (PDT) Received: from localhost ([127.0.0.1]:49334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEaEZ-0003K2-LD for importer@patchew.org; Thu, 11 Apr 2019 09:59:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEaBf-0001Qq-KL for qemu-devel@nongnu.org; Thu, 11 Apr 2019 09:56:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEaBd-0005nQ-Lg for qemu-devel@nongnu.org; Thu, 11 Apr 2019 09:56:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17225) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEaBS-0005fe-0C; Thu, 11 Apr 2019 09:56:06 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 527586DDE8; Thu, 11 Apr 2019 13:56:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B49A9608A5; Thu, 11 Apr 2019 13:56:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4A3CF1132BD3; Thu, 11 Apr 2019 15:56:02 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 15:56:02 +0200 Message-Id: <20190411135602.21725-3-armbru@redhat.com> In-Reply-To: <20190411135602.21725-1-armbru@redhat.com> References: <20190411135602.21725-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 11 Apr 2019 13:56:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] hw/arm/virt: Support firmware configuration with -blockdev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-block@nongnu.org, mreitz@redhat.com, qemu-arm@nongnu.org, lersek@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=3Dpflash,unit=3D0,... and optionally -drive if=3Dpflash,unit=3D1,... Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection. The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive. We recently solved this problem for x86 PC machines, in commit ebc29e1beab. See the commit message for design rationale. This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method virt_instance_init(). The existing code to pick up drives defined with -drive if=3Dpflash is replaced by code to desugar into the machine properties. There are a few behavioral differences, though: * The flash devices are always present (x86: only present if configured) * Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address) * -bios configures contents of first pflash (x86: -bios configures ROM contents) * -bios is rejected when first pflash is also configured with -machine pflash0=3D... (x86: bios is silently ignored then) * -machine pflash1=3D... does not require -machine pflash0=3D... (x86: it does). The actual code is a bit simpler than for x86 mostly due to the first two differences. Signed-off-by: Markus Armbruster Acked-by: Laszlo Ersek --- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ce2664a30b..8ce7ecca80 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -30,6 +30,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" @@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineSt= ate *vms, qemu_irq *pic) } } =20 -static void create_one_flash(const char *name, hwaddr flashbase, - hwaddr flashsize, const char *file, - MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1(VirtMachineState *vms, + const char *name, + const char *alias_prop_name) { - /* Create and map a single flash device. We use the same - * parameters as the flash devices on the Versatile Express board. + /* + * Create a single flash device. We use the same parameters as + * the flash devices on the Versatile Express board. */ - DriveInfo *dinfo =3D drive_get_next(IF_PFLASH); DeviceState *dev =3D qdev_create(NULL, TYPE_PFLASH_CFI01); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - const uint64_t sectorlength =3D 256 * 1024; =20 - if (dinfo) { - qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(dinfo), - &error_abort); - } - - qdev_prop_set_uint32(dev, "num-blocks", flashsize / sectorlength); - qdev_prop_set_uint64(dev, "sector-length", sectorlength); + qdev_prop_set_uint64(dev, "sector-length", VIRT_FLASH_SECTOR_SIZE); qdev_prop_set_uint8(dev, "width", 4); qdev_prop_set_uint8(dev, "device-width", 2); qdev_prop_set_bit(dev, "big-endian", false); @@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr= flashbase, qdev_prop_set_uint16(dev, "id2", 0x00); qdev_prop_set_uint16(dev, "id3", 0x00); qdev_prop_set_string(dev, "name", name); + object_property_add_child(OBJECT(vms), name, OBJECT(dev), + &error_abort); + object_property_add_alias(OBJECT(vms), alias_prop_name, + OBJECT(dev), "drive", &error_abort); + return PFLASH_CFI01(dev); +} + +static void virt_flash_create(VirtMachineState *vms) +{ + vms->flash[0] =3D virt_pflash_create1(vms, "virt.flash0", "pflash0"); + vms->flash[1] =3D virt_pflash_create1(vms, "virt.flash1", "pflash1"); +} + +static void virt_flash_map1(PFlashCFI01 *flash, + hwaddr base, hwaddr size, + MemoryRegion *sysmem) +{ + DeviceState *dev =3D DEVICE(flash); + + assert(size % VIRT_FLASH_SECTOR_SIZE =3D=3D 0); + assert(size / VIRT_FLASH_SECTOR_SIZE <=3D UINT32_MAX); + qdev_prop_set_uint32(dev, "num-blocks", size / VIRT_FLASH_SECTOR_SIZE); qdev_init_nofail(dev); =20 - memory_region_add_subregion(sysmem, flashbase, - sysbus_mmio_get_region(SYS_BUS_DEVICE(dev)= , 0)); - - if (file) { - char *fn; - int image_size; - - if (drive_get(IF_PFLASH, 0, 0)) { - error_report("The contents of the first flash device may be " - "specified with -bios or with -drive if=3Dpflash.= .. " - "but you cannot use both options at once"); - exit(1); - } - fn =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, file); - if (!fn) { - error_report("Could not find ROM image '%s'", file); - exit(1); - } - image_size =3D load_image_mr(fn, sysbus_mmio_get_region(sbd, 0)); - g_free(fn); - if (image_size < 0) { - error_report("Could not load ROM image '%s'", file); - exit(1); - } - } + memory_region_add_subregion(sysmem, base, + sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), + 0)); } =20 -static void create_flash(const VirtMachineState *vms, - MemoryRegion *sysmem, - MemoryRegion *secure_sysmem) +static void virt_flash_map(VirtMachineState *vms, + MemoryRegion *sysmem, + MemoryRegion *secure_sysmem) { - /* Create two flash devices to fill the VIRT_FLASH space in the memmap. - * Any file passed via -bios goes in the first of these. + /* + * Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible on= ly * there. The second flash device is visible to both secure and nonsec= ure. @@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms, */ hwaddr flashsize =3D vms->memmap[VIRT_FLASH].size / 2; hwaddr flashbase =3D vms->memmap[VIRT_FLASH].base; + + virt_flash_map1(vms->flash[0], flashbase, flashsize, + secure_sysmem); + virt_flash_map1(vms->flash[1], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt(VirtMachineState *vms, + MemoryRegion *sysmem, + MemoryRegion *secure_sysmem) +{ + hwaddr flashsize =3D vms->memmap[VIRT_FLASH].size / 2; + hwaddr flashbase =3D vms->memmap[VIRT_FLASH].base; char *nodename; =20 - create_one_flash("virt.flash0", flashbase, flashsize, - bios_name, secure_sysmem); - create_one_flash("virt.flash1", flashbase + flashsize, flashsize, - NULL, sysmem); - if (sysmem =3D=3D secure_sysmem) { /* Report both flash devices as a single node in the DT */ nodename =3D g_strdup_printf("/flash@%" PRIx64, flashbase); @@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms, qemu_fdt_setprop_cell(vms->fdt, nodename, "bank-width", 4); g_free(nodename); } else { - /* Report the devices as separate nodes so we can mark one as + /* + * Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =3D g_strdup_printf("/secflash@%" PRIx64, flashbase); @@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } =20 +static bool virt_firmware_init(VirtMachineState *vms, + MemoryRegion *sysmem, + MemoryRegion *secure_sysmem) +{ + BlockBackend *pflash_blk0; + + pflash_cfi01_legacy_drive(vms->flash, ARRAY_SIZE(vms->flash)); + virt_flash_map(vms, sysmem, secure_sysmem); + + pflash_blk0 =3D pflash_cfi01_get_blk(vms->flash[0]); + + if (bios_name) { + char *fname; + MemoryRegion *mr; + int image_size; + + if (pflash_blk0) { + error_report("The contents of the first flash device may be " + "specified with -bios or with -drive if=3Dpflash.= .. " + "but you cannot use both options at once"); + exit(1); + } + + /* Fall back to -bios */ + + fname =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (!fname) { + error_report("Could not find ROM image '%s'", bios_name); + exit(1); + } + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(vms->flash[0]), 0); + image_size =3D load_image_mr(fname, mr); + g_free(fname); + if (image_size < 0) { + error_report("Could not load ROM image '%s'", bios_name); + exit(1); + } + } + + return pflash_blk0 || bios_name; +} + static FWCfgState *create_fw_cfg(const VirtMachineState *vms, AddressSpace= *as) { hwaddr base =3D vms->memmap[VIRT_FW_CFG].base; @@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine) MemoryRegion *secure_sysmem =3D NULL; int n, virt_max_cpus; MemoryRegion *ram =3D g_new(MemoryRegion, 1); - bool firmware_loaded =3D bios_name || drive_get(IF_PFLASH, 0, 0); + bool firmware_loaded; bool aarch64 =3D true; =20 /* @@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 + if (vms->secure) { + if (kvm_enabled()) { + error_report("mach-virt: KVM does not support Security extensi= ons"); + exit(1); + } + + /* + * The Secure view of the world is the same as the NonSecure, + * but with a few extra devices. Create it as a container region + * containing the system memory at low priority; any secure-only + * devices go in at higher priority and take precedence. + */ + secure_sysmem =3D g_new(MemoryRegion, 1); + memory_region_init(secure_sysmem, OBJECT(machine), "secure-memory", + UINT64_MAX); + memory_region_add_subregion_overlap(secure_sysmem, 0, sysmem, -1); + } + + firmware_loaded =3D virt_firmware_init(vms, sysmem, + secure_sysmem ?: sysmem); + /* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary @@ -1505,23 +1572,6 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->secure) { - if (kvm_enabled()) { - error_report("mach-virt: KVM does not support Security extensi= ons"); - exit(1); - } - - /* The Secure view of the world is the same as the NonSecure, - * but with a few extra devices. Create it as a container region - * containing the system memory at low priority; any secure-only - * devices go in at higher priority and take precedence. - */ - secure_sysmem =3D g_new(MemoryRegion, 1); - memory_region_init(secure_sysmem, OBJECT(machine), "secure-memory", - UINT64_MAX); - memory_region_add_subregion_overlap(secure_sysmem, 0, sysmem, -1); - } - create_fdt(vms); =20 possible_cpus =3D mc->possible_cpu_arch_ids(machine); @@ -1610,7 +1660,7 @@ static void machvirt_init(MachineState *machine) &machine->device_memory->mr); } =20 - create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); + virt_flash_fdt(vms, sysmem, secure_sysmem); =20 create_gic(vms, pic); =20 @@ -1956,6 +2006,8 @@ static void virt_instance_init(Object *obj) NULL); =20 vms->irqmap =3D a15irqmap; + + virt_flash_create(vms); } =20 static const TypeInfo virt_machine_info =3D { diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 507517c603..424070924e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -35,6 +35,7 @@ #include "qemu/notify.h" #include "hw/boards.h" #include "hw/arm/arm.h" +#include "hw/block/flash.h" #include "sysemu/kvm.h" #include "hw/intc/arm_gicv3_common.h" =20 @@ -113,6 +114,7 @@ typedef struct { Notifier machine_done; DeviceState *platform_bus_dev; FWCfgState *fw_cfg; + PFlashCFI01 *flash[2]; bool secure; bool highmem; bool highmem_ecam; --=20 2.17.2