aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/ps3/setup.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2014-10-13 10:01:09 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2014-11-02 20:12:51 -0500
commit9178ba294b6839eeff1a91bed95515d783f3ee6c (patch)
tree61252a8808bba5208c7b7c0f0af31301278272de /arch/powerpc/platforms/ps3/setup.c
parent0df1f2487d2f0d04703f142813d53615d62a1da4 (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/platforms/ps3/setup.c')
-rw-r--r--arch/powerpc/platforms/ps3/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 3f509f86432c..009a2004b876 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -248,6 +248,7 @@ static int __init ps3_probe(void)
248 ps3_mm_init(); 248 ps3_mm_init();
249 ps3_mm_vas_create(&htab_size); 249 ps3_mm_vas_create(&htab_size);
250 ps3_hpte_init(htab_size); 250 ps3_hpte_init(htab_size);
251 pm_power_off = ps3_power_off;
251 252
252 DBG(" <- %s:%d\n", __func__, __LINE__); 253 DBG(" <- %s:%d\n", __func__, __LINE__);
253 return 1; 254 return 1;
@@ -278,7 +279,6 @@ define_machine(ps3) {
278 .calibrate_decr = ps3_calibrate_decr, 279 .calibrate_decr = ps3_calibrate_decr,
279 .progress = ps3_progress, 280 .progress = ps3_progress,
280 .restart = ps3_restart, 281 .restart = ps3_restart,
281 .power_off = ps3_power_off,
282 .halt = ps3_halt, 282 .halt = ps3_halt,
283#if defined(CONFIG_KEXEC) 283#if defined(CONFIG_KEXEC)
284 .kexec_cpu_down = ps3_kexec_cpu_down, 284 .kexec_cpu_down = ps3_kexec_cpu_down,