Re: [Linux-ia64] test patch relative to 2.5.30

[Kimio Suganuma <k-suganuma@mvj.biglobe.ne.jp>]

[-- Attachment #1: Type: text/plain, Size: 984 bytes --]

Hi David,

I updated the boot-change patch for 2.5.30.
Curious to say, the kernel with the patch worked fine on
two way Bigsur, while the original kernel caused panic
at booting. Why don't you take it into your tree? :-)

Regards,
Kimi

On Sat, 10 Aug 2002 01:58:14 -0700
David Mosberger <davidm@napali.hpl.hp.com> wrote:

> Below is a quick patch for 2.5.30.  Warning: it has been tested only
> lightly.  It worked for me on a Big Sur in UP mode.  I think MP is
> broken at the moment.  My focus was to try to get the AGP/DRM code
> into shape so we can have it merged into 2.5.  The primary reason I
> tought it would be good to make this barely tested patch available is
> because 2.5.29 likes to eat filesystems on IDE disks (it ate the
> rootfs on one of my machines and subtly corrupted a couple of files on
> another machine...).  With 2.5.30, I haven't seen any file corruption
> so far, but your mileage obviously may vary.

-- 
Kimio Suganuma <k-suganuma@mvj.biglobe.ne.jp>

[-- Attachment #2: hotplug-boot-change-ia64-2530.patch --]
[-- Type: application/octet-stream, Size: 6521 bytes --]

diff -Nur linux-2.5.30-base/arch/ia64/kernel/acpi.c linux-2.5.30-lhcs/arch/ia64/kernel/acpi.c
--- linux-2.5.30-base/arch/ia64/kernel/acpi.c	Mon Aug 12 10:46:24 2002
+++ linux-2.5.30-lhcs/arch/ia64/kernel/acpi.c	Mon Aug 12 11:06:34 2002
@@ -603,6 +603,8 @@
 		available_cpus = 1; /* We've got at least one of these, no? */
 	}
 	smp_boot_data.cpu_count = total_cpus;
+
+	smp_build_cpu_map();
 #endif
 	/* Make boot-up look pretty */
 	printk("%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
diff -Nur linux-2.5.30-base/arch/ia64/kernel/smpboot.c linux-2.5.30-lhcs/arch/ia64/kernel/smpboot.c
--- linux-2.5.30-base/arch/ia64/kernel/smpboot.c	Mon Aug 12 10:46:24 2002
+++ linux-2.5.30-lhcs/arch/ia64/kernel/smpboot.c	Mon Aug 12 11:11:59 2002
@@ -350,11 +350,7 @@
 	efi_map_pal_code();
 	cpu_init();
 	smp_callin();
-	Dprintk("CPU %d is set to go.\n", smp_processor_id());
-	while (!atomic_read(&smp_commenced))
-		cpu_relax();
 
-	Dprintk("CPU %d is starting idle.\n", smp_processor_id());
 	return cpu_idle();
 }
 
@@ -368,15 +364,11 @@
 	return do_fork(CLONE_VM|CLONE_IDLETASK, 0, 0, 0);
 }
 
-static void __init
-do_boot_cpu (int sapicid)
+static int __init
+do_boot_cpu (int sapicid, int cpu)
 {
 	struct task_struct *idle;
-	int timeout, cpu;
-
-	cpu = ++cpucount;
-
-	set_bit(cpu, &phys_cpu_present_map);
+	int timeout;
 
 	/*
 	 * We can't use kernel_thread since we must avoid to
@@ -392,8 +384,6 @@
 	 */
 	init_idle(idle, cpu);
 
-	ia64_cpu_to_sapicid[cpu] = sapicid;
-
 	unhash_process(idle);
 
 	task_for_booting_cpu = idle;
@@ -421,8 +411,10 @@
 	} else {
 		printk(KERN_ERR "Processor 0x%x/0x%x is stuck.\n", cpu, sapicid);
 		ia64_cpu_to_sapicid[cpu] = -1;
-		cpucount--;
+		clear_bit(cpu, &cpu_online_map);  /* was set in smp_callin() */
+		return -EINVAL;
 	}
+	return 0;
 }
 
 unsigned long cache_decay_ticks;	/* # of ticks an idle task is considered cache-hot */
@@ -437,21 +429,42 @@
 }
 
 /*
+ * Initialize the logical CPU number to SAPICID mapping
+ */
+void __init
+smp_build_cpu_map(void)
+{
+	int sapicid, cpu, i;
+	int boot_cpu_id = hard_smp_processor_id();
+
+	for (cpu = 0; cpu < NR_CPUS; cpu++)
+		ia64_cpu_to_sapicid[cpu] = -1;
+
+	ia64_cpu_to_sapicid[0] = boot_cpu_id;
+	phys_cpu_present_map = 1;
+
+	for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {
+		sapicid = smp_boot_data.cpu_phys_id[i];
+		if (sapicid == -1 || sapicid == boot_cpu_id)
+			continue;
+		phys_cpu_present_map |= (1 << cpu);
+		ia64_cpu_to_sapicid[cpu] = sapicid;
+		cpu++;
+	}
+}
+
+/*
  * Cycle through the APs sending Wakeup IPIs to boot each.
  */
