Skip to contentSkip to conversation

s390x: Make tests bootable from disk

PATCH Thomas Huth 1 participant 1 message Jan 11, 2019 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 44 lines · Janosch Frank

Currently tests are run with the --kernel option of Qemu, which will load the ELF file and jump to the start address. When booting from disk, we need to specify a start address. This is done by setting the initial short PSW at 0x0.

.text was moved to 0x11000 because the bootloader can write from 0x10480 until 0x11000 if it has a lot to write. 0x10480 to 0x10600 was not enough safe space.

---
 s390x/cstart64.S |  8 +++++++-
 s390x/flat.lds   | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)
s390x/cstart64.S +7 -1
index dc7ddd6..385915e 100644
@@ -14,7 +14,13 @@
 
 .section .init
 
-/* entry point - for KVM + TCG we directly start in 64 bit mode */
+/*
+ * Short init between 0x10000 and 0x10480 and then jump to 0x11000.
+ * 0x10480 - 0x11000 are written to by bootloader.
+ *
+ * For KVM and TCG kernel boot we are in 64 bit z/Arch mode.
+ * When booting from disk the initial short psw is in 31 bit mode.
+ */
 	.globl start
 start:
 	/* setup stack */
s390x/flat.lds +1 -0
index b6e2172..977af7c 100644
@@ -1,10 +1,21 @@
 SECTIONS
 {
+	/*

s390x/flat.lds line 13

Quoted 10 lines
s390x/flat.lds +10 -0
+	 * Initial short psw for disk boot, with 31 bit addressing for
+	 * non z/Arch environment compatibility and the instruction
+	 * address 0x10000 (cstart64.S .init).
+	 */
+	.lowcore : {
+		. = 0;
+		 LONG(0x00080000)
+		 LONG(0x80010000)
+	}
+	. = 0x10000;

In case you respin: I think we could/should remove the "-Ttext=0x10000" from the s390x/Makefile now.

Thomas