From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26507C0650F for ; Mon, 5 Aug 2019 13:26:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6D7120651 for ; Mon, 5 Aug 2019 13:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011574; bh=o3AVFO3fKITsxqa+CrmjvSNxJsiSSMNI2nHCdCUjIF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P63ytpk7wbgzmqYc/o3EB19IAJdKEhFXF9arme30oMf3DxxqDWujwU5erTBbYAhmz YaAVOfNLblpUkKqvVqM6jmxY21oxHIf68LNQVjnI94U+DkHYXdxpq5H+0gnbTFUVHr 3sXdR3oIDQA8Vcud6Ae862jUrPY2AC51sOEL44FQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731410AbfHEN0M (ORCPT ); Mon, 5 Aug 2019 09:26:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731064AbfHEN0I (ORCPT ); Mon, 5 Aug 2019 09:26:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1B54220644; Mon, 5 Aug 2019 13:26:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011567; bh=o3AVFO3fKITsxqa+CrmjvSNxJsiSSMNI2nHCdCUjIF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bS2tnEnjYihq5fxbwHUYEe5WTCSheCihNCHPnriMZdthyIeR5hbA60Zu4vGeIThZ0 0JoclKyxFXJuOmSdGgHXtrZAZqjQMaF09UIriINBwGCR3/KkQfwbVDgSe3Qa7dXSwR zsiwtNcIVE4PZXQ4LdMadsQGw6gC8YX4VeSJSffU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anders Roxell , Lorenzo Pieralisi , Will Deacon Subject: [PATCH 5.2 111/131] drivers/perf: arm_pmu: Fix failure path in PM notifier Date: Mon, 5 Aug 2019 15:03:18 +0200 Message-Id: <20190805124959.400939001@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805124951.453337465@linuxfoundation.org> References: <20190805124951.453337465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon commit 0d7fd70f26039bd4b33444ca47f0e69ce3ae0354 upstream. Handling of the CPU_PM_ENTER_FAILED transition in the Arm PMU PM notifier code incorrectly skips restoration of the counters. Fix the logic so that CPU_PM_ENTER_FAILED follows the same path as CPU_PM_EXIT. Cc: Fixes: da4e4f18afe0f372 ("drivers/perf: arm_pmu: implement CPU_PM notifier") Reported-by: Anders Roxell Acked-by: Lorenzo Pieralisi Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- drivers/perf/arm_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -723,8 +723,8 @@ static int cpu_pm_pmu_notify(struct noti cpu_pm_pmu_setup(armpmu, cmd); break; case CPU_PM_EXIT: - cpu_pm_pmu_setup(armpmu, cmd); case CPU_PM_ENTER_FAILED: + cpu_pm_pmu_setup(armpmu, cmd); armpmu->start(armpmu); break; default: