OSDN Git Service

powerpc/pmac/smp: Add missing FROZEN hotplug notifier transitions
authorAnna-Maria Gleixner <anna-maria@linutronix.de>
Mon, 4 Apr 2016 09:30:01 +0000 (11:30 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 14 Jul 2016 10:39:58 +0000 (20:39 +1000)
The FROZEN transitions are used when a CPU suspends/resumes. In case
of a suspend/resume, only the up prepare (CPU_UP_PREPARE_FROZEN) is
handled. The error handling transition CPU_UP_CANCELED_FROZEN as well
as the CPU_ONLINE_FROZEN transition are not handled.

Masking the switch case action argument with ~CPU_TASKS_FROZEN, to
handle all FROZEN tasks the same way than the corresponding non frozen
tasks.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powermac/smp.c

index 28a147c..834868b 100644 (file)
@@ -857,9 +857,8 @@ static int smp_core99_cpu_notify(struct notifier_block *self,
 {
        int rc;
 
-       switch(action) {
+       switch(action & ~CPU_TASKS_FROZEN) {
        case CPU_UP_PREPARE:
-       case CPU_UP_PREPARE_FROZEN:
                /* Open i2c bus if it was used for tb sync */
                if (pmac_tb_clock_chip_host) {
                        rc = pmac_i2c_open(pmac_tb_clock_chip_host, 1);