From: David Gibson <david@gibson.dropbear.id.au>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Jan Kiszka" <jan.kiszka@web.de>,
"open list:Block layer core" <qemu-block@nongnu.org>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Alistair Francis" <alistair@alistair23.me>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>,
"Michael Walle" <michael@walle.cc>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Antony Pavlov" <antonynpavlov@gmail.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Max Reitz" <mreitz@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Greg Kurz" <groug@kaod.org>
Subject: Re: [PATCH-for-6.1 07/10] hw/block/pflash_cfi02: Simplify pflash_cfi02_register() prototype
Date: Mon, 29 Mar 2021 15:12:20 +1100 [thread overview]
Message-ID: <YGFTpHZhWxqYxxl2@yekko.fritz.box> (raw)
In-Reply-To: <20210326002728.1069834-8-f4bug@amsat.org>
[-- Attachment #1: Type: text/plain, Size: 8073 bytes --]
On Fri, Mar 26, 2021 at 01:27:25AM +0100, Philippe Mathieu-Daudé wrote:
> The previous commit removed the mapping code from TYPE_PFLASH_CFI02.
> pflash_cfi02_register() doesn't use the 'nb_mappings' argument
> anymore. Simply remove it to simplify.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Revieed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/hw/block/flash.h | 1 -
> hw/arm/digic_boards.c | 1 -
> hw/arm/musicpal.c | 1 -
> hw/arm/xilinx_zynq.c | 2 +-
> hw/block/pflash_cfi02.c | 3 +--
> hw/lm32/lm32_boards.c | 4 ++--
> hw/ppc/ppc405_boards.c | 6 +++---
> hw/sh4/r2d.c | 2 +-
> 8 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h
> index 7dde0adcee7..0e5dd818a9d 100644
> --- a/include/hw/block/flash.h
> +++ b/include/hw/block/flash.h
> @@ -36,7 +36,6 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,
> hwaddr size,
> BlockBackend *blk,
> uint32_t sector_len,
> - int nb_mappings,
> int width,
> uint16_t id0, uint16_t id1,
> uint16_t id2, uint16_t id3,
> diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
> index 293402b1240..eb694c70d4c 100644
> --- a/hw/arm/digic_boards.c
> +++ b/hw/arm/digic_boards.c
> @@ -128,7 +128,6 @@ static void digic4_add_k8p3215uqb_rom(DigicState *s, hwaddr addr,
> FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE);
> qdev_prop_set_uint32(dev, "sector-length", FLASH_K8P3215UQB_SECTOR_SIZE);
> qdev_prop_set_uint8(dev, "width", 4); /* 32-bit */
> - 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);
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 7d1f2f3fb3f..e882e11df36 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1657,7 +1657,6 @@ static void musicpal_init(MachineState *machine)
> qdev_prop_set_uint32(dev, "num-blocks", flash_size / sector_size);
> qdev_prop_set_uint32(dev, "sector-length", sector_size);
> qdev_prop_set_uint8(dev, "width", 2); /* 16-bit */
> - qdev_prop_set_uint8(dev, "mappings", 0);
> qdev_prop_set_uint8(dev, "big-endian", 0);
> qdev_prop_set_uint16(dev, "id0", 0x00bf);
> qdev_prop_set_uint16(dev, "id1", 0x236d);
> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index 8db6cfd47f5..d12b00e7648 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -220,7 +220,7 @@ static void zynq_init(MachineState *machine)
> pflash_cfi02_register(0xe2000000, "zynq.pflash", FLASH_SIZE,
> dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> FLASH_SECTOR_SIZE, 1,
> - 1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa,
> + 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa,
> 0);
>
> /* Create the main clock source, and feed slcr with it */
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index 6f4b3e3c3fe..2b412402fac 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -968,7 +968,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,
> hwaddr size,
> BlockBackend *blk,
> uint32_t sector_len,
> - int nb_mappings, int width,
> + int width,
> uint16_t id0, uint16_t id1,
> uint16_t id2, uint16_t id3,
> uint16_t unlock_addr0,
> @@ -977,7 +977,6 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,
> {
> DeviceState *dev = qdev_new(TYPE_PFLASH_CFI02);
>
> - assert(nb_mappings <= 1);
> if (blk) {
> qdev_prop_set_drive(dev, "drive", blk);
> }
> diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
> index b5d97dd53ed..96877ba7cfb 100644
> --- a/hw/lm32/lm32_boards.c
> +++ b/hw/lm32/lm32_boards.c
> @@ -121,7 +121,7 @@ static void lm32_evr_init(MachineState *machine)
> pflash_cfi02_register(flash_base, "lm32_evr.flash", flash_size,
> dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> flash_sector_size,
> - 1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
> + 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
>
> /* create irq lines */
> env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, cpu, 0));
> @@ -218,7 +218,7 @@ static void lm32_uclinux_init(MachineState *machine)
> pflash_cfi02_register(flash_base, "lm32_uclinux.flash", flash_size,
> dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> flash_sector_size,
> - 1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
> + 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
>
> /* create irq lines */
> env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, env, 0));
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 8f77887fb18..2503e033497 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -198,7 +198,7 @@ static void ref405ep_init(MachineState *machine)
> pflash_cfi02_register((uint32_t)(-bios_size),
> "ef405ep.bios", bios_size,
> blk_by_legacy_dinfo(dinfo),
> - 64 * KiB, 1,
> + 64 * KiB,
> 2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
> 1);
> } else
> @@ -469,7 +469,7 @@ static void taihu_405ep_init(MachineState *machine)
> pflash_cfi02_register(0xFFE00000,
> "taihu_405ep.bios", bios_size,
> blk_by_legacy_dinfo(dinfo),
> - 64 * KiB, 1,
> + 64 * KiB,
> 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
> 1);
> fl_idx++;
> @@ -502,7 +502,7 @@ static void taihu_405ep_init(MachineState *machine)
> bios_size = 32 * MiB;
> pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size,
> blk_by_legacy_dinfo(dinfo),
> - 64 * KiB, 1,
> + 64 * KiB,
> 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
> 1);
> fl_idx++;
> diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
> index 443820901d4..b7288dcba80 100644
> --- a/hw/sh4/r2d.c
> +++ b/hw/sh4/r2d.c
> @@ -301,7 +301,7 @@ static void r2d_init(MachineState *machine)
> dinfo = drive_get(IF_PFLASH, 0, 0);
> pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE,
> dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> - 64 * KiB, 1, 2, 0x0001, 0x227e, 0x2220, 0x2200,
> + 64 * KiB, 2, 0x0001, 0x227e, 0x2220, 0x2200,
> 0x555, 0x2aa, 0);
>
> /* NIC: rtl8139 on-board, and 2 slots. */
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-03-29 4:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 0:27 [RFC PATCH-for-6.1 00/10] hw/misc: Add memory_region_add_subregion_aliased() helper Philippe Mathieu-Daudé
2021-03-26 0:27 ` [RFC PATCH-for-6.1 01/10] hw/misc: Add device to help managing aliased memory regions Philippe Mathieu-Daudé
2021-03-26 0:27 ` [PATCH-for-6.1 02/10] hw/arm/musicpal: Open-code pflash_cfi02_register() call Philippe Mathieu-Daudé
2021-03-26 0:27 ` [RFC PATCH-for-6.1 03/10] hw/arm/musicpal: Map flash using memory_region_add_subregion_aliased() Philippe Mathieu-Daudé
2021-03-26 22:49 ` Philippe Mathieu-Daudé
2021-03-26 0:27 ` [PATCH-for-6.1 04/10] hw/arm/digic: Open-code pflash_cfi02_register() call Philippe Mathieu-Daudé
2021-03-26 0:27 ` [RFC PATCH-for-6.1 05/10] hw/arm/digic: Map flash using memory_region_add_subregion_aliased() Philippe Mathieu-Daudé
2021-03-26 0:27 ` [PATCH-for-6.1 06/10] hw/block/pflash_cfi02: Remove pflash_setup_mappings() Philippe Mathieu-Daudé
2021-03-29 4:11 ` David Gibson
2021-03-26 0:27 ` [PATCH-for-6.1 07/10] hw/block/pflash_cfi02: Simplify pflash_cfi02_register() prototype Philippe Mathieu-Daudé
2021-03-29 4:12 ` David Gibson [this message]
2021-03-26 0:27 ` [RFC PATCH-for-6.1 08/10] hw/misc/aliased_region: Simplify aliased I/O regions Philippe Mathieu-Daudé
2021-03-26 0:27 ` [PATCH-for-6.1 09/10] hw/m68k/q800: Add MacIO container Philippe Mathieu-Daudé
2021-03-26 0:27 ` [RFC PATCH-for-6.1 10/10] hw/m68k/q800: Map MacIO using memory_region_add_subregion_aliased() Philippe Mathieu-Daudé
2021-03-26 12:58 ` [RFC PATCH-for-6.1 00/10] hw/misc: Add memory_region_add_subregion_aliased() helper Richard Henderson
2021-03-27 21:45 ` Mark Cave-Ayland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YGFTpHZhWxqYxxl2@yekko.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=alistair@alistair23.me \
--cc=antonynpavlov@gmail.com \
--cc=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=groug@kaod.org \
--cc=jan.kiszka@web.de \
--cc=kwolf@redhat.com \
--cc=laurent@vivier.eu \
--cc=magnus.damm@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=michael@walle.cc \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).