Commit 97445c3b authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin

x86/pci: Use u64 instead of size_t in amd_bus.c

Prepare to enable it for 32bit.

-v2: remove not needed cast
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-7-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 3e3da00c
...@@ -82,8 +82,8 @@ static int __init early_fill_mp_bus_info(void) ...@@ -82,8 +82,8 @@ static int __init early_fill_mp_bus_info(void)
struct pci_root_info *info; struct pci_root_info *info;
u32 reg; u32 reg;
struct resource *res; struct resource *res;
size_t start; u64 start;
size_t end; u64 end;
struct range range[RANGE_NUM]; struct range range[RANGE_NUM];
u64 val; u64 val;
u32 address; u32 address;
...@@ -173,7 +173,7 @@ static int __init early_fill_mp_bus_info(void) ...@@ -173,7 +173,7 @@ static int __init early_fill_mp_bus_info(void)
info = &pci_root_info[j]; info = &pci_root_info[j];
printk(KERN_DEBUG "node %d link %d: io port [%llx, %llx]\n", printk(KERN_DEBUG "node %d link %d: io port [%llx, %llx]\n",
node, link, (u64)start, (u64)end); node, link, start, end);
/* kernel only handle 16 bit only */ /* kernel only handle 16 bit only */
if (end > 0xffff) if (end > 0xffff)
...@@ -207,7 +207,7 @@ static int __init early_fill_mp_bus_info(void) ...@@ -207,7 +207,7 @@ static int __init early_fill_mp_bus_info(void)
address = MSR_K8_TOP_MEM1; address = MSR_K8_TOP_MEM1;
rdmsrl(address, val); rdmsrl(address, val);
end = (val & 0xffffff800000ULL); end = (val & 0xffffff800000ULL);
printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20); printk(KERN_INFO "TOM: %016llx aka %lldM\n", end, end>>20);
if (end < (1ULL<<32)) if (end < (1ULL<<32))
subtract_range(range, RANGE_NUM, 0, end - 1); subtract_range(range, RANGE_NUM, 0, end - 1);
...@@ -246,7 +246,7 @@ static int __init early_fill_mp_bus_info(void) ...@@ -246,7 +246,7 @@ static int __init early_fill_mp_bus_info(void)
info = &pci_root_info[j]; info = &pci_root_info[j];
printk(KERN_DEBUG "node %d link %d: mmio [%llx, %llx]", printk(KERN_DEBUG "node %d link %d: mmio [%llx, %llx]",
node, link, (u64)start, (u64)end); node, link, start, end);
/* /*
* some sick allocation would have range overlap with fam10h * some sick allocation would have range overlap with fam10h
* mmconf range, so need to update start and end. * mmconf range, so need to update start and end.
...@@ -272,13 +272,13 @@ static int __init early_fill_mp_bus_info(void) ...@@ -272,13 +272,13 @@ static int __init early_fill_mp_bus_info(void)
endx = fam10h_mmconf_start - 1; endx = fam10h_mmconf_start - 1;
update_res(info, start, endx, IORESOURCE_MEM, 0); update_res(info, start, endx, IORESOURCE_MEM, 0);
subtract_range(range, RANGE_NUM, start, endx); subtract_range(range, RANGE_NUM, start, endx);
printk(KERN_CONT " ==> [%llx, %llx]", (u64)start, endx); printk(KERN_CONT " ==> [%llx, %llx]", start, endx);
start = fam10h_mmconf_end + 1; start = fam10h_mmconf_end + 1;
changed = 1; changed = 1;
} }
if (changed) { if (changed) {
if (start <= end) { if (start <= end) {
printk(KERN_CONT " %s [%llx, %llx]", endx?"and":"==>", (u64)start, (u64)end); printk(KERN_CONT " %s [%llx, %llx]", endx ? "and" : "==>", start, end);
} else { } else {
printk(KERN_CONT "%s\n", endx?"":" ==> none"); printk(KERN_CONT "%s\n", endx?"":" ==> none");
continue; continue;
...@@ -301,7 +301,7 @@ static int __init early_fill_mp_bus_info(void) ...@@ -301,7 +301,7 @@ static int __init early_fill_mp_bus_info(void)
address = MSR_K8_TOP_MEM2; address = MSR_K8_TOP_MEM2;
rdmsrl(address, val); rdmsrl(address, val);
end = (val & 0xffffff800000ULL); end = (val & 0xffffff800000ULL);
printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20); 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 - 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment