From patchwork Thu Sep 17 01:57:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 518672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 344011401AF for ; Thu, 17 Sep 2015 11:57:54 +1000 (AEST) Received: from localhost ([::1]:55131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcOSO-0008BL-BP for incoming@patchwork.ozlabs.org; Wed, 16 Sep 2015 21:57:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcOS9-0007s0-Sv for qemu-devel@nongnu.org; Wed, 16 Sep 2015 21:57:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcOS6-0004zM-Lk for qemu-devel@nongnu.org; Wed, 16 Sep 2015 21:57:37 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:34439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcOS6-0004yt-G7 for qemu-devel@nongnu.org; Wed, 16 Sep 2015 21:57:34 -0400 Received: by wicfx3 with SMTP id fx3so4231177wic.1 for ; Wed, 16 Sep 2015 18:57:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EfAEoGaSke7r72Y+K/xrD3hDFPUERu18I0LmZ2emMQU=; b=O0KE+kGGoky3rNtxi/6LJNAuoRlMdAhc4Z4GYHJAp+FxzH5q9gCwHcFHm0pYnsTzmN VNLAx52AT+RH8XTVnYINKFIgC1m+CDCBIyJKd7azL1g6E486BU5HHe77Lbw8jvSw/48y cR849MRO4GZ8usnLZhCSY3kGirZz80KXqQwSlyy+SsxpPn48jSFxijxucbn/jHEfMb6i MZMHPY2jLBpS5v3SFBaJMLHJn9lZaEXrjwdn6u+3Ox+kw9zDKx0agRdDHq9Hb9NN0XGu OIykJ7VxtCjP4cMFgsh+VSBzDAiwYIAy3MmFLy/kh05PinJUI6GBJsXydfnwb1dIR81L dJmQ== X-Gm-Message-State: ALoCoQlX/VX5etcNbTIyUDSH6T0PFEuD3XJk6IjPdV/8Rq9oLxiPCDpwAd60/Gn9gmQeAw4SuKYd X-Received: by 10.180.219.106 with SMTP id pn10mr2539186wic.56.1442455052440; Wed, 16 Sep 2015 18:57:32 -0700 (PDT) Received: from localhost ([87.117.204.88]) by smtp.gmail.com with ESMTPSA id bq7sm628335wjc.31.2015.09.16.18.57.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 16 Sep 2015 18:57:31 -0700 (PDT) From: shannon.zhao@linaro.org To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Thu, 17 Sep 2015 09:57:21 +0800 Message-Id: <1442455041-6596-1-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.179 Cc: peter.huangpeng@huawei.com, graeme.gregory@linaro.org, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix wrong size of flash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Shannon Zhao While virt machine creates two flash devices with total size 0x08000000, it wrongly uses this total size for each one. So it will overlap other MMIO spaces. Signed-off-by: Shannon Zhao Tested-by: Graeme Gregory Reviewed-by: Andrew Jones Reviewed-by: Wei Huang --- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 2073573..bc858c8 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -114,7 +114,7 @@ static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap) { Aml *dev, *crs; hwaddr base = flash_memmap->base; - hwaddr size = flash_memmap->size; + hwaddr size = flash_memmap->size / 2; dev = aml_device("FLS0"); aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015")));