aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCliff Wickman <cpw@sgi.com>2010-07-16 11:11:21 -0400
committerIngo Molnar <mingo@elte.hu>2010-07-17 06:11:48 -0400
commit93a7ca0c3ebe5d931126f1fb732cb9c4518383d4 (patch)
treed1828065df998305b50e1b42ff33b20fc7e33367
parentf6d8a56693426b1f29ff5cafda8be0d65e4e1870 (diff)
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@sgi.com> LKML-Reference: <E1OZmZN-0006cW-RC@eag09.americas.sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/tlb_uv.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index abf3c31f14cf..59efb5390b37 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)
1635 alloc_intr_gate(vector, uv_bau_message_intr1); 1635 alloc_intr_gate(vector, uv_bau_message_intr1);
1636 1636
1637 for_each_possible_blade(uvhub) { 1637 for_each_possible_blade(uvhub) {
1638 pnode = uv_blade_to_pnode(uvhub); 1638 if (uv_blade_nr_possible_cpus(uvhub)) {
1639 /* INIT the bau */ 1639 pnode = uv_blade_to_pnode(uvhub);
1640 uv_write_global_mmr64(pnode, UVH_LB_BAU_SB_ACTIVATION_CONTROL, 1640 /* INIT the bau */
1641 ((unsigned long)1 << 63)); 1641 uv_write_global_mmr64(pnode,
1642 mmr = 1; /* should be 1 to broadcast to both sockets */ 1642 UVH_LB_BAU_SB_ACTIVATION_CONTROL,
1643 uv_write_global_mmr64(pnode, UVH_BAU_DATA_BROADCAST, mmr); 1643 ((unsigned long)1 << 63));
1644 mmr = 1; /* should be 1 to broadcast to both sockets */
1645 uv_write_global_mmr64(pnode, UVH_BAU_DATA_BROADCAST,
1646 mmr);
1647 }
1644 } 1648 }
1645 1649
1646 return 0; 1650 return 0;