From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1548C433ED for ; Fri, 9 Apr 2021 17:24:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AE746113A for ; Fri, 9 Apr 2021 17:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234222AbhDIRYY (ORCPT ); Fri, 9 Apr 2021 13:24:24 -0400 Received: from foss.arm.com ([217.140.110.172]:55852 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234163AbhDIRYU (ORCPT ); Fri, 9 Apr 2021 13:24:20 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1B7381063; Fri, 9 Apr 2021 10:24:07 -0700 (PDT) Received: from C02W217MHV2R.local (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2EE153F792; Fri, 9 Apr 2021 10:24:05 -0700 (PDT) Subject: Re: [PATCH kvm-unit-tests 2/8] arm/arm64: Move setup_vm into setup To: Andrew Jones , kvm@vger.kernel.org Cc: alexandru.elisei@arm.com, andre.przywara@arm.com, eric.auger@redhat.com References: <20210407185918.371983-1-drjones@redhat.com> <20210407185918.371983-3-drjones@redhat.com> From: Nikos Nikoleris Message-ID: <13d56963-63f0-be3d-d68a-5581f1d558b7@arm.com> Date: Fri, 9 Apr 2021 18:24:00 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210407185918.371983-3-drjones@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 07/04/2021 19:59, Andrew Jones wrote: > Consolidate our setup calls to reduce the amount we need to do from > init::start. Also remove a couple of pointless comments from setup(). > > Signed-off-by: Andrew Jones No need for this to be in assembly. Reviewed-by: Nikos Nikoleris Thanks, Nikos > --- > arm/cstart.S | 6 ------ > arm/cstart64.S | 5 ----- > lib/arm/setup.c | 7 +++++-- > 3 files changed, 5 insertions(+), 13 deletions(-) > > diff --git a/arm/cstart.S b/arm/cstart.S > index 653ab1e8a141..731f841695ce 100644 > --- a/arm/cstart.S > +++ b/arm/cstart.S > @@ -81,12 +81,7 @@ start: > /* complete setup */ > pop {r0-r1} > bl setup > - bl get_mmu_off > - cmp r0, #0 > - bne 1f > - bl setup_vm > > -1: > /* run the test */ > ldr r0, =__argc > ldr r0, [r0] > @@ -108,7 +103,6 @@ enable_vfp: > vmsr fpexc, r0 > mov pc, lr > > -.global get_mmu_off > get_mmu_off: > ldr r0, =auxinfo > ldr r0, [r0, #4] > diff --git a/arm/cstart64.S b/arm/cstart64.S > index d39cf4dfb99c..add60a2b4e74 100644 > --- a/arm/cstart64.S > +++ b/arm/cstart64.S > @@ -95,11 +95,7 @@ start: > /* complete setup */ > mov x0, x4 // restore the addr of the dtb > bl setup > - bl get_mmu_off > - cbnz x0, 1f > - bl setup_vm > > -1: > /* run the test */ > adrp x0, __argc > ldr w0, [x0, :lo12:__argc] > @@ -113,7 +109,6 @@ start: > > .text > > -.globl get_mmu_off > get_mmu_off: > adrp x0, auxinfo > ldr x0, [x0, :lo12:auxinfo + 8] > diff --git a/lib/arm/setup.c b/lib/arm/setup.c > index 751ba980000a..9c16f6004e9f 100644 > --- a/lib/arm/setup.c > +++ b/lib/arm/setup.c > @@ -16,6 +16,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -233,7 +235,6 @@ void setup(const void *fdt) > freemem += initrd_size; > } > > - /* call init functions */ > mem_init(PAGE_ALIGN((unsigned long)freemem)); > cpu_init(); > > @@ -243,7 +244,6 @@ void setup(const void *fdt) > /* mem_init must be called before io_init */ > io_init(); > > - /* finish setup */ > timer_save_state(); > > ret = dt_get_bootargs(&bootargs); > @@ -256,4 +256,7 @@ void setup(const void *fdt) > memcpy(env, initrd, initrd_size); > setup_env(env, initrd_size); > } > + > + if (!(auxinfo.flags & AUXINFO_MMU_OFF)) > + setup_vm(); > } >