From: tip-bot for Cliff Wickman on
Commit-ID: 93a7ca0c3ebe5d931126f1fb732cb9c4518383d4
Gitweb: http://git.kernel.org/tip/93a7ca0c3ebe5d931126f1fb732cb9c4518383d4
Author: Cliff Wickman <cpw(a)sgi.com>
AuthorDate: Fri, 16 Jul 2010 10:11:21 -0500
Committer: Ingo Molnar <mingo(a)elte.hu>
CommitDate: Sat, 17 Jul 2010 12:11:48 +0200

x86, UV: Initialize BAU MMRs only on hubs with cpus

Remove the initialization of MMRs
UVH_LB_BAU_SB_ACTIVATION_CONTROL and UVH_BAU_DATA_BROADCAST on
UV hubs that have no active cpus. Such initialization on hubs
with no active cpus would result in a kernel page fault.

This is not of real high priority, because we don't have any
such systems (with UV hubs that have no active cpus). But they
will be coming.

Signed-off-by: Cliff Wickman <cpw(a)sgi.com>
LKML-Reference: <E1OZmZN-0006cW-RC(a)eag09.americas.sgi.com>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
arch/x86/kernel/tlb_uv.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index abf3c31..59efb53 100644
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -1635,12 +1635,16 @@ static int __init uv_bau_init(void)
alloc_intr_gate(vector, uv_bau_message_intr1);

for_each_possible_blade(uvhub) {
- pnode = uv_blade_to_pnode(uvhub);
- /* INIT the bau */
- uv_write_global_mmr64(pnode, UVH_LB_BAU_SB_ACTIVATION_CONTROL,
- ((unsigned long)1 << 63));
- mmr = 1; /* should be 1 to broadcast to both sockets */
- uv_write_global_mmr64(pnode, UVH_BAU_DATA_BROADCAST, mmr);
+ if (uv_blade_nr_possible_cpus(uvhub)) {
+ pnode = uv_blade_to_pnode(uvhub);
+ /* INIT the bau */
+ uv_write_global_mmr64(pnode,
+ UVH_LB_BAU_SB_ACTIVATION_CONTROL,
+ ((unsigned long)1 << 63));
+ mmr = 1; /* should be 1 to broadcast to both sockets */
+ uv_write_global_mmr64(pnode, UVH_BAU_DATA_BROADCAST,
+ mmr);
+ }
}

return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/