From patchwork Tue Oct 6 11:03:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 54526 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 3A3F522FC5 for ; Tue, 6 Oct 2015 11:06:17 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf40138966wic.3 for ; Tue, 06 Oct 2015 04:06:16 -0700 (PDT) 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:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=ZiL6/NrGq8Ky/LMBhltOhjD0QrOw2k12v2h5DWO+3Rg=; b=bYswuVQAjSs5gDjNK4YZC6VRuekOKnO4NUrtRQ0woQa8TK6U01+FN5FhZrO6niyU2Z B5VMDjauH4JGDgUCA/Ac+0eMvfN/8dUIlmgr1XbZ3g/kj5OWlDZpVeSOKNt1y6XIbmCl PavWflqOzR0lNLC3R3NNAcUhqyHelNU1w9CINhI5m8AcZ00gOs3oD3JRX1gMIE1YDf5b vpjLzZnPgJ62oQ31oPPf/BiQzVG8ZCsrUFbuBtcuxHEOIrcTiT2Ast84AGFXsiOBLIxD vAcXkOK83CaNNC60Vh5wJuHc+lQeD4YE+1o1rLsnvZJrkHmXolUODlavuozCA+rU100u dPTA== X-Gm-Message-State: ALoCoQnbE8FrRmIS59PzOoB/Ks8Zne2XCTMtvuxlaCW4lIRNSpHRPCYQKuefe2iyrekgrWedwLxU X-Received: by 10.194.118.65 with SMTP id kk1mr6304148wjb.5.1444129576540; Tue, 06 Oct 2015 04:06:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.30.18 with SMTP id e18ls536635lfe.35.gmail; Tue, 06 Oct 2015 04:06:16 -0700 (PDT) X-Received: by 10.112.53.231 with SMTP id e7mr14539437lbp.103.1444129576329; Tue, 06 Oct 2015 04:06:16 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id k88si20506228lfi.54.2015.10.06.04.06.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 04:06:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by laddr2 with SMTP id dr2so24401573lad.3 for ; Tue, 06 Oct 2015 04:06:16 -0700 (PDT) X-Received: by 10.112.163.131 with SMTP id yi3mr14264961lbb.36.1444129576092; Tue, 06 Oct 2015 04:06:16 -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 w3csp1780518lbq; Tue, 6 Oct 2015 04:06:15 -0700 (PDT) X-Received: by 10.180.35.163 with SMTP id i3mr18496368wij.55.1444129574652; Tue, 06 Oct 2015 04:06:14 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ga19si22876906wic.9.2015.10.06.04.06.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 04:06:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; 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 1ZjQ30-0005QU-Ho; Tue, 06 Oct 2015 11:04:42 +0000 Received: from mail-wi0-f172.google.com ([209.85.212.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjQ2p-0005BU-MR for linux-arm-kernel@lists.infradead.org; Tue, 06 Oct 2015 11:04:32 +0000 Received: by wicge5 with SMTP id ge5so161164489wic.0 for ; Tue, 06 Oct 2015 04:04:10 -0700 (PDT) X-Received: by 10.180.74.175 with SMTP id u15mr15515330wiv.66.1444129450076; Tue, 06 Oct 2015 04:04:10 -0700 (PDT) Received: from ards-macbook-pro.theccd.local ([89.101.192.72]) by smtp.gmail.com with ESMTPSA id c2sm19435528wiy.11.2015.10.06.04.04.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Oct 2015 04:04:09 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt.fleming@intel.com, catalin.marinas@arm.com Subject: [PATCH v3 1/3] arm64/efi: remove /chosen/linux, uefi-stub-kern-ver DT property Date: Tue, 6 Oct 2015 12:03:42 +0100 Message-Id: <1444129424-8284-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444129424-8284-1-git-send-email-ard.biesheuvel@linaro.org> References: <1444129424-8284-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151006_040431_965156_BF80097D X-CRM114-Status: GOOD ( 11.47 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.172 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.172 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: mark.rutland@arm.com, will.deacon@arm.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.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.215.43 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 With the stub to kernel interface being promoted to a proper interface so that other agents than the stub can boot the kernel proper in EFI mode, we can remove the linux,uefi-stub-kern-ver field, considering that its original purpose was to prevent this from happening in the first place. Signed-off-by: Ard Biesheuvel Acked-by: Roy Franz --- Documentation/arm/uefi.txt | 2 -- drivers/firmware/efi/libstub/fdt.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt index d60030a1b909..7f1bed8872f3 100644 --- a/Documentation/arm/uefi.txt +++ b/Documentation/arm/uefi.txt @@ -58,7 +58,5 @@ linux,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI -------------------------------------------------------------------------------- linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. -------------------------------------------------------------------------------- -linux,uefi-stub-kern-ver | string | Copy of linux_banner from build. --------------------------------------------------------------------------------- For verbose debug messages, specify 'uefi_debug' on the kernel command line. diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index ef5d764e2a27..b62e2f5dcab3 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -147,15 +147,6 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, if (status) goto fdt_set_fail; - /* - * Add kernel version banner so stub/kernel match can be - * verified. - */ - status = fdt_setprop_string(fdt, node, "linux,uefi-stub-kern-ver", - linux_banner); - if (status) - goto fdt_set_fail; - return EFI_SUCCESS; fdt_set_fail: