From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 17 May 2023 11:05:24 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pzD65-0048c0-GL for lore@lore.pengutronix.de; Wed, 17 May 2023 11:05:24 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pzD62-0004qZ-2k for lore@pengutronix.de; Wed, 17 May 2023 11:05:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=i+NZThpbL/j2gu+lE7UH1eCLggPpDviItoEgvxCh4PM=; b=zW3RD66RbhfN9ZtI870Tl3OF9R XIazftgbb00EO2FEfFPF31TtzcxTVkC04ZuFVO5nTIE+WPZmHo78TYQ8tx1+aUfFU8X0FmNusJIIk gb2OzXFP0fuTWexEnIN811wUQBOelW67ct3pTbrRMHQIvP8L/6GpO7eexf56pOv8LIOUe6MpfM+7/ Vk7FCRLE0PQ+iFTM94L02FcSvBj9XsVEmE8WL9okyjaSqYmJuBpuRbhmp6n9k/13H1lp/hwgcgVz7 PmGkFF/pvwGNRXYNG5/KGEc/hM1FYAsD4XVHx1ak9y5G6olLI1bdZwYuFUIFYAY6RQfKcTkO1BIop X+LUIGLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pzD4g-008yTQ-2d; Wed, 17 May 2023 09:03:58 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pzD4Y-008yMK-2G for barebox@lists.infradead.org; Wed, 17 May 2023 09:03:53 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pzD4S-0003x2-Um; Wed, 17 May 2023 11:03:44 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pzD4S-000o6g-5H; Wed, 17 May 2023 11:03:44 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pzD4P-00Gaqu-FH; Wed, 17 May 2023 11:03:41 +0200 From: Sascha Hauer To: Barebox List Date: Wed, 17 May 2023 11:03:07 +0200 Message-Id: <20230517090340.3954615-2-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517090340.3954615-1-s.hauer@pengutronix.de> References: <20230517090340.3954615-1-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230517_020350_751077_5050E2F9 X-CRM114-Status: GOOD ( 13.40 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 01/34] ARM: remove unused membase argument X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) The functions determining the different memory locations for stack, early malloc, ttb and op-tee all take a membase argument which is unused as all locations depend on the end of memory. Remove this unused argument. Signed-off-by: Sascha Hauer --- arch/arm/boards/raspberry-pi/lowlevel.c | 2 +- arch/arm/cpu/entry.c | 2 +- arch/arm/cpu/start.c | 6 ++--- arch/arm/cpu/uncompress.c | 6 ++--- arch/arm/include/asm/barebox-arm.h | 29 ++++++++++--------------- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c index 742f177dec..fd11fe53e0 100644 --- a/arch/arm/boards/raspberry-pi/lowlevel.c +++ b/arch/arm/boards/raspberry-pi/lowlevel.c @@ -42,7 +42,7 @@ static void copy_vc_fdt(void *dest, void *src, unsigned long max_size) * this FDT there. We fetch it from there later in rpi_devices_init(). */ #define rpi_stack_top(memsize) \ - arm_mem_stack_top(BCM2835_SDRAM_BASE, BCM2835_SDRAM_BASE + memsize - VIDEOCORE_FDT_SZ) + arm_mem_stack_top(BCM2835_SDRAM_BASE + memsize - VIDEOCORE_FDT_SZ) static inline void start_raspberry_pi(unsigned long memsize, void *fdt, void *vc_fdt) diff --git a/arch/arm/cpu/entry.c b/arch/arm/cpu/entry.c index b863af5757..dc264c8771 100644 --- a/arch/arm/cpu/entry.c +++ b/arch/arm/cpu/entry.c @@ -40,5 +40,5 @@ void NAKED __noreturn barebox_arm_entry(unsigned long membase, unsigned long memsize, void *boarddata) { __barebox_arm_entry(membase, memsize, boarddata, - arm_mem_stack_top(membase, membase + memsize)); + arm_mem_stack_top(membase + memsize)); } diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index be303514c2..62b2054dd6 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -111,7 +111,7 @@ static inline unsigned long arm_mem_boarddata(unsigned long membase, unsigned long arm_mem_ramoops_get(void) { - return arm_mem_ramoops(0, arm_stack_top); + return arm_mem_ramoops(arm_stack_top); } EXPORT_SYMBOL_GPL(arm_mem_ramoops_get); @@ -163,12 +163,12 @@ __noreturn __no_sanitize_address void barebox_non_pbl_start(unsigned long membas arm_membase = membase; arm_endmem = endmem; - arm_stack_top = arm_mem_stack_top(membase, endmem); + arm_stack_top = arm_mem_stack_top(endmem); arm_barebox_size = barebox_size; malloc_end = barebox_base; if (IS_ENABLED(CONFIG_MMU_EARLY)) { - unsigned long ttb = arm_mem_ttb(membase, endmem); + unsigned long ttb = arm_mem_ttb(endmem); if (IS_ENABLED(CONFIG_PBL_IMAGE)) { arm_set_cache_functions(); diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index 65de87f109..abaf36b68c 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -82,13 +82,13 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize); if (IS_ENABLED(CONFIG_MMU_EARLY)) { - unsigned long ttb = arm_mem_ttb(membase, endmem); + unsigned long ttb = arm_mem_ttb(endmem); pr_debug("enabling MMU, ttb @ 0x%08lx\n", ttb); mmu_early_enable(membase, memsize - OPTEE_SIZE, ttb); } - free_mem_ptr = arm_mem_early_malloc(membase, endmem); - free_mem_end_ptr = arm_mem_early_malloc_end(membase, endmem); + free_mem_ptr = arm_mem_early_malloc(endmem); + free_mem_end_ptr = arm_mem_early_malloc_end(endmem); pr_debug("uncompressing barebox binary at 0x%p (size 0x%08x) to 0x%08lx (uncompressed size: 0x%08x)\n", pg_start, pg_len, barebox_base, uncompressed_len); diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 0cf4549cd7..2e0d8dc9a7 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -78,39 +78,34 @@ static inline const void *arm_mem_scratch_get(void) return (const void *)__arm_mem_scratch(arm_mem_endmem_get()); } -#define arm_mem_stack_top(membase, endmem) ((endmem) - SZ_64K - OPTEE_SIZE) +#define arm_mem_stack_top(endmem) ((endmem) - SZ_64K - OPTEE_SIZE) -static inline unsigned long arm_mem_stack(unsigned long membase, - unsigned long endmem) +static inline unsigned long arm_mem_stack(unsigned long endmem) { - return arm_mem_stack_top(membase, endmem) - STACK_SIZE; + return arm_mem_stack_top(endmem) - STACK_SIZE; } -static inline unsigned long arm_mem_ttb(unsigned long membase, - unsigned long endmem) +static inline unsigned long arm_mem_ttb(unsigned long endmem) { - endmem = arm_mem_stack(membase, endmem); + endmem = arm_mem_stack(endmem); endmem = ALIGN_DOWN(endmem, ARM_TTB_SIZE) - ARM_TTB_SIZE; return endmem; } -static inline unsigned long arm_mem_early_malloc(unsigned long membase, - unsigned long endmem) +static inline unsigned long arm_mem_early_malloc(unsigned long endmem) { - return arm_mem_ttb(membase, endmem) - SZ_128K; + return arm_mem_ttb(endmem) - SZ_128K; } -static inline unsigned long arm_mem_early_malloc_end(unsigned long membase, - unsigned long endmem) +static inline unsigned long arm_mem_early_malloc_end(unsigned long endmem) { - return arm_mem_ttb(membase, endmem); + return arm_mem_ttb(endmem); } -static inline unsigned long arm_mem_ramoops(unsigned long membase, - unsigned long endmem) +static inline unsigned long arm_mem_ramoops(unsigned long endmem) { - endmem = arm_mem_ttb(membase, endmem); + endmem = arm_mem_ttb(endmem); #ifdef CONFIG_FS_PSTORE_RAMOOPS endmem -= CONFIG_FS_PSTORE_RAMOOPS_SIZE; endmem = ALIGN_DOWN(endmem, SZ_4K); @@ -123,7 +118,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, unsigned long endmem, unsigned long size) { - endmem = arm_mem_ramoops(membase, endmem); + endmem = arm_mem_ramoops(endmem); if (IS_ENABLED(CONFIG_RELOCATABLE)) { return ALIGN_DOWN(endmem - size, SZ_1M); -- 2.39.2