From patchwork Thu Feb 4 12:23:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: marcin.krzeminski@nokia.com X-Patchwork-Id: 8220821 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 29937BEEE5 for ; Thu, 4 Feb 2016 12:30:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 917542034C for ; Thu, 4 Feb 2016 12:30:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E0A0220253 for ; Thu, 4 Feb 2016 12:30:26 +0000 (UTC) Received: from localhost ([::1]:41336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRJ3K-00089g-A2 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Feb 2016 07:30:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIws-00060S-1l for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRIwo-0008Np-SR for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:45 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:59356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRIwo-0008Mu-K8 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 07:23:42 -0500 Received: from demuprx017.emea.nsn-intra.net ([10.150.129.56]) by demumfd001.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u14CNcWT004006 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Feb 2016 12:23:38 GMT Received: from CNU418C7XK.nsn-intra.net ([10.154.155.152]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u14CNXOD022276; Thu, 4 Feb 2016 13:23:37 +0100 From: marcin.krzeminski@nokia.com To: qemu-devel@nongnu.org Date: Thu, 4 Feb 2016 13:23:22 +0100 Message-Id: <1454588606-14094-8-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454588606-14094-1-git-send-email-marcin.krzeminski@nokia.com> References: <1454588606-14094-1-git-send-email-marcin.krzeminski@nokia.com> X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 1470 X-purgate-ID: 151667::1454588618-00001C0B-4791906D/0/0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 93.183.12.32 Cc: crosthwaitepeter@gmail.com, clg@fr.ibm.com, pawel.lenkow@itlen.com, marcin.krzeminski@nokia.com Subject: [Qemu-devel] [PATCH v2 07/11] block: m25p80: Dummy cycles for N25Q256/512 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marcin Krzeminski This patch handles dummy cycles. Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index a213587..df1f829 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -531,6 +531,10 @@ static void decode_new_cmd(Flash *s, uint32_t value) case DOR: case QOR: s->needed_bytes = get_cmd_length(s); + if ( ((s->pi->jedec >> 16) & 0xFF) == JEDEC_NUMONYX ) { + /* Dummy cycles - modeled with bytes writes instead of bits */ + s->needed_bytes += extract32(s->volatile_cfg,4,4); + } s->pos = 0; s->len = 0; s->state = STATE_COLLECTING_DATA; @@ -544,6 +548,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_NUMONYX: s->needed_bytes = get_cmd_length(s); + s->needed_bytes += extract32(s->volatile_cfg,4,4); break; default: s->needed_bytes = 5; @@ -561,6 +566,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case JEDEC_NUMONYX: s->needed_bytes = get_cmd_length(s); + s->needed_bytes += extract32(s->volatile_cfg,4,4); break; default: s->needed_bytes = 8;