From patchwork Sat Jun 23 02:20:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 139735 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1547789lji; Fri, 22 Jun 2018 19:21:21 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKndw4cjcMXQeXOyjXPEAI8i/xdyjb3NIzABZghJ630sbbQw8npSZzLVqUAPlqT7Ykc0kkx X-Received: by 2002:a62:6c42:: with SMTP id h63-v6mr2129474pfc.240.1529720481441; Fri, 22 Jun 2018 19:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529720481; cv=none; d=google.com; s=arc-20160816; b=I/8Y93TmBEiRIHfydezBE1T1Rp5euC5QTQbg1iEiAi+CPbAyy4frUCJBc1XRnwkYc0 5bR8uj25RCpFfuX7FXzpWIOOYL/DdfnyyYjuYqY4M2W6zJw5D97Ot4SiOotUQG8W0yNy ClHco0HlCPd0VAV69FjLUKH5MgJaFp2mb8111hVEmqR+D1LicOR/yKerMWUPNbDA98kl Oz+PescdOUcZoiCFunqEn1C5iGTaCaroVXq0kPQnTF3BR+5KP2dbxEkAvaVgz2/+td6D RdP7TPUUIEnjj/jzbVDxO80T+XovO1947j3NQg3EoLTsvjrq8WHcM1AbD7hYqKFlP1v9 D/nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=N6l5ADvfSARlBrFBLh9//Q8Y5HUEl/bDth4c/brQGkk=; b=uXD7AolL4mgZoY1tJWtiKphvlpk6HZJ19sFJk3sz40PRJlHKT2ZuXRMn3D93qyQhiA zEmHJ/MUqPZWXbSCPmdystGnPQ16HXZeZDb5lDq9MgKaOg7In5cW3ITiOhfEyQv0slvI WjQjwVm5PcheSn7YX8mSb5IVSIVAWhSVn5jMIB+ITp8YLyZ64P1En8MXbZ7apCM2yHYv O+vcTtxX+CCBe+K/D9oi47OxwKAr5uBWvqhO3+tp4xQKWM28v9jgB4pf1McpV/uWlEpF ajEMdAem5Ihh2lxHdsWbIJOjaLGlvw4MOgzJTlGu8oIkK1BX7gfORMBCwpR+ggNaxMpK TISQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WxlURdmD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r7-v6si8866273plo.144.2018.06.22.19.21.21; Fri, 22 Jun 2018 19:21:21 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WxlURdmD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934771AbeFWCVT (ORCPT + 31 others); Fri, 22 Jun 2018 22:21:19 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:39751 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934528AbeFWCVP (ORCPT ); Fri, 22 Jun 2018 22:21:15 -0400 Received: by mail-pf0-f194.google.com with SMTP id r11-v6so3990598pfl.6 for ; Fri, 22 Jun 2018 19:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N6l5ADvfSARlBrFBLh9//Q8Y5HUEl/bDth4c/brQGkk=; b=WxlURdmDbAsopckzPs87JfrpO7YFHsw+qidS6gzFHAF8brPet5F1uzoQQJiEotUoCv DYJni3FAh3r4za3XeLOeDQTtUi1TZ7nU14JjW1mZk9959O6lBg8dN8jlc10GBcLYCJts lNgW9L2z95O5KO2wF+miWm97uNUn8cVfC1URE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N6l5ADvfSARlBrFBLh9//Q8Y5HUEl/bDth4c/brQGkk=; b=Wr1EAqeyZkVpyl3lnoCpgwzrBpxIjyOkr6GZSWPH4DgFsONtSjDu/I57yOMms4GpyP R18o118RvJtkqCTDRbH08Azt78GkPCHoncni1g/4NnPKgvEo7aqXwBobL9c1prF1I67+ xS60md77wSZSD5BQsZ6YgIW941+6a4XFnYs92T6GrogTDtcNZEizapxMedNLCg71xOP6 63/kAh+q+VembjdkaY8vjPeHC6R2OhKw3sEh3+c3gG10fMs5HqGYIePXs1HLilPo2Lg3 djMvClfEibzbkQvPWPG4AsbADmUK4tHWo8sY04bv2zR7W9Q8Mv0k6poevllrE18+DMtt 2nAw== X-Gm-Message-State: APt69E3u8+oN+/z1PW2Aj47fLFd/q521RNgMUTjzxdbaHvYkkYI6IPBF 9fZNu3c7lypMGcVIInCv6fV2qg== X-Received: by 2002:a65:468e:: with SMTP id h14-v6mr3245878pgr.89.1529720474766; Fri, 22 Jun 2018 19:21:14 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id a8-v6sm17553197pfe.72.2018.06.22.19.21.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 19:21:14 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v10 05/14] arm64: add image head flag definitions Date: Sat, 23 Jun 2018 11:20:49 +0900 Message-Id: <20180623022058.10935-6-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180623022058.10935-1-takahiro.akashi@linaro.org> References: <20180623022058.10935-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Those image head's flags will be used later by kexec_file loader. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/boot.h | 15 +++++++++++++++ arch/arm64/kernel/head.S | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) -- 2.17.0 Acked-by: James Morse diff --git a/arch/arm64/include/asm/boot.h b/arch/arm64/include/asm/boot.h index 355e552a9175..0bab7eed3012 100644 --- a/arch/arm64/include/asm/boot.h +++ b/arch/arm64/include/asm/boot.h @@ -5,6 +5,21 @@ #include +#define ARM64_MAGIC "ARM\x64" + +#define HEAD_FLAG_BE_SHIFT 0 +#define HEAD_FLAG_PAGE_SIZE_SHIFT 1 +#define HEAD_FLAG_BE_MASK 0x1 +#define HEAD_FLAG_PAGE_SIZE_MASK 0x3 + +#define HEAD_FLAG_BE 1 +#define HEAD_FLAG_PAGE_SIZE_4K 1 +#define HEAD_FLAG_PAGE_SIZE_16K 2 +#define HEAD_FLAG_PAGE_SIZE_64K 3 + +#define head_flag_field(flags, field) \ + (((flags) >> field##_SHIFT) & field##_MASK) + /* * arm64 requires the DTB to be 8 byte aligned and * not exceed 2MB in size. diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index b0853069702f..8cbac6232ed1 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -91,7 +91,7 @@ _head: .quad 0 // reserved .quad 0 // reserved .quad 0 // reserved - .ascii "ARM\x64" // Magic number + .ascii ARM64_MAGIC // Magic number #ifdef CONFIG_EFI .long pe_header - _head // Offset to the PE header.