From: Andrew Jones <drjones@redhat.com>
To: kvm@vger.kernel.org
Cc: alexandru.elisei@arm.com, nikos.nikoleris@arm.com,
andre.przywara@arm.com, eric.auger@redhat.com
Subject: [PATCH kvm-unit-tests v3 2/8] arm/arm64: Move setup_vm into setup
Date: Thu, 29 Apr 2021 18:41:24 +0200 [thread overview]
Message-ID: <20210429164130.405198-3-drjones@redhat.com> (raw)
In-Reply-To: <20210429164130.405198-1-drjones@redhat.com>
Consolidate our setup calls to reduce the amount we need to do from
init::start. Also remove a couple of pointless comments from setup().
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
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 b2c0ba061cd5..bf3c78157e6a 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 7963e1fea979..27251fe8b5cd 100644
--- a/arm/cstart64.S
+++ b/arm/cstart64.S
@@ -93,11 +93,7 @@ start:
/* complete setup */
bl setup // x0 is the addr of the dtb
- bl get_mmu_off
- cbnz x0, 1f
- bl setup_vm
-1:
/* run the test */
adrp x0, __argc
ldr w0, [x0, :lo12:__argc]
@@ -111,7 +107,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 <alloc.h>
#include <alloc_phys.h>
#include <alloc_page.h>
+#include <vmalloc.h>
+#include <auxinfo.h>
#include <argv.h>
#include <asm/thread_info.h>
#include <asm/setup.h>
@@ -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();
}
--
2.30.2
next prev parent reply other threads:[~2021-04-29 16:41 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 16:41 [PATCH kvm-unit-tests v3 0/8] arm/arm64: Prepare for target-efi Andrew Jones
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 1/8] arm/arm64: Reorganize cstart assembler Andrew Jones
2021-04-29 16:41 ` Andrew Jones [this message]
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 3/8] pci-testdev: ioremap regions Andrew Jones
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 4/8] arm/arm64: mmu: Stop mapping an assumed IO region Andrew Jones
2021-05-10 15:45 ` Alexandru Elisei
2021-05-13 15:48 ` Alexandru Elisei
2021-05-13 17:18 ` Andrew Jones
2021-05-13 17:43 ` Andrew Jones
2021-05-17 10:38 ` Alexandru Elisei
2021-05-17 14:40 ` Andrew Jones
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 5/8] arm/arm64: mmu: Remove memory layout assumptions Andrew Jones
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 6/8] arm/arm64: setup: Consolidate " Andrew Jones
2021-05-11 15:11 ` Alexandru Elisei
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 7/8] chr-testdev: Silently fail init Andrew Jones
2021-04-29 16:41 ` [PATCH kvm-unit-tests v3 8/8] arm/arm64: psci: Don't assume method is hvc Andrew Jones
2021-05-12 16:14 ` Alexandru Elisei
2021-05-13 7:08 ` Andrew Jones
2021-05-13 9:08 ` Alexandru Elisei
2021-05-13 10:06 ` Andrew Jones
2021-05-13 10:18 ` [PATCH kvm-unit-tests v4] " Andrew Jones
2021-05-13 15:53 ` Alexandru Elisei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210429164130.405198-3-drjones@redhat.com \
--to=drjones@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=nikos.nikoleris@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).