From patchwork Fri Oct 16 17:06:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 55137 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 887F722EAC for ; Fri, 16 Oct 2015 17:07:34 +0000 (UTC) Received: by wiyb4 with SMTP id b4sf4875827wiy.2 for ; Fri, 16 Oct 2015 10:07:33 -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:in-reply-to:references:content-type :content-transfer-encoding:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=b6ZL5LK7U2Se7HRwah+9IvacxnjsfZWb+2RF6zbeWOQ=; b=lJLJgnPpZEE88/aObPRtUACCouNUMNG0EAmpeldOLAATTnA0tZd6MdLLPMRo4YFC2x uVfBOUj04ERaqFmzAbjppBJRrZ+wEhWH94XMSxdAlyeEmYTTp7kZ+4gJiH9jimksZouV 4W+a6kbH9+rOm17BRkTn57poIXpZ8RhWVlbOR9o+ukMlP6NJH6c2VWVSGv1oscPaDBVv Pil2BJYPk97I4KLk8jgUqnTV/RjgcRjulmauhSg+7aogKSq4HXcWwzGRjELzvwqMHnZB TeivR6AtYzxGkyUMFbKx67j5Zj0PNJhCEr00rDlgCbhYgDNFwTawnBM5yp0XIuALDW7g 6sog== X-Gm-Message-State: ALoCoQmj/oqxTYpLotwE6G/6aAWnGc3tZwULGrQgsgdjsF0qxwBAePBpzlxV+TJ/lM5HHwdkAu6+ X-Received: by 10.194.94.66 with SMTP id da2mr3843183wjb.7.1445015253783; Fri, 16 Oct 2015 10:07:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.141.198 with SMTP id p189ls345690lfd.79.gmail; Fri, 16 Oct 2015 10:07:33 -0700 (PDT) X-Received: by 10.112.139.201 with SMTP id ra9mr8825494lbb.29.1445015253638; Fri, 16 Oct 2015 10:07:33 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id c7si13493391lbd.63.2015.10.16.10.07.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 10:07:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbbwb3 with SMTP id wb3so43492264lbb.1 for ; Fri, 16 Oct 2015 10:07:33 -0700 (PDT) X-Received: by 10.112.132.7 with SMTP id oq7mr9012589lbb.32.1445015253516; Fri, 16 Oct 2015 10:07:33 -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.112.59.35 with SMTP id w3csp41333lbq; Fri, 16 Oct 2015 10:07:32 -0700 (PDT) X-Received: by 10.107.8.233 with SMTP id h102mr10565040ioi.177.1445015251022; Fri, 16 Oct 2015 10:07:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nv7si4757145igb.3.2015.10.16.10.07.30; Fri, 16 Oct 2015 10:07:30 -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 S932869AbbJPRHX (ORCPT + 30 others); Fri, 16 Oct 2015 13:07:23 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([207.82.80.143]:20396 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932740AbbJPRGc (ORCPT ); Fri, 16 Oct 2015 13:06:32 -0400 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-36-Kp6DnA3EQ0yrhhw-ZNgdzg-9; Fri, 16 Oct 2015 18:06:30 +0100 Received: from e106634-lin.cambridge.arm.com ([10.1.2.79]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 16 Oct 2015 18:06:26 +0100 From: "Suzuki K. Poulose" To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, mark.rutland@arm.com, marc.zyngier@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, ard.biesheuvel@linaro.org, chirstoff.dall@linaro.org, steve.capper@linaro.org, jeremy.linton@arm.com, "Suzuki K. Poulose" Subject: [PATCHv4 10/12] arm64: Add page size to the kernel image header Date: Fri, 16 Oct 2015 18:06:19 +0100 Message-Id: <1445015181-29711-11-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1445015181-29711-1-git-send-email-suzuki.poulose@arm.com> References: <1445015181-29711-1-git-send-email-suzuki.poulose@arm.com> X-OriginalArrivalTime: 16 Oct 2015 17:06:26.0000 (UTC) FILETIME=[FDCF5500:01D10834] X-MC-Unique: Kp6DnA3EQ0yrhhw-ZNgdzg-9 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: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mailfrom=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: Ard Biesheuvel This patch adds the page size to the arm64 kernel image header so that one can infer the PAGESIZE used by the kernel. This will be helpful to diagnose failures to boot the kernel with page size not supported by the CPU. Signed-off-by: Ard Biesheuvel Signed-off-by: Suzuki K. Poulose Acked-by: Catalin Marinas Reviewed-by: Christoffer Dall Acked-by: Mark Rutland --- Documentation/arm64/booting.txt | 7 ++++++- arch/arm64/kernel/image.h | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/arm64/booting.txt b/Documentation/arm64/booting.txt index 7d9d3c2..aaf6d77 100644 --- a/Documentation/arm64/booting.txt +++ b/Documentation/arm64/booting.txt @@ -104,7 +104,12 @@ Header notes: - The flags field (introduced in v3.17) is a little-endian 64-bit field composed as follows: Bit 0: Kernel endianness. 1 if BE, 0 if LE. - Bits 1-63: Reserved. + Bit 1-2: Kernel Page size. + 0 - Unspecified. + 1 - 4K + 2 - 16K + 3 - 64K + Bits 3-63: Reserved. - When image_size is zero, a bootloader should attempt to keep as much memory as possible free for use by the kernel immediately after the diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index 6eb8fee..bc2abb8 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -47,7 +47,10 @@ #define __HEAD_FLAG_BE 0 #endif -#define __HEAD_FLAGS (__HEAD_FLAG_BE << 0) +#define __HEAD_FLAG_PAGE_SIZE ((PAGE_SHIFT - 10) / 2) + +#define __HEAD_FLAGS ((__HEAD_FLAG_BE << 0) | \ + (__HEAD_FLAG_PAGE_SIZE << 1)) /* * These will output as part of the Image header, which should be little-endian