Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbcCKKxh (ORCPT ); Fri, 11 Mar 2016 05:53:37 -0500 Received: from www.linutronix.de ([62.245.132.108]:36704 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751359AbcCKKxV (ORCPT ); Fri, 11 Mar 2016 05:53:21 -0500 From: Anna-Maria Gleixner To: linux-kernel@vger.kernel.org Cc: rt@linutronix.de, Martin Schwidefsky , Heiko Carstens , linux-s390@vger.kernel.org, Anna-Maria Gleixner Subject: [PATCH 2/2] s390/cpum_sf: Fix cpu hotplug notifier transitions Date: Fri, 11 Mar 2016 11:52:38 +0100 Message-Id: <1457693558-45970-3-git-send-email-anna-maria@linutronix.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457693558-45970-1-git-send-email-anna-maria@linutronix.de> References: <1457693558-45970-1-git-send-email-anna-maria@linutronix.de> X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1021 Lines: 28 The cpumf_pmu_notfier() hotplug callback lacks handling of the CPU_DOWN_FAILED case. That means, if CPU_DOWN_PREPARE failes, the PMC of the CPU is not setup again. Furthermore the CPU_ONLINE_FROZEN case will never be processed because of masking the switch expression with CPU_TASKS_FROZEN. Add handling for CPU_DOWN_FAILED transition to setup the PMC of the CPU. Remove CPU_ONLINE_FROZEN case. Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux-s390@vger.kernel.org Signed-off-by: Anna-Maria Gleixner --- arch/s390/kernel/perf_cpum_sf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -1518,7 +1518,7 @@ static int cpumf_pmu_notifier(struct not switch (action & ~CPU_TASKS_FROZEN) { case CPU_ONLINE: - case CPU_ONLINE_FROZEN: + case CPU_DOWN_FAILED: flags = PMC_INIT; smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1); break;