From patchwork Sun Nov 26 23:16:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Francisco Iglesias X-Patchwork-Id: 841434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="m3anlYtp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ylQng2v9mz9s7G for ; Mon, 27 Nov 2017 10:17:41 +1100 (AEDT) Received: from localhost ([::1]:58419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ6B8-0004MD-Hl for incoming@patchwork.ozlabs.org; Sun, 26 Nov 2017 18:17:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ6AG-0004Ge-Pw for qemu-devel@nongnu.org; Sun, 26 Nov 2017 18:16:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJ6AF-0000po-Ra for qemu-devel@nongnu.org; Sun, 26 Nov 2017 18:16:44 -0500 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:34141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJ6AF-0000pM-JN for qemu-devel@nongnu.org; Sun, 26 Nov 2017 18:16:43 -0500 Received: by mail-lf0-x243.google.com with SMTP id i14so30684155lfc.1 for ; Sun, 26 Nov 2017 15:16:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xu0+yt3RLda/3XjDZAEzZwWRT0gdVqr5WLY5RIqSepc=; b=m3anlYtpcwHALgmGxsQU4hqPzTywU5zozz6PEfLrx3+AF4HE8xEbX5wwsqkncfALmr n7I6lvkvJLyrXsDQsoL1Rtb+USVJNXDEKB/uiB6bAtXYgE35Aj2xbn+wjIgAMsJWYuBe fcpoa2+DtWSR90WNU7/2QtKdemM9NWydQp3fTA9vvOUIdSPCFflUkX0Z/5W0W+3vuq0n iyZ6hT/nIedSUPnKNCiVV2wKPfld2UOFatpOi1/XQ1qlydc6I35K3hkGk1gn3GALHCsZ plaKj6mrwxz4/4bmxmdCqnkFj9wcDvOQCXqGTgbiZoKAl6i9eeZi1wwsw8TDVk/Vgx8z YTUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xu0+yt3RLda/3XjDZAEzZwWRT0gdVqr5WLY5RIqSepc=; b=kCSGApimAF1TaNw8WbYBjsgPIxsVcFe3mZ7gPVxzdvHeVDMQOMl5NBoJ1/srZGwqwQ LxWqJHZjPwhPpqF1D8/w1k8I+2flapVuxQhf7lXn6ZEBXsOgzE9wiz1Vup7gUjJPiKsS FmE1NhYxjWjzn6O3+i3xu2BoMQEbT9VsJpBYqSGOxmLEaQkgYc4u0vxlOMa2483De6LY h6wU+Exv+zAjP5D23UuUGCtSrs6tqDdgQsl0tltaBSgB+adJcQtoPgfSQoJaE3kgP2Mo kZyfEytpt8OUVF9F+RA1c7KDgvqEqSKjyUEpSMG0dViz96j0+M14JVSYhpHwOQWjW1l6 9iPw== X-Gm-Message-State: AJaThX4gIzLY6eYx7Kkeh49TW2KCEnWafq96w2uKNN0Oyz9qEGSuZgqw IeNWr2FrmZjWN9G4fGKDT/Ot1Q== X-Google-Smtp-Source: AGs4zMYFePngyb55SZbHcSfsd+pcbR6+x5l0vzDnIGed/u/tVOiJb3uMcJ8Q0dFwPX5Uhl5OwgPiaQ== X-Received: by 10.25.168.140 with SMTP id r134mr4206376lfe.65.1511738202025; Sun, 26 Nov 2017 15:16:42 -0800 (PST) Received: from localhost.localdomain (host-90-232-123-128.mobileonline.telia.com. [90.232.123.128]) by smtp.gmail.com with ESMTPSA id j63sm2070285lfg.95.2017.11.26.15.16.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 15:16:41 -0800 (PST) From: Francisco Iglesias To: qemu-devel@nongnu.org Date: Mon, 27 Nov 2017 00:16:23 +0100 Message-Id: <20171126231634.9531-3-frasse.iglesias@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171126231634.9531-1-frasse.iglesias@gmail.com> References: <20171126231634.9531-1-frasse.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PATCH v9 02/13] m25p80: Add support for SST READ ID 0x90/0xAB commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, francisco.iglesias@feimtech.se, f4bug@amsat.org, edgari@xilinx.com, alistai@xilinx.com, mar.krzeminski@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add support for SST READ ID 0x90/0xAB commands for reading out the flash manufacturer ID and device ID. Signed-off-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daudé --- hw/block/m25p80.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index d50acc1..092c0c6 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -355,6 +355,8 @@ typedef enum { DPP = 0xa2, QPP = 0x32, QPP_4 = 0x34, + RDID_90 = 0x90, + RDID_AB = 0xab, ERASE_4K = 0x20, ERASE4_4K = 0x21, @@ -405,6 +407,7 @@ typedef enum { MAN_MACRONIX, MAN_NUMONYX, MAN_WINBOND, + MAN_SST, MAN_GENERIC, } Manufacturer; @@ -476,6 +479,8 @@ static inline Manufacturer get_man(Flash *s) return MAN_SPANSION; case 0xC2: return MAN_MACRONIX; + case 0xBF: + return MAN_SST; default: return MAN_GENERIC; } @@ -711,6 +716,31 @@ static void complete_collecting_data(Flash *s) case WEVCR: s->enh_volatile_cfg = s->data[0]; break; + case RDID_90: + case RDID_AB: + if (get_man(s) == MAN_SST) { + if (s->cur_addr <= 1) { + if (s->cur_addr) { + s->data[0] = s->pi->id[2]; + s->data[1] = s->pi->id[0]; + } else { + s->data[0] = s->pi->id[0]; + s->data[1] = s->pi->id[2]; + } + s->pos = 0; + s->len = 2; + s->data_read_loop = true; + s->state = STATE_READING_DATA; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: Invalid read id address\n"); + } + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: Read id (command 0x90/0xAB) is not supported" + " by device\n"); + } + break; default: break; } @@ -926,6 +956,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) case PP4: case PP4_4: case DIE_ERASE: + case RDID_90: + case RDID_AB: s->needed_bytes = get_addr_length(s); s->pos = 0; s->len = 0;