From patchwork Thu Apr 17 19:39:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 4010481 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 671659F2BA for ; Thu, 17 Apr 2014 19:42:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F926202BE for ; Thu, 17 Apr 2014 19:42:36 +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 CC00E20272 for ; Thu, 17 Apr 2014 19:42:35 +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 1WasA9-0000Lc-54; Thu, 17 Apr 2014 19:39:57 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WasA7-0000Kx-88 for linux-arm-kernel@bombadil.infradead.org; Thu, 17 Apr 2014 19:39:55 +0000 Received: from 107-1-141-74-ip-static.hfc.comcastbusiness.net ([107.1.141.74] helo=[192.168.254.170]) by merlin.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1WasA5-0002ib-SY; Thu, 17 Apr 2014 19:39:54 +0000 Message-ID: <1397763592.30572.56.camel@smoke> Subject: [PATCH V2] arm64: Fix PSCI part of booting.txt From: Geoff Levand To: Will Deacon Date: Thu, 17 Apr 2014 12:39:52 -0700 In-Reply-To: <1397758623.30572.53.camel@smoke> References: <1397758623.30572.53.camel@smoke> X-Mailer: Evolution 3.10.4-0ubuntu1 Mime-Version: 1.0 Cc: Mark Rutland , Catalin Marinas , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, 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 Correct the PSCI booting text to reflect the requirements of the PSCI spec. Signed-off-by: Geoff Levand --- v2: Change to mention online CPUs only. Documentation/arm64/booting.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) Documentation/devicetree/bindings/arm/psci.txt. diff --git a/Documentation/arm64/booting.txt b/Documentation/arm64/booting.txt index beb754e..e5b9c81 100644 --- a/Documentation/arm64/booting.txt +++ b/Documentation/arm64/booting.txt @@ -167,13 +167,12 @@ following manner: value, so CPUs must convert the read value to their native endianness before jumping to it. -- CPUs with a "psci" enable method should remain outside of - the kernel (i.e. outside of the regions of memory described to the - kernel in the memory node, or in a reserved area of memory described - to the kernel by a /memreserve/ region in the device tree). The - kernel will issue CPU_ON calls as described in ARM document number ARM - DEN 0022A ("Power State Coordination Interface System Software on ARM - processors") to bring CPUs into the kernel. +- CPUs with a "psci" enable method should use the PSCI CPU control + functions described in ARM document number ARM DEN 0022A or newer + ("Power State Coordination Interface System Software on ARM + processors"). The boot loader must power off any of these CPUs that + have been brought online using the PSCI CPU_OFF function. The kernel + will issue CPU_ON calls to bring CPUs into the kernel. The device tree should contain a 'psci' node, as described in