PowerMac: force only suspend-to-disk to be valid

This patch adds the .valid callback to pm_ops on PowerMac so that only the suspend to disk state can be entered. Note that just returning 0 would suffice since the upper layers don't pass PM_SUSPEND_DISK down, but I think they ought to be passing it down since they do really need support (or am I mistaken again?) so we handle it there regardless.

arch/powerpc/platforms/powermac/setup.c +12 -0

@@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_
 	return 0;
 }
 
+static int pmac_pm_valid(suspend_state_t state)
+{
+	switch (state) {
+	case PM_SUSPEND_DISK:
+		return 1;
+	/* can't do any other states via generic mechanism yet */
+	default:
+		return 0;
+	}
+}
+
 static struct pm_ops pmac_pm_ops = {
 	.pm_disk_mode	= PM_DISK_SHUTDOWN,
 	.prepare	= pmac_pm_prepare,
 	.enter		= pmac_pm_enter,
 	.finish		= pmac_pm_finish,
+	.valid		= pmac_pm_valid,
 };
 
 #endif /* CONFIG_SOFTWARE_SUSPEND */

Quoted 5 lines · Johannes Berg

This patch adds the .valid callback to pm_ops on PowerMac so that only the suspend to disk state can be entered. Note that just returning 0 would suffice since the upper layers don't pass PM_SUSPEND_DISK down, but I think they ought to be passing it down since they do really need support (or am I mistaken again?) so we handle it there regardless.

No one ever seemed to care about this patch,

can we queue it up for
2.6.18? I suppose it's too late now for 2.6.17 even if it fixes the long-standing but that on ppc, /sys/power/state kills the machine.

[quoted patch for reference]

Quoted 25 lines

arch/powerpc/platforms/powermac/setup.c +12 -0

@@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_
 	return 0;
 }
 
+static int pmac_pm_valid(suspend_state_t state)
+{
+	switch (state) {
+	case PM_SUSPEND_DISK:
+		return 1;
+	/* can't do any other states via generic mechanism yet */
+	default:
+		return 0;
+	}
+}
+
 static struct pm_ops pmac_pm_ops = {
 	.pm_disk_mode	= PM_DISK_SHUTDOWN,
 	.prepare	= pmac_pm_prepare,
 	.enter		= pmac_pm_enter,
 	.finish		= pmac_pm_finish,
+	.valid		= pmac_pm_valid,
 };
 

arch/powerpc/platforms/powermac/setup.c static int pmac_pm_finish(suspend_state_ · line 485

Quoted 1 line

arch/powerpc/platforms/powermac/setup.c +0 -0

 #endif /* CONFIG_SOFTWARE_SUSPEND */

Quoted 20 lines

Quoted 20 lines

arch/powerpc/platforms/powermac/setup.c +12 -0

+static int pmac_pm_valid(suspend_state_t state)
+{
+	switch (state) {
+	case PM_SUSPEND_DISK:
+		return 1;
+	/* can't do any other states via generic mechanism yet */
+	default:
+		return 0;
+	}
+}
+
 static struct pm_ops pmac_pm_ops = {
 	.pm_disk_mode	= PM_DISK_SHUTDOWN,
 	.prepare	= pmac_pm_prepare,
 	.enter		= pmac_pm_enter,
 	.finish		= pmac_pm_finish,
+	.valid		= pmac_pm_valid,
 };

Quoted 2 lines

Quoted 1 line

#endif /* CONFIG_SOFTWARE_SUSPEND */

It looks like a 2.6.17 patch to me. If someone wants to send it over with changelog, signed-off-by, etc I can take care of it.

Please also explain whether this fix is needed in 2.6.16.x.

It looks like a 2.6.17 patch to me. If someone wants to send it over with changelog, signed-off-by, etc I can take care of it.