From patchwork Thu Oct 30 03:55:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kachhap X-Patchwork-Id: 5193291 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6BC789F349 for ; Thu, 30 Oct 2014 03:55:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4F0520274 for ; Thu, 30 Oct 2014 03:55:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8A522012D for ; Thu, 30 Oct 2014 03:55:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752849AbaJ3Dzk (ORCPT ); Wed, 29 Oct 2014 23:55:40 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:43232 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752297AbaJ3Dzj (ORCPT ); Wed, 29 Oct 2014 23:55:39 -0400 Received: by mail-pd0-f169.google.com with SMTP id y10so4306109pdj.14 for ; Wed, 29 Oct 2014 20:55:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=1ZSTCTWgeBc/wOV3/pFYC4WqxRaGKUU0I875+g4QVSQ=; b=aYWLv8idXc5XBQdmbU7w7IQBKYT/+dHPwqFRCtZ24VB4DmJCyjTiuz/QP86YSimfyA SpIvIU4Zf09UsUMG1RY/ZphxhlHQOf5u0oGi7x8gfNThmAqfvVlDfPLnupm0CNCqw8BX Y7dYkcgviD0z9dqTWI9zq08MSWGJC7wMiBk3ZCD/Turxa5X6G/adyVnIdbJMHS6AY+Jk kKIa4FLeAfvCQu0L37+O6K+k375qNkYXHMJqpFNm2zYhL+pwbMgbs/KeDrV5AEQ03Zw5 w7jx+0dcPyi05yEvJ/P9IWqhdsGdqP9OwjPrl6//1oIJYDpdWjppTLCIFmybrO6QPpcY Of4A== X-Received: by 10.66.184.47 with SMTP id er15mr14344592pac.5.1414641339174; Wed, 29 Oct 2014 20:55:39 -0700 (PDT) Received: from localhost.localdomain ([14.140.216.146]) by mx.google.com with ESMTPSA id p10sm5669272pds.37.2014.10.29.20.55.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 20:55:38 -0700 (PDT) From: Amit Daniel Kachhap To: linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Cc: Catalin Marinas , Mark Rutland , Lorenzo Pieralisi , Ashwin Chaugule , Vladimir Murzin Subject: [PATCH 1/3] arm64: psci: warn if psci_power_state variable is not initialised Date: Thu, 30 Oct 2014 09:25:36 +0530 Message-Id: <1414641338-25279-1-git-send-email-amit.daniel@samsung.com> X-Mailer: git-send-email 1.9.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Without this cpu_suspend may cause crash dump when psci cpuidle is not initialised and cpu_suspend is called. Signed-off-by: Amit Daniel Kachhap --- arch/arm64/kernel/psci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 866c1c8..2178d6e 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -523,9 +523,11 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) struct psci_power_state *state = __get_cpu_var(psci_power_state); /* * idle state index 0 corresponds to wfi, should never be called - * from the cpu_suspend operations + * from the cpu_suspend operations. + * Also psci_power_state variable should have been populated by + * above init idle routine. */ - if (WARN_ON_ONCE(!index)) + if (WARN_ON_ONCE(!index || !state)) return -EINVAL; if (state->type == PSCI_POWER_STATE_TYPE_STANDBY)