FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-28 04:17:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: Clean up and add missing log levels for k8

Browse Source 
Convert all printk's in arch/x86/mm/k8topology_64.c to use
pr_info() or pr_err() appropriately.

Adds log levels for messages currently lacking them.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Ankita Garg <ankita@in.ibm.com>
Cc: Len Brown <len.brown@intel.com>
LKML-Reference: <alpine.DEB.1.00.0909251517440.14754@chino.kir.corp.google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
David Rientjes 2009-09-25 15:19:47 -07:00 committed by Ingo Molnar
parent d93a8f829f
commit 1af5ba514f
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch/x86/mm/k8topology_64.c
View File

@ -91,14 +91,14 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
if (nb < 0) if (nb < 0)
return nb; return nb;
printk(KERN_INFO "Scanning NUMA topology in Northbridge %d\n", nb); pr_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); pr_info("Number of nodes %d\n", numnodes);
memset(&nodes, 0, sizeof(nodes)); memset(&nodes, 0, sizeof(nodes));
prevbase = 0; prevbase = 0;
@ -111,28 +111,28 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
nodeid = limit & 7; nodeid = limit & 7;
if ((base & 3) == 0) { if ((base & 3) == 0) {
if (i < numnodes) if (i < numnodes)
printk("Skipping disabled node %d\n", i); pr_info("Skipping disabled node %d\n", i);
continue; continue;
} }
if (nodeid >= numnodes) { if (nodeid >= numnodes) {
printk("Ignoring excess node %d (%lx:%lx)\n", nodeid, pr_info("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", pr_info("Skipping node entry %d (base %lx)\n",
i, 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", pr_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", pr_info("Node %d already present, skipping\n",
nodeid); nodeid);
continue; continue;
} }
@ -154,24 +154,24 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
if (limit > end) if (limit > end)
limit = end; limit = end;
if (limit == base) { if (limit == base) {
printk(KERN_ERR "Empty node %d\n", nodeid); pr_err("Empty node %d\n", nodeid);
continue; continue;
} }
if (limit < base) { if (limit < base) {
printk(KERN_ERR "Node %d bogus settings %lx-%lx.\n", pr_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", pr_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", pr_info("Node %d MemBase %016lx Limit %016lx\n",
nodeid, base, limit); nodeid, base, limit);
found++; found++;
@ -188,10 +188,10 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
memnode_shift = compute_hash_shift(nodes, 8, NULL); memnode_shift = compute_hash_shift(nodes, 8, NULL);
if (memnode_shift < 0) { if (memnode_shift < 0) {
printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n"); pr_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); pr_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;
@ -200,8 +200,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
/* need to get boot_cpu_id early for system with apicid lifting */ /* need to get boot_cpu_id early for system with apicid lifting */
early_get_boot_cpu_id(); early_get_boot_cpu_id();
if (boot_cpu_physical_apicid > 0) { if (boot_cpu_physical_apicid > 0) {
printk(KERN_INFO "BSP APIC ID: %02x\n", pr_info("BSP APIC ID: %02x\n", boot_cpu_physical_apicid);
boot_cpu_physical_apicid);
apicid_base = boot_cpu_physical_apicid; apicid_base = boot_cpu_physical_apicid;
} }