From patchwork Mon Feb 15 13:49:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 8315391 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EEE09F72C for ; Mon, 15 Feb 2016 13:49:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B45F2037C for ; Mon, 15 Feb 2016 13:49:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 839B22035E for ; Mon, 15 Feb 2016 13:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753283AbcBONtx (ORCPT ); Mon, 15 Feb 2016 08:49:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58203 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753225AbcBONtv (ORCPT ); Mon, 15 Feb 2016 08:49:51 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id B5E072655; Mon, 15 Feb 2016 13:49:51 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1FDnZKM022252; Mon, 15 Feb 2016 08:49:49 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: [kvm-unit-tests PATCH v4 05/17] arm/arm64: setup improvements Date: Mon, 15 Feb 2016 14:49:14 +0100 Message-Id: <1455544166-19766-6-git-send-email-drjones@redhat.com> In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> References: <1455544166-19766-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Handle multiple memory regions being described in the DT. Also add a more informative error message for when a user does -smp N, N > NR_CPUS. Signed-off-by: Andrew Jones Reviewed-by: David Gibson --- powerpc will adapt arm's setup to be used as it's own, and it needs these changes. There's no reason to only do them for power, so we do them in arm first, getting them ready to be adapted. --- lib/arm/asm/setup.h | 9 ++++++++ lib/arm/setup.c | 66 ++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/lib/arm/asm/setup.h b/lib/arm/asm/setup.h index 02b668672fca4..cb8fdbd38dd5d 100644 --- a/lib/arm/asm/setup.h +++ b/lib/arm/asm/setup.h @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2. */ #include +#include /* phys_addr_t */ #include #include @@ -13,6 +14,14 @@ extern u32 cpus[NR_CPUS]; extern int nr_cpus; +#define NR_MEM_REGIONS 8 +#define MR_F_PRIMARY (1U << 0) +struct mem_region { + phys_addr_t start; + phys_addr_t end; + unsigned int flags; +}; +extern struct mem_region mem_regions[NR_MEM_REGIONS]; extern phys_addr_t __phys_offset, __phys_end; #define PHYS_OFFSET (__phys_offset) diff --git a/lib/arm/setup.c b/lib/arm/setup.c index da6edc1f9d8ff..8c6172ff94106 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -27,12 +27,18 @@ extern void setup_args(const char *args); u32 cpus[NR_CPUS] = { [0 ... NR_CPUS-1] = (~0U) }; int nr_cpus; +struct mem_region mem_regions[NR_MEM_REGIONS]; phys_addr_t __phys_offset, __phys_end; static void cpu_set(int fdtnode __unused, u32 regval, void *info __unused) { int cpu = nr_cpus++; - assert(cpu < NR_CPUS); + + if (cpu >= NR_CPUS) { + printf("Number cpus exceeds maximum supported (%d).\n", + NR_CPUS); + assert(0); + } cpus[cpu] = regval; set_cpu_present(cpu, true); } @@ -49,24 +55,46 @@ static void cpu_init(void) static void mem_init(phys_addr_t freemem_start) { - /* we only expect one membank to be defined in the DT */ - struct dt_pbus_reg regs[1]; - phys_addr_t mem_start, mem_end; - int ret; - - ret = dt_get_memory_params(regs, 1); - assert(ret != 0); - - mem_start = regs[0].addr; - mem_end = mem_start + regs[0].size; - - assert(!(mem_start & ~PHYS_MASK) && !((mem_end-1) & ~PHYS_MASK)); - assert(freemem_start >= mem_start && freemem_start < mem_end); - - __phys_offset = mem_start; /* PHYS_OFFSET */ - __phys_end = mem_end; /* PHYS_END */ - - phys_alloc_init(freemem_start, mem_end - freemem_start); + struct dt_pbus_reg regs[NR_MEM_REGIONS]; + struct mem_region primary, mem = { + .start = (phys_addr_t)-1, + }; + int nr_regs, i; + + nr_regs = dt_get_memory_params(regs, NR_MEM_REGIONS); + assert(nr_regs > 0); + + primary.end = 0; + + for (i = 0; i < nr_regs; ++i) { + mem_regions[i].start = regs[i].addr; + mem_regions[i].end = regs[i].addr + regs[i].size; + + /* + * pick the region we're in for our primary region + */ + if (freemem_start >= mem_regions[i].start + && freemem_start < mem_regions[i].end) { + mem_regions[i].flags |= MR_F_PRIMARY; + primary = mem_regions[i]; + } + + /* + * set the lowest and highest addresses found, + * ignoring potential gaps + */ + if (mem_regions[i].start < mem.start) + mem.start = mem_regions[i].start; + if (mem_regions[i].end > mem.end) + mem.end = mem_regions[i].end; + } + assert(primary.end != 0); + assert(!(mem.start & ~PHYS_MASK) && !((mem.end - 1) & ~PHYS_MASK)); + + __phys_offset = mem.start; /* PHYS_OFFSET */ + __phys_end = mem.end; /* PHYS_END */ + + phys_alloc_init(freemem_start, primary.end - freemem_start); phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES); mmu_enable_idmap();