From: Paolo Bonzini <pbonzini@redhat.com>
To: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: edgar.iglesias@gmail.com, john.williams@xilinx.com,
qemu-devel@nongnu.org, peter.maydell@linaro.org
Subject: Re: [Qemu-devel] [PATCH v1 3/7] pflash_cfi0x: QOMified
Date: Fri, 19 Oct 2012 12:08:53 +0200 [thread overview]
Message-ID: <508126B5.6020308@redhat.com> (raw)
In-Reply-To: <ddebf66ebc765be0adc04fd6a5b979f543ed482a.1350619775.git.peter.crosthwaite@xilinx.com>
bdrvIl 19/10/2012 08:40, Peter Crosthwaite ha scritto:
> QOMified the pflash_cfi0x so machine models can connect them up in custom ways.
>
> Kept the pflash_cfi0x_register functions as is. They can still be used to
> create a flash straight onto system memory.
>
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Great, thanks!
Can you just name the BlockDriverState property "drive" for consistency
with other device models?
Also:
> struct pflash_t {
> + SysBusDevice busdev;
> BlockDriverState *bs;
> - target_phys_addr_t sector_len;
> - int width;
> + uint32_t nb_blocs;
> + /* FIXME: get rid of target_phys_addr_t usage */
> + union {
> + target_phys_addr_t sector_len;
> + uint32_t sector_len_u32;
Isn't this broken on big-endian machines? You can just make it a
uint64_t, since that's what target_phys_addr_t is now.
Then you can change it to uint32_t when you have more time.
Paolo
> + };
> + uint8_t width;
> + uint8_t be;
> int wcycle; /* if 0, the flash is read normally */
> int bypass;
> int ro;
> uint8_t cmd;
> uint8_t status;
> - uint16_t ident[4];
> + union {
> + uint16_t ident[4];
> + struct {
> + uint16_t ident0;
> + uint16_t ident1;
> + uint16_t ident2;
> + uint16_t ident3;
> + };
> + };
> uint8_t cfi_len;
> uint8_t cfi_table[0x52];
> target_phys_addr_t counter;
> unsigned int writeblock_size;
> QEMUTimer *timer;
> MemoryRegion mem;
> + char *name;
> void *storage;
> };
>
> @@ -541,19 +558,13 @@ static const MemoryRegionOps pflash_cfi01_ops_le = {
> .endianness = DEVICE_NATIVE_ENDIAN,
> };
>
> -pflash_t *pflash_cfi01_register(target_phys_addr_t base,
> - DeviceState *qdev, const char *name,
> - target_phys_addr_t size,
> - BlockDriverState *bs, uint32_t sector_len,
> - int nb_blocs, int width,
> - uint16_t id0, uint16_t id1,
> - uint16_t id2, uint16_t id3, int be)
> +static int pflash_cfi01_init(SysBusDevice *dev)
> {
> - pflash_t *pfl;
> + pflash_t *pfl = FROM_SYSBUS(typeof(*pfl), dev);
> target_phys_addr_t total_len;
> int ret;
>
> - total_len = sector_len * nb_blocs;
> + total_len = pfl->sector_len * pfl->nb_blocs;
>
> /* XXX: to be fixed */
> #if 0
> @@ -562,27 +573,26 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
> return NULL;
> #endif
>
> - pfl = g_malloc0(sizeof(pflash_t));
> -
> + if (!pfl->name) {
> + static int next;
> + pfl->name = g_strdup_printf("pflash.cfi01.%d", next++);
> + }
> memory_region_init_rom_device(
> - &pfl->mem, be ? &pflash_cfi01_ops_be : &pflash_cfi01_ops_le, pfl,
> - name, size);
> - vmstate_register_ram(&pfl->mem, qdev);
> + &pfl->mem, pfl->be ? &pflash_cfi01_ops_be : &pflash_cfi01_ops_le, pfl,
> + pfl->name, total_len);
> + vmstate_register_ram(&pfl->mem, DEVICE(pfl));
> pfl->storage = memory_region_get_ram_ptr(&pfl->mem);
> - memory_region_add_subregion(get_system_memory(), base, &pfl->mem);
> + sysbus_init_mmio(dev, &pfl->mem);
>
> - pfl->bs = bs;
> if (pfl->bs) {
> /* read the initial flash content */
> ret = bdrv_read(pfl->bs, 0, pfl->storage, total_len >> 9);
> +
> if (ret < 0) {
> - memory_region_del_subregion(get_system_memory(), &pfl->mem);
> - vmstate_unregister_ram(&pfl->mem, qdev);
> + vmstate_unregister_ram(&pfl->mem, DEVICE(pfl));
> memory_region_destroy(&pfl->mem);
> - g_free(pfl);
> - return NULL;
> + return 1;
> }
> - bdrv_attach_dev_nofail(pfl->bs, pfl);
> }
>
> if (pfl->bs) {
> @@ -592,15 +602,9 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
> }
>
> pfl->timer = qemu_new_timer_ns(vm_clock, pflash_timer, pfl);
> - pfl->sector_len = sector_len;
> - pfl->width = width;
> pfl->wcycle = 0;
> pfl->cmd = 0;
> pfl->status = 0;
> - pfl->ident[0] = id0;
> - pfl->ident[1] = id1;
> - pfl->ident[2] = id2;
> - pfl->ident[3] = id3;
> /* Hardcoded CFI table */
> pfl->cfi_len = 0x52;
> /* Standard "QRY" string */
> @@ -649,7 +653,7 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
> pfl->cfi_table[0x28] = 0x02;
> pfl->cfi_table[0x29] = 0x00;
> /* Max number of bytes in multi-bytes write */
> - if (width == 1) {
> + if (pfl->width == 1) {
> pfl->cfi_table[0x2A] = 0x08;
> } else {
> pfl->cfi_table[0x2A] = 0x0B;
> @@ -660,10 +664,10 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
> /* Number of erase block regions (uniform) */
> pfl->cfi_table[0x2C] = 0x01;
> /* Erase block region 1 */
> - pfl->cfi_table[0x2D] = nb_blocs - 1;
> - pfl->cfi_table[0x2E] = (nb_blocs - 1) >> 8;
> - pfl->cfi_table[0x2F] = sector_len >> 8;
> - pfl->cfi_table[0x30] = sector_len >> 16;
> + pfl->cfi_table[0x2D] = pfl->nb_blocs - 1;
> + pfl->cfi_table[0x2E] = (pfl->nb_blocs - 1) >> 8;
> + pfl->cfi_table[0x2F] = pfl->sector_len >> 8;
> + pfl->cfi_table[0x30] = pfl->sector_len >> 16;
>
> /* Extended */
> pfl->cfi_table[0x31] = 'P';
> @@ -685,6 +689,74 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
>
> pfl->cfi_table[0x3f] = 0x01; /* Number of protection fields */
>
> + return 0;
> +}
> +
> +static Property pflash_cfi01_properties[] = {
> + DEFINE_PROP_DRIVE("bdrv", struct pflash_t, bs),
> + DEFINE_PROP_UINT32("nb_blocs", struct pflash_t, nb_blocs, 0),
> + DEFINE_PROP_UINT32("sector_len", struct pflash_t, sector_len_u32, 0),
> + DEFINE_PROP_UINT8("width", struct pflash_t, width, 0),
> + DEFINE_PROP_UINT8("be", struct pflash_t, be, 0),
> + DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0),
> + DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0),
> + DEFINE_PROP_UINT16("id2", struct pflash_t, ident2, 0),
> + DEFINE_PROP_UINT16("id3", struct pflash_t, ident3, 0),
> + DEFINE_PROP_STRING("name", struct pflash_t, name),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
> +
> + k->init = pflash_cfi01_init;
> + dc->props = pflash_cfi01_properties;
> +}
> +
> +
> +static const TypeInfo pflash_cfi01_info = {
> + .name = "cfi.pflash01",
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(struct pflash_t),
> + .class_init = pflash_cfi01_class_init,
> +};
> +
> +static void pflash_cfi01_register_types(void)
> +{
> + type_register_static(&pflash_cfi01_info);
> +}
> +
> +type_init(pflash_cfi01_register_types)
> +
> +pflash_t *pflash_cfi01_register(target_phys_addr_t base,
> + DeviceState *qdev, const char *name,
> + target_phys_addr_t size,
> + BlockDriverState *bs,
> + uint32_t sector_len, int nb_blocs, int width,
> + uint16_t id0, uint16_t id1,
> + uint16_t id2, uint16_t id3, int be)
> +{
> + DeviceState *dev = qdev_create(NULL, "cfi.pflash01");
> + SysBusDevice *busdev = sysbus_from_qdev(dev);
> + pflash_t *pfl = (pflash_t *)object_dynamic_cast(OBJECT(dev),
> + "cfi.pflash01");
> +
> + if (bs && qdev_prop_set_drive(dev, "bdrv", bs)) {
> + abort();
> + }
> + qdev_prop_set_uint32(dev, "nb_blocs", nb_blocs);
> + qdev_prop_set_uint32(dev, "sector_len", sector_len);
> + qdev_prop_set_uint8(dev, "width", width);
> + qdev_prop_set_uint8(dev, "be", !!be);
> + qdev_prop_set_uint16(dev, "id0", id0);
> + qdev_prop_set_uint16(dev, "id1", id1);
> + qdev_prop_set_uint16(dev, "id2", id2);
> + qdev_prop_set_uint16(dev, "id3", id3);
> + qdev_init_nofail(dev);
> +
> + sysbus_mmio_map(busdev, 0, base);
> return pfl;
> }
>
> diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
> index 43fb3a4..db05fe6 100644
> --- a/hw/pflash_cfi02.c
> +++ b/hw/pflash_cfi02.c
> @@ -41,6 +41,7 @@
> #include "block.h"
> #include "exec-memory.h"
> #include "host-utils.h"
> +#include "sysbus.h"
>
> //#define PFLASH_DEBUG
> #ifdef PFLASH_DEBUG
> @@ -55,18 +56,36 @@ do { \
> #define PFLASH_LAZY_ROMD_THRESHOLD 42
>
> struct pflash_t {
> + SysBusDevice busdev;
> BlockDriverState *bs;
> uint32_t sector_len;
> + uint32_t nb_blocs;
> uint32_t chip_len;
> - int mappings;
> - int width;
> + uint8_t mappings;
> + uint8_t width;
> + uint8_t be;
> int wcycle; /* if 0, the flash is read normally */
> int bypass;
> int ro;
> uint8_t cmd;
> uint8_t status;
> - uint16_t ident[4];
> - uint16_t unlock_addr[2];
> + /* FIXME: implement array device properties */
> + union {
> + uint16_t ident[4];
> + struct {
> + uint16_t ident0;
> + uint16_t ident1;
> + uint16_t ident2;
> + uint16_t ident3;
> + };
> + };
> + union {
> + uint16_t unlock_addr[2];
> + struct {
> + uint16_t unlock_addr0;
> + uint16_t unlock_addr1;
> + };
> + };
> uint8_t cfi_len;
> uint8_t cfi_table[0x52];
> QEMUTimer *timer;
> @@ -79,6 +98,7 @@ struct pflash_t {
> MemoryRegion orig_mem;
> int rom_mode;
> int read_counter; /* used for lazy switch-back to rom mode */
> + char *name;
> void *storage;
> };
>
> @@ -574,49 +594,42 @@ static const MemoryRegionOps pflash_cfi02_ops_le = {
> .endianness = DEVICE_NATIVE_ENDIAN,
> };
>
> -pflash_t *pflash_cfi02_register(target_phys_addr_t base,
> - DeviceState *qdev, const char *name,
> - target_phys_addr_t size,
> - BlockDriverState *bs, uint32_t sector_len,
> - int nb_blocs, int nb_mappings, int width,
> - uint16_t id0, uint16_t id1,
> - uint16_t id2, uint16_t id3,
> - uint16_t unlock_addr0, uint16_t unlock_addr1,
> - int be)
> +static int pflash_cfi02_init(SysBusDevice *dev)
> {
> - pflash_t *pfl;
> + pflash_t *pfl = FROM_SYSBUS(typeof(*pfl), dev);
> int32_t chip_len;
> int ret;
>
> - chip_len = sector_len * nb_blocs;
> + chip_len = pfl->sector_len * pfl->nb_blocs;
> /* XXX: to be fixed */
> #if 0
> if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) &&
> total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024))
> return NULL;
> #endif
> - pfl = g_malloc0(sizeof(pflash_t));
> - memory_region_init_rom_device(
> - &pfl->orig_mem, be ? &pflash_cfi02_ops_be : &pflash_cfi02_ops_le, pfl,
> - name, size);
> - vmstate_register_ram(&pfl->orig_mem, qdev);
> +
> + if (!pfl->name) {
> + static int next;
> + pfl->name = g_strdup_printf("pflash.cfi01.%d", next++);
> + }
> + memory_region_init_rom_device(&pfl->orig_mem, pfl->be ?
> + &pflash_cfi02_ops_be : &pflash_cfi02_ops_le,
> + pfl, pfl->name, chip_len);
> + vmstate_register_ram(&pfl->orig_mem, DEVICE(pfl));
> pfl->storage = memory_region_get_ram_ptr(&pfl->orig_mem);
> pfl->chip_len = chip_len;
> - pfl->mappings = nb_mappings;
> - pfl->bs = bs;
> if (pfl->bs) {
> /* read the initial flash content */
> ret = bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9);
> if (ret < 0) {
> g_free(pfl);
> - return NULL;
> + return 1;
> }
> - bdrv_attach_dev_nofail(pfl->bs, pfl);
> }
>
> pflash_setup_mappings(pfl);
> pfl->rom_mode = 1;
> - memory_region_add_subregion(get_system_memory(), base, &pfl->mem);
> + sysbus_init_mmio(dev, &pfl->mem);
>
> if (pfl->bs) {
> pfl->ro = bdrv_is_read_only(pfl->bs);
> @@ -625,17 +638,9 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base,
> }
>
> pfl->timer = qemu_new_timer_ns(vm_clock, pflash_timer, pfl);
> - pfl->sector_len = sector_len;
> - pfl->width = width;
> pfl->wcycle = 0;
> pfl->cmd = 0;
> pfl->status = 0;
> - pfl->ident[0] = id0;
> - pfl->ident[1] = id1;
> - pfl->ident[2] = id2;
> - pfl->ident[3] = id3;
> - pfl->unlock_addr[0] = unlock_addr0;
> - pfl->unlock_addr[1] = unlock_addr1;
> /* Hardcoded CFI table (mostly from SG29 Spansion flash) */
> pfl->cfi_len = 0x52;
> /* Standard "QRY" string */
> @@ -691,10 +696,10 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base,
> /* Number of erase block regions (uniform) */
> pfl->cfi_table[0x2C] = 0x01;
> /* Erase block region 1 */
> - pfl->cfi_table[0x2D] = nb_blocs - 1;
> - pfl->cfi_table[0x2E] = (nb_blocs - 1) >> 8;
> - pfl->cfi_table[0x2F] = sector_len >> 8;
> - pfl->cfi_table[0x30] = sector_len >> 16;
> + pfl->cfi_table[0x2D] = pfl->nb_blocs - 1;
> + pfl->cfi_table[0x2E] = (pfl->nb_blocs - 1) >> 8;
> + pfl->cfi_table[0x2F] = pfl->sector_len >> 8;
> + pfl->cfi_table[0x30] = pfl->sector_len >> 16;
>
> /* Extended */
> pfl->cfi_table[0x31] = 'P';
> @@ -714,5 +719,80 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base,
> pfl->cfi_table[0x3b] = 0x00;
> pfl->cfi_table[0x3c] = 0x00;
>
> + return 0;
> +}
> +
> +static Property pflash_cfi02_properties[] = {
> + DEFINE_PROP_DRIVE("bdrv", struct pflash_t, bs),
> + DEFINE_PROP_UINT32("nb_blocs", struct pflash_t, nb_blocs, 0),
> + DEFINE_PROP_UINT32("sector_len", struct pflash_t, sector_len, 0),
> + DEFINE_PROP_UINT8("width", struct pflash_t, width, 0),
> + DEFINE_PROP_UINT8("mappings", struct pflash_t, mappings, 0),
> + DEFINE_PROP_UINT8("be", struct pflash_t, be, 0),
> + DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0),
> + DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0),
> + DEFINE_PROP_UINT16("id2", struct pflash_t, ident2, 0),
> + DEFINE_PROP_UINT16("id3", struct pflash_t, ident3, 0),
> + DEFINE_PROP_UINT16("unlock_addr0", struct pflash_t, unlock_addr0, 0),
> + DEFINE_PROP_UINT16("unlock_addr1", struct pflash_t, unlock_addr1, 0),
> + DEFINE_PROP_STRING("name", struct pflash_t, name),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void pflash_cfi02_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
> +
> + k->init = pflash_cfi02_init;
> + dc->props = pflash_cfi02_properties;
> +}
> +
> +static const TypeInfo pflash_cfi02_info = {
> + .name = "cfi.pflash02",
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(struct pflash_t),
> + .class_init = pflash_cfi02_class_init,
> +};
> +
> +static void pflash_cfi02_register_types(void)
> +{
> + type_register_static(&pflash_cfi02_info);
> +}
> +
> +type_init(pflash_cfi02_register_types)
> +
> +pflash_t *pflash_cfi02_register(target_phys_addr_t base,
> + DeviceState *qdev, const char *name,
> + target_phys_addr_t size,
> + BlockDriverState *bs, uint32_t sector_len,
> + int nb_blocs, int nb_mappings, int width,
> + uint16_t id0, uint16_t id1,
> + uint16_t id2, uint16_t id3,
> + uint16_t unlock_addr0, uint16_t unlock_addr1,
> + int be)
> +{
> + DeviceState *dev = qdev_create(NULL, "cfi.pflash02");
> + SysBusDevice *busdev = sysbus_from_qdev(dev);
> + pflash_t *pfl = (pflash_t *)object_dynamic_cast(OBJECT(dev),
> + "cfi.pflash02");
> +
> + if (bs && qdev_prop_set_drive(dev, "bdrv", bs)) {
> + abort();
> + }
> + qdev_prop_set_uint32(dev, "nb_blocs", nb_blocs);
> + qdev_prop_set_uint32(dev, "sector_len", sector_len);
> + qdev_prop_set_uint8(dev, "width", width);
> + qdev_prop_set_uint8(dev, "mappings", nb_mappings);
> + qdev_prop_set_uint8(dev, "be", !!be);
> + qdev_prop_set_uint16(dev, "id0", id0);
> + qdev_prop_set_uint16(dev, "id1", id1);
> + qdev_prop_set_uint16(dev, "id2", id2);
> + qdev_prop_set_uint16(dev, "id3", id3);
> + qdev_prop_set_uint16(dev, "unlock_addr0", unlock_addr0);
> + qdev_prop_set_uint16(dev, "unlock_addr1", unlock_addr1);
> + qdev_init_nofail(dev);
> +
> + sysbus_mmio_map(busdev, 0, base);
> return pfl;
> }
>
next prev parent reply other threads:[~2012-10-19 10:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-19 6:40 [Qemu-devel] [PATCH v1 0/7] QOMify pflash_cfi0x + PL353 for Xilinx Zynq Peter Crosthwaite
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 1/7] pflash_cfi0x: remove unused base field Peter Crosthwaite
2012-10-19 7:58 ` Peter Maydell
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 2/7] pflash_cfi01: remove unused total_len field Peter Crosthwaite
2012-10-19 7:59 ` Peter Maydell
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 3/7] pflash_cfi0x: QOMified Peter Crosthwaite
2012-10-19 10:08 ` Paolo Bonzini [this message]
2012-10-19 10:24 ` Peter Maydell
2012-10-22 6:46 ` Peter Crosthwaite
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 4/7] sysbus/sysbus_mmio_map: parameterise mapped region Peter Crosthwaite
2012-10-19 8:06 ` Peter Maydell
2012-10-19 9:01 ` Peter Crosthwaite
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 5/7] hw: Model of Primecell pl35x mem controller Peter Crosthwaite
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 6/7] xilinx_zynq: add pl353 Peter Crosthwaite
2012-10-19 10:32 ` Peter Maydell
2012-10-19 23:00 ` Peter Crosthwaite
2012-10-19 6:40 ` [Qemu-devel] [PATCH v1 7/7] nand: Reset addressing after READSTATUS Peter Crosthwaite
2012-10-19 11:59 ` Peter Maydell
2012-10-19 12:18 ` Edgar E. Iglesias
2012-10-22 7:05 ` Peter Crosthwaite
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=508126B5.6020308@redhat.com \
--to=pbonzini@redhat.com \
--cc=edgar.iglesias@gmail.com \
--cc=john.williams@xilinx.com \
--cc=peter.crosthwaite@xilinx.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.