From patchwork Fri Dec 21 16:02:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10740655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E901A13B5 for ; Fri, 21 Dec 2018 16:05:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8A5F26E54 for ; Fri, 21 Dec 2018 16:05:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCA1C2846C; Fri, 21 Dec 2018 16:05:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 66B1326E54 for ; Fri, 21 Dec 2018 16:05:17 +0000 (UTC) Received: from localhost ([::1]:46410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaNIa-0002hH-Fd for patchwork-qemu-devel@patchwork.kernel.org; Fri, 21 Dec 2018 11:05:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaNH0-0001Hi-NT for qemu-devel@nongnu.org; Fri, 21 Dec 2018 11:03:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaNGz-00041L-7N for qemu-devel@nongnu.org; Fri, 21 Dec 2018 11:03:38 -0500 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:44408) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaNGz-00040z-2k for qemu-devel@nongnu.org; Fri, 21 Dec 2018 11:03:37 -0500 Received: by mail-qt1-x834.google.com with SMTP id n32so6160695qte.11 for ; Fri, 21 Dec 2018 08:03:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=RQpnr+T97+tng7kZjR3X+orZ553r6cnvrdttQSiSflU=; b=g+CtIovDslBhu8oe4Brbc+4OqMV7upbNlULerLsouCEDTVZ7nJcGDTzHwAhYfGeIIW KNUtSewMbxyQkZ57xd+9DI6W5Uat9VqZpj2Or/eSP5rPuzjz/ZS0t38py1z1X/Fu9KMq WVDj2aehxr1AcKMnKlozoMxUIlCcu4Ldca1QhZLE5IYWugIcvnSLDd8wJfNtV/obhNfV 4wjT17sfxj69sKfq3ElVpZq1LCYHNAOCqoP7BLl4E8u+l0qXjrpi7PzmbWt62ZZCr+4G QgSYug/v5VAnqpf0q19wAd1DDlV/4B6mh4bxxCdUFcoZeIbM7IurcLfK9qUT5Ls2rGWO ZmhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=RQpnr+T97+tng7kZjR3X+orZ553r6cnvrdttQSiSflU=; b=Dge/qCOqpOYvDKjBuds0rs5NgTpEjoKjnyqUZvWHyA6JCx4dMr4gCWyhcruUjKqgI+ dCC1aRKiEHVnWwFhbOJj3qe2DaYjRRhekLV9cKPlwqoAVJyxwVUV+jl4pC1+UCiShNUc E3pdsL9p1jjdpo6PzKlKREj1Ze6UxHFyQz3sVp+ec8Z2VpdoY0B/mPyqpRkbzo5lDr3z TV7PaXj4EtThHTd+Q2G60PVUVkBKz9dtLVXhXdmd7xgeoxGIV9rSwthxfsmbzxktvFBK zjpFhRnpgj6ALBJ6q+aky6wPHkJvRxKGJVtn2BvoZurZNqaPWLARF5PK1YFvT+0kzOuh 78oA== X-Gm-Message-State: AJcUukdDjyiH4gCZjScPDmbVo0FUDp0h2dnx0xtpqq9i5Ma09711gR5O qh8ulyM/ngQ+oj8el2dU39A0sUeHQpU= X-Google-Smtp-Source: ALg8bN79Y8p9/u9HelCjMbB83Y/6zBMHo4v+o4uQTya/ckx7QdQAjzJ4A2B9j/HfSc50GGvN/4r20Q== X-Received: by 2002:a0c:bb82:: with SMTP id i2mr2911319qvg.159.1545408216196; Fri, 21 Dec 2018 08:03:36 -0800 (PST) Received: from localhost ([2601:182:c980:96c:8dd:4488:90b1:59d1]) by smtp.gmail.com with ESMTPSA id t43sm7969787qtc.53.2018.12.21.08.03.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Dec 2018 08:03:35 -0800 (PST) Date: Fri, 21 Dec 2018 08:02:55 -0800 Message-Id: <20181221160307.14819-3-palmer@sifive.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181221160307.14819-1-palmer@sifive.com> References: <20181221160307.14819-1-palmer@sifive.com> From: Palmer Dabbelt To: qemu-riscv@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::834 Subject: [Qemu-devel] [PULL 02/14] hw/riscv/virt: Adjust memory layout spacing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Palmer Dabbelt , Alistair Francis , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Alistair Francis Signed-off-by: Alistair Francis Reviewed-by: Logan Gunthorpe Tested-by: Guenter Roeck Tested-by: Andrea Bolognani Signed-off-by: Palmer Dabbelt --- hw/riscv/virt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 2b38f890702c..6b6fa39aaa38 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -47,14 +47,14 @@ static const struct MemmapEntry { hwaddr base; hwaddr size; } virt_memmap[] = { - [VIRT_DEBUG] = { 0x0, 0x100 }, - [VIRT_MROM] = { 0x1000, 0x11000 }, - [VIRT_TEST] = { 0x100000, 0x1000 }, - [VIRT_CLINT] = { 0x2000000, 0x10000 }, - [VIRT_PLIC] = { 0xc000000, 0x4000000 }, - [VIRT_UART0] = { 0x10000000, 0x100 }, - [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, - [VIRT_DRAM] = { 0x80000000, 0x0 }, + [VIRT_DEBUG] = { 0x0, 0x100 }, + [VIRT_MROM] = { 0x1000, 0x11000 }, + [VIRT_TEST] = { 0x100000, 0x1000 }, + [VIRT_CLINT] = { 0x2000000, 0x10000 }, + [VIRT_PLIC] = { 0xc000000, 0x4000000 }, + [VIRT_UART0] = { 0x10000000, 0x100 }, + [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, + [VIRT_DRAM] = { 0x80000000, 0x0 }, }; static uint64_t load_kernel(const char *kernel_filename)