Re: please pull the powerpc-merge.git tree
From: Paul Mackerras <hidden>
Date: 2005-11-02 01:03:26
David Woodhouse writes:
Hm. Not entirely in line with my experience. Can you share the configs you used?
Sure, attached (as a .tar.gz). For 32-bit pmac, you currently have to disable CONFIG_PREP and (I believe) the TAU options. For the 64-bit configs I basically just used the defconfigs in arch/ppc64/configs.
Using http://david/woodhou.se/powerpc-merge-32.config it doesn't actually boot on my powerbook. I'll try it on the Pegasos later or tomorrow, where I have a serial console; it dies very early.
That's probably either the pci quirk that got added to do USB host controller handoff unconditionally on all platforms, and which touches the device without doing pci_enable_device or checking whether MMIO is enabled. A fix has gone into Linus' tree for that. There was also a bug added to the adbhid.c driver which would cause an oops when you pressed a key if you had an ADB keyboard (which powerbooks do). That's also fixed in Linus' tree.
quoted hunk ↗ jump to hunk
Aside from disabling CONFIG_NVRAM because call_rtas() isn't implemented anywhere, I also needed to do this to make that config build:--- linux-2.6.14/arch/powerpc/kernel/setup-common.c.orig 2005-11-01 10:14:32.000000000 +0000 +++ linux-2.6.14/arch/powerpc/kernel/setup-common.c 2005-11-01 10:15:03.000000000 +0000@@ -203,11 +203,11 @@ static int show_cpuinfo(struct seq_file #ifdef CONFIG_TAU_AVERAGE /* more straightforward, but potentially misleading */ seq_printf(m, "temperature \t: %u C (uncalibrated)\n", - cpu_temp(i)); + cpu_temp(cpu_id)); #else /* show the actual temp sensor range */ u32 temp; - temp = cpu_temp_both(i); + temp = cpu_temp_both(cpu_id); seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n", temp & 0xff, temp >> 16); #endif
Thanks, I'll put that in. Paul.