From patchwork Thu Oct 8 19:02:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 54674 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 9A90722FFC for ; Thu, 8 Oct 2015 19:03:53 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf16630839wic.3 for ; Thu, 08 Oct 2015 12:03:52 -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=G7GxdLqYd4AZVYd3eOL8gGH3D4rRRe1ZKajAOTac7/0BHHt0lect/ky3X3oZbpHyN1 scDRgOS0RbFIAjZFBho3kdfUInhWYXtaBjQPttBfDiTaImZ1Lad4b1Fy4eIIpwUgFIq0 eeFIbhmjlpzAme/4cJ0S7NDMXyD6oDOMv1fpnPqDMfP8Lqa+Clonavk5W36EdkfvtI7E PtALf47om3sfMBbstR3X7kyC+f6U4obf+0BduRFgwa07dScHzaIMMOgGk5Q6DhA3TxhQ KalfsPvotXtHFhCR84VqQC5kle1zgUlw/ZJbuS/BdQa61qsB76gCPXSWdLWRH/0/n0fr axLg== X-Gm-Message-State: ALoCoQkzXAT0kil8qWkuMfugcSwv4GG3/EmOFIa3zuK1/7d371pelx2GbuUh0AxeC0ovUyr0YOgY X-Received: by 10.112.147.7 with SMTP id tg7mr1782713lbb.16.1444331032904; Thu, 08 Oct 2015 12:03:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.23.155 with SMTP id 27ls230317lfx.49.gmail; Thu, 08 Oct 2015 12:03:52 -0700 (PDT) X-Received: by 10.112.13.161 with SMTP id i1mr4469541lbc.96.1444331032770; Thu, 08 Oct 2015 12:03:52 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id jh5si30872823lbc.136.2015.10.08.12.03.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Oct 2015 12:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbwr8 with SMTP id r8so57296101lbw.2 for ; Thu, 08 Oct 2015 12:03:52 -0700 (PDT) X-Received: by 10.25.153.145 with SMTP id b139mr1500615lfe.117.1444331032638; Thu, 08 Oct 2015 12:03:52 -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 w3csp749503lbq; Thu, 8 Oct 2015 12:03:51 -0700 (PDT) X-Received: by 10.68.222.163 with SMTP id qn3mr9930738pbc.54.1444331031396; Thu, 08 Oct 2015 12:03:51 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id o4si68511440pap.3.2015.10.08.12.03.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Oct 2015 12:03:51 -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 1ZkGSi-0008UE-7w; Thu, 08 Oct 2015 19:02:44 +0000 Received: from mail-wi0-f170.google.com ([209.85.212.170]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkGSa-0008PC-Qa for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2015 19:02:37 +0000 Received: by wicfx3 with SMTP id fx3so41688384wic.1 for ; Thu, 08 Oct 2015 12:02:15 -0700 (PDT) X-Received: by 10.180.109.135 with SMTP id hs7mr6189735wib.12.1444330935246; Thu, 08 Oct 2015 12:02:15 -0700 (PDT) Received: from localhost.localdomain ([5.90.101.38]) by smtp.gmail.com with ESMTPSA id ry1sm47865046wjb.24.2015.10.08.12.02.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Oct 2015 12:02:14 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt.fleming@intel.com, mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, leif.lindholm@linaro.org Subject: [PATCH v4 1/3] arm64/efi: remove /chosen/linux, uefi-stub-kern-ver DT property Date: Thu, 8 Oct 2015 20:02:02 +0100 Message-Id: <1444330924-17830-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444330924-17830-1-git-send-email-ard.biesheuvel@linaro.org> References: <1444330924-17830-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151008_120237_111147_747AFD26 X-CRM114-Status: GOOD ( 11.46 ) 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.170 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.170 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: ryabinin.a.a@gmail.com, 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.217.170 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 Reviewed-by: Matt Fleming --- 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: