From patchwork Fri Jun 24 08:07:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Krzeminski, Marcin (Nokia - PL/Wroclaw)" X-Patchwork-Id: 640081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3rbWH4561bz9s5J for ; Fri, 24 Jun 2016 18:10:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b=ceH5n82y; dkim-atps=neutral Received: from localhost ([::1]:41757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGMCD-0000sm-Bi for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2016 04:10:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGMAW-0007ji-TK for qemu-devel@nongnu.org; Fri, 24 Jun 2016 04:09:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGMAC-000857-Pl for qemu-devel@nongnu.org; Fri, 24 Jun 2016 04:08:51 -0400 Received: from mail-db3on0109.outbound.protection.outlook.com ([157.55.234.109]:19686 helo=emea01-db3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGMAC-00084m-9Z for qemu-devel@nongnu.org; Fri, 24 Jun 2016 04:08:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gbAlsPUM4JA0mUkeZtSYkC/mXQdnNQ1kAKIOV1AAyyo=; b=ceH5n82yrtsYLnufpKWTSCIuFHhEA4Y0LIlgI9GRLTYUxVLyl3nViKki5fZZ31maOXxcpqb58r0jb5rIuIYhd2EfSK3zQTTbLexX2WyDItBw5Q8Qy3gljke5u1zVqjKKJmTE6jZx/jFA9iuyVdoyFfW3CgLHFsXNIbHpab/RKoE= Received: from DB5PR07CA0041.eurprd07.prod.outlook.com (10.167.223.51) by HE1PR07MB0907.eurprd07.prod.outlook.com (10.162.26.14) with Microsoft SMTP Server (TLS) id 15.1.523.12; Fri, 24 Jun 2016 08:08:30 +0000 Received: from DB3FFO11OLC004.protection.gbl (2a01:111:f400:7e04::105) by DB5PR07CA0041.outlook.office365.com (2603:10a6:0:2d::51) with Microsoft SMTP Server (TLS) id 15.1.523.12 via Frontend Transport; Fri, 24 Jun 2016 08:08:30 +0000 Authentication-Results: spf=pass (sender IP is 131.228.2.241) smtp.mailfrom=nokia.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.241 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.241; helo=fihe3nok0735.emea.nsn-net.net; Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.241) by DB3FFO11OLC004.mail.protection.outlook.com (10.47.217.132) with Microsoft SMTP Server (TLS) id 15.1.517.7 via Frontend Transport; Fri, 24 Jun 2016 08:08:30 +0000 Received: from fihe3nok0735.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id u5O882S9008763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jun 2016 11:08:02 +0300 Received: from CNU418C7XK.nsn-intra.net ([10.154.155.220]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id u5O87u7B008453; Fri, 24 Jun 2016 11:08:02 +0300 X-HPESVCS-Source-Ip: 10.154.155.220 From: To: Date: Fri, 24 Jun 2016 10:07:11 +0200 Message-ID: <1466755631-25201-11-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466755631-25201-1-git-send-email-marcin.krzeminski@nokia.com> References: <1466755631-25201-1-git-send-email-marcin.krzeminski@nokia.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:131.228.2.241; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(2980300002)(438002)(199003)(189002)(87936001)(16796002)(81156014)(586003)(2351001)(97736004)(11100500001)(229853001)(36756003)(81166006)(86152002)(7846002)(19580395003)(50226002)(68736007)(8936002)(305945005)(106466001)(19580405001)(8676002)(86362001)(6806005)(33646002)(92566002)(48376002)(189998001)(4326007)(2906002)(77096005)(2876002)(50466002)(5003940100001)(53416004)(76176999)(356003)(50986999)(110136002)(47776003)(2950100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR07MB0907; H:fihe3nok0735.emea.nsn-net.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11OLC004; 1:sN9q8H/HEhDXcm488Pq23r0fLvM2CuCc06e1bLgJ3tlYI9SYH42S2fYp/oaHQI7WdJVM89ws/Gh7Sda2y0HjIB8vLZT9SNarsmO9uW6ghDuVxg7gzNx8X3tyLPSx+EhoJRVtI7QE8N3Qi0nuhJ38bGk2t4Wqwj4XAF/rY3uRYebjH8Af71T1IlJkIxSDhV60D6Dg2It+UW7fOWiQASQsQA/T9c9sYkP1ZFfGFUzmlhxdQIZzLgUoKN7fcFJqKcql49XCDffN5Edf9+6faoosbndRJ96IMczBb/wrDsNtWfq0pjseirTc01YA0cHLuCU14Oj3QL60QFifCyeTYvWVXDaWhhgy7KKPctM4ijxra79pI/kcW2l0NqBHSlRPTqPoaOjHpxteN8aLaJVWq1h9Pw+6M9nQNH/kZCxdgrphGDGl577MQpZ02wrg1O2OptZr MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: dafd848e-56ba-473c-27a1-08d39c06ba84 X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0907; 2:VLUj/yaHPqFqJS2pc1EvGt7UFwh+LvbmnUzx/f5Y21Fp5KMeImtzc7pXLynfPZEY4n91ezoEPp7cRzZ7nNBiWkR/PeyZZlrj0UMdCdkjpN7ZyXaowLRcwG1yVeWk6S6kp7krMRhu/gXCxHudCzSCAmVB3ZEUcfxKeV/aogLNp3JVxIYBU+JJjo6RI2lxgKGl; 3:3Imbp1fLPFLFeiB9+NBKIe1Sb7PErV3l8D0f0SNju33bu6EoywognvYAL070aPyIELiBxsYyjCOVVj0HhrxQtEs1VaMIQPXyQ1Xbmp1JwDpsQESq/zux3elHb37GF3cYcBZiZ7kETqGOrx6SjrVMMHaIq2eAnvkH+3m4gTU8JdhuJUBS1VkeuDMVloakUgrjhmnGHtChd3QSYe32L2iAVAM93Rnc2DrWh33SjNfr8E36wzOfaqY/SflvcCldSLFKqiByvRc7PIDjGrfIcqg3ug== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:HE1PR07MB0907; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0907; 25:B2usYraUqvMsvGf7VjuVnLaSyf5eVVYQqMlF4l/qmKzkgGHwxhulkjQosaWHYcKe3Z7xzgfZy4vHTQ08a+Ji11pZg87UtySNfVFv0kxsa5t1tOzWFjJDDCOCNuCh1gsUkzLOumUIY2qlokR0Q0cC2lNBo8ZsWJX2Yw5+rn5/6A7TXs6lLBXUhK8N4fZqdD9hlbFmSMmCsj6H3oJOxSi6mQTH8WRgJ6JXe3tfFHxBRvaRwD+H6TIYql8WANtzY/jASfSOcewjZAszDsnRxpZQFOLWGXrsS9GqdY4WKgz7xf6KzZghn6psqx63Mb6i9xyX01378YfJGtWJd0DTynUTXw72npVE2AGYPEH8TcUyHecbt3XCxvH9Kzs/d8cFtcu7H3luya4ttbq4pvImsyjFSDs58t5ee266EQ4yfHDilz6DT+SbEw3zE2kaG5ixHYzkM8t1Zdq9AKsYSVJXqNmOuX93PnDiVfJZZMmMxEfcaAvpMEMujscyjKq7DUJsbtMcj4C5NYSYS0i0lzOYbh5SQsBD3mQRJvgLvL2SBROSKIU3oxCNgTCLdwe2H6Vd8JzAPm8MR5lH//J42UIJttloOuzazER9JUm6euzkpzxgKKh5upZ/QZIY+/3WNy0et4waqcNciS0T2mZCVxS8egHupZuN3VfVeM/7VgDlYN2Xb1ogM/aqNyPRd05kNKbmxyJqZ9hWHwhr6N1F5z1ZDtVhw3SNeuO8k0WuEqOXG53C54c= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0907; 20:NwGrSI5xhjoTz6VjXyLjU1WRaC2ljxzX0Un15MwJXB+sA2mBxIacleyvAdWCqUbJlIpo7leCojxNg5PjtnKcBAYzCO0xRo4bp9CdpkUO/vCvl7D0QVl3fQ/UfpTysCxlZzlaIebuQiZyrmRqGH0608oB4LMiFHaKMnmgg3Ui3x08btPVA9yiR7cM7A7Rw2F1L472I9Rnw7UpRg/C8V5ut2l/l7eJCe5oPs4yetICZad2cjjwtjemtyD4nGwqMIPa/04Irsb+i3T+X2r3BD8Y9eTGTGF/LGA6suHWBfyno/lXR0Vov+uY2I33l3lcZ0AFLDVqBSovySIITcQrAKec0VLTlGg3vhrabrdrFY4me1mCEwD36THe3OW66Jj17KDv52Xfqqp0HGfYH+iacb2X3UIA5u8GZHZ44wB/uo5TgCpzyiBw8OECIf979Hbkl0kLEATKHhgsciZYKncQ0nboL8PaAlkJzhTRZSFtCVMj3oH1FXdSAExXuxGx1Njd88AK5y0bwyU5N+SbhQXXb097SyjQKcq+2Ysv8W7r8YXH0utjS9j8DBUXomJ0pOVG4/PF1z3hnu6hPNWi0aoDvJ4MnWHjmZnia/TcDumHYG4tmL4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(10201501046)(3002001); SRVR:HE1PR07MB0907; BCL:0; PCL:0; RULEID:; SRVR:HE1PR07MB0907; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0907; 4:Y3rJ0NU1i8OeryBQ4LndhHj2gEXkGRUrLcaUadvDPRW+XpXTzSq5ppD3K0NrDYtHR3gfff0VuF7TpKLk27LLeUTHlWxVjpkKWZDsjFhfz3fOlHlxNek9AKRCInaK4QdQzzMZsXxsKcEBSPvcTlKxjsJlvm1zPrpAriQ8r1i9d37RbIViqOOSZlLw4gQ/FJbxOCeuUy91CfPrfKL/VFPrQ7prN3sFcN2sJoGgdK4Blci7DxTtd9lczNZI2nZbaBlqLcZ6F2SW728iHciJMU87uKxLh1DTqDDesGUv70INP+Kjob7zNNvoMlrcKJcKhJNeU9hc43rgi7neZaUv4h9+v5YZNlbaZYzwQlpDlrvU4q2IpJtXokBOhynUz0LcagtCmYis1cP+i+ZwPj6tsstqnSWd/AErs67um8DQKp1DhIcHXaeUH9bt14NQrbwPfFCK7zZipLb+iYnispYsEeWpdA== X-Forefront-PRVS: 0983EAD6B2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB0907; 23:SOpOqJXhKYPq8U+RPWOPpxymKp1GrSlwbtmIUim03?= =?us-ascii?Q?UAHr2CEA+vn6zWycof6PoYnekuL3KWW5AR2fXRizRkiOf6f4YQ63q0rKbevy?= =?us-ascii?Q?8N1U3+dGXRnbAUIKEqDwMKWtRSpvkwQQjBRvKdm/P6l6tHeLFtotdAkrbTFD?= =?us-ascii?Q?FSLhFXI2ZJwIxOlmkC1RIMwkORiHnePftVBiD2M0hKzq+4jczcY6XRaJAm63?= =?us-ascii?Q?VBz688qMnEcgq/q0JRXWLdAbgiQL0MeWW1c6pS84hinYMur8ACeUNLU0uxFD?= =?us-ascii?Q?OsYmlUVdA62nxhFGW+Q/du7yd4Ssqb2pPuGh1m0rz/ZTzp5lUPpQqd8TTwM8?= =?us-ascii?Q?ka/iTuL8yCLH9XmMJN5+/S7kgNKzK+K+SB4acxpc/lRiifOn98nq3WQbx7ev?= =?us-ascii?Q?GWHCoQogMosyk1OEBv9kg7Q+X+KdDtV3d6I0kedctTVSjZbnQzV7tXcBJLd1?= =?us-ascii?Q?gnpug7Xjr5JkGlWt1QU4z76T2XbU82UITVqUXFqCH1zsyhkXcLkpInYgOgBA?= =?us-ascii?Q?lY8LrQFbjq00OrgMkjmVTPJMBV05+cFnOQgqtuRYZn1QWuCtzcnmpD0rdFqf?= =?us-ascii?Q?224SXMqMHD0sqkYKHwi1+WPy06wFTywdIsakuU7HJMDmYzMkudGww5ZTOESu?= =?us-ascii?Q?FuIX0PowHb1NkP27ShyWzzySwbISEFSC8BQl/vqfRDJQb4wEj2uTaRJfLin5?= =?us-ascii?Q?EejK0mZ1ToNYaPtNwa9gxMjC6AEK7KofBpbH1PjbIpqTe894npkQ/lqJqzqT?= =?us-ascii?Q?rd8zD1L1+AgtMTJ3K6PKPtGkiPcTZND9ZOXaH50hg0UUpqHyW+3HJXkGmVMR?= =?us-ascii?Q?yNCpWvNwEN42LiQ5B/WOa7v5TqSXp1ibhyGusb1HuTKeJtZwbEICYAGR7Fxs?= =?us-ascii?Q?SxJMzl4pYiBHBzmc+VS2XA7dPwUGGf9NKAPeetAfFPPUcrgh5/n5sYt8UW0w?= =?us-ascii?Q?1LBuHkIspRcAZfbbc5Iy9BLQG8a8qWhgZGRb0hRCqHsZUyZnJhp+D62rxz1h?= =?us-ascii?Q?8RRXjiHn7P2uICwzPTXdtzkD6hSQ1k1WyStfTdGqX6aa8HMAEXnQcBhpft4w?= =?us-ascii?Q?VRE+MhuBo/9nYBMhepTS2ab5tR1YS/JO4I7vvTwkr736nKOh0g6HXc9bVLDG?= =?us-ascii?Q?/JTwx6zZ1U=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0907; 6:oDAzdGUaK+HUWMSnl0jl3dqwyMIgjibPp/Pju4wHvUYGJw3xy//Pbc6nEU4d+DXEofTLj4CB0JIkeL9Chc6UfNSoT3PnFrpnBxhUR1eaYa4dEMKLDO0xk/F+ltl+66vBv2v1uUxnpMlHYVh8GewBboPt8ROhXiepFG0XUqyyABhTZv1tDQHT8dHANH2OI68kTB/sKMjOYhP49o9o4E7k0r3mVPMX3fXtmc7e3MzFelhJRzVSCyx1V8MZzA5fyrypCi/3Z6TYz7PKLmIM77lNv0Ian4oj8k+Yd3ZAXZpdcWicXcqsQxyyrhe+rNiHPB5z; 5:NTUbMgJs0kky5I4vteFOsIfRGWgDTwIwuQXrRmbznQY/+94OOw8Tht55y9UdPzjgiSMDGxpDZSzynbNwaJ2qa1bCZhiKfHClkilwMMLDRIJbYumrMKhhwSC3O2RW3UmxWnktVdZOnMFrTcEpNeL0Lg==; 24:GCHHwrkzUOPMzna07MuxL8i7+tiInp3dnd1jn8sxykP4T/TPZwKlFqsRt5cyk7JmmtFc1IdLh3QxrCjG6rLuC8HzFog5VDhYjmsLJq1HjiA=; 7:GkpqYPoaCjB51EtdC4TLaLcvq2L1uAysPicHJKe7ZddIo7A01hP5uI5qN0gnNOwQtlQMUFEBrQP/5X4ZLITwfMsSQWda7p7a3OEHFBos0+hO6SuMfgZOpi2+Z8sSjNs0nej3NYXa0Gy46e9buWLCDCK7+mSfvqXiafR6Ix6v0taDvHBTt5lALnuMwY6fR63aTn1TH9D1RJyoy/O9Vv1/BeRfQ5MNak6v/HSAmjHeUEOz6ve2EV7I6wbimNKADH78rNCpM0seV3pj+kMam9U5Ag== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2016 08:08:30.0459 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.241]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB0907 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.55.234.109 Subject: [Qemu-devel] [PATCH v3 10/10] m25p80: Fix WINBOND fast read command handling 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, crosthwaitepeter@gmail.com, clg@fr.ibm.com, clg@kaod.org, pawel.lenkow@itlen.com, rfsw-patches@mlist.emea.nsn-intra.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marcin Krzeminski This commit fix obvious bug in WINBOND command handling. Datasheet states that default dummy cycles is 8 so fix it. Signed-off-by: Marcin Krzeminski --- hw/block/m25p80.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index ca5320f..5ab22c4 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -738,6 +738,9 @@ static void decode_fast_read_cmd(Flash *s) s->needed_bytes = get_addr_length(s); switch (get_man(s)) { /* Dummy cycles - modeled with bytes writes instead of bits */ + case MAN_WINBOND: + s->needed_bytes += 8; + break; case MAN_NUMONYX: s->needed_bytes += extract32(s->volatile_cfg, 4, 4); break; @@ -768,7 +771,7 @@ static void decode_dio_read_cmd(Flash *s) /* Dummy cycles modeled with bytes writes instead of bits */ switch (get_man(s)) { case MAN_WINBOND: - s->needed_bytes = 4; + s->needed_bytes += 8; break; case MAN_SPANSION: s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; @@ -807,7 +810,7 @@ static void decode_qio_read_cmd(Flash *s) /* Dummy cycles modeled with bytes writes instead of bits */ switch (get_man(s)) { case MAN_WINBOND: - s->needed_bytes = 6; + s->needed_bytes += 8; break; case MAN_SPANSION: s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN;