From patchwork Wed Dec 26 17:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10743243 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 E401C6C2 for ; Wed, 26 Dec 2018 17:27:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE8F2287AC for ; Wed, 26 Dec 2018 17:27:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF019287B3; Wed, 26 Dec 2018 17:27:03 +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 480DD287AC for ; Wed, 26 Dec 2018 17:27:03 +0000 (UTC) Received: from localhost ([127.0.0.1]:47450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcCxS-0003pQ-4N for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Dec 2018 12:27:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:47879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcCrD-00043c-H1 for qemu-devel@nongnu.org; Wed, 26 Dec 2018 12:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcCrB-0007ow-Vy for qemu-devel@nongnu.org; Wed, 26 Dec 2018 12:20:34 -0500 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:34791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gcCrB-0007eo-MU for qemu-devel@nongnu.org; Wed, 26 Dec 2018 12:20:33 -0500 Received: by mail-qt1-x82a.google.com with SMTP id r14so17897162qtp.1 for ; Wed, 26 Dec 2018 09:20:18 -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=KbV3afr2rwq5w9EvjaTF6FG+R//LBMKA3D6WHE3U0KTYDKPXpbzKfy6IfXomvHJfgD 3LjRJ7P5zZxBM6t77ldsZhNi9SJ5eDO/CS9qiGol52iPpFt8BGBV7y3wTtfses3YLBx4 vasCTwcRr5/0rH6L1oEZ38uojBNtSzot8rTrQrn78exjQpFUVOkrvsnQ5W3Wl352ayd3 NzHH235Dd/dSvQmVB5rYE6wbxGNkHnMwHue6C1XROXnZEPtFbxXXQ+Bchb0t9Uf+dNfY daX1bkA+05D5ooOgOAbXY9CpabGWqwGLvNWHsP8iAoMDkJNSXlDifgQqJ0u59Mr6tyKP xXXg== 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=D5sBiCNTa4qOWC9azDxwTVpOceqc7Ul7lLH0lNmE6CYb2S6IDtxGtptpTN9iQxUvrf 4WsPqyh0LSx99vMxAH4N53/0ZgR5KndFAiwx2E6appPfvTFcCdCoFnVu1QEyXtr7BuH6 IQGaONLm83zK1SyQ8/WbIH0pGVb9iQ9+c2+r+y9iM8J92LUpkErJUoDlwfFgBkj2xRdK iVPsPBhQn+e1IFn8iHG2Z7z/VEuxLiWjCucnnfOXpJ80u7BraMMMQqjMZz9x1ml/7lup 9RwOp2NQFeogOYJGlzavhd6E+PuAfcfpmYTqSDFlceuyk6dgqM9CdDzakyjEydLoF0GU iUww== X-Gm-Message-State: AJcUukeouWG4s0Lm66ZEzmMeNOSC12y1t8BCqBB6Xk52AyiNRbVia8Tj r6dy1ZM1YT44M9v2cbGNdN5Tuw== X-Google-Smtp-Source: ALg8bN72pFwkqWrh6zqWJIVGhTSXNe2wFzNF0fveGg5C9qMuJBFRNoqOiUvCzfcyDDZW5YX2yiLXtw== X-Received: by 2002:a0c:e105:: with SMTP id w5mr19343819qvk.234.1545844817643; Wed, 26 Dec 2018 09:20:17 -0800 (PST) Received: from localhost ([2601:182:c980:96c:8dd:4488:90b1:59d1]) by smtp.gmail.com with ESMTPSA id w52sm15800625qtc.51.2018.12.26.09.20.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Dec 2018 09:20:16 -0800 (PST) Date: Wed, 26 Dec 2018 09:19:53 -0800 Message-Id: <20181226172005.26990-3-palmer@sifive.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181226172005.26990-1-palmer@sifive.com> References: <20181226172005.26990-1-palmer@sifive.com> From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::82a 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: Alistair Francis , Palmer Dabbelt , qemu-riscv@nongnu.org, 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)