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

x86/boot/e820: Standardize e820 table index variable names under 'idx' 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Andy Shevchenko <andy@kernel.org>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: H . Peter Anvin <hpa@zytor.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Paul Menzel <pmenzel@molgen.mpg.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://patch.msgid.link/20250515120549.2820541-18-mingo@kernel.org
parent a515ca96

arch/x86/kernel/e820.c

+57 −57
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ EXPORT_SYMBOL(pci_mem_start); 
static bool _e820__mapped_any(struct e820_table *table,

			      u64 start, u64 end, enum e820_type type)

{

	int i;

	int idx;



	for (i = 0; i < table->nr_entries; i++) {

		struct e820_entry *entry = &table->entries[i];

	for (idx = 0; idx < table->nr_entries; idx++) {

		struct e820_entry *entry = &table->entries[idx];



		if (type && entry->type != type)

			continue;
@@ -111,10 +111,10 @@ EXPORT_SYMBOL_GPL(e820__mapped_any); 
static struct e820_entry *__e820__mapped_all(u64 start, u64 end,

					     enum e820_type type)

{

	int i;

	int idx;



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];



		if (type && entry->type != type)

			continue;
@@ -202,10 +202,10 @@ static void __init e820_print_type(enum e820_type type) 
static void __init e820__print_table(const char *who)

{

	u64 range_end_prev = 0;

	int i;

	int idx;



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = e820_table->entries + i;

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = e820_table->entries + idx;

		u64 range_start, range_end;



		range_start = entry->addr;
@@ -345,7 +345,7 @@ int __init e820__update_table(struct e820_table *table) 
	enum e820_type current_type, last_type;

	u64 last_addr;

	u32 new_nr_entries, overlap_entries;

	u32 i, chg_idx, chg_nr;

	u32 idx, chg_idx, chg_nr;



	/* If there's only one memory region, don't bother: */

	if (table->nr_entries < 2)
@@ -354,26 +354,26 @@ int __init e820__update_table(struct e820_table *table) 
	BUG_ON(table->nr_entries > max_nr_entries);



	/* Bail out if we find any unreasonable addresses in the map: */

	for (i = 0; i < table->nr_entries; i++) {

		if (entries[i].addr + entries[i].size < entries[i].addr)

	for (idx = 0; idx < table->nr_entries; idx++) {

		if (entries[idx].addr + entries[idx].size < entries[idx].addr)

			return -1;

	}



	/* Create pointers for initial change-point information (for sorting): */

	for (i = 0; i < 2 * table->nr_entries; i++)

		change_point[i] = &change_point_list[i];

	for (idx = 0; idx < 2 * table->nr_entries; idx++)

		change_point[idx] = &change_point_list[idx];



	/*

	 * Record all known change-points (starting and ending addresses),

	 * omitting empty memory regions:

	 */

	chg_idx = 0;

	for (i = 0; i < table->nr_entries; i++)	{

		if (entries[i].size != 0) {

			change_point[chg_idx]->addr	= entries[i].addr;

			change_point[chg_idx++]->entry	= &entries[i];

			change_point[chg_idx]->addr	= entries[i].addr + entries[i].size;

			change_point[chg_idx++]->entry	= &entries[i];

	for (idx = 0; idx < table->nr_entries; idx++)	{

		if (entries[idx].size != 0) {

			change_point[chg_idx]->addr	= entries[idx].addr;

			change_point[chg_idx++]->entry	= &entries[idx];

			change_point[chg_idx]->addr	= entries[idx].addr + entries[idx].size;

			change_point[chg_idx++]->entry	= &entries[idx];

		}

	}

	chg_nr = chg_idx;
@@ -395,9 +395,9 @@ int __init e820__update_table(struct e820_table *table) 
			overlap_list[overlap_entries++] = change_point[chg_idx]->entry;

		} else {

			/* Remove entry from list (order independent, so swap with last): */

			for (i = 0; i < overlap_entries; i++) {

				if (overlap_list[i] == change_point[chg_idx]->entry)

					overlap_list[i] = overlap_list[overlap_entries-1];

			for (idx = 0; idx < overlap_entries; idx++) {

				if (overlap_list[idx] == change_point[chg_idx]->entry)

					overlap_list[idx] = overlap_list[overlap_entries-1];

			}

			overlap_entries--;

		}
@@ -407,9 +407,9 @@ int __init e820__update_table(struct e820_table *table) 
		 * 1=usable, 2,3,4,4+=unusable)

		 */

		current_type = 0;

		for (i = 0; i < overlap_entries; i++) {

			if (overlap_list[i]->type > current_type)

				current_type = overlap_list[i]->type;

		for (idx = 0; idx < overlap_entries; idx++) {

			if (overlap_list[idx]->type > current_type)

				current_type = overlap_list[idx]->type;

		}



		/* Continue building up new map based on this information: */
@@ -482,7 +482,7 @@ static u64 __init 
__e820__range_update(struct e820_table *table, u64 start, u64 size, enum e820_type old_type, enum e820_type new_type)

{

	u64 end;

	unsigned int i;

	unsigned int idx;

	u64 real_updated_size = 0;



	BUG_ON(old_type == new_type);
@@ -497,8 +497,8 @@ __e820__range_update(struct e820_table *table, u64 start, u64 size, enum e820_ty 
	e820_print_type(new_type);

	pr_cont("\n");



	for (i = 0; i < table->nr_entries; i++) {

		struct e820_entry *entry = &table->entries[i];

	for (idx = 0; idx < table->nr_entries; idx++) {

		struct e820_entry *entry = &table->entries[idx];

		u64 final_start, final_end;

		u64 entry_end;
@@ -560,7 +560,7 @@ u64 __init e820__range_update_table(struct e820_table *t, u64 start, u64 size, 
/* Remove a range of memory from the E820 table: */

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

{

	int i;

	int idx;

	u64 end;

	u64 real_removed_size = 0;
@@ -573,8 +573,8 @@ u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool 
		e820_print_type(old_type);

	pr_cont("\n");



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];

		u64 final_start, final_end;

		u64 entry_end;
@@ -641,12 +641,12 @@ static void __init e820__update_table_kexec(void) 
static int __init e820_search_gap(unsigned long *gapstart, unsigned long *gapsize)

{

	u64 last = MAX_GAP_END;

	int i = e820_table->nr_entries;

	int idx = e820_table->nr_entries;

	int found = 0;



	while (--i >= 0) {

		u64 start = e820_table->entries[i].addr;

		u64 end = start + e820_table->entries[i].size;

	while (--idx >= 0) {

		u64 start = e820_table->entries[idx].addr;

		u64 end = start + e820_table->entries[idx].size;



		/*

		 * Since "last" is at most 4GB, we know we'll
@@ -772,11 +772,11 @@ void __init e820__memory_setup_extended(u64 phys_addr, u32 data_len) 
 */

void __init e820__register_nosave_regions(unsigned long limit_pfn)

{

	int i;

	int idx;

	u64 last_addr = 0;



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];



		if (entry->type != E820_TYPE_RAM)

			continue;
@@ -797,10 +797,10 @@ void __init e820__register_nosave_regions(unsigned long limit_pfn) 
 */

static int __init e820__register_nvs_regions(void)

{

	int i;

	int idx;



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];



		if (entry->type == E820_TYPE_NVS)

			acpi_nvs_register(entry->addr, entry->size);
@@ -848,12 +848,12 @@ u64 __init e820__memblock_alloc_reserved(u64 size, u64 align) 
 */

static unsigned long __init e820__end_ram_pfn(unsigned long limit_pfn)

{

	int i;

	int idx;

	unsigned long last_pfn = 0;

	unsigned long max_arch_pfn = MAX_ARCH_PFN;



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];

		unsigned long start_pfn;

		unsigned long end_pfn;
@@ -1103,7 +1103,7 @@ static bool __init e820_device_region(enum e820_type type, struct resource *res) 
 */

void __init e820__reserve_resources(void)

{

	int i;

	int idx;

	struct resource *res;

	u64 end;
@@ -1111,8 +1111,8 @@ void __init e820__reserve_resources(void) 
			     SMP_CACHE_BYTES);

	e820_res = res;



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = e820_table->entries + i;

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = e820_table->entries + idx;



		end = entry->addr + entry->size - 1;

		if (end != (resource_size_t)end) {
@@ -1138,8 +1138,8 @@ void __init e820__reserve_resources(void) 
	}



	/* Expose the kexec e820 table to sysfs: */

	for (i = 0; i < e820_table_kexec->nr_entries; i++) {

		struct e820_entry *entry = e820_table_kexec->entries + i;

	for (idx = 0; idx < e820_table_kexec->nr_entries; idx++) {

		struct e820_entry *entry = e820_table_kexec->entries + idx;



		firmware_map_add_early(entry->addr, entry->addr + entry->size, e820_type_to_string(entry));

	}
@@ -1168,7 +1168,7 @@ static unsigned long __init ram_alignment(resource_size_t pos) 


void __init e820__reserve_resources_late(void)

{

	int i;

	int idx;

	struct resource *res;



	/*
@@ -1176,7 +1176,7 @@ void __init e820__reserve_resources_late(void) 
	 * these can be claimed by device drivers later on:

	 */

	res = e820_res;

	for (i = 0; i < e820_table->nr_entries; i++) {

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		if (!res->parent && res->end)

			insert_resource_expand_to_fit(&iomem_resource, res);

		res++;
@@ -1194,8 +1194,8 @@ void __init e820__reserve_resources_late(void) 
	 * doesn't properly list 'stolen RAM' as a system region

	 * in the E820 map.

	 */

	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];

		u64 start, end;



		if (entry->type != E820_TYPE_RAM)
@@ -1272,7 +1272,7 @@ void __init e820__memory_setup(void) 


void __init e820__memblock_setup(void)

{

	int i;

	int idx;

	u64 end;



#ifdef CONFIG_MEMORY_HOTPLUG
@@ -1316,8 +1316,8 @@ void __init e820__memblock_setup(void) 
	 */

	memblock_allow_resize();



	for (i = 0; i < e820_table->nr_entries; i++) {

		struct e820_entry *entry = &e820_table->entries[i];

	for (idx = 0; idx < e820_table->nr_entries; idx++) {

		struct e820_entry *entry = &e820_table->entries[idx];



		end = entry->addr + entry->size;

		if (end != (resource_size_t)end)