From nobody Wed May 8 13:43:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1604626648; cv=pass; d=zohomail.com; s=zohoarc; b=h8+Sz96MmSNtMBN1iGnL7anigRfeoT7dziB+EknUOOO/NQ5MCKwVOu79K9P6kzcLzDHaPOgjFCB3XEDhccOr+LRr4khM0+E/xzej1IFSohiAP0URwy6GGfMnk9dpfUZjb2O2hCoazPjv4Bibq7Q6Y+2m+E57cKJHywqphDGXLkk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604626648; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o2rlnlWPGfzY+D0mtcMg7r2XoumI1JokIQ1OnF+Nubk=; b=kq5Y9Qb5boR8hkMvqERgu5ijha20pvjTmL3cWcI4isS+a5tfnFbpRVydFkJRDsOVvCGmcpYaLuAHj+jNAKfRFyDCYyRMF5fo38FHQYTHxC43lyumud9MuDuW9N+AY+k+BLc3GIfJt3flMahSBZu/AlgPENt2CT+jrlgr0o2Y5dc= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604626648300850.688550482389; Thu, 5 Nov 2020 17:37:28 -0800 (PST) Received: from localhost ([::1]:35334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaqgx-0003fA-7H for importer@patchew.org; Thu, 05 Nov 2020 20:37:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaqct-0000WT-A9; Thu, 05 Nov 2020 20:33:15 -0500 Received: from mail-bn8nam11on2055.outbound.protection.outlook.com ([40.107.236.55]:32481 helo=NAM11-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaqcp-0001YJ-Hr; Thu, 05 Nov 2020 20:33:14 -0500 Received: from DM6PR06CA0087.namprd06.prod.outlook.com (2603:10b6:5:336::20) by CH2PR02MB6968.namprd02.prod.outlook.com (2603:10b6:610:8b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.28; Fri, 6 Nov 2020 01:33:06 +0000 Received: from CY1NAM02FT013.eop-nam02.prod.protection.outlook.com (2603:10b6:5:336:cafe::61) by DM6PR06CA0087.outlook.office365.com (2603:10b6:5:336::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Fri, 6 Nov 2020 01:33:06 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by CY1NAM02FT013.mail.protection.outlook.com (10.152.75.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3541.17 via Frontend Transport; Fri, 6 Nov 2020 01:33:05 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Thu, 5 Nov 2020 17:32:58 -0800 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 5 Nov 2020 17:32:58 -0800 Received: from [172.19.2.32] (port=50874 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kaqcc-0005r0-7N; Thu, 05 Nov 2020 17:32:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ePmmwvDxnLcvU++boafs78eZY+c+7X+/BfCWhKVH9lF2EfRjSk/MrCbkgEtv4sb8u2yq3Plw31UAuneqT5MCWaWqy8tIe+6qnfJ5S5/bdbSGbRw1WRcDtLYFSr+kMJQkrw6aFWscPcC4lsj/6ScPhjOurNjBZMflxvjvcIFbn7Mmd9e99y00auR2xrO516Q4xxDuuC+2uCASFGtaBveGyrgi+QyZkRqTI/KyKZ9Hhyik0k+3eSwQzo40dR2WXz3oDVaxifSQuMF68SY/lGqdhmTRo/wUwS2DOaDE2PBgnblr8Q13Opc3yPHxgX0jEvGJjuogMZuEjOIHWeYOWhfpkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o2rlnlWPGfzY+D0mtcMg7r2XoumI1JokIQ1OnF+Nubk=; b=Fw3B3bAqtaxV9cnIZSBlD34XYbnZFlhrzzFA0Zngi8uzlm9SddbYN6fNZmBNcKqayx2JA9cMbuo13JIGigA3tNeiUL1RVifJiRCUDzEqY8hZPF2mp/ab5SqHKRo1ilGNIbN865KL1KNOGDGRyDppKA2bLVqRxoNGiYNlcbsC3crrF7pjNEG6iJOc9PXTsUbv2U+v820ZTO9RAVidO/n53ahoKC19kQFBpTxAfYCTlafo78q1qn7IOx+9pakpuz6K/syn1bKIxfjvP2JzIUEuxlVL6Xz7T+B5muWEbSNEe+yMeLJ8+/RYwp2lIUh2k/aOuoZFLLKAIE41D6FTKhUK6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o2rlnlWPGfzY+D0mtcMg7r2XoumI1JokIQ1OnF+Nubk=; b=eIyC63D5Woiq7ErUtNauDjSbb+yPzvvEUz+EIlb1uSoKDEflF/9+ObfwlIbeeJFHrZlA50ZT10ATQ/Gps6Pkf1VLr1pvsqSZNadvRJYCja+y/vMOASH72DqJ3dVcI3/q4LM8iz7jaznxfEt/QDR1ZFFgN6C3AEKBHAtd403zGUU= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.62.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com; From: Joe Komlodi To: Subject: [PATCH v3 1/3] hw/block/m25p80: Fix Numonyx NVCFG DIO and QIO bit polarity Date: Thu, 5 Nov 2020 17:32:56 -0800 Message-ID: <1604626378-152352-2-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604626378-152352-1-git-send-email-komlodi@xilinx.com> References: <1604626378-152352-1-git-send-email-komlodi@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 320c3b9c-22df-45e6-faa9-08d881f3e8ea X-MS-TrafficTypeDiagnostic: CH2PR02MB6968: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:483; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CFTkggPSEBxzexjNuRMd3i+BxH9ESqaiQKCL6a9crCklK2UotOg6wuJpHapxaVmfzNSwWWLay+qBRlin/ytR0O6M6e0Rbr70QmRdz6cnxcQfx5p8kjMtdEeYg/AKXyKK0JE5jD3sfMTnA+3M9K+DxuzFxTOwbzUbaTBaAwEtCemwPv0lC4tu9/O/GeYU+9SfPiyJqSNxVgEryi0C1OMP+h/hfekw+9cUZ5Oo/N+sSZ++MSvPY9H6+EdbB+kn6vgn0d6y9z0z+Y5DBPo8MJKvMjTTGJuctpUavh827eLDhe14mMa4GtjNWC3x7LZ0TF4yaOo8uwlREsq7aCsZzIJtlakM0KOTEva4uk0cY0HJBIr0rhJWkC1O1h75LKrz2wLrY+PQcJfHsBJFJ5/6yMRrwi79JnHjC7aZ7Lfm98jR6aQ= X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(346002)(39860400002)(46966005)(2616005)(5660300002)(26005)(478600001)(186003)(54906003)(336012)(70586007)(36906005)(7696005)(47076004)(426003)(4326008)(70206006)(44832011)(4744005)(83380400001)(8676002)(36756003)(82740400003)(356005)(82310400003)(2906002)(8936002)(316002)(7636003)(6916009)(9786002)(86362001)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 01:33:05.7041 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 320c3b9c-22df-45e6-faa9-08d881f3e8ea X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.62.198]; Helo=[xsj-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT013.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6968 Received-SPF: pass client-ip=40.107.236.55; envelope-from=komlodi@xilinx.com; helo=NAM11-BN8-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 20:33:06 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: figlesia@xilinx.com, alistair@alistair23.me, philippe.mathieu.daude@gmail.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" QIO and DIO modes should be enabled when the bits in NVCFG are set to 0. This matches the behavior of the other bits in the NVCFG register. Signed-off-by: Joe Komlodi --- hw/block/m25p80.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 483925f..4255a6a 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -783,10 +783,10 @@ static void reset_memory(Flash *s) s->enh_volatile_cfg |=3D EVCFG_OUT_DRIVER_STRENGTH_DEF; s->enh_volatile_cfg |=3D EVCFG_VPP_ACCELERATOR; s->enh_volatile_cfg |=3D EVCFG_RESET_HOLD_ENABLED; - if (s->nonvolatile_cfg & NVCFG_DUAL_IO_MASK) { + if (!(s->nonvolatile_cfg & NVCFG_DUAL_IO_MASK)) { s->enh_volatile_cfg |=3D EVCFG_DUAL_IO_ENABLED; } - if (s->nonvolatile_cfg & NVCFG_QUAD_IO_MASK) { + if (!(s->nonvolatile_cfg & NVCFG_QUAD_IO_MASK)) { s->enh_volatile_cfg |=3D EVCFG_QUAD_IO_ENABLED; } if (!(s->nonvolatile_cfg & NVCFG_4BYTE_ADDR_MASK)) { --=20 2.7.4 From nobody Wed May 8 13:43:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1604626497; cv=pass; d=zohomail.com; s=zohoarc; b=Xc25/0lx5RSp3QdD1244hgEpwwHZcXt2TQBZ/+pPXvubnXnq15xhUGz56+iCutT47RSTUQ6oBboCj3XUfHZoVM71zhtmGyXDtysNHdNSK6zxFQM/PoSJoURLdleqBdWCwPfzFcCqYyQT68J1Ei3M/zqz4EQYGtX1uDEtgOyujhM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604626497; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=86VOIzYt760d0BWlAUqKRdZOBwPR1di2o8CeSFdDiNQ=; b=LwN594aNqZujuhW4DSkOW4JghR6gTbkdRUC+024i5UALUfYVVjWGYktUQLSxsIUpOgUN6mTo1YV/+hb0dx9pOtT2E1abKzTVmxSCKzgDOnTuJo0S1F2h4IW9BjWyYwUcvLAcyiSVoz5/HJOQlqwTMAZbCHLfKcAYpWKARVFmHTA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604626497043280.71681767694236; Thu, 5 Nov 2020 17:34:57 -0800 (PST) Received: from localhost ([::1]:59448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaqeV-0001ku-MI for importer@patchew.org; Thu, 05 Nov 2020 20:34:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaqcv-0000XM-Ip; Thu, 05 Nov 2020 20:33:21 -0500 Received: from mail-dm6nam11on2057.outbound.protection.outlook.com ([40.107.223.57]:24857 helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaqcp-0001YU-Iy; Thu, 05 Nov 2020 20:33:17 -0500 Received: from DM6PR06CA0095.namprd06.prod.outlook.com (2603:10b6:5:336::28) by DM5PR02MB2379.namprd02.prod.outlook.com (2603:10b6:3:4f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Fri, 6 Nov 2020 01:33:07 +0000 Received: from CY1NAM02FT013.eop-nam02.prod.protection.outlook.com (2603:10b6:5:336:cafe::e3) by DM6PR06CA0095.outlook.office365.com (2603:10b6:5:336::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Fri, 6 Nov 2020 01:33:07 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by CY1NAM02FT013.mail.protection.outlook.com (10.152.75.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3541.17 via Frontend Transport; Fri, 6 Nov 2020 01:33:07 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Thu, 5 Nov 2020 17:32:58 -0800 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 5 Nov 2020 17:32:58 -0800 Received: from [172.19.2.32] (port=50874 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kaqcc-0005r0-7v; Thu, 05 Nov 2020 17:32:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dmaWjUKTw85wKpCN082S+Ht6xnSnmsn6MG/OYroJFgMTyePgRMHfrPAcjW74o/2Rs+XjJaFEN1toV9Ym9sGz5h00Q24pj3lYu/6z4ZwFiM3e8H6aQo88qWgOV0IonF4vur+8usX7m8m1ZtSMDlTrUq1hQfq68KmfcZnO24feMjKsTsPO/VVd1RJlmqtm8taN86ZxdVXqZT19cEKteqI8c8GpEdK5fzCg8OzL05l+ulBmwz2+VlElZsjp8jLE6J/Qhj/kuiFgFaUJDgaXxnD7iLXms4dD1m7rmxqmPIBwzE4UgteB50Y63a7+Qt4X8ra2V6c5qzHQfgU6jJRTHg+oYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=86VOIzYt760d0BWlAUqKRdZOBwPR1di2o8CeSFdDiNQ=; b=StB1juQD8tqFFeyS+/eSJ6v02rA8mUpEBzfGRUcI8L3tLTQSDHYNdNHZOk3SgG39TK9gPNYB3x0FVKAjSuxQSrrbSeBV456MVxlxzy1I/JTUdPhQYTk1ZZJPc5m+JqLXiSoFabFdSbKCizGmTrjyWUc37sqOQbh1IxFZDcuAmqTOjYvlVSZRU5TDBJ4CZHcmpno3SMM3+mVYvC5ir+cdo3PGBjBiM4mUacq1CL4QlScQ1atvkkyBr+fg/CtuKz47aWQepPz5AUNjOAGghSWepKVa6FxDZwc0L4srqjp1+LHlf4sJVazp0a/R3Zqm3a+fjqVwpedmHjIrrwN4zAAyzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=86VOIzYt760d0BWlAUqKRdZOBwPR1di2o8CeSFdDiNQ=; b=DDwKA6kkMMgQ9zdbHWYXYQx4V2oMPOnmTvKKb6yr7OzlhM9UGkCvgxIvs6eRt8V4oVagmhR8POIgshWuCZ8v3xduxk9w45ivFn8+DfQudxB1qm8H5sZ0/K0+grnXpyH89XEsogWsjEtrq2UarDFXo7x6Rc31Fq9/YBWPdW84qUI= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.62.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com; From: Joe Komlodi To: Subject: [PATCH v3 2/3] hw/block/m25p80: Check SPI mode before running some Numonyx commands Date: Thu, 5 Nov 2020 17:32:57 -0800 Message-ID: <1604626378-152352-3-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604626378-152352-1-git-send-email-komlodi@xilinx.com> References: <1604626378-152352-1-git-send-email-komlodi@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80f51326-8df9-4c8f-9b60-08d881f3e9d7 X-MS-TrafficTypeDiagnostic: DM5PR02MB2379: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:242; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pWU55vnEs0nF7jgvQ9rNWgpsUzY2O41DMxe+AnowfOG++KTB/+zplnvlXEA9emyrzPMmP69aJ3dTlbgJKoIp6DkTNZfgqobstLrjO1CRgcbAC/ydsl5jofLeP4OFpZodSqjprrrlMGO0ukO64Un3g9w/ajXoYoVUgN+uGuzUIdtTYvMYJTJKdwiLZlXnVNG2LsLl6g9oXH+lIdlSzII0hWoJD1U+iFml73XGDs0jSjOKNJMdQ6PG7Xijo1PYdc1FA0D1wy7ynfBOT3oLRhf8XlgwUKNmfagPbRnikHVDRQlrCs9rPoRIJdV7P67Ebm4Awoj0Z7nPTKwA8p7jQe/JChEX5kXcAs4mW3yMn+Y6Qm8iACm2KkzWWr7cYdp86AIjywVKtqTFYnRKQzEHpm9Js9SpWMfgzuuATIZx65ClT98= X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(136003)(346002)(376002)(46966005)(44832011)(83380400001)(26005)(86362001)(5660300002)(426003)(8676002)(336012)(316002)(186003)(82740400003)(7696005)(478600001)(9786002)(54906003)(4326008)(36906005)(82310400003)(2906002)(6916009)(356005)(70206006)(47076004)(36756003)(7636003)(70586007)(8936002)(2616005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 01:33:07.2553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80f51326-8df9-4c8f-9b60-08d881f3e9d7 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.62.198]; Helo=[xsj-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT013.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB2379 Received-SPF: pass client-ip=40.107.223.57; envelope-from=komlodi@xilinx.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 20:33:08 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: figlesia@xilinx.com, alistair@alistair23.me, philippe.mathieu.daude@gmail.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some Numonyx flash commands cannot be executed in DIO and QIO mode, such as trying to do DPP or DOR when in QIO mode. Signed-off-by: Joe Komlodi --- hw/block/m25p80.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++--= ---- 1 file changed, 119 insertions(+), 13 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 4255a6a..8a1b684 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -413,6 +413,12 @@ typedef enum { MAN_GENERIC, } Manufacturer; =20 +typedef enum { + MODE_STD =3D 0, + MODE_DIO =3D 1, + MODE_QIO =3D 2 +} SPIMode; + #define M25P80_INTERNAL_DATA_BUFFER_SZ 16 =20 struct Flash { @@ -820,6 +826,70 @@ static void reset_memory(Flash *s) trace_m25p80_reset_done(s); } =20 +static uint8_t numonyx_get_mode(Flash *s) +{ + uint8_t mode; + + if (s->enh_volatile_cfg & EVCFG_QUAD_IO_ENABLED) { + mode =3D MODE_QIO; + } else if (s->enh_volatile_cfg & EVCFG_DUAL_IO_ENABLED) { + mode =3D MODE_DIO; + } else { + mode =3D MODE_STD; + } + + return mode; +} + +static bool numonyx_check_cmd_mode(Flash *s) +{ + uint8_t mode; + assert(get_man(s) =3D=3D MAN_NUMONYX); + + mode =3D numonyx_get_mode(s); + + switch (mode) { + case MODE_STD: + return true; + case MODE_DIO: + switch (s->cmd_in_progress) { + case QOR: + case QOR4: + case QIOR: + case QIOR4: + case QPP: + case QPP_4: + case PP4_4: + case JEDEC_READ: + case READ: + case READ4: + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "DIO mode\n", s->cmd_in_progress); + return false; + default: + return true; + } + case MODE_QIO: + switch (s->cmd_in_progress) { + case DOR: + case DOR4: + case DIOR: + case DIOR4: + case DPP: + case JEDEC_READ: + case READ: + case READ4: + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "QIO mode\n", s->cmd_in_progress); + return false; + default: + return true; + } + default: + g_assert_not_reached(); + } +} + static void decode_fast_read_cmd(Flash *s) { s->needed_bytes =3D get_addr_length(s); @@ -827,9 +897,13 @@ static void decode_fast_read_cmd(Flash *s) /* Dummy cycles - modeled with bytes writes instead of bits */ case MAN_WINBOND: s->needed_bytes +=3D 8; + s->state =3D STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->state =3D STATE_COLLECTING_DATA; + } break; case MAN_MACRONIX: if (extract32(s->volatile_cfg, 6, 2) =3D=3D 1) { @@ -837,19 +911,21 @@ static void decode_fast_read_cmd(Flash *s) } else { s->needed_bytes +=3D 8; } + s->state =3D STATE_COLLECTING_DATA; break; case MAN_SPANSION: s->needed_bytes +=3D extract32(s->spansion_cr2v, SPANSION_DUMMY_CLK_POS, SPANSION_DUMMY_CLK_LEN ); + s->state =3D STATE_COLLECTING_DATA; break; default: + s->state =3D STATE_COLLECTING_DATA; break; } s->pos =3D 0; s->len =3D 0; - s->state =3D STATE_COLLECTING_DATA; } =20 static void decode_dio_read_cmd(Flash *s) @@ -859,6 +935,7 @@ static void decode_dio_read_cmd(Flash *s) switch (get_man(s)) { case MAN_WINBOND: s->needed_bytes +=3D WINBOND_CONTINUOUS_READ_MODE_CMD_LEN; + s->state =3D STATE_COLLECTING_DATA; break; case MAN_SPANSION: s->needed_bytes +=3D SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; @@ -866,9 +943,13 @@ static void decode_dio_read_cmd(Flash *s) SPANSION_DUMMY_CLK_POS, SPANSION_DUMMY_CLK_LEN ); + s->state =3D STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->state =3D STATE_COLLECTING_DATA; + } break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -882,13 +963,14 @@ static void decode_dio_read_cmd(Flash *s) s->needed_bytes +=3D 4; break; } + s->state =3D STATE_COLLECTING_DATA; break; default: + s->state =3D STATE_COLLECTING_DATA; break; } s->pos =3D 0; s->len =3D 0; - s->state =3D STATE_COLLECTING_DATA; } =20 static void decode_qio_read_cmd(Flash *s) @@ -899,6 +981,7 @@ static void decode_qio_read_cmd(Flash *s) case MAN_WINBOND: s->needed_bytes +=3D WINBOND_CONTINUOUS_READ_MODE_CMD_LEN; s->needed_bytes +=3D 4; + s->state =3D STATE_COLLECTING_DATA; break; case MAN_SPANSION: s->needed_bytes +=3D SPANSION_CONTINUOUS_READ_MODE_CMD_LEN; @@ -906,9 +989,13 @@ static void decode_qio_read_cmd(Flash *s) SPANSION_DUMMY_CLK_POS, SPANSION_DUMMY_CLK_LEN ); + s->state =3D STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->state =3D STATE_COLLECTING_DATA; + } break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -922,13 +1009,14 @@ static void decode_qio_read_cmd(Flash *s) s->needed_bytes +=3D 6; break; } + s->state =3D STATE_COLLECTING_DATA; break; default: + s->state =3D STATE_COLLECTING_DATA; break; } s->pos =3D 0; s->len =3D 0; - s->state =3D STATE_COLLECTING_DATA; } =20 static void decode_new_cmd(Flash *s, uint32_t value) @@ -950,6 +1038,15 @@ static void decode_new_cmd(Flash *s, uint32_t value) case ERASE4_32K: case ERASE_SECTOR: case ERASE4_SECTOR: + case DIE_ERASE: + case RDID_90: + case RDID_AB: + s->needed_bytes =3D get_addr_length(s); + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + break; + case READ: case READ4: case DPP: @@ -958,13 +1055,19 @@ static void decode_new_cmd(Flash *s, uint32_t value) case PP: case PP4: case PP4_4: - case DIE_ERASE: - case RDID_90: - case RDID_AB: - s->needed_bytes =3D get_addr_length(s); - s->pos =3D 0; - s->len =3D 0; - s->state =3D STATE_COLLECTING_DATA; + if (get_man(s) =3D=3D MAN_NUMONYX) { + if (numonyx_check_cmd_mode(s)) { + s->needed_bytes =3D get_addr_length(s); + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + } + } else { + s->needed_bytes =3D get_addr_length(s); + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + } break; =20 case FAST_READ: @@ -1035,6 +1138,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; =20 case JEDEC_READ: + if (get_man(s) =3D=3D MAN_NUMONYX && !numonyx_check_cmd_mode(s)) { + break; + } trace_m25p80_populated_jedec(s); for (i =3D 0; i < s->pi->id_len; i++) { s->data[i] =3D s->pi->id[i]; --=20 2.7.4 From nobody Wed May 8 13:43:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1604626650; cv=pass; d=zohomail.com; s=zohoarc; b=N5DwCDStUk98WI9TfdNjJFGuTSf9/mdCCCJngBRYuGwqEzerg3iBzVMh5QPHzHwvxDK07WhG+Givbrshj5U1394UR+qoxYEEK78ttpm7QHRuBwDRKM7IJXvvVJkHU4/z9yz+uPVTQ2SP365Qvw8gWGQu+IgBCPmK0r9XxDMZZDM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604626650; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Bwh3hijBRuOS73J1LNm0G7zEzxHyv2iuKgMzqZooqcI=; b=oDGoP2N3mHKulwxt1cKEPb0vtAHgTmgJGm+4BTX2JgHDfsNnrezP4ev+YUzF4tSA9qCPJ7Mlxaw/O0f70BCwtA6+K+BRtMdZMvKm7xr2q2sM9LCW3iaItMOeKqdm5q6iG9mu+aKFJgeVa7lCRawmw7NtNfcFV5jEqtvBos2+e0g= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160462665049639.186755706357644; Thu, 5 Nov 2020 17:37:30 -0800 (PST) Received: from localhost ([::1]:35476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaqgz-0003iZ-Fh for importer@patchew.org; Thu, 05 Nov 2020 20:37:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaqcz-0000Yo-Pw; Thu, 05 Nov 2020 20:33:22 -0500 Received: from mail-bn7nam10on2068.outbound.protection.outlook.com ([40.107.92.68]:40672 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaqcp-0001YS-Ek; Thu, 05 Nov 2020 20:33:21 -0500 Received: from DM6PR06CA0090.namprd06.prod.outlook.com (2603:10b6:5:336::23) by BL0PR02MB4356.namprd02.prod.outlook.com (2603:10b6:208:41::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21; Fri, 6 Nov 2020 01:33:06 +0000 Received: from CY1NAM02FT013.eop-nam02.prod.protection.outlook.com (2603:10b6:5:336:cafe::98) by DM6PR06CA0090.outlook.office365.com (2603:10b6:5:336::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Fri, 6 Nov 2020 01:33:06 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by CY1NAM02FT013.mail.protection.outlook.com (10.152.75.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3541.17 via Frontend Transport; Fri, 6 Nov 2020 01:33:06 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Thu, 5 Nov 2020 17:32:58 -0800 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 5 Nov 2020 17:32:58 -0800 Received: from [172.19.2.32] (port=50874 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kaqcc-0005r0-8Y; Thu, 05 Nov 2020 17:32:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oUxUSN1sGgMrLNLhlptjtTUZzXzOkQptneeWhmCYIN2mTss5f8h8Xt1TzmXA9hya1LuQgcaUZR+WSrvoJeoBoMxGGTSKMY/hdzG9gJo5hFMnOhf07i6haQXxZ736FB+BkAgiV7aQdE1MifCqld6KXr1GPwUXAa/KTecwDOlvmyvS010NWbVNZ5UpApkQQGoT5zwtjhjkPJnIvmA1qH369xLmzk/EFZAnzvpbZQWgsFa9bshgb1cnLFwBVozu4u1jzEGtjELqlmmqUz7HfR517P/Uv66Jfgbwp6qFoX5ZdGWC4JY98tyknvhv5j/H3G8QtVuQntZZsKtZ+Ejz6KPmhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bwh3hijBRuOS73J1LNm0G7zEzxHyv2iuKgMzqZooqcI=; b=gTGf3nFyg7xu8Ee57wyq1hSPlD9L5sHv7b/XTilma8NhhNOiF64dN+WjNMOrOLNHbDK78Mt67fsZNeLX81We6lpccAQJw4yAwBydmZuCtFHc26h2ZCG82Xm/LXF2zSXqWe1YVaIIxgWaFfjiaEnnCJglzKkieHtTl/T7sRfcXETxwfR3dy+5VnHSNjV/LGkqX7fiG7tSdXq9qCKengfwxVrtqKUho5fL/nD/Pg7dPPiGxoObhv1wlwHd0rhzuVyE+F8vFXvacwwWgKEhNtpllLEHblstq3ylSQzZlUewQ/lWWBmolrcYss/k3EuLrNSHD17C76EHQWswR0swBJK9PQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bwh3hijBRuOS73J1LNm0G7zEzxHyv2iuKgMzqZooqcI=; b=EslWrGf/ralTzDxZPeji3aOuxH76176JYTomGkmIzdFA+2hzFa5q9QN+NcdYe4qngC4dtS81f+BCj4Z2XnhFtXRMzrfk9vzFHXtDTsrixiTch8jmEiksp9MBvLIvMAw48d6inord7m9XStKK6NTCuEJ4NwB9kPGx8noNCLVLIyo= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.62.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com; From: Joe Komlodi To: Subject: [PATCH v3 3/3] hw/block/m25p80: Fix Numonyx fast read dummy cycle count Date: Thu, 5 Nov 2020 17:32:58 -0800 Message-ID: <1604626378-152352-4-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604626378-152352-1-git-send-email-komlodi@xilinx.com> References: <1604626378-152352-1-git-send-email-komlodi@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88ad02c4-acae-4145-28a5-08d881f3e94c X-MS-TrafficTypeDiagnostic: BL0PR02MB4356: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:497; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kgGR3s0Uq9gXscBJ4H13qF03eoRkI9pagsTRFVtUIA5H17nucj4r/p3ARhWcbE4St3VUmyHqt6dpeDirVw+w9xl+1Pd2miMF2+n7hHb6jsS1GJbt4AZAp8FV+lRgfM5B1ZVEhDzj7cFAHkWSQCg4ZKfDpaRo8yU0upoZ8XhX5w6XTCf8+DUrvcqqzIck8SzNoNwH4zZ6t0eRubr2KgIayFyYoCymsIOKThwsjlU3pVGS3u6Eq5kgW/Xh0I1NhPV+g/cRh6N+6YpmsX/o6mrwTIwu1vbeAgX1oXs71BQ0KncFFo+gw2NybDFBQWR/E3frCqicfE5zg1TNigZ22jfWMGnvAoik3Ot/OB7ORVJR1FgxlPaKRidpqo3tOQWcJrCTL4QUHj6Ag/Bq84ahgnY+l28tAqUqy0hny0eyBDeUczoEzMu1FHYL50EjE1qR7d5GRo7N7P0mTT40l7vUdkUEMRlLSdHhfnM06ulDXhBwMl3YE7m2hZ2Yc7GO0MO8mpQO X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(4636009)(396003)(376002)(346002)(39860400002)(136003)(46966005)(36906005)(186003)(966005)(8936002)(9786002)(86362001)(70206006)(316002)(336012)(70586007)(5660300002)(44832011)(82310400003)(2616005)(426003)(26005)(7636003)(6916009)(4326008)(82740400003)(8676002)(47076004)(83380400001)(2906002)(478600001)(54906003)(36756003)(356005)(7696005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 01:33:06.3409 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88ad02c4-acae-4145-28a5-08d881f3e94c X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.62.198]; Helo=[xsj-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT013.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR02MB4356 Received-SPF: pass client-ip=40.107.92.68; envelope-from=komlodi@xilinx.com; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 20:33:08 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: figlesia@xilinx.com, alistair@alistair23.me, philippe.mathieu.daude@gmail.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Numonyx chips determine the number of cycles to wait based on bits 7:4 in the volatile configuration register. However, if these bits are 0x0 or 0xF, the number of dummy cycles to wait is 10 on a QIOR or QIOR4 command, or 8 on any other currently supported fast read command. [1] [1] https://www.micron.com/-/media/client/global/documents/products/data-sheet/= nor-flash/serial-nor/mt25q/die-rev-b/mt25q_qlkt_u_02g_cbb_0.pdf?rev=3D9b167= fbf2b3645efba6385949a72e453 Signed-off-by: Joe Komlodi --- hw/block/m25p80.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 8a1b684..a2cdfb6 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -841,6 +841,43 @@ static uint8_t numonyx_get_mode(Flash *s) return mode; } =20 +static uint8_t numonyx_extract_cfg_num_dummies(Flash *s) +{ + uint8_t cycle_count; + uint8_t num_dummies; + uint8_t mode; + uint8_t cycle_table[0x100][3] =3D { + [FAST_READ] =3D {8, 8, 10}, + [FAST_READ4] =3D {8, 8, 10}, + [DOR] =3D {8, 8, 0xff}, + [DOR4] =3D {8, 8, 0xff}, + [QOR] =3D {8, 0xff, 10}, + [QOR4] =3D {8, 0xff, 10}, + [DIOR] =3D {8, 8, 0xff}, + [DIOR4] =3D {8, 8, 0xff}, + [QIOR] =3D {10, 0xff, 10}, + [QIOR4] =3D {10, 0xff, 10}, + }; + assert(get_man(s) =3D=3D MAN_NUMONYX); + + mode =3D numonyx_get_mode(s); + + cycle_count =3D extract32(s->volatile_cfg, 4, 4); + if (cycle_count =3D=3D 0x0 || cycle_count =3D=3D 0xf) { + num_dummies =3D cycle_table[s->cmd_in_progress][mode]; + } else { + num_dummies =3D cycle_count; + } + + /* + * Validation if the command can be executed should be done outside of + * this function. e.g. trying to execute DIOR in QIO mode. + */ + assert(num_dummies !=3D 0xff); + + return num_dummies; +} + static bool numonyx_check_cmd_mode(Flash *s) { uint8_t mode; @@ -901,7 +938,7 @@ static void decode_fast_read_cmd(Flash *s) break; case MAN_NUMONYX: if (numonyx_check_cmd_mode(s)) { - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->needed_bytes +=3D numonyx_extract_cfg_num_dummies(s); s->state =3D STATE_COLLECTING_DATA; } break; @@ -947,7 +984,7 @@ static void decode_dio_read_cmd(Flash *s) break; case MAN_NUMONYX: if (numonyx_check_cmd_mode(s)) { - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->needed_bytes +=3D numonyx_extract_cfg_num_dummies(s); s->state =3D STATE_COLLECTING_DATA; } break; @@ -993,7 +1030,7 @@ static void decode_qio_read_cmd(Flash *s) break; case MAN_NUMONYX: if (numonyx_check_cmd_mode(s)) { - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->needed_bytes +=3D numonyx_extract_cfg_num_dummies(s); s->state =3D STATE_COLLECTING_DATA; } break; --=20 2.7.4