From patchwork Thu Oct 30 12:24:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kachhap X-Patchwork-Id: 5197201 Return-Path: X-Original-To: patchwork-linux-arm@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 343CB9F349 for ; Thu, 30 Oct 2014 12:27:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 544DD20155 for ; Thu, 30 Oct 2014 12:27:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 339AA2013A for ; Thu, 30 Oct 2014 12:27:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xjomm-00089u-75; Thu, 30 Oct 2014 12:25:04 +0000 Received: from mail-pd0-x22a.google.com ([2607:f8b0:400e:c02::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xjomi-0007u6-N6 for linux-arm-kernel@lists.infradead.org; Thu, 30 Oct 2014 12:25:01 +0000 Received: by mail-pd0-f170.google.com with SMTP id z10so5047259pdj.15 for ; Thu, 30 Oct 2014 05:24: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=pNOYVCrTPO1ydX/hMgvrxLwVJaN1ZW2I33xafN/ddjc=; b=LF3sj1Pv5OuoOLR6bfBkMyYxnolcK4/NG/QakGNtzTO9lrKhrbexEtCH6t63f9by4j /ZoUumX4PrxVawTSgDZiJvbU62ujZl0bNCgdpyASjblrJubxZd3uVmZlRxuwYZXaLOjh YjH36p/U/bGZXe1zYuxtX7Lpq8OzMK1cBEJRhZLkUeEh5+7kZ82J17CJwknmjHlweYp3 7/MzjyXf66oyKDSUNuyQEo0RCHbWea+YfEg7joqx7ox2SO1/148tj6N+WJd3zIW/tVfG K/uO3FDEiBg8X85dJBDjPRCVC9F248WDn0vLRhv0317tgy8PGhUT9d85yRBAP3cf5jSF FlsA== X-Received: by 10.66.253.164 with SMTP id ab4mr16909182pad.59.1414671879649; Thu, 30 Oct 2014 05:24:39 -0700 (PDT) Received: from localhost.localdomain ([14.140.216.146]) by mx.google.com with ESMTPSA id fv6sm7019005pdb.83.2014.10.30.05.24.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Oct 2014 05:24:38 -0700 (PDT) From: Amit Daniel Kachhap To: linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, Catalin Marinas Subject: [PATCH v2] arm64: psci: fix cpu_suspend to check idle state type for index Date: Thu, 30 Oct 2014 17:54:51 +0530 Message-Id: <1414671891-29448-1-git-send-email-amit.daniel@samsung.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141030_052500_779089_B4E3A1D9 X-CRM114-Status: GOOD ( 10.62 ) X-Spam-Score: -0.7 (/) Cc: Mark Rutland , Vladimir Murzin , Lorenzo Pieralisi , will.deacon@arm.com, Ashwin Chaugule X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 This fix rectifies the psci cpu_suspend implementation to check the PSCI power state parameter type field associated with the requested idle state index. Acked-by: Lorenzo Pieralisi Signed-off-by: Amit Daniel Kachhap --- arch/arm64/kernel/psci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 866c1c8..663da77 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -528,7 +528,7 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; - if (state->type == PSCI_POWER_STATE_TYPE_STANDBY) + if (state[index - 1].type == PSCI_POWER_STATE_TYPE_STANDBY) ret = psci_ops.cpu_suspend(state[index - 1], 0); else ret = __cpu_suspend(index, psci_suspend_finisher);