From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548C6C4361B for ; Tue, 15 Dec 2020 14:28:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D521522518 for ; Tue, 15 Dec 2020 14:28:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D521522518 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpBJw-0006LH-0t for qemu-devel@archiver.kernel.org; Tue, 15 Dec 2020 09:28:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpB4l-0001eC-6i for qemu-devel@nongnu.org; Tue, 15 Dec 2020 09:13:15 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:34751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpB4Z-0007Ba-Cm for qemu-devel@nongnu.org; Tue, 15 Dec 2020 09:13:14 -0500 Received: by mail-wm1-x32b.google.com with SMTP id g25so11100192wmh.1 for ; Tue, 15 Dec 2020 06:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6oHI4nI9UNd7uvlc5Xb1A8Ko50Iz35kwbptxV7aPIF8=; b=yO5sx1v6gDzE4VdJpkQUYiqXp7oFgdBBbGbGaAG4RVBBCynIGZ9bBGLHJQcVHlT9zl 9LF0GLyg5xZRSbS8qlEF0tXeF+qBDD6uPSF4uu0dUgbnDMXmbbVxvDBBPBww0DjDJoYP v6syNfLAxBNjH61tXV6WsDzMGmu9rmTt+DdvTZjTQZoeTMYZwvmKIs0dBoZuQ3rBN01L XWcfNQa0WUD3tlKAkSD9hZdbeVEgmXCg3IEPQdnVHEUCdXhtGDn62tgq3EyehfOPtjZ0 B3EMLLmYBPq+m8n+064Ei8ZFwVWIobBnd3E5EwE1JiXJluP7AbyLbUby6p4m9WSIgQB2 a54A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6oHI4nI9UNd7uvlc5Xb1A8Ko50Iz35kwbptxV7aPIF8=; b=c3qqlP63NchDOIDifIL0dvbYvBNg6CDKaMt3yuVyAFD4fodkSlTghZvoNs2uajZdDV RY42VBaVrnh8Qv2tBISj0BfW/5FrxYj+jiUaD2jeq8ZnhGx0jF8wZGAshIVJrpVI/lk2 aRhSsHeCW6+DwXl8kUrahdFpSE96j+KnYERbhOwo142f01LUUeuhegfFNCKMwBQ437ug UjGHYYId/jOEzeiTnm2dHNZmkD059Wg3MVVltfRk0mvWfbMUr3j1Qg4/kDhkCWUe/bgZ cl6RBP7ecQ0JkifmIZArBIvaUY3VVltjtxHHiSmJvY0rS4Dy7xsOB8Q7KzmGx5e+QUjy 9Ocw== X-Gm-Message-State: AOAM531tzmdKtpLCgxumTfMB3UaQlBQu7XBPnxzG+uAXP1FlNJIYK+4F dMw+vFUtsIObUAy1w5n9BrpSJohgTJLIxQ== X-Google-Smtp-Source: ABdhPJyasY+tFVH2VrYkW9DAwKNrybbUfzwlgoA1pUuU6681MWdXXnhs/kO7lr3YqzNylhBtAUvv+g== X-Received: by 2002:a1c:151:: with SMTP id 78mr33597452wmb.24.1608041580440; Tue, 15 Dec 2020 06:13:00 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w21sm19667319wmi.45.2020.12.15.06.12.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 06:12:59 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/20] hw/block/m25p80: Fix when VCFG XIP bit is set for Numonyx Date: Tue, 15 Dec 2020 14:12:35 +0000 Message-Id: <20201215141237.17868-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201215141237.17868-1-peter.maydell@linaro.org> References: <20201215141237.17868-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Joe Komlodi VCFG XIP is set (disabled) when the NVCFG XIP bits are all set (disabled). Signed-off-by: Joe Komlodi Reviewed-by: Francisco Iglesias Message-id: 1605568264-26376-3-git-send-email-komlodi@xilinx.com Signed-off-by: Peter Maydell --- 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 bad72538386..7e1d56442f3 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -768,7 +768,7 @@ static void reset_memory(Flash *s) s->volatile_cfg |= VCFG_DUMMY; s->volatile_cfg |= VCFG_WRAP_SEQUENTIAL; if ((s->nonvolatile_cfg & NVCFG_XIP_MODE_MASK) - != NVCFG_XIP_MODE_DISABLED) { + == NVCFG_XIP_MODE_DISABLED) { s->volatile_cfg |= VCFG_XIP_MODE_DISABLED; } s->volatile_cfg |= deposit32(s->volatile_cfg, -- 2.20.1