From patchwork Mon Mar 24 18:13:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 26943 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 123E420062 for ; Mon, 24 Mar 2014 18:13:15 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id e16sf14519635qcx.10 for ; Mon, 24 Mar 2014 11:13:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=oO8vaOId9MvxIEbsfd64I/5SnQastcPGJwDmDjInYuo=; b=W9fMdURH3qVNcfap+YMXQnXuZ8M7hiPn4zFDMqi1//lVyQ9Ti6nVAqk3HIJAOjeAhl Ppsf1qlwGkmtfEh6kC6lROeY78CAeFsQtskFS8OiDulB3BvFqKQdw/z2a0xLjJ2BGg2P S+HeNeF1oNbpv6IhcZd2ywhLfxkG9Y6qcAnbQzLyVWn5PGi9yR9yjFQHb+EuJF9mEpgg RukBMLAirEA9IGkO/F+sgGXVbeVLH1UTFLABNUkQQDXfEEJQCvO0TXkVMLf7Cyk9ZAl9 c9+jvHWHB/gNuooTk7MbfZvbRaywKR0RvWTonF+uUKyhutl31H6T+5ZNS06MXfa9haRt 8DYQ== X-Gm-Message-State: ALoCoQkkuoOnPUCh7KlvT/BmyVGezk3kYIDca2N0AKPScQrYJWCYyw0FoyJe1t1TZPXC2z19mi8M X-Received: by 10.58.171.135 with SMTP id au7mr17757849vec.22.1395684794856; Mon, 24 Mar 2014 11:13:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.230 with SMTP id f93ls776827qgf.67.gmail; Mon, 24 Mar 2014 11:13:14 -0700 (PDT) X-Received: by 10.58.57.42 with SMTP id f10mr51910363veq.1.1395684794724; Mon, 24 Mar 2014 11:13:14 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id gs7si3272952vdc.128.2014.03.24.11.13.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Mar 2014 11:13:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so5992702veb.19 for ; Mon, 24 Mar 2014 11:13:14 -0700 (PDT) X-Received: by 10.220.225.5 with SMTP id iq5mr196804vcb.42.1395684794592; Mon, 24 Mar 2014 11:13:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp243904vck; Mon, 24 Mar 2014 11:13:13 -0700 (PDT) X-Received: by 10.68.242.68 with SMTP id wo4mr73920655pbc.32.1395684793519; Mon, 24 Mar 2014 11:13:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id se7si9716460pbb.53.2014.03.24.11.13.11; Mon, 24 Mar 2014 11:13:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753664AbaCXSND (ORCPT + 26 others); Mon, 24 Mar 2014 14:13:03 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:44015 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753513AbaCXSNA (ORCPT ); Mon, 24 Mar 2014 14:13:00 -0400 Received: by mail-pd0-f169.google.com with SMTP id fp1so5704477pdb.28 for ; Mon, 24 Mar 2014 11:13:00 -0700 (PDT) X-Received: by 10.68.237.99 with SMTP id vb3mr73328939pbc.76.1395684780059; Mon, 24 Mar 2014 11:13:00 -0700 (PDT) Received: from localhost (cpe-76-93-135-111.san.res.rr.com. [76.93.135.111]) by mx.google.com with ESMTPSA id nx12sm63168481pab.6.2014.03.24.11.12.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 24 Mar 2014 11:12:58 -0700 (PDT) From: Sebastian Capella To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org Cc: Sebastian Capella , Len Brown , Pavel Machek , "Rafael J. Wysocki" Subject: [PATCH] ARM: machine_power_off should not return Date: Mon, 24 Mar 2014 11:13:04 -0700 Message-Id: <1395684784-12601-1-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sebastian.capella@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add loop to prevent return from machine_power_off if pm_power_off is null or does not halt the system. This caused a panic during hibernation testing on Kirkwood Openblocks A6 board. Signed-off-by: Sebastian Capella Reported-by: Ezequiel Garcia Cc: Len Brown Cc: Pavel Machek Cc: "Rafael J. Wysocki" --- arch/arm/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index f58b723..6ffdc2c 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -217,6 +217,8 @@ void machine_power_off(void) if (pm_power_off) pm_power_off(); + while (1) + cpu_relax(); } /*