From patchwork Wed Feb 5 20:00:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 24234 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0079A20675 for ; Wed, 5 Feb 2014 20:54:01 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id x13sf290291ief.10 for ; Wed, 05 Feb 2014 12:54:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=2jQAMtMSU82ixjfx3++VmXrHq3D+hRgCAsY5MYvOVos=; b=izP9n4gsZHi7YMGQFfdR6nyTCIQnuZkBkVWu9PBL/kL1DXrGizqH/pIdIg1+eEMhkp 9EQqGJRxk76y6awuoLetOhzVopfBO0KNDkaNW+KpdaitNjfXYaTZoQ1QRcfNqgnF1XoO EWDeNssn8RliD/67DHDz6FD55laf8aNPKgK6wfujVU9WXQr0KxBEzcDLkSTWlxYboUT3 uT+Vp1rMkQdkIkBGZIlWHFp2cCYCLXW4wFaP6scUcSjaxt5zqJ5HMEuUzkF3z48WH718 gXAXhKOuZI0I22tIGBOI3w0x9IpmGMgISw35tjorp5K6RkzE0HMfvE6V8V9YarAlrJQP /TWw== X-Gm-Message-State: ALoCoQn0A7m9pd2DCN/bhVgA5aHQX9DOUSnYKKNbCpT4JTDInnjKTDZMYbcezxUVLCwg5H8abU/I X-Received: by 10.50.18.49 with SMTP id t17mr11204283igd.3.1391633640950; Wed, 05 Feb 2014 12:54:00 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.100 with SMTP id 91ls328379qgi.18.gmail; Wed, 05 Feb 2014 12:54:00 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr2363731vec.9.1391633640854; Wed, 05 Feb 2014 12:54:00 -0800 (PST) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id at8si10032871vec.113.2014.02.05.12.54.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 12:54:00 -0800 (PST) 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 pa12so778446veb.33 for ; Wed, 05 Feb 2014 12:54:00 -0800 (PST) X-Received: by 10.58.24.196 with SMTP id w4mr130713vef.48.1391633640757; Wed, 05 Feb 2014 12:54:00 -0800 (PST) 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.174.196 with SMTP id u4csp85521vcz; Wed, 5 Feb 2014 12:54:00 -0800 (PST) X-Received: by 10.68.239.70 with SMTP id vq6mr5190865pbc.152.1391633636349; Wed, 05 Feb 2014 12:53:56 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i8si30355897pav.161.2014.02.05.12.53.55; Wed, 05 Feb 2014 12:53:55 -0800 (PST) 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 S1755961AbaBEUxr (ORCPT + 27 others); Wed, 5 Feb 2014 15:53:47 -0500 Received: from mail.windriver.com ([147.11.1.11]:54888 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754665AbaBEUFt (ORCPT ); Wed, 5 Feb 2014 15:05:49 -0500 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id s15K5gqr022213 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 5 Feb 2014 12:05:43 -0800 (PST) Received: from yow-pgortmak-d2.corp.ad.wrs.com (128.224.146.165) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.2.347.0; Wed, 5 Feb 2014 12:05:42 -0800 From: Paul Gortmaker To: , CC: Shawn Guo , Andrew Morton , Linus Torvalds , Paul Gortmaker Subject: [v2.6.34-stable 091/213] kernel/sys.c: call disable_nonboot_cpus() in kernel_restart() Date: Wed, 5 Feb 2014 15:00:46 -0500 Message-ID: <1391630568-49251-92-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1391630568-49251-1-git-send-email-paul.gortmaker@windriver.com> References: <1391630568-49251-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 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: paul.gortmaker@windriver.com 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: , From: Shawn Guo ------------------- This is a commit scheduled for the next v2.6.34 longterm release. http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git If you see a problem with using this for longterm, please comment. ------------------- commit f96972f2dc6365421cf2366ebd61ee4cf060c8d5 upstream. As kernel_power_off() calls disable_nonboot_cpus(), we may also want to have kernel_restart() call disable_nonboot_cpus(). Doing so can help machines that require boot cpu be the last alive cpu during reboot to survive with kernel restart. This fixes one reboot issue seen on imx6q (Cortex-A9 Quad). The machine requires that the restart routine be run on the primary cpu rather than secondary ones. Otherwise, the secondary core running the restart routine will fail to come to online after reboot. Signed-off-by: Shawn Guo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Paul Gortmaker --- kernel/sys.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sys.c b/kernel/sys.c index 0324c1cd8e7b..006883113861 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -308,6 +308,7 @@ void kernel_restart_prepare(char *cmd) void kernel_restart(char *cmd) { kernel_restart_prepare(cmd); + disable_nonboot_cpus(); if (!cmd) printk(KERN_EMERG "Restarting system.\n"); else