
Code: Select all
--- windfarm_smu_controls.c 2008-04-01 20:00:08.000000000 +0200
+++ windfarm_smu_controls_dualpump.c 2008-04-01 19:59:44.000000000 +0200
@@ -202,6 +202,8 @@
fct->ctrl.name = "cpu-front-fan-1";
else if (!strcmp(l, "CPU A PUMP"))
fct->ctrl.name = "cpu-pump-0";
+ else if (!strcmp(l, "CPU B PUMP"))
+ fct->ctrl.name = "cpu-pump-1";
else if (!strcmp(l, "Slots Fan") || !strcmp(l, "Slots fan") ||
!strcmp(l, "EXPANSION SLOTS INTAKE"))
fct->ctrl.name = "slots-fan";
Code: Select all
/* Second pump isn't required (and isn't actually present) */

bmaass wrote:I think one might contact Benjamin Herrenschmidt, he wrote the thing. I guess if it's two people having this problem already, it might be worth adding two lines of code, if it doesn't break anything for anybody else AND is actually a "fix" and not just masking the problem somehow (I can't claim I understood the driver when I poked around in there and stumbled on this).
Also, the file "windfarm_pm112.c" explicitly states:There's got to be some reason he assumed this to be true for all machines.Code: Select all
/* Second pump isn't required (and isn't actually present) */

Code: Select all
uname -a
Linux orcabox 2.6.31-gentoo-r6 #1 SMP Sat Dec 5 02:28:29 CET 2009 ppc64 PPC970MP, altivec supported PowerMac11,2 GNU/Linux
Code: Select all
emerge --info
Portage 2.1.6.13 (default/linux/powerpc/ppc64/10.0/32bit-userland/desktop, gcc-4.3.4, glibc-2.9_p20081201-r2, 2.6.31-gentoo-r6 ppc64)
=================================================================
System uname: Linux-2.6.31-gentoo-r6-ppc64-PPC970MP,_altivec_supported-with-gentoo-1.12.13
Timestamp of tree: Fri, 04 Dec 2009 23:30:01 +0000
ccache version 2.4 [enabled]
app-shells/bash: 4.0_p28
dev-java/java-config: 2.1.9-r1
dev-lang/python: 2.6.2-r1
dev-util/ccache: 2.4-r7
dev-util/cmake: 2.6.4
sys-apps/baselayout: 1.12.13
sys-apps/sandbox: 1.6-r2
sys-devel/autoconf: 2.13, 2.63-r1
sys-devel/automake: 1.6.3, 1.9.6-r2, 1.10.2
sys-devel/binutils: 2.18-r3
sys-devel/gcc-config: 1.4.1
sys-devel/libtool: 2.2.6a
virtual/os-headers: 2.6.27-r2
ACCEPT_KEYWORDS="ppc"
CBUILD="powerpc-unknown-linux-gnu"
CFLAGS="-mcpu=G5 -O2 -pipe -maltivec -mabi=altivec -fno-strict-aliasing"
CHOST="powerpc-unknown-linux-gnu"
CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/udev/rules.d"
CXXFLAGS="-mcpu=G5 -O2 -pipe -maltivec -mabi=altivec -fno-strict-aliasing"
DISTDIR="/usr/portage/distfiles"
FEATURES="ccache distlocks fixpackages parallel-fetch protect-owned sandbox sfperms strict unmerge-orphans userfetch"
GENTOO_MIRRORS="ftp://ftp.snt.utwente.nl/pub/os/linux/gentoo ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/ ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/gentoo http://mirror.netcologne.de/gentoo/ ftp://mirror.leaseweb.com/gentoo/"
LANG="en_US.UTF-8"
LDFLAGS="-Wl,-O1"
LINGUAS="en de"
MAKEOPTS="-j5"
PKGDIR="/opt/portage/packages/"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage/layman/x11 /usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X a52 aac acl alsa altivec apache2 avahi berkdb bluetooth branding bzip2 cairo cdr clamav cli consolekit cracklib crypt ctype cups cxx dbus dri dts dvd dvdr eds emacs emboss encode evo exif fam ffmpeg firefox flac fortran gcc64 gd gdbm gif gnome gpm gstreamer gtk hal iconv ipv6 java jpeg ldap libnotify libwww mad mikmod modules mp3 mp4 mpeg mplayer mudflap mysql ncurses nls nptl nptlonly ogg opengl openmp pam pcre pdf perl php png ppc ppds pppd python qt3support qt4 quicktime readline reflection sdl session spell spl sqlite ssl startup-notification svg sysfs tcpd thunar tiff truetype unicode usb vorbis x264 xml xorg xulrunner xv xvid zlib" ALSA_CARDS="snd-aoa usb-audio" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en de" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="nv nouveau"
Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Code: Select all
grep -i pump /usr/src/linux/drivers/macintosh/windfarm_smu_controls.c
else if (!strcmp(l, "CPU A PUMP"))
fct->ctrl.name = "cpu-pump-0";
else if (!strcmp(l, "CPU B PUMP"))
fct->ctrl.name = "cpu-pump-1";
Code: Select all
ls -l /usr/src/
total 8
lrwxrwxrwx 1 root root 22 2009-12-05 01:49 linux -> linux-2.6.31-gentoo-r6
drwxr-xr-x 23 root root 4096 2009-12-05 12:48 linux-2.6.30-gentoo-r8
drwxr-xr-x 24 root root 4096 2009-12-05 14:11 linux-2.6.31-gentoo-r6Code: Select all
dmesg | grep windfarm
windfarm: Failed to create SMU RPM fan fan
windfarm: initializing for dual-core desktop G5
windfarm: CPUs control loops started.
windfarm: Backside control loop started.
windfarm: Slots control loop started.
windfarm: Drive bay control loop started.
Code: Select all
dmesg | grep gentoo
Linux version 2.6.31-gentoo-r6 (root@orcabox) (gcc version 4.1.2 (Gentoo 4.1.2 p1.0.1)) #1 SMP Sat Dec 5 02:28:29 CET 2009

Can you give me the exact kernel revision you use from unstable then I will try that.bmaass wrote:Nah, you did something wrong there. I'm running 2.6.32 and it's all fine here. In fact, I ran it up the chain to Ben Herrenschmidt who promised to have this patch included in the future.
Uh, I'm just using 2.6.32-gentoo from portage. I did nothing different with this version, and it works like it always did. I just sync, eselect new kernel, patch source, build, copy to /boot, update /etc/yaboot.conf, ybin -v and eventually reboot...aguettinger wrote:Can you give me the exact kernel revision you use from unstable then I will try that.

Code: Select all
else if (!strcmp(l, "CPU A PUMP"))
fct->ctrl.name = "cpu-pump-0";
else if (!strcmp(l, "CPUÂ BÂ PUMP"))
fct->ctrl.name = "cpu-pump-1";