Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f52355a9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/boot/e820: Rename sanitize_e820_table() to e820__update_table() 



sanitize_e820_table() is a minor misnomer in that it suggests that
the E820 table requires sanitizing - which implies that it will only
do anything if the E820 table is irregular (not sane).

That is wrong, because sanitize_e820_table() also does a very regular
sorting of the E820 table, which is a necessity in the basic
append-only flow of E820 updates the kernel is allowed to perform to
it.

So rename it to e820__update_table() to include that purpose as well.

This also lines up all the table-update functions into a coherent
naming family:

  int  e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

  void e820__update_table_print(void);
  void e820__update_table_firmware(void);

No change in functionality.

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6464d294

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ extern int e820_any_mapped(u64 start, u64 end, unsigned type); 
extern int  e820_all_mapped(u64 start, u64 end, unsigned type);

extern void e820_add_region(u64 start, u64 size, int type);

extern void e820_print_map(char *who);

extern int  sanitize_e820_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

extern int  e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

extern u64  e820_update_range(u64 start, u64 size, unsigned old_type, unsigned new_type);

extern u64  e820_remove_range(u64 start, u64 size, unsigned old_type, int checktype);

extern void e820__update_table_print(void);

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *

 * This allows for bootstrap/firmware quirks such as possible duplicate

 * E820 entries that might need room in the same arrays, prior to the

 * call to sanitize_e820_table() to remove duplicates.  The allowance

 * call to e820__update_table() to remove duplicates.  The allowance

 * of three memory map entries per node is "enough" entries for

 * the initial hardware platform motivating this mechanism to make

 * use of additional EFI map entries.  Future platforms may want

arch/x86/kernel/e820.c

+8 −8
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void __init e820_print_map(char *who) 
 * sanitizing succeeds the *pnr_map will be updated with the new

 * number of valid entries (something no more than max_nr_map).

 *

 * The return value from sanitize_e820_table() is zero if it

 * The return value from e820__update_table() is zero if it

 * successfully 'sanitized' the map entries passed in, and is -1

 * if it did nothing, which can happen if either of (1) it was

 * only passed one map entry, or (2) any of the input map entries
@@ -259,7 +259,7 @@ static int __init cpcompare(const void *a, const void *b) 
	return (ap->addr != ap->pbios->addr) - (bp->addr != bp->pbios->addr);

}



int __init sanitize_e820_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map)

int __init e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map)

{

	static struct change_member change_point_list[2*E820_X_MAX] __initdata;

	static struct change_member *change_point[2*E820_X_MAX] __initdata;
@@ -548,7 +548,7 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type, int checkty 


void __init e820__update_table_print(void)

{

	if (sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries))

	if (e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries))

		return;



	pr_info("e820: modified physical RAM map:\n");
@@ -557,7 +557,7 @@ void __init e820__update_table_print(void) 


static void __init e820__update_table_firmware(void)

{

	sanitize_e820_table(e820_table_firmware->entries, ARRAY_SIZE(e820_table_firmware->entries), &e820_table_firmware->nr_entries);

	e820__update_table(e820_table_firmware->entries, ARRAY_SIZE(e820_table_firmware->entries), &e820_table_firmware->nr_entries);

}



#define MAX_GAP_END 0x100000000ull
@@ -676,7 +676,7 @@ void __init e820__memory_setup_extended(u64 phys_addr, u32 data_len) 
	extmap = (struct e820_entry *)(sdata->data);



	__append_e820_table(extmap, entries);

	sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

	e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);



	early_memunmap(sdata, data_len);

	pr_info("e820: extended physical RAM map:\n");
@@ -931,7 +931,7 @@ void __init e820_reserve_setup_data(void) 
		early_memunmap(data, sizeof(*data));

	}



	sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

	e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

	memcpy(e820_table_firmware, e820_table, sizeof(struct e820_table));

	printk(KERN_INFO "extended physical RAM map:\n");

	e820_print_map("reserve setup_data");
@@ -945,7 +945,7 @@ void __init e820_reserve_setup_data(void) 
void __init e820__finish_early_params(void)

{

	if (userdef) {

		if (sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries) < 0)

		if (e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries) < 0)

			early_panic("Invalid user supplied memory map");



		pr_info("e820: user-defined physical RAM map:\n");
@@ -1130,7 +1130,7 @@ char *__init e820__memory_setup_default(void) 
	 * the next section from 1mb->appropriate_mem_k

	 */

	new_nr = boot_params.e820_entries;

	sanitize_e820_table(boot_params.e820_table, ARRAY_SIZE(boot_params.e820_table), &new_nr);

	e820__update_table(boot_params.e820_table, ARRAY_SIZE(boot_params.e820_table), &new_nr);

	boot_params.e820_entries = new_nr;



	if (append_e820_table(boot_params.e820_table, boot_params.e820_entries) < 0) {

arch/x86/kernel/early-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ intel_graphics_stolen(int num, int slot, int func, 


	/* Mark this space as reserved */

	e820_add_region(base, size, E820_RESERVED);

	sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

	e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

}



static void __init intel_graphics_quirks(int num, int slot, int func)

arch/x86/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static void __init trim_bios_range(void) 
	 */

	e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);



	sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

	e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

}



/* called before trim_bios_range() to spare extra sanitize */
@@ -1033,7 +1033,7 @@ void __init setup_arch(char **cmdline_p) 
	if (ppro_with_ram_bug()) {

		e820_update_range(0x70000000ULL, 0x40000ULL, E820_RAM,

				  E820_RESERVED);

		sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

		e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);

		printk(KERN_INFO "fixed physical RAM map:\n");

		e820_print_map("bad_ppro");

	}