From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRfc-0002mO-QK for qemu-devel@nongnu.org; Thu, 16 Jun 2016 03:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDRfY-0001Zv-Kc for qemu-devel@nongnu.org; Thu, 16 Jun 2016 03:24:55 -0400 Received: from 10.mo3.mail-out.ovh.net ([87.98.165.232]:50260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRfY-0001Zr-9N for qemu-devel@nongnu.org; Thu, 16 Jun 2016 03:24:52 -0400 Received: from player772.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 5F3231000320 for ; Thu, 16 Jun 2016 09:24:51 +0200 (CEST) References: <1465998071-7355-1-git-send-email-marcin.krzeminski@nokia.com> <1465998071-7355-8-git-send-email-marcin.krzeminski@nokia.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <5762543E.9040006@kaod.org> Date: Thu, 16 Jun 2016 09:24:46 +0200 MIME-Version: 1.0 In-Reply-To: <1465998071-7355-8-git-send-email-marcin.krzeminski@nokia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 7/9] m25p80: Introduce configuration registers. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcin.krzeminski@nokia.com, qemu-devel@nongnu.org Cc: crosthwaitepeter@gmail.com, pawel.lenkow@itlen.com, peter.maydell@linaro.org On 06/15/2016 03:41 PM, marcin.krzeminski@nokia.com wrote: > From: Marcin Krzeminski >=20 > Configuration registers for Spansion and Macronix devices. >=20 > Signed-off-by: Marcin Krzeminski Reviewed-by: C=E9dric Le Goater I don't think we can define a property array. can we ?=20 > --- > hw/block/m25p80.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 47 insertions(+) >=20 > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index d1c4d46..21998db 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -134,6 +134,14 @@ typedef struct FlashPartInfo { > #define FSR_4BYTE_ADDR_MODE_ENABLED 0x1 > #define FSR_FLASH_READY (1 << 7) >=20 > +/* Spansion configuration registers macros. */ > +#define SPANSION_QUAD_CFG_POS 0 > +#define SPANSION_QUAD_CFG_LEN 1 > +#define SPANSION_DUMMY_CLK_POS 0 > +#define SPANSION_DUMMY_CLK_LEN 4 > +#define SPANSION_ADDR_LEN_POS 7 > +#define SPANSION_ADDR_LEN_LEN 1 > + > static const FlashPartInfo known_devices[] =3D { > /* Atmel -- some are (confusingly) marketed as "DataFlash" */ > { INFO("at25fs010", 0x1f6601, 0, 32 << 10, 4, ER_4K) }, > @@ -369,8 +377,18 @@ typedef struct Flash { > uint8_t cmd_in_progress; > uint64_t cur_addr; > uint32_t nonvolatile_cfg; > + /* Configuration register for Macronix */ > uint32_t volatile_cfg; > uint32_t enh_volatile_cfg; > + /* Spansion cfg registers. */ > + uint8_t spansion_cr1nv; > + uint8_t spansion_cr2nv; > + uint8_t spansion_cr3nv; > + uint8_t spansion_cr4nv; > + uint8_t spansion_cr1v; > + uint8_t spansion_cr2v; > + uint8_t spansion_cr3v; > + uint8_t spansion_cr4v; > bool write_enable; > bool four_bytes_address_mode; > bool reset_enable; > @@ -601,6 +619,9 @@ static void complete_collecting_data(Flash *s) > break; > case MAN_MACRONIX: > s->quad_enable =3D extract32(s->data[0], 6, 1); > + if (s->len > 1) { > + s->four_bytes_address_mode =3D extract32(s->data[1], 5= , 1); > + } > break; > default: > break; > @@ -674,6 +695,23 @@ static void reset_memory(Flash *s) > s->ear =3D s->size / MAX_3BYTES_SIZE - 1; > } > break; > + case MAN_MACRONIX: > + s->volatile_cfg =3D 0x7; > + break; > + case MAN_SPANSION: > + s->spansion_cr1v =3D s->spansion_cr1nv; > + s->spansion_cr2v =3D s->spansion_cr2nv; > + s->spansion_cr3v =3D s->spansion_cr3nv; > + s->spansion_cr4v =3D s->spansion_cr4nv; > + s->quad_enable =3D extract32(s->spansion_cr1v, > + SPANSION_QUAD_CFG_POS, > + SPANSION_QUAD_CFG_LEN > + ); > + s->four_bytes_address_mode =3D extract32(s->spansion_cr2v, > + SPANSION_ADDR_LEN_POS, > + SPANSION_ADDR_LEN_LEN > + ); > + break; > default: > break; > } > @@ -1052,7 +1090,12 @@ static void m25p80_pre_save(void *opaque) > } >=20 > static Property m25p80_properties[] =3D { > + /* This is default value for Micron flash */ > DEFINE_PROP_UINT32("nonvolatile-cfg", Flash, nonvolatile_cfg, 0x8F= FF), > + DEFINE_PROP_UINT8("spansion-cr1nv", Flash, spansion_cr1nv, 0x0), > + DEFINE_PROP_UINT8("spansion-cr2nv", Flash, spansion_cr2nv, 0x8), > + DEFINE_PROP_UINT8("spansion-cr3nv", Flash, spansion_cr3nv, 0x2), > + DEFINE_PROP_UINT8("spansion-cr4nv", Flash, spansion_cr4nv, 0x10), > DEFINE_PROP_END_OF_LIST(), > }; >=20 > @@ -1077,6 +1120,10 @@ static const VMStateDescription vmstate_m25p80 =3D= { > VMSTATE_UINT32_V(volatile_cfg, Flash, 2), > VMSTATE_UINT32_V(enh_volatile_cfg, Flash, 2), > VMSTATE_BOOL_V(quad_enable, Flash, 3), > + VMSTATE_UINT8_V(spansion_cr1nv, Flash, 3), > + VMSTATE_UINT8_V(spansion_cr2nv, Flash, 3), > + VMSTATE_UINT8_V(spansion_cr3nv, Flash, 3), > + VMSTATE_UINT8_V(spansion_cr4nv, Flash, 3), > VMSTATE_END_OF_LIST() > } > }; >=20