From patchwork Sun Oct 29 10:13:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Francisco Iglesias X-Patchwork-Id: 831703 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="Nhjn0NtE"; 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 3yPtpJ6wDZz9t0F for ; Sun, 29 Oct 2017 21:17:28 +1100 (AEDT) Received: from localhost ([::1]:35469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8kek-0000PJ-UB for incoming@patchwork.ozlabs.org; Sun, 29 Oct 2017 06:17:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8kbJ-0006UE-7F for qemu-devel@nongnu.org; Sun, 29 Oct 2017 06:13:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8kbI-0007pN-93 for qemu-devel@nongnu.org; Sun, 29 Oct 2017 06:13:53 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:56413) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e8kbI-0007oZ-1Q for qemu-devel@nongnu.org; Sun, 29 Oct 2017 06:13:52 -0400 Received: by mail-lf0-x244.google.com with SMTP id 90so11649040lfs.13 for ; Sun, 29 Oct 2017 03:13:51 -0700 (PDT) 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=LQ0ruKnUlE+DgyjYfHiKoTnB/n7tJczzW3/L1uLzZ+w=; b=Nhjn0NtEEN5UE9f0qlLRMDu6tXcrYzCFuw8oWv0C9CUaqETGFL8rGei0lGu5mlWagN MhobOXfvR05tpigVtI29R3JzUCPgiMEImGVRHULgWWTsz2hQQ2oghjHXXcd89+LNBF0s Li4t28sEwNpHbtclmSTe9elKYX/39ox3PHGpBI++io1hF3Q06afq+3mgxzkXbA/4f6iL hNOTyQCvbS019cuBbZ6vCSbuZWV6Td1GRurJajg0uTsRGrjMsxgRXmSA0dqNwNHGJpDD 6Gu/EWR073Dnc/bhJ4L/KSzKmaiFn4FoaVmECdVkQbZeVSvuMP8ZNkZlPN4J4zXuuGBC xZag== 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=LQ0ruKnUlE+DgyjYfHiKoTnB/n7tJczzW3/L1uLzZ+w=; b=aKqQ7yFQoO8Dp8L46KTyuxXtRKWvZkFlDheh4qzJWdj+cZvu5CATG0N9TfZt8wBFqi V8xitAbTFrga33kq0Tc8iMYnMpvNiAK5u7QOuAquY4X+8T4QnMdJudCt6z/Yljgdqvyn +pKtdqH57o7DfDSM8MEKJwxFn99i9M6k5VDCp4hxzkj8jWMORAZMpZy+4mdWhkBBYewC KRVvsdmKi3XP5ylo9vf5Sou5u+zDZ6YJrVSB2CGxF5wPxsWYhh/dIo+P5FyLpGzv66yT aXfqYJjHY4/uszhMgCpziVEgkR0ycyjOeat3oBtmsDeTRNwAortbssmx1uhGJhBekPcJ TMxA== X-Gm-Message-State: AMCzsaXgwf0ZlH3aRmKk9ks+YuKkIaHCKbLEeSK72QjllvLjxTqnn0R1 Ngx7r8aNV505O9oToIiIWqNmuA== X-Google-Smtp-Source: ABhQp+RXkPNqPg1f5zJvJVkeo30cBX1lkfvg2a7C21TYrvXFwVzbccS+7VkuzaO5peWWUwd3yt1lRA== X-Received: by 10.46.75.26 with SMTP id y26mr2324930lja.113.1509272030542; Sun, 29 Oct 2017 03:13:50 -0700 (PDT) Received: from localhost.localdomain (c83-254-152-225.bredband.comhem.se. [83.254.152.225]) by smtp.gmail.com with ESMTPSA id v62sm2819800lje.39.2017.10.29.03.13.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Oct 2017 03:13:49 -0700 (PDT) From: Francisco Iglesias To: qemu-devel@nongnu.org Date: Sun, 29 Oct 2017 11:13:32 +0100 Message-Id: <20171029101343.15544-3-frasse.iglesias@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171029101343.15544-1-frasse.iglesias@gmail.com> References: <20171029101343.15544-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::244 Subject: [Qemu-devel] [PATCH v5 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: edgari@xilinx.com, alistai@xilinx.com, francisco.iglesias@feimtech.se, 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 manufacuter ID and device ID. Signed-off-by: Francisco Iglesias Acked-by: Alistair Francis Acked-by: Marcin KrzemiƄski --- hw/block/m25p80.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 2971519..7a5c137 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,22 @@ 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 && 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; + } + break; default: break; } @@ -926,6 +947,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;