From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S267244AbTBIMBD>; Sun, 9 Feb 2003 07:01:03 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S267245AbTBIMAn>; Sun, 9 Feb 2003 07:00:43 -0500
Received: from modemcable092.130-200-24.mtl.mc.videotron.ca ([24.200.130.92]:3664
	"EHLO montezuma.mastecende.com") by vger.kernel.org with ESMTP
	id <S267244AbTBIL6M>; Sun, 9 Feb 2003 06:58:12 -0500
Date: Sun, 9 Feb 2003 07:06:56 -0500 (EST)
From: Zwane Mwaikambo <zwane@holomorphy.com>
X-X-Sender: zwane@montezuma.mastecende.com
To: Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH][2.5][9/15] smp_call_function/_on_cpu - ppc64
Message-ID: <Pine.LNX.4.50.0302090651490.2812-100000@montezuma.mastecende.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

 smp.c |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 91 insertions(+), 4 deletions(-)

Index: linux-2.5.59-bk/arch/ppc64/kernel/smp.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/ppc64/kernel/smp.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 smp.c
--- linux-2.5.59-bk/arch/ppc64/kernel/smp.c	9 Feb 2003 09:08:33 -0000	1.1.1.1
+++ linux-2.5.59-bk/arch/ppc64/kernel/smp.c	9 Feb 2003 09:23:30 -0000
@@ -430,7 +430,7 @@
 
 void smp_send_stop(void)
 {
-	smp_call_function(stop_this_cpu, NULL, 1, 0);
+	smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 /*
@@ -458,7 +458,6 @@
  * [SUMMARY] Run a function on all other CPUs.
  * <func> The function to run. This must be fast and non-blocking.
  * <info> An arbitrary pointer to pass to the function.
- * <nonatomic> currently unused.
  * <wait> If true, wait (atomically) until function has completed on other CPUs.
  * [RETURNS] 0 on success, else a negative status code. Does not return until
  * remote CPUs are nearly ready to execute <<func>> or are or have executed.
@@ -466,8 +465,7 @@
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
-int smp_call_function (void (*func) (void *info), void *info, int nonatomic,
-		       int wait)
+int smp_call_function (void (*func) (void *info), void *info, int wait)
 { 
 	struct call_data_struct data;
 	int ret = -1, cpus = num_online_cpus()-1;
@@ -525,6 +523,95 @@
 out:
 	HMT_medium();
 	spin_unlock(&call_lock);
+	return ret;
+}
+
+/*
+ * smp_call_function_on_cpu - Runs func on all processors in the mask
+ *
+ * @func: The function to run. This must be fast and non-blocking.
+ * @info: An arbitrary pointer to pass to the function.
+ * @wait: If true, wait (atomically) until function has completed on other CPUs.
+ * @mask The bitmask of CPUs to call the function
+ * 
+ * Returns 0 on success, else a negative status code. Does not return until
+ * remote CPUs are nearly ready to execute func or have executed it.
+ *
+ * You must not call this function with disabled interrupts or from a
+ * hardware interrupt handler or from a bottom half handler.
+ */
+
+int smp_call_function_on_cpu (void (*func) (void *info), void *info, int wait,
+				unsigned long mask)
+{ 
+	struct call_data_struct data;
+	int ret = 0, cpu, i, num_cpus = hweight64(mask);
+	unsigned long timeout;
+
+	if (num_cpus == 0)
+		return -EINVAL;
+
+	cpu = get_cpu();
+	if ((1UL << cpu) & mask) {
+		put_cpu_no_resched();
+		return -EINVAL;
+	}
+
+	data.func = func;
+	data.info = info;
+	atomic_set(&data.started, 0);
+	data.wait = wait;
+	if (wait)
+		atomic_set(&data.finished, 0);
+
+	spin_lock(&call_lock);
+	call_data = &data;
+	wmb();
+	/* Send a message to all other CPUs and wait for them to respond */
+	for (i = 0; i < NR_CPUS; i++) {
+		if (cpu_online(i) && ((1UL << i) & mask))
+			smp_message_pass(i, PPC_MSG_CALL_FUNCTION, 0, 0);
+	}
+
+	/* Wait for response */
+	timeout = SMP_CALL_TIMEOUT;
+	while (atomic_read(&data.started) != num_cpus) {
+		HMT_low();
+		if (--timeout == 0) {
+			if (debugger)
+				debugger(0);
+			printk("smp_call_function on cpu %d: other cpus not "
+			       "responding (%d)\n", cpu,
+			       atomic_read(&data.started));
+			ret = -EIO;
+			goto out;
+		}
+	}
+
+	if (wait) {
+		timeout = SMP_CALL_TIMEOUT;
+		while (atomic_read(&data.finished) != num_cpus) {
+			HMT_low();
+			if (--timeout == 0) {
+				if (debugger)
+					debugger(0);
+				printk("smp_call_function on cpu %d: other "
+				       "cpus not finishing (%d/%d)\n",
+				       cpu,
+				       atomic_read(&data.finished),
+				       atomic_read(&data.started));
+				ret = -EIO;
+				goto out;
+			}
+		}
+	}
+
+	ret = 0;
+
+out:
+	HMT_medium();
+	spin_unlock(&call_lock);
+	put_cpu_no_resched();
 	return ret;
 }