From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 369C8C433DB for ; Mon, 11 Jan 2021 10:32:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC0A022515 for ; Mon, 11 Jan 2021 10:32:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC0A022515 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yANAtJCDwadiO3VNsgh9CXqMibtw8aaHLpgH35CZyjo=; b=t2e/Q5TfaXV5tY6nG9jP8IJOTV P2dWZliGF5OI/Myn9TOYFa0VfQkNc6Hc2Hgmy96+j7U9cGsfJULqHtQht8m2dV+Tvv0p7teCrOC8X R1Iuxvo4/zz4BWr2BIP1QQDKOP8EcxzwhCyG76ZxZUVJJsoaBwc0My+c6Qd5TLQgm7XDE4K22Hx77 rqgDqxeauiK3gfMxw16y3CEaRU4sN9a7IQT8N31Akr02ia0GKyjeS1YdtMLReP4QyDieiG6OCeAMo HxvX0LX5R3l4yFhwyQWLI+ZZCNl/UoLisRvR8E0GynAKe1Nq9h1Zkko50YlNH6x5beiiD0qXfKExh lSwwNXlQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyuTO-0007Bd-7b; Mon, 11 Jan 2021 10:30:54 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyuT5-00074m-6p for linux-arm-kernel@lists.infradead.org; Mon, 11 Jan 2021 10:30:40 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D3D58227C3; Mon, 11 Jan 2021 10:30:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610361034; bh=D+Ob3wDDekLhtrgdd1iB1spAFbVjZYIzGjlEeRSLdMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPjiCYw08O7iSJDbhrFwk7mV9odV3yGvpI9RraH+ab0HPxz2UL/nu/HGbINlfibwk Xuykk0na1UsnRHeibjcGzrC4y9lP5NoFSmIeoRwmJ/XCHJZR3KaBYgPuntoH5HFRuG iwPV5xDnwcsHMOmd/Y8YHD5bbXnP9ZsXKvduB8bi3ifzp/jifkuocfSydQdOtmKMsw 9pRx1K3Y5+IDvdtv4RZQ+ZHtJ4+/LM37PxzSKx85Q64d7gOiSAYQGvafGNrq/iQHy5 zjqN48N1O+XFgbYJ9fXq5jeBmurox19CyIJ1ybJQHIPTvkTlh1nPx78XAQkH9tAdHw jtzPtjrC/RDlA== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] ARM: take memreserve FDT entries into account when discovering base of RAM Date: Mon, 11 Jan 2021 11:30:19 +0100 Message-Id: <20210111103020.32372-2-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210111103020.32372-1-ardb@kernel.org> References: <20210111103020.32372-1-ardb@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210111_053035_426622_90CDE801 X-CRM114-Status: GOOD ( 20.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Geert Uytterhoeven , Linus Walleij , Russell King - ARM Linux , Alexander Sverdlin , Ard Biesheuvel MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As an enhancement to the newly added logic to cross-reference the base of DRAM calculated by rounding the decompressor load address against the memory nodes in the DT, take /memreserve/ entries into account as well. This ensures that DT platforms that currently rely on TEXT_OFFSET to be increased in order to stay clear of memory reservations no longer need this hack in the future. Signed-off-by: Ard Biesheuvel --- arch/arm/boot/compressed/Makefile | 2 ++ arch/arm/boot/compressed/fdt_check_mem_start.c | 35 +++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index fd94e27ba4fa..cf8cfe3f286c 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -96,6 +96,8 @@ endif $(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \ $(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector)) +CFLAGS_fdt_check_mem_start.o += -DTEXT_OFFSET=$(TEXT_OFFSET) + # These were previously generated C files. When you are building the kernel # with O=, make sure to remove the stale files in the output tree. Otherwise, # the build system wrongly compiles the stale ones. diff --git a/arch/arm/boot/compressed/fdt_check_mem_start.c b/arch/arm/boot/compressed/fdt_check_mem_start.c index 62450d824c3c..f81ed6ae9776 100644 --- a/arch/arm/boot/compressed/fdt_check_mem_start.c +++ b/arch/arm/boot/compressed/fdt_check_mem_start.c @@ -4,6 +4,19 @@ #include #include +/* + * The ARM kernel only uses part of the 32 KiB TEXT_OFFSET window at the start + * of the uncompressed image, and some platforms rely on this, and have placed + * reserved regions right before it. This means we should only consider an + * overlap to be a collision if the reserved region covers the area that we + * actually use for page tables. + */ +#ifdef CONFIG_ARM_LPAE +#define TEXT_OFFSET_FREE (TEXT_OFFSET - 0x5000) +#else +#define TEXT_OFFSET_FREE (TEXT_OFFSET - 0x4000) +#endif + static const void *get_prop(const void *fdt, const char *node_path, const char *property, int minlen) { @@ -44,6 +57,24 @@ static uint64_t get_val(const fdt32_t *cells, uint32_t ncells) return r; } +static void clip_reserved_regions(const void *fdt, uint32_t *base, uint64_t *end) +{ + int i; + + for (i = 0; i < fdt_num_mem_rsv(fdt); i++) { + uint64_t address, size; + + if (fdt_get_mem_rsv(fdt, i, &address, &size)) + return; + + if (*base >= address && *base < (address + size)) + *base = address + size; + + if (*end >= address && *end < (address + size)) + *end = address; + } +} + /* * Check the start of physical memory * @@ -107,7 +138,9 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt) base = fdt32_ld(reg + addr_cells - 1); end = base + size; - if (mem_start >= base && mem_start < end) { + clip_reserved_regions(fdt, &base, &end); + if (mem_start + TEXT_OFFSET_FREE >= base && + mem_start < end) { /* Calculated address is valid, use it */ return mem_start; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel