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

Commit e9a0064a authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86: Change range end to start+size 



So make interface more consistent with early_res.
Later we can share some code with early_res.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-10-git-send-email-yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 284f933d

arch/x86/kernel/cpu/mtrr/cleanup.c

+16 −16
Original line number Diff line number Diff line
@@ -78,13 +78,13 @@ x86_get_mtrr_mem_range(struct range *range, int nr_range, 
		base = range_state[i].base_pfn;

		size = range_state[i].size_pfn;

		nr_range = add_range_with_merge(range, RANGE_NUM, nr_range,

						base, base + size - 1);

						base, base + size);

	}

	if (debug_print) {

		printk(KERN_DEBUG "After WB checking\n");

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

			printk(KERN_DEBUG "MTRR MAP PFN: %016llx - %016llx\n",

				 range[i].start, range[i].end + 1);

				 range[i].start, range[i].end);

	}



	/* Take out UC ranges: */
@@ -106,11 +106,11 @@ x86_get_mtrr_mem_range(struct range *range, int nr_range, 
			size -= (1<<(20-PAGE_SHIFT)) - base;

			base = 1<<(20-PAGE_SHIFT);

		}

		subtract_range(range, RANGE_NUM, base, base + size - 1);

		subtract_range(range, RANGE_NUM, base, base + size);

	}

	if (extra_remove_size)

		subtract_range(range, RANGE_NUM, extra_remove_base,

				 extra_remove_base + extra_remove_size  - 1);

				 extra_remove_base + extra_remove_size);



	if  (debug_print) {

		printk(KERN_DEBUG "After UC checking\n");
@@ -118,7 +118,7 @@ x86_get_mtrr_mem_range(struct range *range, int nr_range, 
			if (!range[i].end)

				continue;

			printk(KERN_DEBUG "MTRR MAP PFN: %016llx - %016llx\n",

				 range[i].start, range[i].end + 1);

				 range[i].start, range[i].end);

		}

	}
@@ -128,7 +128,7 @@ x86_get_mtrr_mem_range(struct range *range, int nr_range, 
		printk(KERN_DEBUG "After sorting\n");

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

			printk(KERN_DEBUG "MTRR MAP PFN: %016llx - %016llx\n",

				 range[i].start, range[i].end + 1);

				 range[i].start, range[i].end);

	}



	return nr_range;
@@ -142,7 +142,7 @@ static unsigned long __init sum_ranges(struct range *range, int nr_range) 
	int i;



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

		sum += range[i].end + 1 - range[i].start;

		sum += range[i].end - range[i].start;



	return sum;

}
@@ -489,7 +489,7 @@ x86_setup_var_mtrrs(struct range *range, int nr_range, 
	/* Write the range: */

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

		set_var_mtrr_range(&var_state, range[i].start,

				   range[i].end - range[i].start + 1);

				   range[i].end - range[i].start);

	}



	/* Write the last range: */
@@ -720,7 +720,7 @@ int __init mtrr_cleanup(unsigned address_bits) 
	 * and fixed mtrrs should take effect before var mtrr for it:

	 */

	nr_range = add_range_with_merge(range, RANGE_NUM, nr_range, 0,

					(1ULL<<(20 - PAGE_SHIFT)) - 1);

					1ULL<<(20 - PAGE_SHIFT));

	/* Sort the ranges: */

	sort_range(range, nr_range);
@@ -939,9 +939,9 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) 
	nr_range = 0;

	if (mtrr_tom2) {

		range[nr_range].start = (1ULL<<(32 - PAGE_SHIFT));

		range[nr_range].end = (mtrr_tom2 >> PAGE_SHIFT) - 1;

		if (highest_pfn < range[nr_range].end + 1)

			highest_pfn = range[nr_range].end + 1;

		range[nr_range].end = mtrr_tom2 >> PAGE_SHIFT;

		if (highest_pfn < range[nr_range].end)

			highest_pfn = range[nr_range].end;

		nr_range++;

	}

	nr_range = x86_get_mtrr_mem_range(range, nr_range, 0, 0);
