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

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

x86/pci: Add cap_resource() 



Prepare for 32bit pci root bus

-v2: hpa said we should compare with (resource_size_t)~0
-v3: according to Linus to use MAX_RESOURCE instead.
     also need need to put related patches together
-v4: according to Andrew, use min in cap_resource()

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-8-git-send-email-yinghai@kernel.org>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 97445c3b

arch/x86/pci/amd_bus.c

+5 −3
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int __init early_fill_mp_bus_info(void) 


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

	/* 0xfd00000000-0xffffffffff for HT */

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

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



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

	address = MSR_K8_TOP_MEM1;
@@ -286,7 +286,8 @@ static int __init early_fill_mp_bus_info(void) 
			}

		}



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

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

				 IORESOURCE_MEM, 1);

		subtract_range(range, RANGE_NUM, start, end);

		printk(KERN_CONT "\n");

	}
@@ -321,7 +322,8 @@ 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, cap_resource(range[i].start),

				   cap_resource(range[i].end),

				   IORESOURCE_MEM, 1);

		}

	}

arch/x86/pci/bus_numa.c

+4 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/pci.h>

#include <linux/range.h>



#include "bus_numa.h"
@@ -55,6 +56,9 @@ void __devinit update_res(struct pci_root_info *info, resource_size_t start, 
	if (start > end)

		return;



	if (start == MAX_RESOURCE)

		return;



	if (!merge)

		goto addit;

include/linux/range.h

+8 −0
Original line number Diff line number Diff line
@@ -19,4 +19,12 @@ int clean_sort_range(struct range *range, int az); 


void sort_range(struct range *range, int nr_range);



#define MAX_RESOURCE ((resource_size_t)~0)

static inline resource_size_t cap_resource(u64 val)

{

	if (val > MAX_RESOURCE)

		return MAX_RESOURCE;



	return val;

}

#endif