From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glbzn-00056X-CP for qemu-devel@nongnu.org; Mon, 21 Jan 2019 11:00:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glbzl-0007CD-7I for qemu-devel@nongnu.org; Mon, 21 Jan 2019 11:00:19 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1glbzk-0007Af-Rc for qemu-devel@nongnu.org; Mon, 21 Jan 2019 11:00:17 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0LFwrdl099657 for ; Mon, 21 Jan 2019 11:00:14 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2q5fpqvbx7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 21 Jan 2019 11:00:14 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Jan 2019 16:00:11 -0000 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 21 Jan 2019 17:00:02 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Message-Id: <20190121160002.731-1-clg@kaod.org> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] m25p80: add basic support for the SFPD command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Alistair Francis , Peter Crosthwaite , Max Reitz , Kevin Wolf , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= JEDEC STANDARD JESD216 for Serial Flash Discovery Parameters (SFDP) provides a mean to describe the features of a serial flash device using a set of internal parameter tables. This is the initial framework for the RDSFPD command which is given access to a private SFPD area under the flash. This area now needs to be populated with the flash device characteristics, presumingly with the values from the FlashPartInfo array. Signed-off-by: C=C3=A9dric Le Goater --- hw/block/m25p80.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index e8dfa14b332f..581a9e1fb82e 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -340,6 +340,7 @@ typedef enum { BULK_ERASE =3D 0xc7, READ_FSR =3D 0x70, RDCR =3D 0x15, + RDSFPD =3D 0x5a, =20 READ =3D 0x03, READ4 =3D 0x13, @@ -405,6 +406,7 @@ typedef enum { STATE_COLLECTING_DATA, STATE_COLLECTING_VAR_LEN_DATA, STATE_READING_DATA, + STATE_READING_SFPD, } CMDState; =20 typedef enum { @@ -456,6 +458,8 @@ typedef struct Flash { =20 int64_t dirty_page; =20 +#define M25P80_SFPD_AREA_SIZE 0x100 + uint8_t sfpd_area[M25P80_SFPD_AREA_SIZE]; const FlashPartInfo *pi; =20 } Flash; @@ -626,6 +630,8 @@ static inline int get_addr_length(Flash *s) } =20 switch (s->cmd_in_progress) { + case RDSFPD: + return 3; case PP4: case PP4_4: case QPP_4: @@ -748,11 +754,55 @@ static void complete_collecting_data(Flash *s) " by device\n"); } break; + + case RDSFPD: + if (s->cur_addr < M25P80_SFPD_AREA_SIZE) { + s->state =3D STATE_READING_SFPD; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: Invalid SFPD address %#" PRIx32 "\n", + s->cur_addr); + } + break; + default: break; } } =20 +static void reset_memory_sfpd(Flash *s) +{ + s->sfpd_area[0x00] =3D 'S'; + s->sfpd_area[0x01] =3D 'F'; + s->sfpd_area[0x02] =3D 'P'; + s->sfpd_area[0x03] =3D 'D'; + + s->sfpd_area[0x04] =3D 0x00; /* SFDP Minor Revision Number */ + s->sfpd_area[0x05] =3D 0x01; /* SFDP Major Revision Number */ + s->sfpd_area[0x06] =3D 0x01; /* Number of Parameter Headers */ + s->sfpd_area[0x07] =3D 0xFF; /* Unused */ + + s->sfpd_area[0x08] =3D 0x00; /* ID Number. 0x0 : JEDEC */ + s->sfpd_area[0x09] =3D 0x00; /* Parameter Table Minor Revision */ + s->sfpd_area[0x0A] =3D 0x01; /* Parameter Table Major Revision */ + s->sfpd_area[0x0B] =3D 0x09; /* Parameter Table Length (DWORD) */ + s->sfpd_area[0x0C] =3D 0x30; /* Parameter Table Pointer */ + s->sfpd_area[0x0D] =3D 0x00; /* Parameter Table Pointer */ + s->sfpd_area[0x0E] =3D 0x00; /* Parameter Table Pointer */ + s->sfpd_area[0x0F] =3D 0xFF; /* Unused */ + + s->sfpd_area[0x10] =3D s->pi->id[0]; /* ID Number. Manufacturer */ + s->sfpd_area[0x11] =3D 0x00; /* Parameter Table Minor Revision */ + s->sfpd_area[0x12] =3D 0x01; /* Parameter Table Major Revision */ + s->sfpd_area[0x13] =3D 0x04; /* Parameter Table Length (DWORD) */ + s->sfpd_area[0x14] =3D 0x60; /* Parameter Table Pointer */ + s->sfpd_area[0x15] =3D 0x00; /* Parameter Table Pointer */ + s->sfpd_area[0x16] =3D 0x00; /* Parameter Table Pointer */ + s->sfpd_area[0x17] =3D 0xFF; /* Unused */ + + /* TODO: populate accordingly to chip model */ +} + static void reset_memory(Flash *s) { s->cmd_in_progress =3D NOP; @@ -822,6 +872,8 @@ static void reset_memory(Flash *s) break; } =20 + reset_memory_sfpd(s); + DB_PRINT_L(0, "Reset done.\n"); } =20 @@ -1049,6 +1101,13 @@ static void decode_new_cmd(Flash *s, uint32_t valu= e) s->state =3D STATE_READING_DATA; break; =20 + case RDSFPD: + s->needed_bytes =3D get_addr_length(s) + 1 ; /* SFPD addr + dumm= y */ + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + break; + case RDCR: s->data[0] =3D s->volatile_cfg & 0xFF; s->data[0] |=3D (!!s->four_bytes_address_mode) << 5; @@ -1241,6 +1300,8 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint= 32_t tx) } =20 r =3D s->data[s->pos]; + DB_PRINT_L(1, "READ DATA 0x%" PRIx32 "=3D%" PRIx8 "\n", s->pos, + (uint8_t)r); s->pos++; if (s->pos =3D=3D s->len) { s->pos =3D 0; @@ -1249,6 +1310,12 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uin= t32_t tx) } } break; + case STATE_READING_SFPD: + r =3D s->sfpd_area[s->cur_addr]; + DB_PRINT_L(1, "READ SFPD 0x%" PRIx32 "=3D%" PRIx8 "\n", s->cur_a= ddr, + (uint8_t)r); + s->cur_addr =3D (s->cur_addr + 1) & (M25P80_SFPD_AREA_SIZE - 1); + break; =20 default: case STATE_IDLE: --=20 2.20.1