From patchwork Tue Jul 26 04:25:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 652582 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rz5Dd0KKJz9t15 for ; Tue, 26 Jul 2016 14:46:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pZenSi4X; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rz5Dc5P85zDqgf for ; Tue, 26 Jul 2016 14:46:24 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pZenSi4X; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rz4mT4qRDzDqYp for ; Tue, 26 Jul 2016 14:25:29 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pZenSi4X; dkim-atps=neutral Received: by mail-pf0-x242.google.com with SMTP id h186so13061259pfg.2 for ; Mon, 25 Jul 2016 21:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=p1mWzexjHdqxvlfq2J/hWbH6k2TJgJWSeh/0OP5R3O0=; b=pZenSi4X3b7Opq18HGzBDx+EJ61ecg6QUfj/qihZTME/BD2Nt/n/ReP76UJWoLidGl C4BF6shprsSykQ6tNAxojkUEsGRjBWdyacU+fTSdc3qXisvGYmHCwulqRJrC95+5t3TW qfdBLUGFYFIBypU8iAV9bdiSZ0v1BXzDmSbU6TQcnpHgIvpYw50pDUOvV0SSkkspF6G6 gmSiX3poxU7ZL/v3E0ny3CjlaGsWrYLhgyZV25+qjQmdtbfU6xD2WyaS6Mt9sNYrlDGm FNWtP+IuL4cxeTagoL0wxR5gGECRiIWbsT0rGgBSw0hfxLHANShmPVo9HnPDkR1DpY0J t0QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p1mWzexjHdqxvlfq2J/hWbH6k2TJgJWSeh/0OP5R3O0=; b=RoD4gLv3AtvW9YfUM1vVy0x0rHgJ33cWOFjXDxPC+W5ZQXpoOJogT893Ed8irgngxl 0pjU7Sn1lO8rKzZgZrn7gM6a8eMT07t7iYMnbt1z/6IvqGBO5sXrRejKdyZrrqZuQQ/I TbR7u+EP9jbapVaiRJA7dRcZpEtO05vL1jwB465pNgPYRHkBDQxZpZjRqrKaINk02yVq PMXWDBLRJ6i08u9i+8WFEZ0KEYK1zsJF9No4u5rVPW1MkJG3lGE/WR1ZhN2RO3wjU/W4 god/qsNH1Gi92AuwUYvOkgaVeZkVtDXijrA7fTTTevDnPG/3Xqi5Yod/ycMaWlzaavVk 7jBg== X-Gm-Message-State: AEkoouuewz2Tb/VBp9Y+pQCwNuJ856Ejrdnm1OMep2kg60azbBKHiRvBYXUV/PcRp9ik1Q== X-Received: by 10.98.13.157 with SMTP id 29mr35638418pfn.105.1469507127225; Mon, 25 Jul 2016 21:25:27 -0700 (PDT) Received: from squirtle.localdomain.localdomain (c-73-225-163-254.hsd1.wa.comcast.net. [73.225.163.254]) by smtp.gmail.com with ESMTPSA id t1sm43544498pfa.86.2016.07.25.21.25.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jul 2016 21:25:26 -0700 (PDT) From: Andrey Smirnov To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/3] powerpc: Factor out common code in setup-common.c Date: Mon, 25 Jul 2016 21:25:12 -0700 Message-Id: <1469507114-5788-1-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 X-Mailman-Approved-At: Tue, 26 Jul 2016 14:44:58 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , linux-kernel@vger.kernel.org, Scott Wood , Alessio Igor Bogani , Paul Mackerras , Daniel Axtens MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Factor out a small bit of common code in machine_restart(), machine_power_off() and machine_halt(). Signed-off-by: Andrey Smirnov --- arch/powerpc/kernel/setup-common.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 714b4ba..5cd3283 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -130,15 +130,22 @@ void machine_shutdown(void) ppc_md.machine_shutdown(); } +static void machine_hang(void) +{ + pr_emerg("System Halted, OK to turn off power\n"); + local_irq_disable(); + while (1) + ; +} + void machine_restart(char *cmd) { machine_shutdown(); if (ppc_md.restart) ppc_md.restart(cmd); + smp_send_stop(); - printk(KERN_EMERG "System Halted, OK to turn off power\n"); - local_irq_disable(); - while (1) ; + machine_hang(); } void machine_power_off(void) @@ -146,10 +153,9 @@ void machine_power_off(void) machine_shutdown(); if (pm_power_off) pm_power_off(); + smp_send_stop(); - printk(KERN_EMERG "System Halted, OK to turn off power\n"); - local_irq_disable(); - while (1) ; + machine_hang(); } /* Used by the G5 thermal driver */ EXPORT_SYMBOL_GPL(machine_power_off); @@ -162,10 +168,9 @@ void machine_halt(void) machine_shutdown(); if (ppc_md.halt) ppc_md.halt(); + smp_send_stop(); - printk(KERN_EMERG "System Halted, OK to turn off power\n"); - local_irq_disable(); - while (1) ; + machine_hang(); }