Commit 9f744abb authored by Alexander Egorenkov's avatar Alexander Egorenkov Committed by Vasily Gorbik
Browse files

s390/boot: replace magic string check with a bootdata flag 



The magic string "S390EP" at offset 0x10008 indicated to the decompressed
kernel that it was booted by the decompressor. Introduce a new bootdata
flag instead which conveys the same information in an explicit and
a cleaner way. But keep the magic string because it is a kernel ABI.

Signed-off-by: default avatarAlexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 549abb7f

arch/s390/boot/startup.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ unsigned long __bootdata_preserved(vmemmap_size); 
unsigned long __bootdata_preserved(MODULES_VADDR);

unsigned long __bootdata_preserved(MODULES_END);

unsigned long __bootdata(ident_map_size);

int __bootdata(is_full_image) = 1;



u64 __bootdata_preserved(stfle_fac_list[16]);

u64 __bootdata_preserved(alt_stfle_fac_list[16]);

arch/s390/include/asm/setup.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ static inline unsigned long kaslr_offset(void) 
	return __kaslr_offset;

}



extern int is_full_image;



static inline u32 gen_lpswe(unsigned long addr)

{

	BUILD_BUG_ON(addr > 0xfff);

arch/s390/kernel/early.c

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include <asm/switch_to.h>

#include "entry.h"



int __bootdata(is_full_image);



static void __init reset_tod_clock(void)

{

	union tod_clock clk;
@@ -279,7 +281,7 @@ static void __init setup_boot_command_line(void) 


static void __init check_image_bootable(void)

{

	if (!memcmp(EP_STRING, (void *)EP_OFFSET, strlen(EP_STRING)))

	if (is_full_image)

		return;



	sclp_early_printk("Linux kernel boot failure: An attempt to boot a vmlinux ELF image failed.\n");