From nobody Tue Feb 10 00:59:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618825438; cv=none; d=zohomail.com; s=zohoarc; b=enB0GckMdATjW5/JXzaawoavCmzmh9q8lTgejsw1zeuyCryqox07zoB+7Rc0aEpGBD90ptfW6tuM48Li+hyYvbdeSjY7lh4LZ5csyzjMHG/KGx55fS+Ct1tFvVdh5nG22egZz5yqEKDLjYIS6jVE/OHOMX8PY1HM99bsRPfgyWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618825438; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wGahhPByYM3/GV4I+MipmLSfFtBrhhdK0pNeulGHnOg=; b=Fx9C1BLJ4JLyQdqdWwM+kI54mN00bpjpGZZKGLV6pFcIPo8tA8j38OY4PfeX/EmXJsCyGmv+Tdc26+Q1zo8lvQTXy2ORxE2qN4J6jB4agCum31U5ZFLxq9iFuvvnonqyIkaRpjQMnjC/F5r/0ALcHL/TsOWCz7NBEnOoiGlXrH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1618825438015767.2840743045972; Mon, 19 Apr 2021 02:43:58 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id p19so17804343wmq.1 for ; Mon, 19 Apr 2021 02:43:57 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id d10sm8780039wri.41.2021.04.19.02.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 02:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wGahhPByYM3/GV4I+MipmLSfFtBrhhdK0pNeulGHnOg=; b=rLqVoY70nGRtxd4t+4gNmXqpZ501xpYtqx0+gTRHJl+q/TDR0WKwomF7AX+z/GnYA3 hYIIroyGfy1UEKVnpKE2dozXwLhPy/JGv6lODL5jR3R0IKk1me304GZUXefeZRN5ll3w JhCLWCg52Zq6fAw+a40LxUlS70mJH4wCU7DkUM3pSxtd1ddcrX0OCosPT90ToBHqg71P I0v1Kqv63i0qqZc+qUJfpn2HZ9qwpW3kMm/c0QpWzsO4Wen4vrnPlyq+CuYXHGpefi2v XIUkSK5DWAtjycgzK/L476Z10jjjxoGs5Cl4m1qiqGFpatAWa1sU61l1wnIBc68RHNWO levw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wGahhPByYM3/GV4I+MipmLSfFtBrhhdK0pNeulGHnOg=; b=a0zFNnpP2x/td3JESyoUybJeL2teKVcRbzCdF5wTFfspOfdvBik4kSqklpdNU8LM/7 5bQKm3RDS5XVJowAauZntiIAF8R6chOA6VGq+Cu1e2bBmeo08B7zwLou+5+dHzeUYP5Y 82+LFEnXsJg9GMQxYtrwMqTBh6qUlGWEx4qeX0P8riwQmHksVQpgDwOgaYC7aW3x+0/K alQKkB9DC+35SNUyyoJsFwWf2mn3Ec7nxLDEfRvRo4rAI6k3JN+NIEObLAg1PRK47ZZx Cm+EsB1KDUAqdVgHiy29f7MTLCd6NuUsij/bvjKxSXCSr/j0Jqxly6TW774kAtHa/UEX BAyQ== X-Gm-Message-State: AOAM5303AGYpLE4cOWtxK8DI/IqkwSxgHdzOsTKqe8kRVVnqS+b3MyLs 1DYFkZc6cms6pUHW4nAk0CQ= X-Google-Smtp-Source: ABdhPJwyl3Kv8/bu34lp44ExPoJfa7wZXEs40FRUbTvz4VoCDL6IJT4GpScDCUg8QveyKI/+c4Ho6g== X-Received: by 2002:a7b:ce09:: with SMTP id m9mr20924525wmc.150.1618825436271; Mon, 19 Apr 2021 02:43:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, qemu-block@nongnu.org, David Edmondson , Richard Henderson , Stephen Checkoway , Peter Maydell , Antony Pavlov Subject: [PATCH v2 5/7] hw/arm/digic: Map flash using memory_region_add_subregion_aliased() Date: Mon, 19 Apr 2021 11:43:27 +0200 Message-Id: <20210419094329.1402767-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210419094329.1402767-1-f4bug@amsat.org> References: <20210419094329.1402767-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Instead of using a device specific feature for mapping the flash memory multiple times over a wider region, use the generic memory_region_add_subregion_aliased() helper. There is no change in the memory layout. * before: $ qemu-system-arm -M canon-a1100 -S -monitor stdio QEMU 5.2.90 monitor - type 'help' for more information (qemu) info mtree address-space: memory 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000003ffffff (prio 0, ram): ram 00000000c0210000-00000000c02100ff (prio 0, i/o): digic-timer 00000000c0210100-00000000c02101ff (prio 0, i/o): digic-timer 00000000c0210200-00000000c02102ff (prio 0, i/o): digic-timer 00000000c0800000-00000000c0800017 (prio 0, i/o): digic-uart 00000000f8000000-00000000ffffffff (prio 0, i/o): pflash 00000000f8000000-00000000f83fffff (prio 0, romd): alias pflash-alia= s @pflash 0000000000000000-00000000003fffff 00000000f8400000-00000000f87fffff (prio 0, romd): alias pflash-alia= s @pflash 0000000000000000-00000000003fffff 00000000f8800000-00000000f8bfffff (prio 0, romd): alias pflash-alia= s @pflash 0000000000000000-00000000003fffff ... 00000000ff400000-00000000ff7fffff (prio 0, romd): alias pflash-alia= s @pflash 0000000000000000-00000000003fffff 00000000ff800000-00000000ffbfffff (prio 0, romd): alias pflash-alia= s @pflash 0000000000000000-00000000003fffff 00000000ffc00000-00000000ffffffff (prio 0, romd): alias pflash-alia= s @pflash 0000000000000000-00000000003fffff * after: (qemu) info mtree address-space: memory 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000003ffffff (prio 0, ram): ram 00000000c0210000-00000000c02100ff (prio 0, i/o): digic-timer 00000000c0210100-00000000c02101ff (prio 0, i/o): digic-timer 00000000c0210200-00000000c02102ff (prio 0, i/o): digic-timer 00000000c0800000-00000000c0800017 (prio 0, i/o): digic-uart 00000000f8000000-00000000ffffffff (prio 0, i/o): masked pflash [span = of 4 MiB] 00000000f8000000-00000000f83fffff (prio 0, romd): alias pflash [#0/= 32] @pflash 0000000000000000-00000000003fffff 00000000f8400000-00000000f87fffff (prio 0, romd): alias pflash [#1/= 32] @pflash 0000000000000000-00000000003fffff 00000000f8800000-00000000f8bfffff (prio 0, romd): alias pflash [#2/= 32] @pflash 0000000000000000-00000000003fffff ... 00000000ff400000-00000000ff7fffff (prio 0, romd): alias pflash [#29= /32] @pflash 0000000000000000-00000000003fffff 00000000ff800000-00000000ffbfffff (prio 0, romd): alias pflash [#30= /32] @pflash 0000000000000000-00000000003fffff 00000000ffc00000-00000000ffffffff (prio 0, romd): alias pflash [#31= /32] @pflash 0000000000000000-00000000003fffff Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/digic_boards.c | 8 +++++--- hw/arm/Kconfig | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index fc4a671b2e1..293402b1240 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -128,8 +128,7 @@ static void digic4_add_k8p3215uqb_rom(DigicState *s, hw= addr addr, FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_S= IZE); qdev_prop_set_uint32(dev, "sector-length", FLASH_K8P3215UQB_SECTOR_SIZ= E); qdev_prop_set_uint8(dev, "width", 4); /* 32-bit */ - qdev_prop_set_uint8(dev, "mappings", - DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE); + qdev_prop_set_uint8(dev, "mappings", 0); qdev_prop_set_uint8(dev, "big-endian", 0); qdev_prop_set_uint16(dev, "id0", 0x00ec); qdev_prop_set_uint16(dev, "id1", 0x007e); @@ -140,7 +139,10 @@ static void digic4_add_k8p3215uqb_rom(DigicState *s, h= waddr addr, qdev_prop_set_string(dev, "name", "pflash"); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr); + memory_region_add_subregion_aliased(get_system_memory(), + addr, DIGIC4_ROM_MAX_SIZE, + sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0), + FLASH_K8P3215UQB_SIZE); =20 digic_load_rom(s, addr, FLASH_K8P3215UQB_SIZE, filename); } diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index aa8553b3cd3..1a7b9724d6c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -42,6 +42,7 @@ config DIGIC bool select PTIMER select PFLASH_CFI02 + select ALIASED_REGION =20 config EXYNOS4 bool --=20 2.26.3