Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j6Ker-0001HF-8i for mharc-qemu-riscv@gnu.org; Mon, 24 Feb 2020 15:48:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48794) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Keo-00019F-86 for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Kem-000691-Q8 for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:50 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27117 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Kem-00068S-MV for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582577328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=shskCEX2uYtXc4beNl78HPxrHEcrnngUbNyRlJDIBE8=; b=bE6Db/qwFNzy0DUxU7Gj6BYwpPJnG+eYNSrAHvBzvlcZxa4tfH1lyAGPje8/I7yHpYsylP hPiDvMA3o+2CLigjB6/ve3hbDZlNo96GqkXHRDJtBGCFk+hWmUAmocaUYqD04ZZu7FmtxI +IMfQa5/zOIxBt+QtqRwCWbFIICk+CE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-7G9UnM1IMgemfZ1deXD2wQ-1; Mon, 24 Feb 2020 15:48:46 -0500 X-MC-Unique: 7G9UnM1IMgemfZ1deXD2wQ-1 Received: by mail-wr1-f69.google.com with SMTP id l1so6188021wrt.4 for ; Mon, 24 Feb 2020 12:48:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ejODWbyMs0NJv2uHz+segH18oMcov0kTRu+NHCJHJqI=; b=dKvOQOJHjAh6l0S9fUHTOi/41vS7A49VI39QotybCd2xX3VF7ifMSDpWc/Mw1Ti6QI R3OzcascxZZN+t5pv9uCMTbHezYNjmMUvsbRFPDjwOORUtteJ1bfRKTNPkmlvQzf6ob8 SRF2swUjNV5P8DOAa/J+rYpb1sxpf7G72iZip1IArqN1F7ilfnZUJuhi/awl1T348m3M BF7ckkPfiHmQA5LTHZeHplNONUGBN0Q0xblZM0V6Bn7OY6r09Z3TeyqPJTAKQcyJLl20 wx28EvUkYaEBYg5bofSuSwm6YqatnM2e3I0KFOvy05b9f5kV058sKZWL6OzkP+Szlm0J qeiw== X-Gm-Message-State: APjAAAV0L1B2jIV+sUMuUKXuVr1aGS97dvOZbUZ2IzwS4y+mD4pycc2V LBrhSA0VtLceOAN1lKCq84D7+EFZlHQosbktBYYzCIO4xCvHk0YnF9aElxkU+1uN2GZOq6gGGvD YBXnu6tgXGHcUfj8= X-Received: by 2002:a5d:498f:: with SMTP id r15mr66990183wrq.284.1582577322978; Mon, 24 Feb 2020 12:48:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyVdstprzgxeqTV/vrmrQb2L2FOVPuY7mMMO1ufuxU+w2dqLSvcF7vUvd+8zKDsYpvuHWJHsA== X-Received: by 2002:a5d:498f:: with SMTP id r15mr66990168wrq.284.1582577322703; Mon, 24 Feb 2020 12:48:42 -0800 (PST) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id t81sm863436wmg.6.2020.02.24.12.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 12:48:42 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org Cc: Joel Stanley , Laurent Vivier , Aleksandar Markovic , Richard Henderson , Andrzej Zaborowski , KONRAD Frederic , Peter Chubb , Palmer Dabbelt , Michael Walle , Max Reitz , "Edgar E. Iglesias" , Marcel Apfelbaum , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, Magnus Damm , Subbaraya Sundeep , David Gibson , Eduardo Habkost , Jean-Christophe Dubois , Sagar Karandikar , Igor Mitsyanko , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, Mark Cave-Ayland , Aurelien Jarno , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Bastian Koppelmann , Fabien Chouteau , Alistair Francis , Kevin Wolf , Aleksandar Rikalo , qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , Artyom Tarasenko Subject: [PATCH v2 05/32] hw/arm: Use memory_region_init_rom() with read-only regions Date: Mon, 24 Feb 2020 21:48:01 +0100 Message-Id: <20200224204828.23167-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200224204828.23167-1-philmd@redhat.com> References: <20200224204828.23167-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 20:48:52 -0000 This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/exynos4210.c | 3 +-- hw/arm/mainstone.c | 3 +-- hw/arm/omap_sx1.c | 6 ++---- hw/arm/palm.c | 3 +-- hw/arm/spitz.c | 3 +-- hw/arm/stellaris.c | 3 +-- hw/arm/tosa.c | 3 +-- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 59a27bdd68..3af6502a5e 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -311,9 +311,8 @@ static void exynos4210_realize(DeviceState *socdev, Err= or **errp) &s->chipid_mem); =20 /* Internal ROM */ - memory_region_init_ram(&s->irom_mem, NULL, "exynos4210.irom", + memory_region_init_rom(&s->irom_mem, NULL, "exynos4210.irom", EXYNOS4210_IROM_SIZE, &error_fatal); - memory_region_set_readonly(&s->irom_mem, true); memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR, &s->irom_mem); /* mirror of iROM */ diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index 6e64dfab50..05a806b422 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -125,9 +125,8 @@ static void mainstone_common_init(MemoryRegion *address= _space_mem, /* Setup CPU & memory */ mpu =3D pxa270_init(address_space_mem, mainstone_binfo.ram_size, machine->cpu_type); - memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM, + memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM, &error_fatal); - memory_region_set_readonly(rom, true); memory_region_add_subregion(address_space_mem, 0, rom); =20 #ifdef TARGET_WORDS_BIGENDIAN diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index be245714db..6c3fd1b271 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -126,9 +126,8 @@ static void sx1_init(MachineState *machine, const int v= ersion) mpu =3D omap310_mpu_init(dram, machine->cpu_type); =20 /* External Flash (EMIFS) */ - memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size, + memory_region_init_rom(flash, NULL, "omap_sx1.flash0-0", flash_size, &error_fatal); - memory_region_set_readonly(flash, true); memory_region_add_subregion(address_space, OMAP_CS0_BASE, flash); =20 memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, @@ -168,9 +167,8 @@ static void sx1_init(MachineState *machine, const int v= ersion) if ((version =3D=3D 1) && (dinfo =3D drive_get(IF_PFLASH, 0, fl_idx)) !=3D NULL) { MemoryRegion *flash_1 =3D g_new(MemoryRegion, 1); - memory_region_init_ram(flash_1, NULL, "omap_sx1.flash1-0", + memory_region_init_rom(flash_1, NULL, "omap_sx1.flash1-0", flash1_size, &error_fatal); - memory_region_set_readonly(flash_1, true); memory_region_add_subregion(address_space, OMAP_CS1_BASE, flash_1)= ; =20 memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val, diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 72eca8cc55..265d5891a6 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -206,9 +206,8 @@ static void palmte_init(MachineState *machine) mpu =3D omap310_mpu_init(dram, machine->cpu_type); =20 /* External Flash (EMIFS) */ - memory_region_init_ram(flash, NULL, "palmte.flash", flash_size, + memory_region_init_rom(flash, NULL, "palmte.flash", flash_size, &error_fatal); - memory_region_set_readonly(flash, true); memory_region_add_subregion(address_space_mem, OMAP_CS0_BASE, flash); =20 memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, "palmte-cs0"= , diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index e001088103..1d27399721 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -924,8 +924,7 @@ static void spitz_common_init(MachineState *machine, =20 sl_flash_register(mpu, (model =3D=3D spitz) ? FLASH_128M : FLASH_1024M= ); =20 - memory_region_init_ram(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal= ); - memory_region_set_readonly(rom, true); + memory_region_init_rom(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal= ); memory_region_add_subregion(address_space_mem, 0, rom); =20 /* Setup peripherals */ diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 221a78674e..d136ba1a92 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1300,9 +1300,8 @@ static void stellaris_init(MachineState *ms, stellari= s_board_info *board) sram_size =3D ((board->dc0 >> 18) + 1) * 1024; =20 /* Flash programming is done via the SCU, so pretend it is ROM. */ - memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size, + memory_region_init_rom(flash, NULL, "stellaris.flash", flash_size, &error_fatal); - memory_region_set_readonly(flash, true); memory_region_add_subregion(system_memory, 0, flash); =20 memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size, diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 4d95a1f3e2..5dee2d76c6 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -226,8 +226,7 @@ static void tosa_init(MachineState *machine) =20 mpu =3D pxa255_init(address_space_mem, tosa_binfo.ram_size); =20 - memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal); - memory_region_set_readonly(rom, true); + memory_region_init_rom(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal); memory_region_add_subregion(address_space_mem, 0, rom); =20 tmio =3D tc6393xb_init(address_space_mem, 0x10000000, --=20 2.21.1