Commit d6d85ac1 authored by Ashish Kalra's avatar Ashish Kalra Committed by Borislav Petkov (AMD)
Browse files

x86/e820: Add a new e820 table update helper 



Add a new API helper e820__range_update_table() with which to update an
arbitrary e820 table. Move all current users of
e820__range_update_kexec() to this new helper.

  [ bp: Massage. ]

Signed-off-by: default avatarAshish Kalra <ashish.kalra@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/b726af213ad55053f8a7a1e793b01bb3f1ca9dd5.1714090302.git.ashish.kalra@amd.com
parent e67572cd

arch/x86/include/asm/e820/api.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type); 
extern void e820__range_add   (u64 start, u64 size, enum e820_type type);

extern u64  e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);

extern u64  e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type);

extern u64  e820__range_update_table(struct e820_table *t, u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);



extern void e820__print_table(char *who);

extern int  e820__update_table(struct e820_table *table);

arch/x86/kernel/e820.c

+4 −3
Original line number Diff line number Diff line
@@ -532,9 +532,10 @@ u64 __init e820__range_update(u64 start, u64 size, enum e820_type old_type, enum 
	return __e820__range_update(e820_table, start, size, old_type, new_type);

}



static u64 __init e820__range_update_kexec(u64 start, u64 size, enum e820_type old_type, enum e820_type  new_type)

u64 __init e820__range_update_table(struct e820_table *t, u64 start, u64 size,

				    enum e820_type old_type, enum e820_type new_type)

{

	return __e820__range_update(e820_table_kexec, start, size, old_type, new_type);

	return __e820__range_update(t, start, size, old_type, new_type);

}



/* Remove a range of memory from the E820 table: */
@@ -806,7 +807,7 @@ u64 __init e820__memblock_alloc_reserved(u64 size, u64 align) 


	addr = memblock_phys_alloc(size, align);

	if (addr) {

		e820__range_update_kexec(addr, size, E820_TYPE_RAM, E820_TYPE_RESERVED);

		e820__range_update_table(e820_table_kexec, addr, size, E820_TYPE_RAM, E820_TYPE_RESERVED);

		pr_info("update e820_table_kexec for e820__memblock_alloc_reserved()\n");

		e820__update_table_kexec();

	}