Skip to content

Commit d6d85ac

Browse files
ashkalrabp3tk0v
authored andcommitted
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: Ashish Kalra <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Link: https://lore.kernel.org/r/b726af213ad55053f8a7a1e793b01bb3f1ca9dd5.1714090302.git.ashish.kalra@amd.com
1 parent e67572c commit d6d85ac

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type);
1717
extern void e820__range_add (u64 start, u64 size, enum e820_type type);
1818
extern u64 e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
1919
extern u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type);
20+
extern u64 e820__range_update_table(struct e820_table *t, u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
2021

2122
extern void e820__print_table(char *who);
2223
extern int e820__update_table(struct e820_table *table);

arch/x86/kernel/e820.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,9 +532,10 @@ u64 __init e820__range_update(u64 start, u64 size, enum e820_type old_type, enum
532532
return __e820__range_update(e820_table, start, size, old_type, new_type);
533533
}
534534

535-
static u64 __init e820__range_update_kexec(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type)
535+
u64 __init e820__range_update_table(struct e820_table *t, u64 start, u64 size,
536+
enum e820_type old_type, enum e820_type new_type)
536537
{
537-
return __e820__range_update(e820_table_kexec, start, size, old_type, new_type);
538+
return __e820__range_update(t, start, size, old_type, new_type);
538539
}
539540

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

807808
addr = memblock_phys_alloc(size, align);
808809
if (addr) {
809-
e820__range_update_kexec(addr, size, E820_TYPE_RAM, E820_TYPE_RESERVED);
810+
e820__range_update_table(e820_table_kexec, addr, size, E820_TYPE_RAM, E820_TYPE_RESERVED);
810811
pr_info("update e820_table_kexec for e820__memblock_alloc_reserved()\n");
811812
e820__update_table_kexec();
812813
}

0 commit comments

Comments
 (0)