From patchwork Thu Sep 24 21:46:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 54131 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 9185722B1E for ; Thu, 24 Sep 2015 21:49:03 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf805863wic.3 for ; Thu, 24 Sep 2015 14:49:02 -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 :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=0g1KT5xmcS9mbGvdzA8HC6ZdcgypIHqCNsY7QRqoPLc=; b=XwQVjlqVhEpcjcjKH9fdat0BnpO73KgeMbANU8K4UXICpd8KyfvPJBgpLFXLjkG3aZ otNWvZWvr4auUM/kw/e/gRY+xSwlPWmTxcqsxbMwDf210OI5cPcHaYUkZR7H3KQ91eLQ sNTMaVlu/iGyX0h0l4KCoDVxeP5sSs16nSL4/CkYwnmXuZPwaxKFXiQp+S+HKLc7JDHK OGyuxtqrlvjtxgPU9ZpTqJd8xsmUnx+OimdfWgYlfx28pKHDfneeYlxTA/XRl/vy3Y2c VwpdHOimS4JX9SeAf4N+WfdZr9HT+EBHDbNY2Tx/tdzpygQZ2ftVEk/rhBDbMVfb8eUy J9bg== X-Gm-Message-State: ALoCoQmGx3h2cZwCIJFPZSzOSs6Rz28aFX4/w8GmgbYwCDuZawSIEyktZPJIal2JlSeAm0Ini3RG X-Received: by 10.152.21.42 with SMTP id s10mr303600lae.9.1443131342657; Thu, 24 Sep 2015 14:49:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.166.82 with SMTP id p79ls207236lfe.99.gmail; Thu, 24 Sep 2015 14:49:02 -0700 (PDT) X-Received: by 10.112.54.169 with SMTP id k9mr546768lbp.95.1443131342513; Thu, 24 Sep 2015 14:49:02 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id y5si167064lal.115.2015.09.24.14.49.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 14:49:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lacdq2 with SMTP id dq2so23687933lac.1 for ; Thu, 24 Sep 2015 14:49:02 -0700 (PDT) X-Received: by 10.112.35.130 with SMTP id h2mr578393lbj.36.1443131342030; Thu, 24 Sep 2015 14:49:02 -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 w3csp570258lbq; Thu, 24 Sep 2015 14:49:00 -0700 (PDT) X-Received: by 10.66.146.4 with SMTP id sy4mr2342964pab.79.1443131340860; Thu, 24 Sep 2015 14:49:00 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sf2si462890pbc.162.2015.09.24.14.49.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 14:49:00 -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 1ZfEMg-0005Iq-Em; Thu, 24 Sep 2015 21:47:42 +0000 Received: from mail-pa0-f42.google.com ([209.85.220.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZfEM2-00051t-J4 for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2015 21:47:03 +0000 Received: by pacgz1 with SMTP id gz1so1704087pac.3 for ; Thu, 24 Sep 2015 14:46:40 -0700 (PDT) X-Received: by 10.66.253.170 with SMTP id ab10mr2353110pad.135.1443131200579; Thu, 24 Sep 2015 14:46:40 -0700 (PDT) Received: from localhost.localdomain ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id w9sm230597pbt.29.2015.09.24.14.46.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Sep 2015 14:46:40 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, matt.fleming@intel.com, leif.lindholm@linaro.org, roy.franz@linaro.org, grant.likely@linaro.org, mark.rutland@arm.com Subject: [RFC PATCH] arm64/efi: remove /chosen/linux, uefi-stub-kern-ver DT property Date: Thu, 24 Sep 2015 14:46:30 -0700 Message-Id: <1443131190-17790-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150924_144702_662875_BF9C29C2 X-CRM114-Status: GOOD ( 10.72 ) 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.220.42 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.220.42 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: 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.44 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 --- 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 7b3fdfe0f7ba..6543a0adea8a 100644 --- a/Documentation/arm/uefi.txt +++ b/Documentation/arm/uefi.txt @@ -58,5 +58,3 @@ 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. --------------------------------------------------------------------------------- diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index a7e87cd582f2..60a11551fc15 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -116,15 +116,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: