From patchwork Tue Mar 7 14:04:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2462941wrd; Tue, 7 Mar 2023 06:32:10 -0800 (PST) X-Google-Smtp-Source: AK7set+zd3UTX7EHSw+lQBzZ5OjxuMNCg7oCAIg4uHiHbNe/Zp5O9izeXA4U1bXSueh6bD7iAKmn X-Received: by 2002:a17:906:c001:b0:8b2:d70c:34ae with SMTP id e1-20020a170906c00100b008b2d70c34aemr15163206ejz.71.1678199530734; Tue, 07 Mar 2023 06:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678199530; cv=none; d=google.com; s=arc-20160816; b=rc9wbnJCqluoQ/Avuuwv77J3FBBKUmUuI6mQdJzkc2VwmxzLl50dY9Gxg5BlipZBj1 sXElF0LdKt4eAVDO0nY+K392/c83LYf4w4e+9RTZFWsP+YJ7+mqLgtUi6Os5B5Mlhf11 dFCcgu1VnspvkH5ATvQauIA8sKav+Q6tzLD8bqqRycheeUK5dTFX/BKXL2sNxFAqhFC2 +aVdgwNisYJB9LhQ5n+oql5sOcZZIPXhhhAVHTIlEzZ3/edzu56bD02OaX9jreFa/pKh jIz/CA7cNvVbT5bI9Pn8+Oa4iw166cJV36SyctSQY8YHIx79qSa/hCtUt6X1eCjVhw3P hlGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Yrs77WpSvMgYwzmwhbREq87v7T7v5tsTfOlAbupMOMs=; b=dOSatQsEUpN/CgdtrB37tpTFgAH8drYOCOffn2VQ9l/XT/hsSctn1MIYpKo72TYa9m sqQEKvtM/zQG3wlHh7L9oTkPqkFgfLmoLwxABWnzl2T2pxx1LqAUf9TBfwFDDtpaRz3X d8r8o6zibtHPASMXUONG6DvwDNywxQ1xybHElNnHXETIgczISEoKfshzTBn+kMSZgBCg s1hJS37XhZ+A6FcV3yxWPX+njuyjh824+COuU1NYwLDpD0ygvSq9fGlWdIh7rLu6D5mr gOq0IHIaWLd30HDXw61LLSgs78+nVkhouxTGt+QhB5SkKE99CsR4MTEKLOJnhuwAfmoY oPTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="C1AMjA/Q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id be4-20020a1709070a4400b008c660960fa5si2868254ejc.336.2023.03.07.06.31.46; Tue, 07 Mar 2023 06:32:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="C1AMjA/Q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231211AbjCGOJI (ORCPT + 99 others); Tue, 7 Mar 2023 09:09:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229759AbjCGOIR (ORCPT ); Tue, 7 Mar 2023 09:08:17 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B308F867D1 for ; Tue, 7 Mar 2023 06:07:36 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 950B161456 for ; Tue, 7 Mar 2023 14:07:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1021EC4339C; Tue, 7 Mar 2023 14:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678198056; bh=an7RQl0FyYFp7pKvljqsgvYahLoQXlUCxmiwvRE6nxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C1AMjA/Q6Tv3JeIisClS6GOarzAr08r6Bk0wyffkzCepVTonXIzNfn3dUG7iWkgjX dNDCIuawjWf584NQZRvBZECxIqAPoKXI9r7qy+drljZo+dgHMf/UCmCK8xWjij+HpP IDkGd5BGbfTNsE7p2IaTMYkRmc3cGfXtXi4RSKFXXqqUV7nzxJfJciSb6IxyNWR4t3 wxbTPKgzRK7jYLmhqinyjhAs9/fcr25cHfwwd5QOoz/xf0d/NWGDMRuB0EClW/nbad Di5hhFWByMQ4MlVIg8dG3TSpcAiaJm1+WYhpOcdXuQgvh27jS78kxnG1igLHBc6/U+ 4CrBQFoFtJ1Rw== From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook Subject: [PATCH v3 24/60] arm64: kernel: Remove early fdt remap code Date: Tue, 7 Mar 2023 15:04:46 +0100 Message-Id: <20230307140522.2311461-25-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307140522.2311461-1-ardb@kernel.org> References: <20230307140522.2311461-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1349; i=ardb@kernel.org; h=from:subject; bh=an7RQl0FyYFp7pKvljqsgvYahLoQXlUCxmiwvRE6nxQ=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIYXdxSqOkXnV6mPWGxZKXlvR5vbwjFFV9H1f3/1+B2PvH dintU+jo5SFQYyDQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAEzktiAjw0UG5R2NFRlGBk0u nxcly37OrC0orPc5x+8vbuwidNR2P8M/i/sxShuXJ3Gpiymmr7hrfn/Gih1/LQP+CPgKmJd4XFr DCAA= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759719751177386179?= X-GMAIL-MSGID: =?utf-8?q?1759719751177386179?= The early FDT remap code is no longer used so let's drop it. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/setup.h | 3 --- arch/arm64/kernel/setup.c | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/arch/arm64/include/asm/setup.h b/arch/arm64/include/asm/setup.h index f4af547ef54caa70..acc5e00bf3b0fafb 100644 --- a/arch/arm64/include/asm/setup.h +++ b/arch/arm64/include/asm/setup.h @@ -7,9 +7,6 @@ #include -void *get_early_fdt_ptr(void); -void early_fdt_map(u64 dt_phys); - /* * These two variables are used in the head.S file. */ diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index b8ec7b3ac9cbe8a8..bda21a9245943c57 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -166,21 +166,6 @@ static void __init smp_build_mpidr_hash(void) pr_warn("Large number of MPIDR hash buckets detected\n"); } -static void *early_fdt_ptr __initdata; - -void __init *get_early_fdt_ptr(void) -{ - return early_fdt_ptr; -} - -asmlinkage void __init early_fdt_map(u64 dt_phys) -{ - int fdt_size; - - early_fixmap_init(); - early_fdt_ptr = fixmap_remap_fdt(dt_phys, &fdt_size, PAGE_KERNEL); -} - static void __init setup_machine_fdt(phys_addr_t dt_phys) { int size;