Commit 3aa88cdf authored by Carlos R. Mafra's avatar Carlos R. Mafra Committed by Ingo Molnar

x86: clean up k8topology.c

This patch fixes all errors pointed out by checkpatch.pl.

                                      errors   lines of code   errors/KLOC
arch/x86/mm/k8topology_64.c (before)      72             185         389.1
arch/x86/mm/k8topology_64.c (after)        0             185             0

No code changed.

   text    data     bss     dec     hex filename
   1506       0       0    1506     5e2 k8topology_64.o.after
   1506       0       0    1506     5e2 k8topology_64.o.before

md5sum:

   f9f48331a7eca4fc60d2a03369dc5f53  k8topology_64.o.after
   f9f48331a7eca4fc60d2a03369dc5f53  k8topology_64.o.before
Signed-off-by: default avatarCarlos R. Mafra <crmafra@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ff8a03a6
/* /*
* AMD K8 NUMA support. * AMD K8 NUMA support.
* Discover the memory map and associated nodes. * Discover the memory map and associated nodes.
* *
* This version reads it directly from the K8 northbridge. * This version reads it directly from the K8 northbridge.
* *
* Copyright 2002,2003 Andi Kleen, SuSE Labs. * Copyright 2002,2003 Andi Kleen, SuSE Labs.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -22,26 +22,26 @@ ...@@ -22,26 +22,26 @@
static __init int find_northbridge(void) static __init int find_northbridge(void)
{ {
int num; int num;
for (num = 0; num < 32; num++) { for (num = 0; num < 32; num++) {
u32 header; u32 header;
header = read_pci_config(0, num, 0, 0x00); header = read_pci_config(0, num, 0, 0x00);
if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16))) if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16)))
continue; continue;
header = read_pci_config(0, num, 1, 0x00); header = read_pci_config(0, num, 1, 0x00);
if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16))) if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16)))
continue; continue;
return num; return num;
} }
return -1; return -1;
} }
int __init k8_scan_nodes(unsigned long start, unsigned long end) int __init k8_scan_nodes(unsigned long start, unsigned long end)
{ {
unsigned long prevbase; unsigned long prevbase;
struct bootnode nodes[8]; struct bootnode nodes[8];
int nodeid, i, nb; int nodeid, i, nb;
...@@ -56,97 +56,97 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -56,97 +56,97 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
if (!early_pci_allowed()) if (!early_pci_allowed())
return -1; return -1;
nb = find_northbridge(); nb = find_northbridge();
if (nb < 0) if (nb < 0)
return nb; return nb;
printk(KERN_INFO "Scanning NUMA topology in Northbridge %d\n", nb); printk(KERN_INFO "Scanning NUMA topology in Northbridge %d\n", nb);
reg = read_pci_config(0, nb, 0, 0x60); reg = read_pci_config(0, nb, 0, 0x60);
numnodes = ((reg >> 4) & 0xF) + 1; numnodes = ((reg >> 4) & 0xF) + 1;
if (numnodes <= 1) if (numnodes <= 1)
return -1; return -1;
printk(KERN_INFO "Number of nodes %d\n", numnodes); printk(KERN_INFO "Number of nodes %d\n", numnodes);
memset(&nodes,0,sizeof(nodes)); memset(&nodes, 0, sizeof(nodes));
prevbase = 0; prevbase = 0;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
unsigned long base,limit; unsigned long base, limit;
u32 nodeid; u32 nodeid;
base = read_pci_config(0, nb, 1, 0x40 + i*8); base = read_pci_config(0, nb, 1, 0x40 + i*8);
limit = read_pci_config(0, nb, 1, 0x44 + i*8); limit = read_pci_config(0, nb, 1, 0x44 + i*8);
nodeid = limit & 7; nodeid = limit & 7;
nodeids[i] = nodeid; nodeids[i] = nodeid;
if ((base & 3) == 0) { if ((base & 3) == 0) {
if (i < numnodes) if (i < numnodes)
printk("Skipping disabled node %d\n", i); printk("Skipping disabled node %d\n", i);
continue; continue;
} }
if (nodeid >= numnodes) { if (nodeid >= numnodes) {
printk("Ignoring excess node %d (%lx:%lx)\n", nodeid, printk("Ignoring excess node %d (%lx:%lx)\n", nodeid,
base, limit); base, limit);
continue; continue;
} }
if (!limit) { if (!limit) {
printk(KERN_INFO "Skipping node entry %d (base %lx)\n", i, printk(KERN_INFO "Skipping node entry %d (base %lx)\n",
base); i, base);
continue; continue;
} }
if ((base >> 8) & 3 || (limit >> 8) & 3) { if ((base >> 8) & 3 || (limit >> 8) & 3) {
printk(KERN_ERR "Node %d using interleaving mode %lx/%lx\n", printk(KERN_ERR "Node %d using interleaving mode %lx/%lx\n",
nodeid, (base>>8)&3, (limit>>8) & 3); nodeid, (base>>8)&3, (limit>>8) & 3);
return -1; return -1;
} }
if (node_isset(nodeid, node_possible_map)) { if (node_isset(nodeid, node_possible_map)) {
printk(KERN_INFO "Node %d already present. Skipping\n", printk(KERN_INFO "Node %d already present. Skipping\n",
nodeid); nodeid);
continue; continue;
} }
limit >>= 16; limit >>= 16;
limit <<= 24; limit <<= 24;
limit |= (1<<24)-1; limit |= (1<<24)-1;
limit++; limit++;
if (limit > end_pfn << PAGE_SHIFT) if (limit > end_pfn << PAGE_SHIFT)
limit = end_pfn << PAGE_SHIFT; limit = end_pfn << PAGE_SHIFT;
if (limit <= base) if (limit <= base)
continue; continue;
base >>= 16; base >>= 16;
base <<= 24; base <<= 24;
if (base < start) if (base < start)
base = start; base = start;
if (limit > end) if (limit > end)
limit = end; limit = end;
if (limit == base) { if (limit == base) {
printk(KERN_ERR "Empty node %d\n", nodeid); printk(KERN_ERR "Empty node %d\n", nodeid);
continue; continue;
} }
if (limit < base) { if (limit < base) {
printk(KERN_ERR "Node %d bogus settings %lx-%lx.\n", printk(KERN_ERR "Node %d bogus settings %lx-%lx.\n",
nodeid, base, limit); nodeid, base, limit);
continue; continue;
} }
/* Could sort here, but pun for now. Should not happen anyroads. */ /* Could sort here, but pun for now. Should not happen anyroads. */
if (prevbase > base) { if (prevbase > base) {
printk(KERN_ERR "Node map not sorted %lx,%lx\n", printk(KERN_ERR "Node map not sorted %lx,%lx\n",
prevbase,base); prevbase, base);
return -1; return -1;
} }
printk(KERN_INFO "Node %d MemBase %016lx Limit %016lx\n", printk(KERN_INFO "Node %d MemBase %016lx Limit %016lx\n",
nodeid, base, limit); nodeid, base, limit);
found++; found++;
nodes[nodeid].start = base; nodes[nodeid].start = base;
nodes[nodeid].end = limit; nodes[nodeid].end = limit;
e820_register_active_regions(nodeid, e820_register_active_regions(nodeid,
nodes[nodeid].start >> PAGE_SHIFT, nodes[nodeid].start >> PAGE_SHIFT,
...@@ -155,31 +155,31 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -155,31 +155,31 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
prevbase = base; prevbase = base;
node_set(nodeid, node_possible_map); node_set(nodeid, node_possible_map);
} }
if (!found) if (!found)
return -1; return -1;
memnode_shift = compute_hash_shift(nodes, 8); memnode_shift = compute_hash_shift(nodes, 8);
if (memnode_shift < 0) { if (memnode_shift < 0) {
printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n"); printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n");
return -1; return -1;
} }
printk(KERN_INFO "Using node hash shift of %d\n", memnode_shift); printk(KERN_INFO "Using node hash shift of %d\n", memnode_shift);
/* use the coreid bits from early_identify_cpu */ /* use the coreid bits from early_identify_cpu */
bits = boot_cpu_data.x86_coreid_bits; bits = boot_cpu_data.x86_coreid_bits;
cores = (1<<bits); cores = (1<<bits);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (nodes[i].start != nodes[i].end) { if (nodes[i].start != nodes[i].end) {
nodeid = nodeids[i]; nodeid = nodeids[i];
for (j = 0; j < cores; j++) for (j = 0; j < cores; j++)
apicid_to_node[(nodeid << bits) + j] = i; apicid_to_node[(nodeid << bits) + j] = i;
setup_node_bootmem(i, nodes[i].start, nodes[i].end); setup_node_bootmem(i, nodes[i].start, nodes[i].end);
} }
} }
numa_init_array(); numa_init_array();
return 0; return 0;
} }
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