From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXlT3-00062w-6W for qemu-devel@nongnu.org; Mon, 22 Feb 2016 03:03:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXlT2-0007jB-Bq for qemu-devel@nongnu.org; Mon, 22 Feb 2016 03:03:41 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:54401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXlT2-0007j6-34 for qemu-devel@nongnu.org; Mon, 22 Feb 2016 03:03:40 -0500 From: marcin.krzeminski@nokia.com Date: Mon, 22 Feb 2016 09:03:25 +0100 Message-Id: <1456128205-5092-12-git-send-email-marcin.krzeminski@nokia.com> In-Reply-To: <1456128205-5092-1-git-send-email-marcin.krzeminski@nokia.com> References: <1456128205-5092-1-git-send-email-marcin.krzeminski@nokia.com> Subject: [Qemu-devel] [PATCH v4 11/11] block: m25p80: at25128a/at25256a models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com From: Marcin Krzeminski Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 2b7d19f..987fe07 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -99,6 +99,12 @@ static const FlashPartInfo known_devices[] = { { INFO("at45db081d", 0x1f2500, 0, 64 << 10, 16, ER_4K) }, + /* Atmel EEPROMS - it is assumed, that don't care bit in command + * is set to 0. Block protection is not supported. + */ + { INFO("at25128a-nonjedec", 0x0, 0, 1, 131072, WR_1) }, + { INFO("at25256a-nonjedec", 0x0, 0, 1, 262144, WR_1) }, + /* EON -- en25xxx */ { INFO("en25f32", 0x1c3116, 0, 64 << 10, 64, ER_4K) }, { INFO("en25p32", 0x1c2016, 0, 64 << 10, 64, 0) }, @@ -438,6 +444,11 @@ void flash_write8(Flash *s, uint64_t addr, uint8_t data) static inline int get_addr_length(Flash *s) { + /* check if eeprom is in use */ + if (s->pi->flags == WR_1) { + return 2; + } + switch (s->cmd_in_progress) { case PP4: case READ4: -- 2.5.0