Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / arch / x86 / platform / uv / tlb_uv.c

diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 68e467f..db8b915 100644 (file)
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -296,14 +296,18 @@ static void bau_process_message(struct msg_desc *mdp,
 }
 
 /*
- * Determine the first cpu on a uvhub.
+ * Determine the first cpu on a pnode.
  */
-static int uvhub_to_first_cpu(int uvhub)
+static int pnode_to_first_cpu(int pnode, struct bau_control *smaster)
 {
        int cpu;
-       for_each_present_cpu(cpu)
-               if (uvhub == uv_cpu_to_blade_id(cpu))
+       struct hub_and_pnode *hpp;
+
+       for_each_present_cpu(cpu) {
+               hpp = &smaster->thp[cpu];
+               if (pnode == hpp->pnode)
                        return cpu;
+       }
        return -1;
 }
 
@@ -366,28 +370,32 @@ static void do_reset(void *ptr)
  * Use IPI to get all target uvhubs to release resources held by
  * a given sending cpu number.
  */
-static void reset_with_ipi(struct bau_targ_hubmask *distribution, int sender)
+static void reset_with_ipi(struct pnmask *distribution, struct bau_control *bcp)
 {
-       int uvhub;
+       int pnode;
+       int apnode;
        int maskbits;
-       cpumask_t mask;
+       int sender = bcp->cpu;
+       cpumask_t *mask = bcp->uvhub_master->cpumask;
+       struct bau_control *smaster = bcp->socket_master;
        struct reset_args reset_args;
 
        reset_args.sender = sender;
-       cpus_clear(mask);
+       cpus_clear(*mask);
        /* find a single cpu for each uvhub in this distribution mask */
-       maskbits = sizeof(struct bau_targ_hubmask) * BITSPERBYTE;
-       for (uvhub = 0; uvhub < maskbits; uvhub++) {
+       maskbits = sizeof(struct pnmask) * BITSPERBYTE;
+       /* each bit is a pnode relative to the partition base pnode */
+       for (pnode = 0; pnode < maskbits; pnode++) {
                int cpu;
-               if (!bau_uvhub_isset(uvhub, distribution))
+               if (!bau_uvhub_isset(pnode, distribution))
                        continue;
-               /* find a cpu for this uvhub */
-               cpu = uvhub_to_first_cpu(uvhub);
-               cpu_set(cpu, mask);
+               apnode = pnode + bcp->partition_base_pnode;
+               cpu = pnode_to_first_cpu(apnode, smaster);
+               cpu_set(cpu, *mask);
        }
 
        /* IPI all cpus; preemption is already disabled */
-       smp_call_function_many(&mask, do_reset, (void *)&reset_args, 1);
+       smp_call_function_many(mask, do_reset, (void *)&reset_args, 1);
        return;
 }
 
@@ -604,7 +612,7 @@ static void destination_plugged(struct bau_desc *bau_desc,
                quiesce_local_uvhub(hmaster);
 
                spin_lock(&hmaster->queue_lock);
-               reset_with_ipi(&bau_desc->distribution, bcp->cpu);
+               reset_with_ipi(&bau_desc->distribution, bcp);
                spin_unlock(&hmaster->queue_lock);
 
                end_uvhub_quiesce(hmaster);
@@ -626,7 +634,7 @@ static void destination_timeout(struct bau_desc *bau_desc,
                quiesce_local_uvhub(hmaster);
 
                spin_lock(&hmaster->queue_lock);
-               reset_with_ipi(&bau_desc->distribution, bcp->cpu);
+               reset_with_ipi(&bau_desc->distribution, bcp);
                spin_unlock(&hmaster->queue_lock);
 
                end_uvhub_quiesce(hmaster);
@@ -1334,9 +1342,10 @@ static ssize_t tunables_write(struct file *file, const char __user *user,
 
        instr[count] = '\0';
 
-       bcp = &per_cpu(bau_control, smp_processor_id());
-
+       cpu = get_cpu();
+       bcp = &per_cpu(bau_control, cpu);
        ret = parse_tunables_write(bcp, instr, count);
+       put_cpu();
        if (ret)
                return ret;
 
@@ -1686,6 +1695,16 @@ static void make_per_cpu_thp(struct bau_control *smaster)
        }
 }
 
+/*
+ * Each uvhub is to get a local cpumask.
+ */
+static void make_per_hub_cpumask(struct bau_control *hmaster)
+{
+       int sz = sizeof(cpumask_t);
+
+       hmaster->cpumask = kzalloc_node(sz, GFP_KERNEL, hmaster->osnode);
+}
+
 /*
  * Initialize all the per_cpu information for the cpu's on a given socket,
  * given what has been gathered into the socket_desc struct.
@@ -1751,11 +1770,12 @@ static int __init summarize_uvhub_sockets(int nuvhubs,
                                sdp = &bdp->socket[socket];
                                if (scan_sock(sdp, bdp, &smaster, &hmaster))
                                        return 1;
+                               make_per_cpu_thp(smaster);
                        }
                        socket++;
                        socket_mask = (socket_mask >> 1);
-                       make_per_cpu_thp(smaster);
                }
+               make_per_hub_cpumask(hmaster);
        }
        return 0;
 }
@@ -1777,15 +1797,20 @@ static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
        uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
 
        if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))
-               return 1;
+               goto fail;
 
        if (summarize_uvhub_sockets(nuvhubs, uvhub_descs, uvhub_mask))
-               return 1;
+               goto fail;
 
        kfree(uvhub_descs);
        kfree(uvhub_mask);
        init_per_cpu_tunables();
        return 0;
+
+fail:
+       kfree(uvhub_descs);
+       kfree(uvhub_mask);
+       return 1;
 }
 
 /*