diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-03 01:13:30 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-03 05:44:06 -0500 |
| commit | e2a002b9a731083c69add71b1f5014bac7dc1770 (patch) | |
| tree | 70668e3b177573abe292a5965a7acb1cf0ab721c | |
| parent | b55fafc5a800f27beedfdcf8bd1b6baa47e769a9 (diff) | |
[PATCH] powerpc: Fix windfarm_pm112 not starting all control loops
This adds a couple of printk's to windfarm_pm112 to display which
control loops are actually starting and fixes a bug where it would not
start all loops.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | drivers/macintosh/windfarm_pm112.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c index 17aec8e7476f..ef66bf2778ec 100644 --- a/drivers/macintosh/windfarm_pm112.c +++ b/drivers/macintosh/windfarm_pm112.c | |||
| @@ -358,6 +358,7 @@ static void backside_fan_tick(void) | |||
| 358 | return; | 358 | return; |
| 359 | if (!backside_tick) { | 359 | if (!backside_tick) { |
| 360 | /* first time; initialize things */ | 360 | /* first time; initialize things */ |
| 361 | printk(KERN_INFO "windfarm: Backside control loop started.\n"); | ||
| 361 | backside_param.min = backside_fan->ops->get_min(backside_fan); | 362 | backside_param.min = backside_fan->ops->get_min(backside_fan); |
| 362 | backside_param.max = backside_fan->ops->get_max(backside_fan); | 363 | backside_param.max = backside_fan->ops->get_max(backside_fan); |
| 363 | wf_pid_init(&backside_pid, &backside_param); | 364 | wf_pid_init(&backside_pid, &backside_param); |
| @@ -407,6 +408,7 @@ static void drive_bay_fan_tick(void) | |||
| 407 | return; | 408 | return; |
| 408 | if (!drive_bay_tick) { | 409 | if (!drive_bay_tick) { |
| 409 | /* first time; initialize things */ | 410 | /* first time; initialize things */ |
| 411 | printk(KERN_INFO "windfarm: Drive bay control loop started.\n"); | ||
| 410 | drive_bay_prm.min = drive_bay_fan->ops->get_min(drive_bay_fan); | 412 | drive_bay_prm.min = drive_bay_fan->ops->get_min(drive_bay_fan); |
| 411 | drive_bay_prm.max = drive_bay_fan->ops->get_max(drive_bay_fan); | 413 | drive_bay_prm.max = drive_bay_fan->ops->get_max(drive_bay_fan); |
| 412 | wf_pid_init(&drive_bay_pid, &drive_bay_prm); | 414 | wf_pid_init(&drive_bay_pid, &drive_bay_prm); |
| @@ -458,6 +460,7 @@ static void slots_fan_tick(void) | |||
| 458 | return; | 460 | return; |
| 459 | if (!slots_started) { | 461 | if (!slots_started) { |
| 460 | /* first time; initialize things */ | 462 | /* first time; initialize things */ |
| 463 | printk(KERN_INFO "windfarm: Slots control loop started.\n"); | ||
| 461 | wf_pid_init(&slots_pid, &slots_param); | 464 | wf_pid_init(&slots_pid, &slots_param); |
| 462 | slots_started = 1; | 465 | slots_started = 1; |
| 463 | } | 466 | } |
| @@ -504,6 +507,7 @@ static void pm112_tick(void) | |||
| 504 | 507 | ||
| 505 | if (!started) { | 508 | if (!started) { |
| 506 | started = 1; | 509 | started = 1; |
| 510 | printk(KERN_INFO "windfarm: CPUs control loops started.\n"); | ||
| 507 | for (i = 0; i < nr_cores; ++i) { | 511 | for (i = 0; i < nr_cores; ++i) { |
| 508 | if (create_cpu_loop(i) < 0) { | 512 | if (create_cpu_loop(i) < 0) { |
| 509 | failure_state = FAILURE_PERM; | 513 | failure_state = FAILURE_PERM; |
| @@ -594,8 +598,6 @@ static void pm112_new_sensor(struct wf_sensor *sr) | |||
| 594 | { | 598 | { |
| 595 | unsigned int i; | 599 | unsigned int i; |
| 596 | 600 | ||
| 597 | if (have_all_sensors) | ||
| 598 | return; | ||
| 599 | if (!strncmp(sr->name, "cpu-temp-", 9)) { | 601 | if (!strncmp(sr->name, "cpu-temp-", 9)) { |
| 600 | i = sr->name[9] - '0'; | 602 | i = sr->name[9] - '0'; |
| 601 | if (sr->name[10] == 0 && i < NR_CORES && | 603 | if (sr->name[10] == 0 && i < NR_CORES && |
