From nobody Wed May 7 18:59:35 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.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;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1563198222; cv=none;
d=zoho.com; s=zohoarc;
b=djP8aIVjurH9Dit+r8t+QjuOqE8GJBvNYUOg8+UBvfhbSetd1lG4+m9oBDu8eIOANKDjBimFNd50V9vIwtJExsNcucke66gR/pFXLulQ2l3yn/uH7/5AfovxoILWKVl4/tbXM05VOPoUC6F7znKM3Y3nTywAPZ+roMOyLKOe+hU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
s=zohoarc;
t=1563198222;
h=Content-Transfer-Encoding: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:ARC-Authentication-Results;
bh=Lkg7H1NRSw1xymZWFmnKrvzweUJjE5TzOTqnyXYm+p0=;
b=H2bSTq1qbjVldp9z6e1y+5gtuKkzsIMahPvIT837u8mIf3MdycUTirqPykIKtJtd/7J10s4LyoUammB9CiZHtJVw6SSNzx/CZQoSzqYEOP/SF5LXQva1wbHO5WtxQVt57YfpNHtiu23DheIeLRyWd4KeNYx/4TnrxEhZC7xmZzU=
ARC-Authentication-Results: i=1; mx.zoho.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail header.from=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1563198222959681.1870779851143;
Mon, 15 Jul 2019 06:43:42 -0700 (PDT)
Received: from localhost ([::1]:38740 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.86_2)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1hn1GU-0004N9-LQ
for importer@patchew.org; Mon, 15 Jul 2019 09:43:38 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51787)
by lists.gnu.org with esmtp (Exim 4.86_2)
(envelope-from <peter.maydell@linaro.org>) id 1hn1FG-0007sU-VV
for qemu-devel@nongnu.org; Mon, 15 Jul 2019 09:42:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1hn1FF-0006BH-NU
for qemu-devel@nongnu.org; Mon, 15 Jul 2019 09:42:22 -0400
Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39297)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1hn1FF-00069z-Gr
for qemu-devel@nongnu.org; Mon, 15 Jul 2019 09:42:21 -0400
Received: by mail-wr1-x42f.google.com with SMTP id x4so17141142wrt.6
for <qemu-devel@nongnu.org>; Mon, 15 Jul 2019 06:42:21 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id c7sm14221808wro.70.2019.07.15.06.42.19
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
Mon, 15 Jul 2019 06:42:19 -0700 (PDT)
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=Lkg7H1NRSw1xymZWFmnKrvzweUJjE5TzOTqnyXYm+p0=;
b=beAAmzYmHgMu4mw9foyEgPO/LTAocGSdXuDkBTbB2NcOTLZuK0k6hnfAFO/+3vdmZy
W/kGAg/CktB/772KsVN4pXD9/bQuvTX+gbPMA6HNpyd65sbQ9sQp3UO3yTz/g95DVZXL
WKytwXYSPqbogTs0Z0T2wEGKME8nRDL5b6TwYcrdx13pL9HYm2OnUs1Qotq4Oji9FLOL
4QQPomFiGijzU3LEAD9C0PxOhg+X37PTZpITqJxUk/J/rVAjk16ohjGmvxMHt+MOJSgw
Sy4j5v98ZnDVpT6wKvgYJZ1OPLc9bBn2jbT/dC5/lLM+7l2yM2QqD3NUR+B4ciM8W9NX
LDGQ==
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=Lkg7H1NRSw1xymZWFmnKrvzweUJjE5TzOTqnyXYm+p0=;
b=iSA8T1xkahG1Ht5rFa+UVIxpz123sl2T+X3/jCnLZy590B9ao8avy1KrQBxS9vZUDE
kBURyuPr8yC08fSdPXP9ZuauWWPEjy7f+SWuJQxoc3Zw6Jz94DxyObF9dQYe3cZmxOG5
Wh8PS9kHIUFxmbIEAuNOd2VVKq9dZylv6AFeNxa9zZKwUDBAJkZGxOoA8mpsxwLSL5XJ
9CJzfp0ElT684OzCo87KgjqbBo3Jsh6VLfDqCMtubgG5CkPASHV8upwy5ehFUj8RcuLg
CfRNC0n7iUN9GLpvfMKfa0j5ov946LaMgp6/y6LRlCuHmJHVfr1Xw+CM5QO0tty2Nivs
OIQg==
X-Gm-Message-State: APjAAAULJJHYOXOgw3TMrnP1wHQCpTX0swA+7GRnCnn2S3n1ajzsJT6I
8In5KACVFxQGVcqgnEXH2FlNnwOvtte/oQ==
X-Google-Smtp-Source:
APXvYqyiu+KISngMkfNELdbRmmyVoYuPkMAg+WC4Xcas2ZY1g7OTuHHAX0OkQn2yotys+XdYAOd6ZQ==
X-Received: by 2002:adf:f646:: with SMTP id x6mr31177839wrp.18.1563198139863;
Mon, 15 Jul 2019 06:42:19 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 15 Jul 2019 14:42:08 +0100
Message-Id: <20190715134211.23063-8-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190715134211.23063-1-peter.maydell@linaro.org>
References: <20190715134211.23063-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::42f
Subject: [Qemu-devel] [PULL 07/10] hw/arm/virt: Fix non-secure flash mode
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: David Engraf <david.engraf@sysgo.com>
Using the whole 128 MiB flash in non-secure mode is not working because
virt_flash_fdt() expects the same address for secure_sysmem and sysmem.
This is not correctly handled by caller because it forwards NULL for
secure_sysmem in non-secure flash mode.
Fixed by using sysmem when secure_sysmem is NULL.
Signed-off-by: David Engraf <david.engraf@sysgo.com>
Message-id: 20190712075002.14326-1-david.engraf@sysgo.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/virt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0b5138cb22c..d9496c93634 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1674,7 +1674,7 @@ static void machvirt_init(MachineState *machine)
&machine->device_memory->mr);
}
=20
- virt_flash_fdt(vms, sysmem, secure_sysmem);
+ virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem);
=20
create_gic(vms, pic);
=20
--=20
2.20.1