From nobody Thu Apr 25 09:33:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1562918045; cv=none; d=zoho.com; s=zohoarc; b=nmyhqSFqbBvLXMwjn8HDWucGRyI5D5cl5Lyj1gmd+MgSRvPj8BlFzJR7QB2+mvrLr0e3f6evVcPIrEDV5N8BFuJsZxusKhF4ouD0/+6FjNBg2YMM7mvKPK9dzZ9YimDFCcjJl6yKq9OtB9YJ1OFOBi3Yhi6N9SfMFkjBszPp7b0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562918045; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=vtIAZ6vmuod1tk+7ROzY0KNSrAfvKQ1HBcJz1j1qLR4=; b=jt0kA/wqZkO9xZftsgWPVBE6HmR+l8NVpRwjz2k2pZtkBM7QYU+TSbp3ggu7LgqfOCwP1yf9agCWTNYwXjgix3LxxTwLvYl44e69OhsHCUcfSpyNRunvWImLixcqC6HocJ1m1TzEv25pyJZGtBIlNdJotdy0gi1g1t3lWp32klc= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562918045120860.0911240017039; Fri, 12 Jul 2019 00:54:05 -0700 (PDT) Received: from localhost ([::1]:47286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlqNU-00064v-Tc for importer@patchew.org; Fri, 12 Jul 2019 03:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43837) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlqNL-0005b8-A7 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlqNK-0000Wf-Di for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:53:51 -0400 Received: from mail.sysgo.com ([176.9.12.79]:46240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hlqNI-0000Rv-GS; Fri, 12 Jul 2019 03:53:48 -0400 From: David Engraf To: peter.maydell@linaro.org, qemu-arm@nongnu.org Date: Fri, 12 Jul 2019 09:50:02 +0200 Message-Id: <20190712075002.14326-1-david.engraf@sysgo.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 176.9.12.79 Subject: [Qemu-devel] [PATCH] hw/arm/virt: Fix non-secure flash mode 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: qemu-devel@nongnu.org, David Engraf Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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 0b5138cb22..d9496c9363 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.17.1