-static void __init
-smp_boot_cpus (unsigned int max_cpus)
+void __init
+smp_prepare_cpus (unsigned int max_cpus)
 {
-	int sapicid, cpu;
 	int boot_cpu_id = hard_smp_processor_id();
 
 	/*
-	 * Initialize the logical to physical CPU number mapping
-	 * and the per-CPU profiling counter/multiplier
+	 * Initialize the per-CPU profiling counter/multiplier
 	 */
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
-		ia64_cpu_to_sapicid[cpu] = -1;
 	smp_setup_percpu_timer();
 
 	/*
@@ -459,7 +472,6 @@
 	 */
 	set_bit(0, &cpu_online_map);
 	set_bit(0, &cpu_callin_map);
-	set_bit(0, &phys_cpu_present_map);
 
 	local_cpu_data->loops_per_jiffy = loops_per_jiffy;
 	ia64_cpu_to_sapicid[0] = boot_cpu_id;
@@ -474,78 +486,48 @@
 	 */
 	if (!max_cpus || (max_cpus < -1)) {
 		printk(KERN_INFO "SMP mode deactivated.\n");
-		cpu_online_map =  1;
-		goto smp_done;
+		cpu_online_map = phys_cpu_present_map = 1;
+		return;
 	}
-	if (max_cpus != -1)
-		printk (KERN_INFO "Limiting CPUs to %d\n", max_cpus);
+}
 
-	if (smp_boot_data.cpu_count > 1) {
+void
+smp_cpus_done(unsigned int dummy)
+{
+	int cpu;
+	unsigned long bogosum = 0;
 
-		printk(KERN_INFO "SMP: starting up secondaries.\n");
+	/*
+	 * Allow the user to impress friends.
+	 */
 
-		for (cpu = 0; cpu < smp_boot_data.cpu_count; cpu++) {
-			/*
-			 * Don't even attempt to start the boot CPU!
-			 */
-			sapicid = smp_boot_data.cpu_phys_id[cpu];
-			if ((sapicid == -1) || (sapicid == hard_smp_processor_id()))
-				continue;
-
-			if ((max_cpus > 0) && (cpucount + 1 >= max_cpus))
-				break;
-
-			do_boot_cpu(sapicid);
-
-			/*
-			 * Make sure we unmap all failed CPUs
-			 */
-			if (ia64_cpu_to_sapicid[cpu] == -1)
-				printk("phys CPU#%d not responding - cannot use it.\n", cpu);
-		}
-
-		/*
-		 * Allow the user to impress friends.
-		 */
-
-		printk("Before bogomips.\n");
-		if (!cpucount) {
-			printk(KERN_WARNING "Warning: only one processor found.\n");
-		} else {
-			unsigned long bogosum = 0;
-  			for (cpu = 0; cpu < NR_CPUS; cpu++)
-				if (cpu_online_map & (1UL << cpu))
-					bogosum += cpu_data(cpu)->loops_per_jiffy;
-
-			printk(KERN_INFO"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
-			       cpucount + 1, bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
-		}
-	}
-  smp_done:
-	;
-}
+	for (cpu = 0; cpu < NR_CPUS; cpu++)
+		if (cpu_online(cpu))
+			bogosum += cpu_data(cpu)->loops_per_jiffy;
 
-void __init
-smp_prepare_cpus (unsigned int max_cpus)
-{
- 	smp_boot_cpus(max_cpus);
+	printk(KERN_INFO"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
+	       num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
 }
 
 int __devinit
 __cpu_up (unsigned int cpu)
 {
-	/*
-	 * Yeah, that's cheesy, but it will do until there is real hotplug support and in
-	 * the meantime, this gives time for the interface changes to settle down...
-	 */
-	smp_commence();
-	return 0;
-}
+	int ret;
+	int sapicid;
 
-void __init
-smp_cpus_done (unsigned int max_cpus)
-{
-	/* nuthing... */
+	sapicid = ia64_cpu_to_sapicid[cpu];
+	if (sapicid == -1)
+		return -EINVAL;
+
+	printk(KERN_INFO "Processor %d/%d is spinning up...\n", sapicid, cpu);
+
+	/* Processor goes to start_secondary(), sets online flag */
+	ret = do_boot_cpu(sapicid, cpu);
+	if (ret < 0)
+		return ret;
+
+	printk(KERN_INFO "Processor %d has spun up...\n", cpu);
+	return 0;
 }
 
 /*
diff -Nur linux-2.5.30-base/include/asm-ia64/smp.h linux-2.5.30-lhcs/include/asm-ia64/smp.h
--- linux-2.5.30-base/include/asm-ia64/smp.h	Mon Aug 12 10:46:24 2002
+++ linux-2.5.30-lhcs/include/asm-ia64/smp.h	Mon Aug 12 11:06:34 2002
@@ -128,6 +128,7 @@
 extern int __cpu_disable (void);
 extern void __cpu_die (unsigned int cpu);
 extern int __cpu_up (unsigned int cpu);
+extern void __init smp_build_cpu_map(void);
 
 extern void __init init_smp_config (void);
 extern void smp_do_timer (struct pt_regs *regs);
Binary files linux-2.5.30-base/vmlinux.kimi.gz and linux-2.5.30-lhcs/vmlinux.kimi.gz differ