@@ -953,15 +953,15 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) 


	/* Check the holes: */

	for (i = 0; i < nr_range - 1; i++) {

		if (range[i].end + 1 < range[i+1].start)

			total_trim_size += real_trim_memory(range[i].end + 1,

		if (range[i].end < range[i+1].start)

			total_trim_size += real_trim_memory(range[i].end,

							    range[i+1].start);

	}



	/* Check the top: */

	i = nr_range - 1;

	if (range[i].end + 1 < end_pfn)

		total_trim_size += real_trim_memory(range[i].end + 1,

	if (range[i].end < end_pfn)

		total_trim_size += real_trim_memory(range[i].end,

							 end_pfn);



	if (total_trim_size) {

arch/x86/pci/amd_bus.c

+14 −10
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int __init early_fill_mp_bus_info(void) 
	def_link = (reg >> 8) & 0x03;



	memset(range, 0, sizeof(range));

	range[0].end = 0xffff;

	add_range(range, RANGE_NUM, 0, 0, 0xffff + 1);

	/* io port resource */

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

		reg = read_pci_config(bus, slot, 1, 0xc0 + (i << 3));
@@ -175,7 +175,7 @@ static int __init early_fill_mp_bus_info(void) 
		if (end > 0xffff)

			end = 0xffff;

		update_res(info, start, end, IORESOURCE_IO, 1);

		subtract_range(range, RANGE_NUM, start, end);

		subtract_range(range, RANGE_NUM, start, end + 1);

	}

	/* add left over io port range to def node/link, [0, 0xffff] */

	/* find the position */
@@ -190,14 +190,16 @@ static int __init early_fill_mp_bus_info(void) 
			if (!range[i].end)

				continue;



			update_res(info, range[i].start, range[i].end,

			update_res(info, range[i].start, range[i].end - 1,

				   IORESOURCE_IO, 1);

		}

	}



	memset(range, 0, sizeof(range));

	/* 0xfd00000000-0xffffffffff for HT */

	range[0].end = cap_resource((0xfdULL<<32) - 1);

	end = cap_resource((0xfdULL<<32) - 1);

	end++;

	add_range(range, RANGE_NUM, 0, 0, end);



	/* need to take out [0, TOM) for RAM*/

	address = MSR_K8_TOP_MEM1;
@@ -205,14 +207,15 @@ static int __init early_fill_mp_bus_info(void) 
	end = (val & 0xffffff800000ULL);

	printk(KERN_INFO "TOM: %016llx aka %lldM\n", end, end>>20);

	if (end < (1ULL<<32))

		subtract_range(range, RANGE_NUM, 0, end - 1);

		subtract_range(range, RANGE_NUM, 0, end);



	/* get mmconfig */

	get_pci_mmcfg_amd_fam10h_range();

	/* need to take out mmconf range */

	if (fam10h_mmconf_end) {

		printk(KERN_DEBUG "Fam 10h mmconf [%llx, %llx]\n", fam10h_mmconf_start, fam10h_mmconf_end);

		subtract_range(range, RANGE_NUM, fam10h_mmconf_start, fam10h_mmconf_end);

		subtract_range(range, RANGE_NUM, fam10h_mmconf_start,

				 fam10h_mmconf_end + 1);

	}



	/* mmio resource */
@@ -267,7 +270,8 @@ static int __init early_fill_mp_bus_info(void) 
				/* we got a hole */

				endx = fam10h_mmconf_start - 1;

				update_res(info, start, endx, IORESOURCE_MEM, 0);

				subtract_range(range, RANGE_NUM, start, endx);

				subtract_range(range, RANGE_NUM, start,

						 endx + 1);

				printk(KERN_CONT " ==> [%llx, %llx]", start, endx);

				start = fam10h_mmconf_end + 1;

				changed = 1;
@@ -284,7 +288,7 @@ static int __init early_fill_mp_bus_info(void) 


		update_res(info, cap_resource(start), cap_resource(end),

				 IORESOURCE_MEM, 1);

		subtract_range(range, RANGE_NUM, start, end);

		subtract_range(range, RANGE_NUM, start, end + 1);

		printk(KERN_CONT "\n");

	}
@@ -299,7 +303,7 @@ static int __init early_fill_mp_bus_info(void) 
		rdmsrl(address, val);

		end = (val & 0xffffff800000ULL);

		printk(KERN_INFO "TOM2: %016llx aka %lldM\n", end, end>>20);

		subtract_range(range, RANGE_NUM, 1ULL<<32, end - 1);

		subtract_range(range, RANGE_NUM, 1ULL<<32, end);

	}



	/*
@@ -319,7 +323,7 @@ static int __init early_fill_mp_bus_info(void) 
				continue;



			update_res(info, cap_resource(range[i].start),

				   cap_resource(range[i].end),

				   cap_resource(range[i].end - 1),

				   IORESOURCE_MEM, 1);

		}

	}

kernel/range.c

+10 −10
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


int add_range(struct range *range, int az, int nr_range, u64 start, u64 end)

{

	if (start > end)

	if (start >= end)

		return nr_range;



	/* Out of slots: */
@@ -33,7 +33,7 @@ int add_range_with_merge(struct range *range, int az, int nr_range, 
{

	int i;



	if (start > end)

	if (start >= end)

		return nr_range;



	/* Try to merge it with old one: */
@@ -46,7 +46,7 @@ int add_range_with_merge(struct range *range, int az, int nr_range, 


		common_start = max(range[i].start, start);

		common_end = min(range[i].end, end);

		if (common_start > common_end + 1)

		if (common_start > common_end)

			continue;



		final_start = min(range[i].start, start);
@@ -65,7 +65,7 @@ void subtract_range(struct range *range, int az, u64 start, u64 end) 
{

	int i, j;



	if (start > end)

	if (start >= end)

		return;



	for (j = 0; j < az; j++) {
@@ -79,15 +79,15 @@ void subtract_range(struct range *range, int az, u64 start, u64 end) 
		}



		if (start <= range[j].start && end < range[j].end &&

		    range[j].start < end + 1) {

			range[j].start = end + 1;

		    range[j].start < end) {

			range[j].start = end;

			continue;

		}





		if (start > range[j].start && end >= range[j].end &&

		    range[j].end > start - 1) {

			range[j].end = start - 1;

		    range[j].end > start) {

			range[j].end = start;

			continue;

		}
@@ -99,11 +99,11 @@ void subtract_range(struct range *range, int az, u64 start, u64 end) 
			}

			if (i < az) {

				range[i].end = range[j].end;

				range[i].start = end + 1;

				range[i].start = end;

			} else {

				printk(KERN_ERR "run of slot in ranges\n");

			}

			range[j].end = start - 1;

			range[j].end = start;

			continue;

		}

	}