From patchwork Wed Sep 30 00:28:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Komlodi X-Patchwork-Id: 1373999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-xilinx-onmicrosoft-com header.b=DXtl8dWC; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C1HFh3JgGz9sSG for ; Wed, 30 Sep 2020 10:29:42 +1000 (AEST) Received: from localhost ([::1]:40816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNQ02-0004Bk-Vh for incoming@patchwork.ozlabs.org; Tue, 29 Sep 2020 20:29:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNPzC-00049n-KZ; Tue, 29 Sep 2020 20:28:46 -0400 Received: from mail-bn8nam12on2058.outbound.protection.outlook.com ([40.107.237.58]:61473 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 1kNPz9-0007lC-BP; Tue, 29 Sep 2020 20:28:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZRDdCnF+tUQ00VfxQWXdaO6yZE0tHTM2AECckOwLxW3Cs4RWD8CjTbNS4qusyHBGCdooAsv8K3UrLWSjKWFA4Dh0eLIS+r7DO1xjNQ5JKC1jZhR1qeIBetso4YL+CCxqRjvl9mL8M71nF5pYoJW1VxWXvSI4+zMgDO3ezTssit7PSav/QRWA86qbm8i0uoa9IxaC27/lrIGzsPQ0T1gFK/EktQI/XYApyeSVw63GbgUtQWORym+6L0foeBgqsEaf57sII32JGh2vc5YOYKAoaZmmc59gvZMXAFsJXZ5+BlSJyw6AUstE3MZ51/UNnwXgM1FzsZ8QlJrEnHWyiLxgMA== 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=OHFWZZ0YIVJaBYLWslkr5H3LB5h1lUK6sUkG7dXJ2vI=; b=oFMejxGac6F8yTh8BPnHvnfaUlwLp4BXnvbSTn4mQKK9ubCK+1Zh4+OLQE75wO8QmQbgyqPGogfjAW+N8ZEYlo6liB40oCkRXQiBqP7hgjQk0IhpBVrhXg4CfX6gOVVZUxlAuDFsbePhbQ/wx+YMIRegB4itguC03GHQbgl6AEfdt2RA7zzznCMBKBFPqVjqpWEBj/ZLcL7t/63zuoNbNdIq3BTpjLQSBiuJZxsrYUTprXVYbtYqIjxjco6s8CSqy2+wYBxs07XsEDYydyVpBN9RcyxJ4wYzsBJbuwWpWi5Y+YO3shWk8N7/ZC7emOJb1rWHJ5dvZR1b9m2knhMQVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) 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=OHFWZZ0YIVJaBYLWslkr5H3LB5h1lUK6sUkG7dXJ2vI=; b=DXtl8dWCLh6UO/RAxFwNAQ1RTZXZvLMe25jh9H7ZlG62sBIlYVmuc/hmgut4+GYVKdRip3P7hA3foG+rO1I9fYcAEclRPxjVS4+R404PGz3frTuNTUTowhNX/GNcCQwVbIxNbNocQBPxoq2CH+kA44YDShCZSjflUyjOacindp8= Received: from CY4PR21CA0041.namprd21.prod.outlook.com (2603:10b6:903:12b::27) by MN2PR02MB7054.namprd02.prod.outlook.com (2603:10b6:208:201::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.32; Wed, 30 Sep 2020 00:28:40 +0000 Received: from CY1NAM02FT045.eop-nam02.prod.protection.outlook.com (2603:10b6:903:12b:cafe::ac) by CY4PR21CA0041.outlook.office365.com (2603:10b6:903:12b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.8 via Frontend Transport; Wed, 30 Sep 2020 00:28:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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 (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT045.mail.protection.outlook.com (10.152.75.111) with Microsoft SMTP Server id 15.20.3412.21 via Frontend Transport; Wed, 30 Sep 2020 00:28:39 +0000 Received: from [149.199.38.66] (port=59136 helo=smtp.xilinx.com) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1kNPyg-00073l-Bn; Tue, 29 Sep 2020 17:28:14 -0700 Received: from [127.0.0.1] (helo=localhost) by smtp.xilinx.com with smtp (Exim 4.63) (envelope-from ) id 1kNPz5-0007Kh-E1; Tue, 29 Sep 2020 17:28:39 -0700 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 08U0Sav3012242; Tue, 29 Sep 2020 17:28:36 -0700 Received: from [172.19.2.32] (helo=xsjkomlodi50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1kNPz2-0007Ja-MT; Tue, 29 Sep 2020 17:28:36 -0700 From: Joe Komlodi To: qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/block/m25p80: Fix Numonyx dummy cycle register behavior Date: Tue, 29 Sep 2020 17:28:35 -0700 Message-Id: <1601425716-204629-2-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1601425716-204629-1-git-send-email-komlodi@xilinx.com> References: <1601425716-204629-1-git-send-email-komlodi@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: d40113a4-8f6d-4748-b088-08d864d7c740 X-MS-TrafficTypeDiagnostic: MN2PR02MB7054: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:626; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qNBRYbTkUxQT4ZqDw6C1g8snL+aUOZVyHXYafwJ+RPnn8GKJGqso2r/a/6vS/IIBIpVCdihHQXBltpDnK9YyGSIbhqZoT7eS1zlB5XUK98FlnmogNAAVjrIPxPT/txwJKJCQ/ymxK0OC2Ec9+hksG2KKF0HidRqVeomuANp7Shnu7F/D1zxy9QCZBR7Y7EUUxm1dIH42vuBBnYVW+1ep2VVYIs4A4eaka3J/8uQOLiv3nBD4e568uMIhnBqpNVB0x8yxbGcfQbfwj2rYCLWNOokHCM06ExUaMirz+Z4puEyzB32YsMIXAfEPumcn3Xxnc80XmHVvPx27oYJaKuaGpfuHSBwrQyo8x4hdN+TnupZRhk6/rVGPoOMC9/F+Xz4mnqHsesUtSd5gd/iNoxR8Kdz6W9Ta4pbcEo0BIsFC1lLT8FzITwxBFgfpmXVe7wt/K9G2dSuDL8lBQ3VzLb0oRNc86OjiHKV59r7ZW02JdFE= X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFS:(346002)(396003)(39850400004)(376002)(136003)(46966005)(81166007)(966005)(86362001)(6916009)(26005)(478600001)(426003)(186003)(7696005)(82310400003)(70586007)(316002)(44832011)(2616005)(70206006)(4326008)(8676002)(83380400001)(356005)(8936002)(36756003)(83080400001)(5660300002)(9786002)(82740400003)(2906002)(336012)(47076004); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2020 00:28:39.6506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d40113a4-8f6d-4748-b088-08d864d7c740 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT045.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR02MB7054 Received-SPF: pass client-ip=40.107.237.58; envelope-from=komlodi@xilinx.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 20:28:40 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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.614, 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: kwolf@redhat.com, francisco.iglesias@xilinx.com, alistair@alistair23.me, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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] http://www.micron.com/-/media/client/global/documents/products/ data-sheet/nor-flash/serial-nor/n25q/n25q_512mb_1_8v_65nm.pdf Page 22 note 2, and page 30 notes 5 and 10. Signed-off-by: Joe Komlodi --- hw/block/m25p80.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 483925f..43830c9 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -820,6 +820,26 @@ static void reset_memory(Flash *s) trace_m25p80_reset_done(s); } +static uint8_t numonyx_fast_read_num_dummies(Flash *s) +{ + uint8_t cycle_count; + uint8_t num_dummies; + assert(get_man(s) == MAN_NUMONYX); + + cycle_count = extract32(s->volatile_cfg, 4, 4); + if (cycle_count == 0x0 || cycle_count == 0x0F) { + if (s->cmd_in_progress == QIOR || s->cmd_in_progress == QIOR4) { + num_dummies = 10; + } else { + num_dummies = 8; + } + } else { + num_dummies = cycle_count; + } + + return num_dummies; +} + static void decode_fast_read_cmd(Flash *s) { s->needed_bytes = get_addr_length(s); @@ -829,7 +849,7 @@ static void decode_fast_read_cmd(Flash *s) s->needed_bytes += 8; break; case MAN_NUMONYX: - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + s->needed_bytes += numonyx_fast_read_num_dummies(s); break; case MAN_MACRONIX: if (extract32(s->volatile_cfg, 6, 2) == 1) { @@ -868,7 +888,7 @@ static void decode_dio_read_cmd(Flash *s) ); break; case MAN_NUMONYX: - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + s->needed_bytes += numonyx_fast_read_num_dummies(s); break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { @@ -908,7 +928,7 @@ static void decode_qio_read_cmd(Flash *s) ); break; case MAN_NUMONYX: - s->needed_bytes += extract32(s->volatile_cfg, 4, 4); + s->needed_bytes += numonyx_fast_read_num_dummies(s); break; case MAN_MACRONIX: switch (extract32(s->volatile_cfg, 6, 2)) { From patchwork Wed Sep 30 00:28:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Komlodi X-Patchwork-Id: 1374003 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-xilinx-onmicrosoft-com header.b=oM4F8hoN; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C1HK80J71z9sSC for ; Wed, 30 Sep 2020 10:32:44 +1000 (AEST) Received: from localhost ([::1]:45284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNQ2z-0006wr-UX for incoming@patchwork.ozlabs.org; Tue, 29 Sep 2020 20:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNPzK-0004Hk-PD; Tue, 29 Sep 2020 20:28:55 -0400 Received: from mail-bn7nam10on2065.outbound.protection.outlook.com ([40.107.92.65]:58849 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNPzI-0007nV-2X; Tue, 29 Sep 2020 20:28:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nftEVYKi0nl7HGfLfFpM65svbsTcBGOaqWQUluVt5lRE2rgD9RcXNq+6k+CvXT22Ll+CO8+jTwYN9EvsrBSggtNUcMd9VXcQx+TRjxASKcj+aIcwK+hbGkZ9UJNJjvipXLfb3OWiNMmoNSVPZE7lRnt1KQ/IwHxsQArkoKZsbMCrvfAcOHAcsDDGgn43su+XofHWS9PCCjNePG7aDNbZBggrbuZBKSPmw1UcRWiDgHJl7zB3jJPYOl8mbeyBXZjSiquPwNyuvrlU6eScKEzzFCod8PqyKrgbv2jYsmRMO+FACJ1oW9kEGHvF/JhcvF4ytA16/1xbY3NUv7hPPmH2tQ== 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=H61A/oGg4zdNXB4k2yjG1CH5TXnZZPxH3HEFsJp1j9Y=; b=ELzNNBiv5Hh6Z6sp+nAq9TP4hueJz5itJqsp/EFpK8HcpTGXyNIk95VfntbLQn0ZFF5uQ1n4lSZW6XN5pt4zUMV0PPWBbBSABmHUJpHm/+5QCP8JS1E6va8Oual+iEuViF06bpZtTvHKkhvflCc9vs/eka8zRQP3af8/I+KCjhmgpWjSwQMDL/fBrTdUXbj12HASetqMAopIRol3sDLNJr1eSLmQyGxko0cJ4B0GQcqCTIO6qubw35f/7sxeYaTxgEmr5WR/kVgD0lLuEWRj9H05rcju5S16+fotcONoK7nfnfdVSP4/kN0/lTdfuPYk+D2KzKAvIwsB8FcnsJoc+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) 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=H61A/oGg4zdNXB4k2yjG1CH5TXnZZPxH3HEFsJp1j9Y=; b=oM4F8hoNDvF5t6qfMAm8BeO0DocdqBBxJY8bx6F47tb369V6hBDW0DozCdd0VXrxvY3zc9ADt00SKHvXO7ta7TFnWvY9QfcVjiPNW6AtAcZ1baq9pq4w6xHzdHg82ePm5Ds1AnfZiheUpsJG1tMaitJ+7y4PLy7PF/+Xdg8H8TI= Received: from SN4PR0501CA0023.namprd05.prod.outlook.com (2603:10b6:803:40::36) by MN2PR02MB5967.namprd02.prod.outlook.com (2603:10b6:208:11a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.26; Wed, 30 Sep 2020 00:28:41 +0000 Received: from SN1NAM02FT050.eop-nam02.prod.protection.outlook.com (2603:10b6:803:40:cafe::fa) by SN4PR0501CA0023.outlook.office365.com (2603:10b6:803:40::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.16 via Frontend Transport; Wed, 30 Sep 2020 00:28:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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 (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT050.mail.protection.outlook.com (10.152.72.128) with Microsoft SMTP Server id 15.20.3412.21 via Frontend Transport; Wed, 30 Sep 2020 00:28:41 +0000 Received: from [149.199.38.66] (port=59140 helo=smtp.xilinx.com) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1kNPyg-00073o-DH; Tue, 29 Sep 2020 17:28:14 -0700 Received: from [127.0.0.1] (helo=localhost) by smtp.xilinx.com with smtp (Exim 4.63) (envelope-from ) id 1kNPz5-0007Kh-FX; Tue, 29 Sep 2020 17:28:39 -0700 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 08U0SaHK005668; Tue, 29 Sep 2020 17:28:37 -0700 Received: from [172.19.2.32] (helo=xsjkomlodi50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1kNPz2-0007Ja-OI; Tue, 29 Sep 2020 17:28:36 -0700 From: Joe Komlodi To: qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/block/m25p80: Fix nonvolatile-cfg property default value Date: Tue, 29 Sep 2020 17:28:36 -0700 Message-Id: <1601425716-204629-3-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1601425716-204629-1-git-send-email-komlodi@xilinx.com> References: <1601425716-204629-1-git-send-email-komlodi@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: bea96594-f715-42ee-6189-08d864d7c816 X-MS-TrafficTypeDiagnostic: MN2PR02MB5967: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:741; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CXPkJ53kekNW3WaAZcj4fZd1xCl7N3R2Bj1KuWdhaaZwAhueLjF7jTM/mFGmKjpkU8ZMpjWi8Sd+amBOfwcth8HzHfT7JcEu5/ia1xBkz6M/PFDIU3V37PG0Swdx2NKWES7iE28d5YOP0en78xaRYx3qDfO8kQgl5lZiYfo6F350L7luAFAW5A48wsmt6+zkMGiIpwNcKrl8o9K57XVXNbWnFW/inPPv8VcIR1kzacBiAwxPpOfA6oOhOZ0zn25uLI+uTLgPFr48FvgzDMAHHnuFg8wB1Zxre04NRBTp8RHCeSDxEFpSpmDxkg9jBBmNi98zsIcrwDX6sz7wZYOXRoF08igyNmVSFX1ZGeJcUyWNNHcD0sdQwoqVjh0Qj+kHOr4iEykXo8FsPIm9KwgJcOpKia2kOcgwxF3ggBGxvK93MogLuOPhNTYJ6Dx6jzs7 X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFS:(39850400004)(376002)(136003)(346002)(396003)(46966005)(336012)(2616005)(2906002)(86362001)(316002)(4326008)(7696005)(36756003)(5660300002)(44832011)(4744005)(70206006)(70586007)(6916009)(82740400003)(47076004)(186003)(478600001)(8936002)(83380400001)(81166007)(82310400003)(356005)(26005)(8676002)(9786002)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2020 00:28:41.0501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bea96594-f715-42ee-6189-08d864d7c816 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT050.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR02MB5967 Received-SPF: pass client-ip=40.107.92.65; envelope-from=komlodi@xilinx.com; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 20:28:50 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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.614, 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: kwolf@redhat.com, francisco.iglesias@xilinx.com, alistair@alistair23.me, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The nvcfg registers are all 1s, unless previously modified. Signed-off-by: Joe Komlodi --- 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 43830c9..69c88d4 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -1334,7 +1334,7 @@ static int m25p80_pre_save(void *opaque) static Property m25p80_properties[] = { /* This is default value for Micron flash */ - DEFINE_PROP_UINT32("nonvolatile-cfg", Flash, nonvolatile_cfg, 0x8FFF), + DEFINE_PROP_UINT32("nonvolatile-cfg", Flash, nonvolatile_cfg, 0xFFFF), DEFINE_PROP_UINT8("spansion-cr1nv", Flash, spansion_cr1nv, 0x0), DEFINE_PROP_UINT8("spansion-cr2nv", Flash, spansion_cr2nv, 0x8), DEFINE_PROP_UINT8("spansion-cr3nv", Flash, spansion_cr3nv, 0x2),