From nobody Sun May 5 17:19:56 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=1605237160; cv=pass; d=zohomail.com; s=zohoarc; b=KX3+z0z3dLMsq+pTM1nX82VPi0Zb2TOiryPRA9L9vZde4u4lnXUmpNOuksPf7NF7rnPNKTvQAZcH1KJ0RbWtCClb9FGQTlhQx8eK5IknBYxLGuPhmYuKDFgOatIUkdS8pyx5ssuVrzmtOALnDj2Yo0TqZTEwTGxZOfI8ipyMy4U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605237160; 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=euaI1M9x3H4lwn8c7NWo2yKUYhwvBn9kDJm71R2d1BM=; b=ESnyHpKeRcGGzbTFqljhCOKTeZ6cTaowMro70K2WtQdE5DQDBkkgddX3X9W/Qy3R8pAK3jdicSxvLQ06zkKal5UZOfLUYE/3F/TSy9GHkM21WdaMWGGFEU0ulQZWX4nY6mSqj2RPI2AdUE7p+iY4YQNJ92tDcCPZVN9NQGd21cI= 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 1605237160278962.7937469346043; Thu, 12 Nov 2020 19:12:40 -0800 (PST) Received: from localhost ([::1]:60558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdPVu-0005tF-JX for importer@patchew.org; Thu, 12 Nov 2020 22:12:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdPUM-00048o-Ou; Thu, 12 Nov 2020 22:11:02 -0500 Received: from mail-bn8nam12on2073.outbound.protection.outlook.com ([40.107.237.73]:31457 helo=NAM12-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 1kdPUJ-0008NR-N1; Thu, 12 Nov 2020 22:11:01 -0500 Received: from MN2PR16CA0036.namprd16.prod.outlook.com (2603:10b6:208:134::49) by SJ0PR02MB7327.namprd02.prod.outlook.com (2603:10b6:a03:29c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.24; Fri, 13 Nov 2020 03:10:57 +0000 Received: from BL2NAM02FT016.eop-nam02.prod.protection.outlook.com (2603:10b6:208:134:cafe::57) by MN2PR16CA0036.outlook.office365.com (2603:10b6:208:134::49) 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, 13 Nov 2020 03:10:56 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by BL2NAM02FT016.mail.protection.outlook.com (10.152.77.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Fri, 13 Nov 2020 03:10:56 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Thu, 12 Nov 2020 19:10:55 -0800 Received: from smtp.xilinx.com (172.19.127.95) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 12 Nov 2020 19:10:55 -0800 Received: from [172.19.2.32] (port=54046 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kdPUF-0004vx-PJ; Thu, 12 Nov 2020 19:10:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l/HhHroWJR8pPqOSk2j3rymHFE6ws7105cGUS5SAQ+1NeiuPOHIIit/02z7bekhOqeKb6nenVUJ6I5Xi5ymdoDlqb+cYBP9DJCyaFiyipWLr+StOLwhY7uznUuN5oYb84PhD0ecIbeT6jq/1Y0JEnoHNnihhz/fcdBo4uR093yDqu13kLSyfHAyNLa3/mu8aapEAD/L3tI202I7X9ukw7yOAoxhlieiXTCHYwp2SyAHQGya6Jz+glxHqFXX57CJu0ps9wE2Ef+Nu2PlATpmgsjXAMNOvfDbIhOuI+L6JtZyritxUEL1HekadVXZzd/n+CIUpx9QT/yJqgfRXMI8tVw== 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=euaI1M9x3H4lwn8c7NWo2yKUYhwvBn9kDJm71R2d1BM=; b=K3CZ+bQQlzYW+Pwj3TvS7CUQDJ2hciXYm96Hpxb7IKkmOEbuUKpv6Hvc9wEQ0UftmtRkE1H+tgYzybhDs/WZgTh4lTD6MI35Vd4drtOoZ+y3BrgJHuczpy2Oe5isWtzVw4BVxR8xv6TotP+4BluTKiLzKi0/8g4R29C77bfTJDAYvkIdcWHdp1lo0RzVZyNSNPkt9uvsWRTajqIqPqN6KYnpas7EGpDLMAW2obNcSfOiOFTKFNDI3v6P+d2S/SdiYeoI9QY735Bjb8j7YmLAZ9OokK6srkMOZW3Ja5TdZw02Hq1mhyOhz4G6WabjlRus8i/XopsX41JZpb27YKD/Yg== 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=euaI1M9x3H4lwn8c7NWo2yKUYhwvBn9kDJm71R2d1BM=; b=s61vGDHU6sIajiOnMOr8eYMUu5z9KmkruT1JiQm1+eMEIa5Pa1WcgPERZT6iZYYPYehqWDM4KF7ysJhlbd+RXXI/KJRDLS2S140LjqfIvKmJ+AHvkBOKpZdBxg4WaWBkdcWseng7W3SJiyCYVcAKtRfwEGpelZ4zw0CK1Fqlvs8= 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-pvapexch01.xlnx.xilinx.com; From: Joe Komlodi To: Subject: [PATCH v4 1/4] hw/block/m25p80: Make Numonyx config field names more accurate Date: Thu, 12 Nov 2020 19:10:52 -0800 Message-ID: <1605237055-393580-2-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605237055-393580-1-git-send-email-komlodi@xilinx.com> References: <1605237055-393580-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: b19fbdf4-0272-4d93-58ab-08d88781bd44 X-MS-TrafficTypeDiagnostic: SJ0PR02MB7327: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:186; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eCHsgrEDcKwbN6L67oxCh6vckEZ92Cu7mCzRzNgH6WdWPoLOfe87QX3el/6le/rSGl69gpjioFw7KX4MCYY+6LoVhbu/A4dbwGdPArTLLQFMPXhhp0XrI/RtPcU47WwZYUuUaTWyqI8stHaUUOqbLup2lEAL1IuzPXZnV2tFtkvOF1MicddCV7/hC5hGn7VJ3Gz0gNfT/BTC1y9nofrUD+kOuvaKIEbh2ls6RKzcl/c8xfQLAl4ztGRHlcQE/ApQ3YJMW7xXV6qok6uA0fReZNKJQyEtT/5FaNrHrijcEWLeqmk6IQH9LqlRq0o5cjcEGHAcbw9BUMwtzA4Cng3UCJE+eukVEehcK0QYvksvgKDEyX/nOL1xqFzbbsJO6BUhvyqSdV4sXr0bl05dRCiot+Z6KsvwaJ1fk4frLzKmSBs= X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch01.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(46966005)(8936002)(47076004)(26005)(86362001)(54906003)(82310400003)(7696005)(6666004)(4326008)(8676002)(9786002)(478600001)(82740400003)(7636003)(36906005)(83380400001)(36756003)(44832011)(316002)(70206006)(6916009)(186003)(336012)(426003)(5660300002)(2616005)(70586007)(2906002)(356005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2020 03:10:56.7419 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b19fbdf4-0272-4d93-58ab-08d88781bd44 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-pvapexch01.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: BL2NAM02FT016.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB7327 Received-SPF: pass client-ip=40.107.237.73; envelope-from=komlodi@xilinx.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 22:10:58 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" The previous naming of the configuration registers made it sound like that = if the bits were set the settings would be enabled, while the opposite is true. Signed-off-by: Joe Komlodi Reviewed-by: Francisco Iglesias --- hw/block/m25p80.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 483925f..452d252 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -136,7 +136,7 @@ typedef struct FlashPartInfo { #define VCFG_WRAP_SEQUENTIAL 0x2 #define NVCFG_XIP_MODE_DISABLED (7 << 9) #define NVCFG_XIP_MODE_MASK (7 << 9) -#define VCFG_XIP_MODE_ENABLED (1 << 3) +#define VCFG_XIP_MODE_DISABLED (1 << 3) #define CFG_DUMMY_CLK_LEN 4 #define NVCFG_DUMMY_CLK_POS 12 #define VCFG_DUMMY_CLK_POS 4 @@ -144,9 +144,9 @@ typedef struct FlashPartInfo { #define EVCFG_VPP_ACCELERATOR (1 << 3) #define EVCFG_RESET_HOLD_ENABLED (1 << 4) #define NVCFG_DUAL_IO_MASK (1 << 2) -#define EVCFG_DUAL_IO_ENABLED (1 << 6) +#define EVCFG_DUAL_IO_DISABLED (1 << 6) #define NVCFG_QUAD_IO_MASK (1 << 3) -#define EVCFG_QUAD_IO_ENABLED (1 << 7) +#define EVCFG_QUAD_IO_DISABLED (1 << 7) #define NVCFG_4BYTE_ADDR_MASK (1 << 0) #define NVCFG_LOWER_SEGMENT_MASK (1 << 1) =20 @@ -769,7 +769,7 @@ static void reset_memory(Flash *s) s->volatile_cfg |=3D VCFG_WRAP_SEQUENTIAL; if ((s->nonvolatile_cfg & NVCFG_XIP_MODE_MASK) !=3D NVCFG_XIP_MODE_DISABLED) { - s->volatile_cfg |=3D VCFG_XIP_MODE_ENABLED; + s->volatile_cfg |=3D VCFG_XIP_MODE_DISABLED; } s->volatile_cfg |=3D deposit32(s->volatile_cfg, VCFG_DUMMY_CLK_POS, @@ -784,10 +784,10 @@ static void reset_memory(Flash *s) 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) { - s->enh_volatile_cfg |=3D EVCFG_DUAL_IO_ENABLED; + s->enh_volatile_cfg |=3D EVCFG_DUAL_IO_DISABLED; } if (s->nonvolatile_cfg & NVCFG_QUAD_IO_MASK) { - s->enh_volatile_cfg |=3D EVCFG_QUAD_IO_ENABLED; + s->enh_volatile_cfg |=3D EVCFG_QUAD_IO_DISABLED; } if (!(s->nonvolatile_cfg & NVCFG_4BYTE_ADDR_MASK)) { s->four_bytes_address_mode =3D true; --=20 2.7.4 From nobody Sun May 5 17:19:56 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=1605237192; cv=pass; d=zohomail.com; s=zohoarc; b=KA+icMO7xodJ8BY22czEmZPqDY11lsHD5G2/qh8rYUewq4LcN7e6Cb7Z+h/ZwQuD4wjcOVpc3k6rXI5LspAdTd2dAqgTgAds5wtqJIox6cTrmABtz7rlu9Fpx4n7Chh1uQG9Qj9Xj70qNtrfQfwbMlHG73neaw2N4Gv1toUZJ2A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605237192; 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=Fij6OG1nCB/qU2b7zMeBELdwLiukAF+a4RymvbQyVJM=; b=BNao1Fs+NiqaxwFchhlOATKric9PUlvs/fAkFjRlWeSWcSC8ZzPyiDzhf3KPt6HY0lU4sbF2hkqnZl+5ckjMDZpJ3STN1iW5iA2mJj+CEX3Mo4FcP1PUrskXEQHjKYA7xz3IJWkvZwjj8TsSsekA/xFbloR7EPM0aM9x0ZSqsg4= 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 1605237192396725.3251159409454; Thu, 12 Nov 2020 19:13:12 -0800 (PST) Received: from localhost ([::1]:33856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdPWR-0006V3-6p for importer@patchew.org; Thu, 12 Nov 2020 22:13:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdPUM-00048c-PE; Thu, 12 Nov 2020 22:11:02 -0500 Received: from mail-bn8nam12on2059.outbound.protection.outlook.com ([40.107.237.59]:34400 helo=NAM12-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 1kdPUK-0008NV-9O; Thu, 12 Nov 2020 22:11:01 -0500 Received: from MN2PR19CA0004.namprd19.prod.outlook.com (2603:10b6:208:178::17) by DM5PR02MB2588.namprd02.prod.outlook.com (2603:10b6:3:3d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.22; Fri, 13 Nov 2020 03:10:58 +0000 Received: from BL2NAM02FT018.eop-nam02.prod.protection.outlook.com (2603:10b6:208:178:cafe::85) by MN2PR19CA0004.outlook.office365.com (2603:10b6:208:178::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25 via Frontend Transport; Fri, 13 Nov 2020 03:10:57 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by BL2NAM02FT018.mail.protection.outlook.com (10.152.77.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Fri, 13 Nov 2020 03:10:57 +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, 12 Nov 2020 19:10:55 -0800 Received: from smtp.xilinx.com (172.19.127.95) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 12 Nov 2020 19:10:55 -0800 Received: from [172.19.2.32] (port=54046 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kdPUF-0004vx-Pn; Thu, 12 Nov 2020 19:10:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DJrKfOT5+mAMJM1Wudvvbfh/vH2gy/JlHmXro3Qlal9Yenpcx7+w41M6EdPxTLZC9I4AYhJpJVPO2WG+jL2aBkeS25ThrZkl4M08+viz6OCYiJjilBbF4g+5lba3NxtrmzQZy3l//oHcjVlP2n72IuYQrsoVyF/4xZjWWbEvkfJsmPyloIkWX+ja4ON4ehRT9D/i7gBktAD/bduPL5s5PF79nHJPysNIChMSVVhH93pfgwv0DC5jH8Sc0IcdoFDdkRZlZyRijrz1k6/Qay6EMQHQ6zTIiQY/Hwb2PezF3IcvMZsUKlYSTTM4NjMXJJf7YXHnlnHYyIkVsuWOiAqwjQ== 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=Fij6OG1nCB/qU2b7zMeBELdwLiukAF+a4RymvbQyVJM=; b=jqznmJEq3N826iH7AP3Ly2C/kZtINumu68ZODVtn9lg8whEcWR7Nsyvtc1ndfpZeUZWQGHAom0x9ltC1yhmt8sh377pBkClyFnOtW7MP6/xWNCW4sj1+K1rdisjQrHRJ9GC0JAeaKnn5QL61vmzLvG/8iJT03/SXYYoz3XMFkULdGsCg5QDs9jCCIwYz9m8oQRN33igO9UBXYWu9sgAVhyv+Wg4Bwc+yozcZCxRRtVDKD4FQXAzxFIP0pbJzayW20oCOHSArpA1Q5Epvt1Q6KE1/Z17uwmCn2RED+ORcmX44edsmW85CpKXnKD/q0N97GJ9dD8Fpbvczhifo/OyFMA== 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=Fij6OG1nCB/qU2b7zMeBELdwLiukAF+a4RymvbQyVJM=; b=jzb7uZ/W/pSMnYvKtvCN9bAYEfzpS48wIpYKiHij9rKs+Nm1b0vPnnGtG5avfxUgH3pyipWhbCPMNkH1lOrk6vjHVMePezZbI3R7upantGI/F1YiI4HoaBttEUNGu+TeDEYHqYPNHIsQfbtbjLMIa+TYwQhM5OXinYcQJsczMWM= 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 v4 2/4] hw/block/m25p80: Fix when VCFG XIP bit is set for Numonyx Date: Thu, 12 Nov 2020 19:10:53 -0800 Message-ID: <1605237055-393580-3-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605237055-393580-1-git-send-email-komlodi@xilinx.com> References: <1605237055-393580-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: a1b654f5-ad98-4370-bd64-08d88781bdaf X-MS-TrafficTypeDiagnostic: DM5PR02MB2588: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:79; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EnDEnS1kGyt1SUp71d0urGqmV4dNtK6SeoHSQz4INo3dpMXHRbOgklWAEl92ZKhWJgaiNWkKnSY9E3CQhNoGXftF/EO5nyDqxwUNbAHi8plO8qwVu8hAyZzkQKecyF+p/IVNXGkYpX6CwWKWoYN1elPqmLJXZ1+6ECVTEVhTfv8KgZvIPGgMbn7YGrjYf26nDpdbe49Lgj3x7WRJW3qBb5ypH00btBbRPr40bGbazoUKTnd5zlMTE6taJOgjsYF5sDCgCETEx3QBHEq0B2XnrdYPLJMiYhmw5ltu9iVYg9Ypt77qUXdLnHkuQ/9JNlQ5NPcnR4w/Ggie88+ubmtA3edpzayHWgpXGbF/T7TKkVy0LnJ+uu+JPUFHpoMDtX6Pqw63iypuGiM5JE3SeUs3Nqoo5Cf5Ti5f3p0W500vVIc= 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)(346002)(39860400002)(136003)(46966005)(2906002)(478600001)(6916009)(7696005)(4744005)(86362001)(5660300002)(316002)(26005)(36906005)(9786002)(7636003)(44832011)(54906003)(336012)(2616005)(8676002)(8936002)(83380400001)(356005)(4326008)(36756003)(82310400003)(70206006)(47076004)(186003)(82740400003)(426003)(70586007)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2020 03:10:57.4447 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1b654f5-ad98-4370-bd64-08d88781bdaf 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: BL2NAM02FT018.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB2588 Received-SPF: pass client-ip=40.107.237.59; envelope-from=komlodi@xilinx.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 22:10:59 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" VCFG XIP is set (disabled) when the NVCFG XIP bits are all set (disabled). Signed-off-by: Joe Komlodi Reviewed-by: Francisco Iglesias --- hw/block/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 452d252..eb6539f 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -768,7 +768,7 @@ static void reset_memory(Flash *s) s->volatile_cfg |=3D VCFG_DUMMY; s->volatile_cfg |=3D VCFG_WRAP_SEQUENTIAL; if ((s->nonvolatile_cfg & NVCFG_XIP_MODE_MASK) - !=3D NVCFG_XIP_MODE_DISABLED) { + =3D=3D NVCFG_XIP_MODE_DISABLED) { s->volatile_cfg |=3D VCFG_XIP_MODE_DISABLED; } s->volatile_cfg |=3D deposit32(s->volatile_cfg, --=20 2.7.4 From nobody Sun May 5 17:19:56 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=1605237162; cv=pass; d=zohomail.com; s=zohoarc; b=H985dnWTTtG6fMGUvcdd/r0mN57/gaSmHHVqrhfLXGdAxC3TzgWsKzDjZBnRzDNoJ85oEfU8Xfjzz3lnzZrabtvfAL3nZ9DRv2J6Y6tHhOs8wgY/A4G7ZC7kHr9jiEvx022GY/XFVK+K1OaTRKrwio5sApfD1DBiRk3dlvsDWVU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605237162; 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=ehKC6A9O9eZsvY8PNmTxcuoKYCTOgKuyVsqjlIN93sw=; b=JJROc5IGz1ukPoYKWRSbexjvcyf9A20pGO/4UrQCkQFpwQl+CZfpeN6G8+pVwnxwgj4XdNjNcJV4P537bAJrQOWqIu71yaG1LMqv3IBSacIieOgDSJipHuKxvK0F9AGMWArVM/uSX0FXUyq+yuz9jz6OvTtmnOa0n8yP9/XxbzQ= 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 160523716247275.10773792360806; Thu, 12 Nov 2020 19:12:42 -0800 (PST) Received: from localhost ([::1]:60780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdPVw-0005yg-WB for importer@patchew.org; Thu, 12 Nov 2020 22:12:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdPUP-0004Dp-Pk; Thu, 12 Nov 2020 22:11:05 -0500 Received: from mail-dm6nam08on2078.outbound.protection.outlook.com ([40.107.102.78]:5156 helo=NAM04-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 1kdPUM-0008O4-U5; Thu, 12 Nov 2020 22:11:05 -0500 Received: from MN2PR19CA0002.namprd19.prod.outlook.com (2603:10b6:208:178::15) by MN2PR02MB6254.namprd02.prod.outlook.com (2603:10b6:208:185::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 13 Nov 2020 03:10:59 +0000 Received: from BL2NAM02FT018.eop-nam02.prod.protection.outlook.com (2603:10b6:208:178:cafe::1a) by MN2PR19CA0002.outlook.office365.com (2603:10b6:208:178::15) 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, 13 Nov 2020 03:10:59 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by BL2NAM02FT018.mail.protection.outlook.com (10.152.77.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Fri, 13 Nov 2020 03:10:58 +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, 12 Nov 2020 19:10:56 -0800 Received: from smtp.xilinx.com (172.19.127.95) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 12 Nov 2020 19:10:55 -0800 Received: from [172.19.2.32] (port=54046 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kdPUF-0004vx-QM; Thu, 12 Nov 2020 19:10:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=et32bjCNFr/8YW1nMh1VtXR+FWe3j/NfJ9NycHx2hx/KLdlRhXmXndpT2T7pxJpK88387YeNe8Jt8PMFYVzlzCmxOCb/m+4R0ISGJlZVRFOzgnkyxzcaJTRW5RFJMeaeBc/UpJ/AyNjfvKjhiCzHcG6qQQ700cNw+X7/TJhYbp4NgmynoOU4+KSz0i5LrU0mAg+LIK090ewmVKgJ3wSiNYkdny/1GHY3OFOqdbtnUks+4OXrGbFmMRn831usKs/z1VnT4QmkepnKpdPKjmnj7s3+VFaKvMWs2jN2q+4unsEwMbZmJOM6Tp4H1tV3clfl7XXPZi0ejJ9iM1beAWTEqQ== 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=ehKC6A9O9eZsvY8PNmTxcuoKYCTOgKuyVsqjlIN93sw=; b=eE1WkQ27By9P7V4RQ067baSmuhDngv3i6CJ3gg56cR4Hq5LW7WRHSdDYHGneSYtDRJrrFaDutZHlTVEQPt6vLjCmTbad/hlvV6uKlZXKuPitV8/GZ5Y4A15mZ2anqU31SHhGwNxIC5/xQL1wC3bOiDhtpEhwgH9NWrDaMKAQKysbz06lVJhn/Rwp81kBZwwN2Eb4kRmyf0BgdhpFYoJ7b4UPh+jYBW9CcP9BtZqocu8eZ2/T4ASlQqQLKC/IZWL2QdErfE4pBkX/squreE40mqLUuCrzx2tl9H6ArdkKfPO7ifyrGH0R3dVUvXpKOfBqCg9sSTx8YcO1a+3Ft3OtbQ== 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=ehKC6A9O9eZsvY8PNmTxcuoKYCTOgKuyVsqjlIN93sw=; b=rRzp2L/vprixD3F21XZ511DIlB1y2G8n6h5UhaFJZo/ibM+UyA7uw2pPj+Y2i1CHTWArz0SD6S2rxXOcw7dzGhWJ4ssdkMZf5ZFbHcXKVUwl+Oq++taax80ZhMWh348ZggH6POEgobDpK+Lv9zJGOclPakGi8OA+3ptxlsZ2DBI= 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 v4 3/4] hw/block/m25p80: Check SPI mode before running some Numonyx commands Date: Thu, 12 Nov 2020 19:10:54 -0800 Message-ID: <1605237055-393580-4-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605237055-393580-1-git-send-email-komlodi@xilinx.com> References: <1605237055-393580-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: 3f3b6c2e-2db2-4666-e7f5-08d88781be78 X-MS-TrafficTypeDiagnostic: MN2PR02MB6254: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:120; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nkrm7nc8cEPLVc0Cv7gmQRT2BtoXfdKfr2qwbJwBQh0xgx4UXONcl+aPxi8uSK9qc6Tl9hwyhjUDMv3PM+Wf+x1qAS/94PnwORRdnIYoakDM6ZQKdJKmriEuyoBnYgjEMV1TCmukvRmgldWaA+rX0ZM+jgk8oLSWDC011ZrjaDXUvNCpiBfs+XB67tNSi9kSRtl5kxVrQaI5e+EFLy+EgTeaREOhm6m9LUo79mwHAtB5dbpP/9ChVTUnorbQvqEbsm75CBFaDHVhVA9vmiX+ggByH4ccYScvOJAmACmzhqQnL90OvNCDNgz6WJziWK6S9zWncwDzQhvgW8yIkwjSgG93NG0G1gnhBtS+ZulMRpSuxGXNfez5T9KmYGt8yH8tK9vJQ/jZ3S5DBxhdjp16A+AqF2CI9zlhtJkAn+h3A/8= 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)(136003)(39860400002)(346002)(376002)(396003)(46966005)(8676002)(426003)(8936002)(336012)(70586007)(82740400003)(70206006)(5660300002)(4326008)(26005)(316002)(36906005)(7696005)(478600001)(6916009)(9786002)(86362001)(54906003)(2906002)(2616005)(44832011)(7636003)(186003)(83380400001)(47076004)(36756003)(82310400003)(356005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2020 03:10:58.7641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f3b6c2e-2db2-4666-e7f5-08d88781be78 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: BL2NAM02FT018.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR02MB6254 Received-SPF: pass client-ip=40.107.102.78; envelope-from=komlodi@xilinx.com; helo=NAM04-DM6-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 22:11:01 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_NONE=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 | 134 +++++++++++++++++++++++++++++++++++++++++++++-----= ---- 1 file changed, 112 insertions(+), 22 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index eb6539f..2552f2c 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,17 @@ static void reset_memory(Flash *s) trace_m25p80_reset_done(s); } =20 +static uint8_t numonyx_get_mode(Flash *s) +{ + if (!(s->enh_volatile_cfg & EVCFG_QUAD_IO_DISABLED)) { + return MODE_QIO; + } else if (!(s->enh_volatile_cfg & EVCFG_DUAL_IO_DISABLED)) { + return MODE_DIO; + } else { + return MODE_STD; + } +} + static void decode_fast_read_cmd(Flash *s) { s->needed_bytes =3D get_addr_length(s); @@ -827,9 +844,11 @@ 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); + s->state =3D STATE_COLLECTING_DATA; break; case MAN_MACRONIX: if (extract32(s->volatile_cfg, 6, 2) =3D=3D 1) { @@ -837,19 +856,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 +880,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 +888,11 @@ 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); + s->state =3D STATE_COLLECTING_DATA; break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -882,13 +906,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 +924,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 +932,11 @@ 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); + s->state =3D STATE_COLLECTING_DATA; break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -922,13 +950,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,14 +979,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) case ERASE4_32K: case ERASE_SECTOR: case ERASE4_SECTOR: - case READ: - case READ4: - case DPP: - case QPP: - case QPP_4: case PP: case PP4: - case PP4_4: case DIE_ERASE: case RDID_90: case RDID_AB: @@ -966,24 +989,85 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->len =3D 0; s->state =3D STATE_COLLECTING_DATA; break; + case READ: + case READ4: + if (!(get_man(s) =3D=3D MAN_NUMONYX) || (numonyx_get_mode(s) !=3D = MODE_DIO && + numonyx_get_mode(s) !=3D MODE_QIO)) { + s->needed_bytes =3D get_addr_length(s); + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "DIO or QIO mode\n", s->cmd_in_progress); + } + break; + case DPP: + if (!(get_man(s) =3D=3D MAN_NUMONYX) || numonyx_get_mode(s) !=3D M= ODE_QIO) { + s->needed_bytes =3D get_addr_length(s); + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "QIO mode\n", s->cmd_in_progress); + } + break; + case QPP: + case QPP_4: + case PP4_4: + if (!(get_man(s) =3D=3D MAN_NUMONYX) || numonyx_get_mode(s) !=3D M= ODE_DIO) { + s->needed_bytes =3D get_addr_length(s); + s->pos =3D 0; + s->len =3D 0; + s->state =3D STATE_COLLECTING_DATA; + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "DIO mode\n", s->cmd_in_progress); + } + break; =20 case FAST_READ: case FAST_READ4: + decode_fast_read_cmd(s); + break; case DOR: case DOR4: + if (!(get_man(s) =3D=3D MAN_NUMONYX) || numonyx_get_mode(s) !=3D M= ODE_QIO) { + decode_fast_read_cmd(s); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "QIO mode\n", s->cmd_in_progress); + } + break; case QOR: case QOR4: - decode_fast_read_cmd(s); + if (!(get_man(s) =3D=3D MAN_NUMONYX) || numonyx_get_mode(s) !=3D M= ODE_DIO) { + decode_fast_read_cmd(s); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "DIO mode\n", s->cmd_in_progress); + } break; =20 case DIOR: case DIOR4: - decode_dio_read_cmd(s); + if (!(get_man(s) =3D=3D MAN_NUMONYX) || numonyx_get_mode(s) !=3D M= ODE_QIO) { + decode_dio_read_cmd(s); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "QIO mode\n", s->cmd_in_progress); + } break; =20 case QIOR: case QIOR4: - decode_qio_read_cmd(s); + if (!(get_man(s) =3D=3D MAN_NUMONYX) || numonyx_get_mode(s) !=3D M= ODE_DIO) { + decode_qio_read_cmd(s); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute cmd %x = in " + "DIO mode\n", s->cmd_in_progress); + } break; =20 case WRSR: @@ -1035,17 +1119,23 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; =20 case JEDEC_READ: - trace_m25p80_populated_jedec(s); - for (i =3D 0; i < s->pi->id_len; i++) { - s->data[i] =3D s->pi->id[i]; - } - for (; i < SPI_NOR_MAX_ID_LEN; i++) { - s->data[i] =3D 0; - } + if (!(get_man(s) =3D=3D MAN_NUMONYX) || (numonyx_get_mode(s) !=3D = MODE_DIO && + numonyx_get_mode(s) !=3D MODE_QIO)) { + trace_m25p80_populated_jedec(s); + for (i =3D 0; i < s->pi->id_len; i++) { + s->data[i] =3D s->pi->id[i]; + } + for (; i < SPI_NOR_MAX_ID_LEN; i++) { + s->data[i] =3D 0; + } =20 - s->len =3D SPI_NOR_MAX_ID_LEN; - s->pos =3D 0; - s->state =3D STATE_READING_DATA; + s->len =3D SPI_NOR_MAX_ID_LEN; + s->pos =3D 0; + s->state =3D STATE_READING_DATA; + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Cannot execute JEDEC r= ead " + "in DIO or QIO mode\n"); + } break; =20 case RDCR: --=20 2.7.4 From nobody Sun May 5 17:19:56 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=1605237176; cv=pass; d=zohomail.com; s=zohoarc; b=lBdQqVAO6kL0Qo7jzdkFRAmZytrPZEpop9jiwFDMY6bt2ewEl0LSo+BhrXmrvJrOv0fpvXd8weTUiSJTSbclb8X6BJ8+GPrOA/XzkKqr+QowEJtZdTguxyjRgBGItdqJbJ8d+NVi20vbKojRmNFdx4j1pCy8JAKjV1NHFZVXUsU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605237176; 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=73hXoEu5tO6gENXtYU1saSfkVCz8CSEZhTKeUvegX/8=; b=k7Sn9ZAqkJnPUrBasv8BQ+8oOLxckQG1WxZw19xInKbwPzqmWlHiqljsjy+u5BdmDBz/nBqJni550tC5slur6j/ieSCsgchi6xd4o2kmDbFEZW1Z5VSexV7kajGNxbNXFSr0MgiwyNfKploX9oJaK/d2dPZ7zywXFFjruBAT9cY= 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 1605237176743695.0416192028795; Thu, 12 Nov 2020 19:12:56 -0800 (PST) Received: from localhost ([::1]:32852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdPW9-00066D-Ko for importer@patchew.org; Thu, 12 Nov 2020 22:12:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdPUO-0004By-Nt; Thu, 12 Nov 2020 22:11:04 -0500 Received: from mail-eopbgr750058.outbound.protection.outlook.com ([40.107.75.58]:50241 helo=NAM02-BL2-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 1kdPUK-0008Ne-Qw; Thu, 12 Nov 2020 22:11:04 -0500 Received: from MN2PR19CA0004.namprd19.prod.outlook.com (2603:10b6:208:178::17) by DM6PR02MB6044.namprd02.prod.outlook.com (2603:10b6:5:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.23; Fri, 13 Nov 2020 03:10:58 +0000 Received: from BL2NAM02FT018.eop-nam02.prod.protection.outlook.com (2603:10b6:208:178:cafe::74) by MN2PR19CA0004.outlook.office365.com (2603:10b6:208:178::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25 via Frontend Transport; Fri, 13 Nov 2020 03:10:58 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by BL2NAM02FT018.mail.protection.outlook.com (10.152.77.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Fri, 13 Nov 2020 03:10:58 +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, 12 Nov 2020 19:10:56 -0800 Received: from smtp.xilinx.com (172.19.127.95) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.1913.5 via Frontend Transport; Thu, 12 Nov 2020 19:10:55 -0800 Received: from [172.19.2.32] (port=54046 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1kdPUF-0004vx-Qr; Thu, 12 Nov 2020 19:10:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kMHSROeprfYZpOWeGby1o2eTglQP2GXgwQHEsuqANkJWE0L6BVEudB7On4TXzhmf+kXS8ajIdpgJFtQOTTKeDb2kLXwXDvx4CTS8nDxQqqBC0Qk7DeO90qJ4aFu2e5tCBNjNqmR6DtpJlD3syV7y9WwuQs7p0S1SdCKKmu0Vcqe2xmoa5/dM16nWpWpt65LzhnPtbDAKlxCrEDX2BFV/0vYTt/kgyeTLVVGRNrTNRQoZOaW2QpGfmVRbiF/pJFIhb+9+gACznhgMocxUI3xd5On6J/7mRtkfRTIyXO4fPGdMHBoXEeNdUfVok4n41X8qXnzCiIVXATvIm5rOwBZLZg== 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=73hXoEu5tO6gENXtYU1saSfkVCz8CSEZhTKeUvegX/8=; b=j51N3TY4nBdR/nIGs8VjSu1K+gl9+DNWZDqGy/nHdQqMz42q8f3ewG4ayZUGGYLWXQbmUpt6JC7gb/kbPk1J0TXGH136dpNXFuWcGGwhQeeJNS/jPD/k80Xlu4pvSj0FYVS+xdvrm+IzGj+7qJ+3DY1wSlHEnWs+YFDCcjyCW/N/S9RWWT44ekg16cxkemWNIrJl73vTr9Iw3W05z9WGYtoEttW8TT0tWAKyNzGxI6gKd9+07ulBsF9A+lxIXzVEBXVczcGUl/FGEdtgrZX3qTMoYzSqU2gCur/NB5gQtusXV80Dp8iY4f8SxGdw/cUBE1F1W8Kz0OrcrwWIRUc/AQ== 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=73hXoEu5tO6gENXtYU1saSfkVCz8CSEZhTKeUvegX/8=; b=hJ2TPLH5gn88+If3FYgXXX0Lvw3CsjEXxANJ6BHJIKzaOgChoV/MbTZofI8ezeNbaFii9DLy+N/YAeTTmHaPpSUSIFur45kdSj5RSCpOVDvX9dmwYJgvehFZ//c9MdK2TJbv3YbCqbf04yzbSIUQ46B5qKGV3LtANgLmBd13CWo= 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 v4 4/4] hw/block/m25p80: Fix Numonyx fast read dummy cycle count Date: Thu, 12 Nov 2020 19:10:55 -0800 Message-ID: <1605237055-393580-5-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605237055-393580-1-git-send-email-komlodi@xilinx.com> References: <1605237055-393580-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: dadf8b20-ae2c-470f-905d-08d88781be2d X-MS-TrafficTypeDiagnostic: DM6PR02MB6044: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:334; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9DIcAv4SS7DaiiGxeN0h4D4L1cYOkFdUP4G4wHMjRGjuS8GzL5yHu4o/uZYwt1oVmeRtpr79grDocN+Tdu7ZyBzsgmF2qgDPlxUY/FQnLHQlXE2lAeHV0GmXAqVYxC10F9mNM5WxI+xVqAKgPvWDQ0j415a/uxk9UCBZl4YbtVvKAma7C1X/pEAzia2fN4SFwflygckCrNr6T3JwJL1A85zCz6DOEvsAUfU2BoY0wA/SLh3W5qI9/9UA3az5/66sF+CsiXzBbKuC+DveuoWdQYDJc2bHBjWhCDNKXVGsQJMAzKgMz3aoebt+NdvX8mUpLcvizQcqg09FtMksHK9Kfn513HcOama25NygFSAIsmoV1pbXbsZAkYm8+fEv4wimlogzK3to//beE5rVQ8gwGALBFb6D/fbeJUANUKDcoJIAvN36khe1tpRHpT6BiOo+ZJEVX+yEIQ/EaIuOi6iztrEjM8KTXlT+w3+DYhO1RQNtr3Nk9/jdBeHKzVBi+RSQ 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)(2616005)(9786002)(86362001)(5660300002)(26005)(316002)(478600001)(336012)(426003)(7696005)(966005)(8676002)(2906002)(70206006)(4326008)(356005)(186003)(6916009)(83380400001)(82740400003)(7636003)(44832011)(47076004)(36756003)(82310400003)(70586007)(36906005)(8936002)(54906003)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2020 03:10:58.2703 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dadf8b20-ae2c-470f-905d-08d88781be2d 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: BL2NAM02FT018.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB6044 Received-SPF: pass client-ip=40.107.75.58; envelope-from=komlodi@xilinx.com; helo=NAM02-BL2-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 22:10:59 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 Reviewed-by: Francisco Iglesias --- hw/block/m25p80.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 2552f2c..0c78015 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -837,6 +837,30 @@ static uint8_t numonyx_get_mode(Flash *s) } } =20 +static uint8_t numonyx_extract_cfg_num_dummies(Flash *s) +{ + uint8_t num_dummies; + uint8_t mode; + assert(get_man(s) =3D=3D MAN_NUMONYX); + + mode =3D numonyx_get_mode(s); + num_dummies =3D extract32(s->volatile_cfg, 4, 4); + + if (num_dummies =3D=3D 0x0 || num_dummies =3D=3D 0xf) { + switch (s->cmd_in_progress) { + case QIOR: + case QIOR4: + num_dummies =3D 10; + break; + default: + num_dummies =3D (mode =3D=3D MODE_QIO) ? 10 : 8; + break; + } + } + + return num_dummies; +} + static void decode_fast_read_cmd(Flash *s) { s->needed_bytes =3D get_addr_length(s); @@ -847,7 +871,7 @@ static void decode_fast_read_cmd(Flash *s) s->state =3D STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - 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; case MAN_MACRONIX: @@ -891,7 +915,7 @@ static void decode_dio_read_cmd(Flash *s) s->state =3D STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - 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; case MAN_MACRONIX: @@ -935,7 +959,7 @@ static void decode_qio_read_cmd(Flash *s) s->state =3D STATE_COLLECTING_DATA; break; case MAN_NUMONYX: - 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; case MAN_MACRONIX: --=20 2.7.4