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

Commit 2f36fa13 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: clean up arch/x86/kernel/e820_64.c 



White space and coding style cleanup.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 05fccb0e

arch/x86/kernel/e820_64.c

+177 −128
Original line number Diff line number Diff line
@@ -109,8 +109,10 @@ int 
e820_any_mapped(unsigned long start, unsigned long end, unsigned type)

{

	int i;



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



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

			continue;

		if (ei->addr >= end || ei->addr + ei->size <= start)
@@ -127,11 +129,14 @@ EXPORT_SYMBOL_GPL(e820_any_mapped); 
 * Note: this function only works correct if the e820 table is sorted and

 * not-overlapping, which is the case

 */

int __init e820_all_mapped(unsigned long start, unsigned long end, unsigned type)

int __init e820_all_mapped(unsigned long start, unsigned long end,

			   unsigned type)

{

	int i;



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



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

			continue;

		/* is the region (part) in overlap with the current region ?*/
@@ -143,9 +148,12 @@ int __init e820_all_mapped(unsigned long start, unsigned long end, unsigned type 
		 */

		if (ei->addr <= start)

			start = ei->addr + ei->size;

		/* if start is now at or beyond end, we're done, full coverage */

		/*

		 * if start is now at or beyond end, we're done, full

		 * coverage

		 */

		if (start >= end)

			return 1; /* we're done */

			return 1;

	}

	return 0;

}
@@ -153,12 +161,15 @@ int __init e820_all_mapped(unsigned long start, unsigned long end, unsigned type 
/*

 * Find a free area in a specific range.

 */

unsigned long __init find_e820_area(unsigned long start, unsigned long end, unsigned size) 

unsigned long __init find_e820_area(unsigned long start, unsigned long end,

				    unsigned size)

{

	int i;



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];

		unsigned long addr = ei->addr, last;



		if (ei->type != E820_RAM)

			continue;

		if (addr < start)
@@ -182,7 +193,8 @@ unsigned long __init find_e820_area(unsigned long start, unsigned long end, unsi 
 */

unsigned long __init e820_end_of_ram(void)

{

	unsigned long end_pfn = 0;

	unsigned long end_pfn;



	end_pfn = find_max_pfn_with_active_regions();



	if (end_pfn > end_pfn_map)
@@ -194,7 +206,7 @@ unsigned long __init e820_end_of_ram(void) 
	if (end_pfn > end_pfn_map)

		end_pfn = end_pfn_map;



	printk("end_pfn_map = %lu\n", end_pfn_map);

	printk(KERN_INFO "end_pfn_map = %lu\n", end_pfn_map);

	return end_pfn;

}
@@ -349,9 +361,7 @@ unsigned long __init e820_hole_size(unsigned long start, unsigned long end) 
{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long end_pfn = end >> PAGE_SHIFT;

	unsigned long ei_startpfn;

	unsigned long ei_endpfn;

	unsigned long ram = 0;

	unsigned long ei_startpfn, ei_endpfn, ram = 0;

	int i;



	for (i = 0; i < e820.nr_map; i++) {
@@ -370,20 +380,23 @@ void __init e820_print_map(char *who) 
	for (i = 0; i < e820.nr_map; i++) {

		printk(KERN_INFO " %s: %016Lx - %016Lx ", who,

		       (unsigned long long) e820.map[i].addr,

			(unsigned long long) (e820.map[i].addr + e820.map[i].size));

		       (unsigned long long)

		       (e820.map[i].addr + e820.map[i].size));

		switch (e820.map[i].type) {

		case E820_RAM:	printk("(usable)\n");

		case E820_RAM:

			printk(KERN_CONT "(usable)\n");

			break;

		case E820_RESERVED:

				printk("(reserved)\n");

			printk(KERN_CONT "(reserved)\n");

			break;

		case E820_ACPI:

				printk("(ACPI data)\n");

			printk(KERN_CONT "(ACPI data)\n");

			break;

		case E820_NVS:

				printk("(ACPI NVS)\n");

			printk(KERN_CONT "(ACPI NVS)\n");

			break;

		default:	printk("type %u\n", e820.map[i].type);

		default:

			printk(KERN_CONT "type %u\n", e820.map[i].type);

			break;

		}

	}
@@ -416,7 +429,8 @@ static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map) 
	int i;



	/*

		Visually we're performing the following (1,2,3,4 = memory types)...

		Visually we're performing the following

		(1,2,3,4 = memory types)...



		Sample memory map (w/overlaps):

		   ____22__________________
@@ -473,7 +487,8 @@ static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map) 
		if (biosmap[i].size != 0) {

			change_point[chgidx]->addr = biosmap[i].addr;

			change_point[chgidx++]->pbios = &biosmap[i];

			change_point[chgidx]->addr = biosmap[i].addr + biosmap[i].size;

			change_point[chgidx]->addr = biosmap[i].addr +

				biosmap[i].size;

			change_point[chgidx++]->pbios = &biosmap[i];

		}

	}
@@ -484,14 +499,24 @@ static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map) 
	while (still_changing)	{

		still_changing = 0;

		for (i = 1; i < chg_nr; i++)  {

			/* if <current_addr> > <last_addr>, swap */

			/* or, if current=<start_addr> & last=<end_addr>, swap */

			if ((change_point[i]->addr < change_point[i-1]->addr) ||

				((change_point[i]->addr == change_point[i-1]->addr) &&

				 (change_point[i]->addr == change_point[i]->pbios->addr) &&

				 (change_point[i-1]->addr != change_point[i-1]->pbios->addr))

			   )

			{

			unsigned long long curaddr, lastaddr;

			unsigned long long curpbaddr, lastpbaddr;



			curaddr = change_point[i]->addr;

			lastaddr = change_point[i - 1]->addr;

			curpbaddr = change_point[i]->pbios->addr;

			lastpbaddr = change_point[i - 1]->pbios->addr;



			/*

			 * swap entries, when:

			 *

			 * curaddr > lastaddr or

			 * curaddr == lastaddr and curaddr == curpbaddr and

			 * lastaddr != lastpbaddr

			 */

			if (curaddr < lastaddr ||

			    (curaddr == lastaddr && curaddr == curpbaddr &&

			     lastaddr != lastpbaddr)) {

				change_tmp = change_point[i];

				change_point[i] = change_point[i-1];

				change_point[i-1] = change_tmp;
@@ -505,50 +530,71 @@ static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map) 
	new_bios_entry = 0;	 /* index for creating new bios map entries */

	last_type = 0;		 /* start with undefined memory type */

	last_addr = 0;		 /* start with 0 as last starting address */



	/* loop through change-points, determining affect on the new bios map */

	for (chgidx=0; chgidx < chg_nr; chgidx++)

	{

	for (chgidx = 0; chgidx < chg_nr; chgidx++) {

		/* keep track of all overlapping bios entries */

		if (change_point[chgidx]->addr == change_point[chgidx]->pbios->addr)

		{

			/* add map entry to overlap list (> 1 entry implies an overlap) */

			overlap_list[overlap_entries++]=change_point[chgidx]->pbios;

		}

		else

		{

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

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

			{

				if (overlap_list[i] == change_point[chgidx]->pbios)

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

		if (change_point[chgidx]->addr ==

		    change_point[chgidx]->pbios->addr) {

			/*

			 * add map entry to overlap list (> 1 entry

			 * implies an overlap)

			 */

			overlap_list[overlap_entries++] =

				change_point[chgidx]->pbios;

		} else {

			/*

			 * remove entry from list (order independent,

			 * so swap with last)

			 */

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

				if (overlap_list[i] ==

				    change_point[chgidx]->pbios)

					overlap_list[i] =

						overlap_list[overlap_entries-1];

			}

			overlap_entries--;

		}

		/* if there are overlapping entries, decide which "type" to use */

		/* (larger value takes precedence -- 1=usable, 2,3,4,4+=unusable) */

		/*

		 * if there are overlapping entries, decide which

		 * "type" to use (larger value takes precedence --

		 * 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;

		/* continue building up new bios map based on this information */

		/*

		 * continue building up new bios map based on this

		 * information

		 */

		if (current_type != last_type)	{

			if (last_type != 0)	 {

				new_bios[new_bios_entry].size =

					change_point[chgidx]->addr - last_addr;

				/* move forward only if the new size was non-zero */

				/*

				 * move forward only if the new size

				 * was non-zero

				 */

				if (new_bios[new_bios_entry].size != 0)

					/*

					 * no more space left for new

					 * bios entries ?

					 */

					if (++new_bios_entry >= E820MAX)

						break; 	/* no more space left for new bios entries */

						break;

			}

			if (current_type != 0)	{

				new_bios[new_bios_entry].addr = change_point[chgidx]->addr;

				new_bios[new_bios_entry].addr =

					change_point[chgidx]->addr;

				new_bios[new_bios_entry].type = current_type;

				last_addr = change_point[chgidx]->addr;

			}

			last_type = current_type;

		}

	}

	new_nr = new_bios_entry;   /* retain count for new bios entries */

	/* retain count for new bios entries */

	new_nr = new_bios_entry;



	/* copy new bios mapping into original location */

	memcpy(biosmap, new_bios, new_nr * sizeof(struct e820entry));
@@ -627,9 +673,9 @@ static int __init parse_memmap_opt(char *p) 


	if (!strcmp(p, "exactmap")) {

#ifdef CONFIG_CRASH_DUMP

		/* If we are doing a crash dump, we

		 * still need to know the real mem

		 * size before original memory map is

		/*

		 * If we are doing a crash dump, we still need to know

		 * the real mem size before original memory map is

		 * reset.

		 */

		e820_register_active_regions(0, 0, -1UL);
@@ -713,8 +759,10 @@ __init void e820_setup_gap(void) 


	if (!found) {

		gapstart = (end_pfn << PAGE_SHIFT) + 1024*1024;

		printk(KERN_ERR "PCI: Warning: Cannot find a gap in the 32bit address range\n"

		       KERN_ERR "PCI: Unassigned devices with 32bit resource registers may break!\n");

		printk(KERN_ERR "PCI: Warning: Cannot find a gap in the 32bit "

		       "address range\n"

		       KERN_ERR "PCI: Unassigned devices with 32bit resource "

		       "registers may break!\n");

	}



	/*
@@ -727,7 +775,8 @@ __init void e820_setup_gap(void) 
	/* Fun with two's complement */

	pci_mem_start = (gapstart + round) & -round;



	printk(KERN_INFO "Allocating PCI resources starting at %lx (gap: %lx:%lx)\n",

	printk(KERN_INFO

	       "Allocating PCI resources starting at %lx (gap: %lx:%lx)\n",

	       pci_mem_start, gapstart, gapsize);

}