Commit 821f8212 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/boot' into x86/core, to merge dependent commits 

Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:

  6f5bf947 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 206c07d6 ed4d95d0

arch/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ archprepare: $(cpufeaturemasks.hdr) 
###

# Kernel objects



core-y  += arch/x86/boot/startup/

libs-y  += arch/x86/lib/



# drivers-y are linked after core-y

arch/x86/boot/bioscall.S

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ intcall: 
	movw	%dx, %si

	movw	%sp, %di

	movw	$11, %cx

	rep; movsl

	rep movsl



	/* Pop full state from the stack */

	popal
@@ -67,7 +67,7 @@ intcall: 
	jz	4f

	movw	%sp, %si

	movw	$11, %cx

	rep; movsl

	rep movsl

4:	addw	$44, %sp



	/* Restore state and return */

arch/x86/boot/boot.h

+2 −2
Original line number Diff line number Diff line
@@ -155,14 +155,14 @@ static inline void wrgs32(u32 v, addr_t addr) 
static inline bool memcmp_fs(const void *s1, addr_t s2, size_t len)

{

	bool diff;

	asm volatile("fs; repe; cmpsb" CC_SET(nz)

	asm volatile("fs repe cmpsb" CC_SET(nz)

		     : CC_OUT(nz) (diff), "+D" (s1), "+S" (s2), "+c" (len));

	return diff;

}

static inline bool memcmp_gs(const void *s1, addr_t s2, size_t len)

{

	bool diff;

	asm volatile("gs; repe; cmpsb" CC_SET(nz)

	asm volatile("gs repe cmpsb" CC_SET(nz)

		     : CC_OUT(nz) (diff), "+D" (s1), "+S" (s2), "+c" (len));

	return diff;

}

arch/x86/boot/compressed/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ KBUILD_CFLAGS += -D__DISABLE_EXPORTS 
KBUILD_CFLAGS += $(call cc-option,-Wa$(comma)-mrelax-relocations=no)

KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h



# sev.c indirectly includes inat-table.h which is generated during

# sev-decode-insn.c indirectly includes inat-table.c which is generated during

# compilation and stored in $(objtree). Add the directory to the includes so

# that the compiler finds it even with out-of-tree builds (make O=/some/path).

CFLAGS_sev.o += -I$(objtree)/arch/x86/lib/

CFLAGS_sev-handle-vc.o += -I$(objtree)/arch/x86/lib/



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
@@ -73,7 +73,7 @@ LDFLAGS_vmlinux += -T 
hostprogs	:= mkpiggy

HOST_EXTRACFLAGS += -I$(srctree)/tools/include



sed-voffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(_text\|__start_rodata\|__bss_start\|_end\)$$/\#define VO_\2 _AC(0x\1,UL)/p'

sed-voffset := -e 's/^\([0-9a-fA-F]*\) [ABbCDGRSTtVW] \(_text\|__start_rodata\|__bss_start\|_end\)$$/\#define VO_\2 _AC(0x\1,UL)/p'



quiet_cmd_voffset = VOFFSET $@

      cmd_voffset = $(NM) $< | sed -n $(sed-voffset) > $@
@@ -96,8 +96,7 @@ ifdef CONFIG_X86_64 
	vmlinux-objs-y += $(obj)/idt_64.o $(obj)/idt_handlers_64.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/mem_encrypt.o

	vmlinux-objs-y += $(obj)/pgtable_64.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o

	vmlinux-objs-y += $(obj)/la57toggle.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o $(obj)/sev-handle-vc.o

endif



vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o
@@ -106,6 +105,7 @@ vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o 


vmlinux-objs-$(CONFIG_EFI) += $(obj)/efi.o

vmlinux-libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

vmlinux-libs-$(CONFIG_X86_64)	+= $(objtree)/arch/x86/boot/startup/lib.a



$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE

	$(call if_changed,ld)

arch/x86/boot/compressed/head_64.S

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <asm/bootparam.h>

#include <asm/desc_defs.h>

#include <asm/trapnr.h>

#include "pgtable.h"



/*

 * Fix alignment at 16 bytes. Following CONFIG_FUNCTION_ALIGNMENT will result