From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai3vT-0000fH-VM for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:47:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai3vR-0006en-6A for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:47:35 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:53614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai3vQ-0006ei-SO for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:47:33 -0400 Received: from localhost by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Mar 2016 17:47:31 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id A9FDB219005F for ; Mon, 21 Mar 2016 17:47:11 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2LHlUma65274054 for ; Mon, 21 Mar 2016 17:47:30 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2LHlTC4025403 for ; Mon, 21 Mar 2016 11:47:29 -0600 References: <1458498493-13906-1-git-send-email-marcin.krzeminski@nokia.com> <1458498493-13906-6-git-send-email-marcin.krzeminski@nokia.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <56F033AA.4090501@fr.ibm.com> Date: Mon, 21 Mar 2016 18:47:22 +0100 MIME-Version: 1.0 In-Reply-To: <1458498493-13906-6-git-send-email-marcin.krzeminski@nokia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 05/11] block: m25p80: 4byte address mode 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, rfsw-patches@mlist.nsn-inter.net Hello again, One question below. On 03/20/2016 07:28 PM, marcin.krzeminski@nokia.com wrote: > From: Marcin Krzeminski > > This patch adds only 4byte address mode (does not cover dummy cycles). > This mode is needed to access more than 16 MiB of flash. > > Signed-off-by: Marcin Krzeminski > Reviewed-by: Peter Crosthwaite > --- > hw/block/m25p80.c | 43 +++++++++++++++++++++++++++++++++---------- > 1 file changed, 33 insertions(+), 10 deletions(-) > > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index c5de4ee..101a43f 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -237,6 +237,9 @@ typedef enum { > ERASE_32K = 0x52, > ERASE_SECTOR = 0xd8, > > + EN_4BYTE_ADDR = 0xB7, > + EX_4BYTE_ADDR = 0xE9, > + > EXTEND_ADDR_READ = 0xC8, > EXTEND_ADDR_WRITE = 0xC5, > > @@ -269,6 +272,7 @@ typedef struct Flash { > uint8_t cmd_in_progress; > uint64_t cur_addr; > bool write_enable; > + bool four_bytes_address_mode; > bool reset_enable; > uint8_t ear; > > @@ -406,12 +410,25 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data) > s->dirty_page = page; > } > > +static inline int get_addr_length(Flash *s) > +{ > + return s->four_bytes_address_mode ? 4 : 3; > +} > + > static void complete_collecting_data(Flash *s) > { > - s->cur_addr = s->data[0] << 16; > - s->cur_addr |= s->data[1] << 8; > - s->cur_addr |= s->data[2]; > - s->cur_addr += (s->ear & 0x3) * MAX_3BYTES_SIZE; > + int i; > + > + s->cur_addr = 0; > + > + for (i = 0; i < get_addr_length(s); ++i) { > + s->cur_addr <<= 8; > + s->cur_addr |= s->data[i]; > + } > + > + if (get_addr_length(s) == 3) { > + s->cur_addr += (s->ear & 0x3) * MAX_3BYTES_SIZE; > + } > > s->state = STATE_IDLE; > > @@ -452,6 +469,7 @@ static void reset_memory(Flash *s) > s->cmd_in_progress = NOP; > s->cur_addr = 0; > s->ear = 0; > + s->four_bytes_address_mode = false; > s->len = 0; > s->needed_bytes = 0; > s->pos = 0; > @@ -480,7 +498,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) > case DPP: > case QPP: > case PP: > - s->needed_bytes = 3; > + s->needed_bytes = get_addr_length(s); > s->pos = 0; > s->len = 0; > s->state = STATE_COLLECTING_DATA; > @@ -489,7 +507,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) > case FAST_READ: > case DOR: > case QOR: > - s->needed_bytes = 4; > + s->needed_bytes = get_addr_length(s) + 1; > s->pos = 0; > s->len = 0; > s->state = STATE_COLLECTING_DATA; > @@ -501,9 +519,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) > case JEDEC_SPANSION: > s->needed_bytes = 4; > break; > - case JEDEC_NUMONYX: JEDEC_NUMONYX is being removed ? > default: > - s->needed_bytes = 5; > + s->needed_bytes = get_addr_length(s) + 2; > } > s->pos = 0; > s->len = 0; > @@ -516,9 +533,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) > case JEDEC_SPANSION: > s->needed_bytes = 6; > break; > - case JEDEC_NUMONYX: and here also. Is that a typo ? Thanks, C. > default: > - s->needed_bytes = 8; > + s->needed_bytes = get_addr_length(s) + 4; > } > s->pos = 0; > s->len = 0; > @@ -575,6 +591,12 @@ static void decode_new_cmd(Flash *s, uint32_t value) > break; > case NOP: > break; > + case EN_4BYTE_ADDR: > + s->four_bytes_address_mode = true; > + break; > + case EX_4BYTE_ADDR: > + s->four_bytes_address_mode = false; > + break; > case EXTEND_ADDR_READ: > s->data[0] = s->ear; > s->pos = 0; > @@ -729,6 +751,7 @@ static const VMStateDescription vmstate_m25p80 = { > VMSTATE_UINT8(cmd_in_progress, Flash), > VMSTATE_UINT64(cur_addr, Flash), > VMSTATE_BOOL(write_enable, Flash), > + VMSTATE_BOOL(four_bytes_address_mode, Flash), > VMSTATE_UINT8(ear, Flash), > VMSTATE_BOOL(reset_enable, Flash), > VMSTATE_END_OF_LIST() >