From nobody Sun May 5 01:29:35 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=1605568490; cv=pass; d=zohomail.com; s=zohoarc; b=HeL0Q3zkZZ2gjfkXgrgS6+IRL2kz9ltCFs8Xqn6I/EZ2DLM/n/NvnxQcMN0dSY+rFu9WQ04Iark+SQzPyX00KN6fEx6XIKDCh0fp/hypY3qCm8fbJNAlB/QL3nv8KZUPLojAtVj/1hUBpuKxy++xi7TkxQWiOAU3r4QaaXr2nic= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605568490; 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=xB72zoCgJMQKkC69oOANDzU8BLU6bdkDfmXEYRE1ftA=; b=NZqY9eVnjBD2TkOzur7nv6sHxYoV1y1NXkEXKg/HwO8nw3XNKeaKJhTh7OcTyHj4ALaComa0uhPn6ycrHvXy9RvFTL/GbkRDPAzdfCMDKbGZXV/G8cDAynaSR97WI5d6BHRUA/Ew7roCJ5M6Lv4ZNuofQMBjb7OipEJvSLuev7I= 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 1605568490920122.84495674455286; Mon, 16 Nov 2020 15:14:50 -0800 (PST) Received: from localhost ([::1]:49560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kenhx-00011b-Rn for importer@patchew.org; Mon, 16 Nov 2020 18:14:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keneX-0005xL-2y; Mon, 16 Nov 2020 18:11:17 -0500 Received: from mail-bn8nam11on2050.outbound.protection.outlook.com ([40.107.236.50]:56480 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 1keneU-0003xW-Pn; Mon, 16 Nov 2020 18:11:16 -0500 Received: from DM6PR10CA0031.namprd10.prod.outlook.com (2603:10b6:5:60::44) by CH2PR02MB6854.namprd02.prod.outlook.com (2603:10b6:610:aa::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Mon, 16 Nov 2020 23:11:08 +0000 Received: from CY1NAM02FT022.eop-nam02.prod.protection.outlook.com (2603:10b6:5:60:cafe::27) by DM6PR10CA0031.outlook.office365.com (2603:10b6:5:60::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25 via Frontend Transport; Mon, 16 Nov 2020 23:11:08 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by CY1NAM02FT022.mail.protection.outlook.com (10.152.75.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Mon, 16 Nov 2020 23:11:08 +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; Mon, 16 Nov 2020 15:11:04 -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; Mon, 16 Nov 2020 15:11:04 -0800 Received: from [172.19.2.32] (port=55506 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1keneK-0007S0-Ib; Mon, 16 Nov 2020 15:11:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fUefF2pID87ZFAj1a6+KIVoebssecoG2mqCgCyGM2S7Dw2bMaS+KENHquaIagSQb8NpSyyObsKoxq7K9ey518IiGKhYuN06qZOu0KrIU4uEBCEGimyT4CNXWcYuRNSLBYFzpaZ8one6/UReTn/+ly75C9mHwxGKIMirLFWuutT7nygtewybB4A1N8fujsw1cQL/5slpwVHl5XgDd6qZ8cqqtA7ZFN9q58sa/0dlen7HPaS+1gPqMLPsvap6othi/lrme9u3eC5Rm6WOIYvxffXYwDI2P1BX3sQOagTejLAgGjHwy0zJwRFW+FUCkiegjLHCiaWp0/MhqTRmC+S1tpg== 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=xB72zoCgJMQKkC69oOANDzU8BLU6bdkDfmXEYRE1ftA=; b=TOWZlC2dbisfLt8AkscH47YfZ+TjXEGOsVqhCmfKEpNfMGXkd0eaP50/9zOrWHzN0WgGl6v0Fa/DrZnnfCNK5TolaXdXnycdWNsT+ndIMEQ60SjmaE02l4GGoD8GWXFwEznQP9HIuFMB8DMIz6UoMy6js6KDlENrY5NyJat0U2LdJ7itESVpWvl5viKEwKXfiCCVGvHw2Ri8ShAwX3lzpm117Cl8Um3y0hhlBJf02DeVNHIvjhLadoBD0oSzoTPmIcrWdOjpvyI1x4Z0Lqxy7lqb4rkyPmmaQ9qkzYsGbJP1hByRJhKre5MndQBs1Zq+K40cVOXZPMhjgK3+4UWT+Q== 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=xB72zoCgJMQKkC69oOANDzU8BLU6bdkDfmXEYRE1ftA=; b=ns1IT9rmQVBnI749v0Y1pwVzhHrmFqLuQqqI1YO2w1MCleDzNSHze7BnwcRDeGHfBmTaEsHRoEL+4MerkV9bwtUeUqASd1gcBHisgQ0XasXBn03lip+dmq6r5U+8K3M4ZO9JBGNKC1fOImgkAsMbSq0gA4ftUBBuTGKFezHQNNg= 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 v5 1/4] hw/block/m25p80: Make Numonyx config field names more accurate Date: Mon, 16 Nov 2020 15:11:01 -0800 Message-ID: <1605568264-26376-2-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605568264-26376-1-git-send-email-komlodi@xilinx.com> References: <1605568264-26376-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: b19dbd0f-b10c-4767-550c-08d88a84e6de X-MS-TrafficTypeDiagnostic: CH2PR02MB6854: 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: H3J4Q99Zj0ZUc/wrDq8O91ookCB+8Xw5iI6lXRJS3vf6vt0U2A4cmWCkczf0FwkfwyAZYkFppjJLkx/Lj3nKQyX8EJkpcl+dIHBVf452sSRghmrW7xArJCATqI7v8BcwkUA5Vrt1VA99BFsAxw13zaRXKgktI1sppK0CUFgGAs969mlK0IRuhOcZVAzZ1IISbOzHISI+3v/86iECGxrV5nfZQPSuHfLTCsxLEunRizz9BvMFJj1H76ukJajqiLWh6qFVhp6odwNT9mUP8BQLqO1vAiGCNFEL+jcXBb89PTchMLgf2xFj3sJWuwyH6zGinACj/Wp5a7E8/RPU4m1+ONwNUTQyNtfJ2JTwzP6xrI8LEcxfAKFNg47+53ddD/7REEJOF3ScneNc25UEqXkVWT45yIf8XsjweRjsNRErAW4= 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)(396003)(39860400002)(376002)(346002)(46966005)(2616005)(478600001)(44832011)(356005)(316002)(4326008)(36906005)(82740400003)(47076004)(2906002)(9786002)(7636003)(8936002)(5660300002)(54906003)(6916009)(8676002)(83380400001)(70206006)(82310400003)(70586007)(36756003)(26005)(186003)(6666004)(86362001)(336012)(426003)(7696005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2020 23:11:08.5932 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b19dbd0f-b10c-4767-550c-08d88a84e6de 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: CY1NAM02FT022.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6854 Received-SPF: pass client-ip=40.107.236.50; 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/16 18:11:13 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 01:29:35 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=1605568401; cv=pass; d=zohomail.com; s=zohoarc; b=RGFSy5+Wv3HKalyCpJ3hou0COTqXnOKocshYM2cW/HH5jJoW83/KjGOXkLvj/RupsdGz544GoP1FvRKeI9OBVFI9I3NeXt3tJn+FWTtsyKvqyoct2u7v0a09hTftHDom/dH6Zqie7BkGXAo6sER7smd9TeXMNJmuJFuH62JG86o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605568401; 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=TR8jD+j5MrWmKeZ+Dv79qspK7/u27O+5MG+fkBzsLSU=; b=TqpNemFiS9JpcMVDcqbT2jp2VqXR5cKDA8sBuJVK8NbsZIl5iPkzAF3Kv6NniECpeQod8MfPLxv5EAs0QVs7x0bKoMaE+7xacrHwQAKg3mzzTYlaTONhbPgqMTywQi5dSkvVPkKtgsS+NJ6cE6bh8FSOhHgm90XJ2tGAHXATolc= 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 1605568401304310.5442111150047; Mon, 16 Nov 2020 15:13:21 -0800 (PST) Received: from localhost ([::1]:44738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kengV-0007PY-IS for importer@patchew.org; Mon, 16 Nov 2020 18:13:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keneW-0005xA-Lg; Mon, 16 Nov 2020 18:11:16 -0500 Received: from mail-eopbgr690062.outbound.protection.outlook.com ([40.107.69.62]:49230 helo=NAM04-CO1-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 1keneS-0003x9-Nu; Mon, 16 Nov 2020 18:11:16 -0500 Received: from MN2PR15CA0064.namprd15.prod.outlook.com (2603:10b6:208:237::33) by DM6PR02MB4058.namprd02.prod.outlook.com (2603:10b6:5:9f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Mon, 16 Nov 2020 23:11:09 +0000 Received: from BL2NAM02FT051.eop-nam02.prod.protection.outlook.com (2603:10b6:208:237:cafe::26) by MN2PR15CA0064.outlook.office365.com (2603:10b6:208:237::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25 via Frontend Transport; Mon, 16 Nov 2020 23:11:09 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by BL2NAM02FT051.mail.protection.outlook.com (10.152.76.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Mon, 16 Nov 2020 23:11:08 +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; Mon, 16 Nov 2020 15:11:04 -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; Mon, 16 Nov 2020 15:11:04 -0800 Received: from [172.19.2.32] (port=55506 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1keneK-0007S0-JK; Mon, 16 Nov 2020 15:11:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G59oerhABxTIbWv970XZscW8/I/XuppZ6S1aj9WHXCNE524qTW3RVmvtcNnHxk84yCJn7Lf5w3Jq1lhVq2krUc80qXHPBIs1DN85Gjt/xOzpoXg1GC4g5tVQbVm1zqj8+TynGEO3pXE/d3hzUYIaKYeuURaJtyBkghnpiCL+d406uraFkLGAVAJO+jGcFyN1Lv/k2n+CoSVSGVFxSc4SFuwDH1leWAc0PFBdXjL9qQi6zntw4+WM7mF2fWZktlKxMuggyZyCK/5hRPmuTfvZtqwd/bQ+3GYwxztRS/rcirE1WMCO5K38+7/5O4B/I7bOrCo1q1q4eKuF1VP79UCW3A== 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=TR8jD+j5MrWmKeZ+Dv79qspK7/u27O+5MG+fkBzsLSU=; b=TOq9mMW8LdFk3kid6QeWlVVxAK9KbyINYK5WZuIZHHnHalwo8FtdspcDxIyJgWAoqkGEj/qlgRzpncRzTynnrBn7zc4tH/GbDAQ2U45Du67jGxMbgNx21CK5ApaZ55ijaDJrU2+sI7KEQBYQiBjHwy+B/vOXCwG3L1qhdJpo/0Dass4XWAuR7T1k1EtQg8AOnRxzPick+r5JW4HSMGKb/YMB54opm7lmD3r1j3mZtBY0R4OHnMP1uJyL/WSeZ5pYRMKEKQpXb9TqRiAOmuxd8Y8ozZMo4h4a96TdotHuDw44mK6G36kVvjqrsfBCCiMMIVEW+S3uAqh2D278G3+uYA== 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=TR8jD+j5MrWmKeZ+Dv79qspK7/u27O+5MG+fkBzsLSU=; b=jfDejbZSWaBRVIST/QZuMgASBC2NSR6GJnBT4n9OsimoCf+2zbvJDEjhqJRkt4ajOKf1Ead4p5+eSWWjiDXVQfkwYh0+slTcRBrDMVKlJqqAtmcd35ntC5UD2nPS4bqlZbb3tmLdvvJJe9IDJmTECBbRwnjApNqjbqbBcs7zb0g= 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 v5 2/4] hw/block/m25p80: Fix when VCFG XIP bit is set for Numonyx Date: Mon, 16 Nov 2020 15:11:02 -0800 Message-ID: <1605568264-26376-3-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605568264-26376-1-git-send-email-komlodi@xilinx.com> References: <1605568264-26376-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: 075f1545-0af4-43ab-87c9-08d88a84e6f3 X-MS-TrafficTypeDiagnostic: DM6PR02MB4058: 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: zzId58GfzODCZYugP9NQk8eOfT7JQ8+EBMdKk6ArnIFl4mx9hxWFqdbCOig8DoVqtHHbRv25TkN9DVEy9X3aAJh7ZKptMmWl++Om6qVh8ZU1DB6OOdstSiMSxvl+nvSfEepJiWC1PYcImk8hz1wmEvVUOD/O6run59Io/EsDs2bSg94arq8Ix4pYmXndOiqC4aDYxWjmkTvhs3QLhq2yaOQ0TtQfgsmT4hrJxk7b2IaROCfMifT3rW9bfDih3qgqliYtcXup+MI5V0wB1ZxpBsOxnZ5GvyvAuAP2mzsqP9tuK7nzlqDanNNb8HiDaiNbuw6mCl9lDi2/TmFMBosTsuPNTcKf7lhzQSEoUNwYpIppRLqoDx3Awu6yMELx+CXP5IZc4Wz2bMqNqzZSL6epgUost/itCaLQv6Q5dmeTnuE= 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)(396003)(376002)(46966005)(54906003)(36906005)(316002)(478600001)(5660300002)(70586007)(70206006)(8936002)(4744005)(86362001)(2906002)(8676002)(9786002)(4326008)(336012)(426003)(6916009)(36756003)(44832011)(2616005)(83380400001)(7696005)(82740400003)(186003)(47076004)(26005)(7636003)(82310400003)(356005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2020 23:11:08.6541 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 075f1545-0af4-43ab-87c9-08d88a84e6f3 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: BL2NAM02FT051.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB4058 Received-SPF: pass client-ip=40.107.69.62; envelope-from=komlodi@xilinx.com; helo=NAM04-CO1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 18:11:10 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 01:29:35 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=1605568401; cv=pass; d=zohomail.com; s=zohoarc; b=d0wJOsaHNhheWLGF19oebnJmNYZuCA8dx4cKAPjt+NcDwnnS8pTZ2CgzN134aGu9+QjHz7k+OQLeg5+SUOFN0AX9Br5WyGMnkPCK7dlFuOWep7MO3lZ6f434cpUF0DRBbWJUBQG1JY04MhgS9yRnCCyAdjcN5M4p4dnPjP5LdCY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605568401; 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=odIGpw+UDMOf/66/cVK3QbqoaDlb7lRd65ebuQoUHq8=; b=l/s/F3qaOe4DZpa+D+SjR8hNI3YvQFQ5qgSR4bToywhaayu8no9TXOxNUm+xnWE8mO3weyPI1Ay/v+OBGSBCZQd9BXyfsCHqWTGM4dEMhzCl/yDsTj7uwhLtOde62iDg77J+lp/HR9eaMum66WX6Yu+V7ufsNRco+mU1Z4bKGLs= 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 1605568401404518.7084594955523; Mon, 16 Nov 2020 15:13:21 -0800 (PST) Received: from localhost ([::1]:44746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kengV-0007Pd-Sy for importer@patchew.org; Mon, 16 Nov 2020 18:13:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keneV-0005wn-Kz; Mon, 16 Nov 2020 18:11:15 -0500 Received: from mail-mw2nam12on2076.outbound.protection.outlook.com ([40.107.244.76]:8512 helo=NAM12-MW2-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 1keneR-0003wy-Of; Mon, 16 Nov 2020 18:11:14 -0500 Received: from DM6PR10CA0011.namprd10.prod.outlook.com (2603:10b6:5:60::24) by SN6PR02MB5485.namprd02.prod.outlook.com (2603:10b6:805:ed::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Mon, 16 Nov 2020 23:11:08 +0000 Received: from CY1NAM02FT022.eop-nam02.prod.protection.outlook.com (2603:10b6:5:60:cafe::69) by DM6PR10CA0011.outlook.office365.com (2603:10b6:5:60::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25 via Frontend Transport; Mon, 16 Nov 2020 23:11:08 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by CY1NAM02FT022.mail.protection.outlook.com (10.152.75.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Mon, 16 Nov 2020 23:11:07 +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; Mon, 16 Nov 2020 15:11:04 -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; Mon, 16 Nov 2020 15:11:04 -0800 Received: from [172.19.2.32] (port=55506 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1keneK-0007S0-Jp; Mon, 16 Nov 2020 15:11:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZIt+xoZ+fVnv3cJRGZsqbSLGDhoTv+sSMkbWuTKvNagJ0I945JyP39r+tg/mWoUxbr1UxMgHXll8gGgBIQYg0yCZTc8GDbd/7fuvzTu5esOok5Hi3UXFKqRznCz2hmeRVqJOlGCMYZ6de027lMv9bzt7cCGiNfgq8z7tkvwkP3cOxVUVL5K7ZIuZzS4IUqRHcODc3v38ZE2+/mAEd3E9AISO2gibb5S9j/UCwQpVlM52GkGR8tJLxMYtpxtGKV2UiCwyIEM6NRbxn4byqQTMWsMvlTjjW4WcwefRV3DaxdfYGlBwmUf3k65z9PCaIlcEMkXg9T7h2Z3PWytRFEse0Q== 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=odIGpw+UDMOf/66/cVK3QbqoaDlb7lRd65ebuQoUHq8=; b=En41xqlUwVACFf2cnS1mNuNKl9FCNF68/YMwGk6EMwDeCJMVQrXnPTG7P8+IxftVWSK9L8/Mm64m8Iy0V3Rm+jc0YKheA8urly+Avx7+RzvIRcFQaC8KhwMaT4zQHqifXAeXC97bOvRTSGL+KypZgp1TpNQvN1V+H4Ybbyl8tEje+EcY/z0QjPx5cT1WrCi0jA12qEIP0g6DXmmHbJFu03IjUYPaTZMPBjBikqCxnO269kk/+VWntPuC/E6/a1y+aDCeP49ueTroHmA0upxFLPNCzRdar3Xoecr+lZMxkzcyTi7uFqJRxwMvv68MQb/NpS+dJoh/3G2ELWDw1zZglw== 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=odIGpw+UDMOf/66/cVK3QbqoaDlb7lRd65ebuQoUHq8=; b=SbJ8mKPEqr7Q2++LpCYlYUNH0kjBByJQM1LyY2/MR4OHCyOPvlvwC5xs3hmg5LeRS58If/a9nCBERRrwlp0HF7avHfUG6ZSvvTPLgQe6vAqrpcb6X3If5LbH5e+CxDqTnGa+PavZEA7fxa+miLjX+rGiPa0jVhWJ7Cj7MhLwSDI= 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 v5 3/4] hw/block/m25p80: Check SPI mode before running some Numonyx commands Date: Mon, 16 Nov 2020 15:11:03 -0800 Message-ID: <1605568264-26376-4-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605568264-26376-1-git-send-email-komlodi@xilinx.com> References: <1605568264-26376-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: aaafe1cd-f0e8-4c95-56c0-08d88a84e66a X-MS-TrafficTypeDiagnostic: SN6PR02MB5485: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:114; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DIRnFbbVm4MNzelr1NGhSyRh26q1Ft4yRWjqKwHXxgy0PB+Kj4Al/fJLtRtKXvDPb7WwrcbomBFSW8txLBSMRIEVR1yCaUr25TEEgvQRF/u40qSuK7qY0K46BKeMai3z26781pebFYZEQLGQvABl9P3YcTGA/l30VM7Dmt4zNF4bSc2cklLDu7eiNmeOT0AC92Z+XktSFs4xPjl2rEmsrAILYwORQ5CNiNGE2o3tYZ1D5WVgXqxzz42n9jJytlczqWD47sj4PHbVjAjcsoM4mxc84scIYCJBRpHf/SF3meagCNjm/1dfek+uIFxVZ6VsrwK9T0Nkd5OgkizC3fSbd9H/zMOQ50j0zLLkFMOEpIKngydam8eBxzeEPSUcWj54ovjT+vwCU3U7/e8p7L3Q7BB4MTbOYNZxDxkCfhkGf+0= 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)(396003)(136003)(39860400002)(376002)(346002)(46966005)(83380400001)(6916009)(336012)(186003)(44832011)(316002)(8936002)(54906003)(426003)(2906002)(82740400003)(356005)(36756003)(7696005)(5660300002)(82310400003)(26005)(86362001)(8676002)(478600001)(70206006)(70586007)(9786002)(47076004)(4326008)(2616005)(7636003)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2020 23:11:07.8336 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aaafe1cd-f0e8-4c95-56c0-08d88a84e66a 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: CY1NAM02FT022.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB5485 Received-SPF: pass client-ip=40.107.244.76; envelope-from=komlodi@xilinx.com; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 18:11:09 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 Reviewed-by: Francisco Iglesias --- hw/block/m25p80.c | 114 +++++++++++++++++++++++++++++++++++++++++++++-----= ---- 1 file changed, 95 insertions(+), 19 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index eb6539f..56bd5bc 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_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); @@ -950,14 +967,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 +977,84 @@ 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 MAN_NUMONYX || numonyx_mode(s) =3D=3D MODE_STD= ) { + 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 MAN_NUMONYX || numonyx_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 " + "QIO mode\n", s->cmd_in_progress); + } + break; + case QPP: + case QPP_4: + case PP4_4: + if (get_man(s) !=3D MAN_NUMONYX || numonyx_mode(s) !=3D MODE_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 MAN_NUMONYX || numonyx_mode(s) !=3D MODE_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 MAN_NUMONYX || numonyx_mode(s) !=3D MODE_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 MAN_NUMONYX || numonyx_mode(s) !=3D MODE_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 MAN_NUMONYX || numonyx_mode(s) !=3D MODE_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 +1106,22 @@ 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 MAN_NUMONYX || numonyx_mode(s) =3D=3D MODE_STD= ) { + 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 01:29:35 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=1605569280; cv=pass; d=zohomail.com; s=zohoarc; b=njHGfkw1cbetIOBL1jr/uaIE+wNl6sZAy5osANtvfEcfYudBiH7c9YKuM0/bp2hCIpamc9yfCT7b8uiNQxiJAZ/rzbEAYbTUwizuxhcye6XuqGtifU1/rZvZcZ/nPVu9/JQhVuBE7J69GADiMUwLy5MFHrdiiNfCHbsZSkzfq7A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605569280; 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=7GRwkfAOwkzUcWIMd6ntQxe8ao+JW3mT3KWLg5aFFls=; b=TQxPtfxRW+TsR74cYByd08Is6ETqbhRVJpmgWtlCC9PdwRSks/NVDNY8JyVQPq+5QkXBUdFTnwJbnAy3t+j8CO9mTNilCAPvfCxxtE+yXWqFzNn0x29iaImaRqrxDR2p0oDW0ns9NeeeL0Hay83fSHMRM0yGQqNT+x08WG/Yhjo= 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 1605569280575421.9964670505034; Mon, 16 Nov 2020 15:28:00 -0800 (PST) Received: from localhost ([::1]:36410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kenug-0007wd-Uo for importer@patchew.org; Mon, 16 Nov 2020 18:27:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kent3-0006xT-50; Mon, 16 Nov 2020 18:26:18 -0500 Received: from mail-dm6nam12on2052.outbound.protection.outlook.com ([40.107.243.52]:38433 helo=NAM12-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 1kensz-0005YY-4W; Mon, 16 Nov 2020 18:26:16 -0500 Received: from DM6PR10CA0019.namprd10.prod.outlook.com (2603:10b6:5:60::32) by CH2PR02MB6326.namprd02.prod.outlook.com (2603:10b6:610:10::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Mon, 16 Nov 2020 23:11:07 +0000 Received: from CY1NAM02FT022.eop-nam02.prod.protection.outlook.com (2603:10b6:5:60:cafe::5f) by DM6PR10CA0019.outlook.office365.com (2603:10b6:5:60::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25 via Frontend Transport; Mon, 16 Nov 2020 23:11:07 +0000 Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by CY1NAM02FT022.mail.protection.outlook.com (10.152.75.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3564.22 via Frontend Transport; Mon, 16 Nov 2020 23:11:07 +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; Mon, 16 Nov 2020 15:11:04 -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; Mon, 16 Nov 2020 15:11:04 -0800 Received: from [172.19.2.32] (port=55506 helo=xsjkomlodi50.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1keneK-0007S0-KX; Mon, 16 Nov 2020 15:11:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ikxEXJy61f7QXzOxUusPSx15im+e5spkeeAy8aWkhTKAe3lM0G2g+yNVidd0lwNzEunpkHIJPcn66agHq8lP5O4uB4ww+TbAUIidKn+0NGKHS6AeW06b8uvngdh6ses7CdhoE/9ykSTtKdvjV3lqchBPikRYe1gbrc6sqOj7vvXyIewRVxDwddlIBqdaMLEjPyohqKDLvmDmRx4iC4kSzqFuxdMjLx9dbYaF0B5ZsLmn/fjAJ6k9ArZN8HdkLN1cRgdIt52KCgVG6df6zvAWR0Skzpw57DbTqoEQd/Y76KxATlnyyCneJxbEPlXMUvIudNHCyd5+y17tswImjtp5kg== 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=7GRwkfAOwkzUcWIMd6ntQxe8ao+JW3mT3KWLg5aFFls=; b=ZyMo2bahYpvW7Roam4bTgHFYdDJ3I7Dvlq5fPRB1Buf5byi9RGu1QaxkccajndJlRBcEU1d2JgrI8T+tf2G7RIQdRyKx7LfBym/QCfpiBBcfBemudh3t/lruedH2t/cpfS7xgvE4e9ZDzxy7iGJeeFse70SZFN94sQCPBbt20t04AsVei15GXqau0RxP9Tsq2z+uaeW0gsfZpjObtBEe1NAuUhD9FEuDHE/rjw3r5oTPJixllc9fGf2vHE2CxW9CFLgtD+Bs10kt0xwUa8UQZzyCFslqH4HWjsmFSH9SIqxnVPfpaRWoASGnoFCeIGfJiLtGHl2Agc6EaeaFrKZeKA== 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=7GRwkfAOwkzUcWIMd6ntQxe8ao+JW3mT3KWLg5aFFls=; b=GQP3PdtMMdQdwEc+O5PP+2ngMWHVqW6XejyaM7xm9hYDFrmVF25yfLEQQApMlTJseHS5Rjbmhriuk58QrTD+jZvmPzMecOZYiM1eHOspwKre3wzNhZcHz063rIN3GuqpmB7xTV5VDObQymMuj/wBNPE6Hup+Wm+N8DAuXRpy9Xo= 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 v5 4/4] hw/block/m25p80: Fix Numonyx fast read dummy cycle count Date: Mon, 16 Nov 2020 15:11:04 -0800 Message-ID: <1605568264-26376-5-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605568264-26376-1-git-send-email-komlodi@xilinx.com> References: <1605568264-26376-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: bd576801-1e1d-4da2-7b36-08d88a84e5f0 X-MS-TrafficTypeDiagnostic: CH2PR02MB6326: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:291; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /qVV/o2a4e3gX4J5AE1FnYUhCbN6BHBCevOE7NRqcfTlxplngOMpM0vODr0ABJkFBorjkv+p7iteRecN5XStrBDLRJCNv98gkwd+SssgXjN9fA8kNg8INEQhOtxjaGFC0WY9B4VBcGcQOMyYUGEQTSpWtmCcVqlepgqwR6EHOBG/S/6z+YSCknjqaiOn1pUIDxdLl7TKBV2NHB6SCwuG4N5g8DYk8qCyKaiHfhMqhDetd2BzHW8G4FyjVlRsDfmnBz/vXlLncbm9FG954vkhi321BXeMFeuppwfrA9CDljI/peEVKyRN6MjCItsmuV9MamY+Hq2P2eUacss+VQUbHSvj8Rl0SpcsLJ6FS79rS+fBXMRNFDL1xpr/VMoMBBvVYfGjao8puiTnCEiv1J/wSgHNB/TAM/8DuzuYVajcS8LTw/6gzmr53GHBlkjuaC9i2T6dZB78FLD00b6Ws83+THtBL4bxzcWwOabECcvRjU/vyNYue8FGiLmOk+lYcpTC 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)(39860400002)(346002)(376002)(396003)(136003)(46966005)(2616005)(7636003)(426003)(356005)(70206006)(82310400003)(336012)(186003)(26005)(8936002)(7696005)(8676002)(70586007)(83380400001)(9786002)(82740400003)(5660300002)(47076004)(36906005)(36756003)(478600001)(44832011)(86362001)(2906002)(6916009)(4326008)(54906003)(316002)(966005)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2020 23:11:07.0090 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd576801-1e1d-4da2-7b36-08d88a84e5f0 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: CY1NAM02FT022.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6326 Received-SPF: pass client-ip=40.107.243.52; envelope-from=komlodi@xilinx.com; helo=NAM12-DM6-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 18:26:10 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 for QIOR and QIOR4 commands or when in QIO mode, and otherwise 8= for the currently supported fast read commands. [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 56bd5bc..a67dc53 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -837,6 +837,30 @@ static uint8_t numonyx_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_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); @@ -846,7 +870,7 @@ static void decode_fast_read_cmd(Flash *s) s->needed_bytes +=3D 8; break; case MAN_NUMONYX: - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->needed_bytes +=3D numonyx_extract_cfg_num_dummies(s); break; case MAN_MACRONIX: if (extract32(s->volatile_cfg, 6, 2) =3D=3D 1) { @@ -885,7 +909,7 @@ static void decode_dio_read_cmd(Flash *s) ); break; case MAN_NUMONYX: - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->needed_bytes +=3D numonyx_extract_cfg_num_dummies(s); break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -925,7 +949,7 @@ static void decode_qio_read_cmd(Flash *s) ); break; case MAN_NUMONYX: - s->needed_bytes +=3D extract32(s->volatile_cfg, 4, 4); + s->needed_bytes +=3D numonyx_extract_cfg_num_dummies(s); break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { --=20 2.7.4