diff options
author | Alexander Graf <agraf@suse.de> | 2014-10-13 10:01:09 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-02 20:12:51 -0500 |
commit | 9178ba294b6839eeff1a91bed95515d783f3ee6c (patch) | |
tree | 61252a8808bba5208c7b7c0f0af31301278272de /arch/powerpc/kernel/setup-common.c | |
parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) |
powerpc: Convert power off logic to pm_power_off
The generic Linux framework to power off the machine is a function pointer
called pm_power_off. The trick about this pointer is that device drivers can
potentially implement it rather than board files.
Today on powerpc we set pm_power_off to invoke our generic full machine power
off logic which then calls ppc_md.power_off to invoke machine specific power
off.
However, when we want to add a power off GPIO via the "gpio-poweroff" driver,
this card house falls apart. That driver only registers itself if pm_power_off
is NULL to ensure it doesn't override board specific logic. However, since we
always set pm_power_off to the generic power off logic (which will just not
power off the machine if no ppc_md.power_off call is implemented), we can't
implement power off via the generic GPIO power off driver.
To fix this up, let's get rid of the ppc_md.power_off logic and just always use
pm_power_off as was intended. Then individual drivers such as the GPIO power off
driver can implement power off logic via that function pointer.
With this patch set applied and a few patches on top of QEMU that implement a
power off GPIO on the virt e500 machine, I can successfully turn off my virtual
machine after halt.
Signed-off-by: Alexander Graf <agraf@suse.de>
[mpe: Squash into one patch and update changelog based on cover letter]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 1362cd62b3fa..44c8d03558ac 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
@@ -139,8 +139,8 @@ void machine_restart(char *cmd) | |||
139 | void machine_power_off(void) | 139 | void machine_power_off(void) |
140 | { | 140 | { |
141 | machine_shutdown(); | 141 | machine_shutdown(); |
142 | if (ppc_md.power_off) | 142 | if (pm_power_off) |
143 | ppc_md.power_off(); | 143 | pm_power_off(); |
144 | #ifdef CONFIG_SMP | 144 | #ifdef CONFIG_SMP |
145 | smp_send_stop(); | 145 | smp_send_stop(); |
146 | #endif | 146 | #endif |
@@ -151,7 +151,7 @@ void machine_power_off(void) | |||
151 | /* Used by the G5 thermal driver */ | 151 | /* Used by the G5 thermal driver */ |
152 | EXPORT_SYMBOL_GPL(machine_power_off); | 152 | EXPORT_SYMBOL_GPL(machine_power_off); |
153 | 153 | ||
154 | void (*pm_power_off)(void) = machine_power_off; | 154 | void (*pm_power_off)(void); |
155 | EXPORT_SYMBOL_GPL(pm_power_off); | 155 | EXPORT_SYMBOL_GPL(pm_power_off); |
156 | 156 | ||
157 | void machine_halt(void) | 157 | void machine_halt(void) |