From patchwork Tue Aug 8 22:53:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1819074 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=YLE4zm4n; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=YLE4zm4n; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RL7lp4gm5z1yfB for ; Wed, 9 Aug 2023 08:53:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 40D3B86724; Wed, 9 Aug 2023 00:53:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="YLE4zm4n"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="YLE4zm4n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8889B86714; Wed, 9 Aug 2023 00:53:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20608.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::608]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ABF7E86672 for ; Wed, 9 Aug 2023 00:53:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PYpeIDdCTJS5ZqRL3q72tdTEyDc121nTBB4KGkP3AOQ=; b=YLE4zm4n3YReU8oGi1kKCCVALQFPZJWrXs8XD+4SiiQOoj3BC53MJ16/t46gF3vSQ2kNYlG+wBD2MC0qvLTe6umMRjHpR9a3ZmjmNotaq1BI4UNTyrxJPsVNayTSED1owW/Hjg1BW4dc3Deq7mVQs4wCSFOvnQ+lF94KmkBzVC2ZrTxLShLKbaenLn/awHspveDvRByFnznXt7nfI35G+3mlHbd7mDoPYrG3oUX5dY+STWEK9pCKdINxZDYW1MlFUPbI2aVAZqH97Jq9C3+9PxcuoLtO/zPtWm17L4rZ3FsKeuCv5Hr1l1Zux1fh3zevom9FdXDRQynD5M93FpG1ew== Received: from FR3P281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::21) by AS8PR03MB7399.eurprd03.prod.outlook.com (2603:10a6:20b:2e2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:41 +0000 Received: from VI1EUR05FT009.eop-eur05.prod.protection.outlook.com (2603:10a6:d10:1d:cafe::de) by FR3P281CA0016.outlook.office365.com (2603:10a6:d10:1d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.17 via Frontend Transport; Tue, 8 Aug 2023 22:53:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.81) smtp.mailfrom=seco.com; dkim=pass (signature was verified) header.d=seco.com;dmarc=pass action=none header.from=seco.com; Received-SPF: Pass (protection.outlook.com: domain of seco.com designates 20.160.56.81 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.81; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.81) by VI1EUR05FT009.mail.protection.outlook.com (10.233.243.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.18 via Frontend Transport; Tue, 8 Aug 2023 22:53:40 +0000 Received: from outmta (unknown [192.168.82.132]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id E46422008009E; Tue, 8 Aug 2023 22:53:39 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [104.47.14.59]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 5BF5A2008006E; Tue, 8 Aug 2023 22:53:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KjnQ4Z6ULIb22Alb5UijvM/roL0zRGwfit+SDjFgOzQcJ7xqMVid2VSWn3cQPkcdqkfQ8u+7qpFin5iy7zVbpERE1ntutduxAP/TBuChVX+sANGw6Qxa6Rum27/H9X+KQ/b/y5gFvNGPi9HUaPNLdLlpWeza1WMXyX4NHIfkqUh4AqVQiT7Jrqo/Aw3LEz8foy7pVy4rKxfQa3nHWlg3KOXLCdQj4nJ7+TJ0mpE0JYA7ir5WdK6nvrhOLmkkEAMZkJR2ss4Clh2B4p/Gs9oXIwYOoSlYIMN3HJj73MOWbE011N0tD37wTTCDJuhX7YIsN6xmN8YQhxerIRkC+sGtqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PYpeIDdCTJS5ZqRL3q72tdTEyDc121nTBB4KGkP3AOQ=; b=iy8oQJUwBI6S+ADoUpQKXUy+7AS2lB6Rru4DJoUj75qbfeTEqI4C6GEFn9qgBB7N7vM31xAi9PL1Y+ri2YiM+wrzMb2ixSUdxE9LS7zNvsGeD0xeVoj2rLqfpfzCksF7eBhLrY/Y9Ub/BuqXDmnAMt4LW5l/j9oWC/MlmWNDhX+Tv22XUMHF1FZJx/7rnkYejIEBqxiPZAPx99n7aj2pRMXA4efXn1Rh3iJ7zr67R0QJEpCV9mMuo8oEbGMJC5ZIEO52msYNozsjrg8J/WBTN/TlVO4F/xL5ZWyoasQs1bcitgYHu4t4odtC771GzFIjeEezVXqgj0sB3LKfumSE2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PYpeIDdCTJS5ZqRL3q72tdTEyDc121nTBB4KGkP3AOQ=; b=YLE4zm4n3YReU8oGi1kKCCVALQFPZJWrXs8XD+4SiiQOoj3BC53MJ16/t46gF3vSQ2kNYlG+wBD2MC0qvLTe6umMRjHpR9a3ZmjmNotaq1BI4UNTyrxJPsVNayTSED1owW/Hjg1BW4dc3Deq7mVQs4wCSFOvnQ+lF94KmkBzVC2ZrTxLShLKbaenLn/awHspveDvRByFnznXt7nfI35G+3mlHbd7mDoPYrG3oUX5dY+STWEK9pCKdINxZDYW1MlFUPbI2aVAZqH97Jq9C3+9PxcuoLtO/zPtWm17L4rZ3FsKeuCv5Hr1l1Zux1fh3zevom9FdXDRQynD5M93FpG1ew== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by PR3PR03MB6634.eurprd03.prod.outlook.com (2603:10a6:102:7d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:33 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6652.025; Tue, 8 Aug 2023 22:53:33 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v2 1/4] common: Only mark malloc initialized after mem_malloc_init Date: Tue, 8 Aug 2023 18:53:17 -0400 Message-Id: <20230808225320.310926-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808225320.310926-1-sean.anderson@seco.com> References: <20230808225320.310926-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0036.namprd05.prod.outlook.com (2603:10b6:208:c0::49) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|PR3PR03MB6634:EE_|VI1EUR05FT009:EE_|AS8PR03MB7399:EE_ X-MS-Office365-Filtering-Correlation-Id: 112ea3e0-fcca-43c8-07ff-08db98624f26 X-TrendMicro-CAS-OUT-LOOP-IDENTIFIER: 656f966764b7fb185830381c646b41a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: VUqZGpaAtIg1BEf8mcELnbdpR2+HDspE82kZU1Yw/9Upsb8AjGikN8lkk/5T5IFO7F61TpmEHuMF42ch9LWQNbDqPbpKXHeSxiyIe92ahuXtPSCRsPk7asO0csrBg2IMYdBVPzd6WSU3HXm2sKdEFiJU9B0WKTa4NqQyuZXm76orowMmc06sr7ALQiGsC54Vx6AbDRmVNU0ecB7dQMOtpSpQcDm+EbLdMNV1DRkeWQ3zq4T7VLIEILzwY8l7VP55rCyFGUWdL40ZgPrbyXi3XtkOnKXBMdmrAXUhoCbS+0pKX6jgpHWDVR05nV0jk3IPL5bwlO4oJoDn2PNL6AC64gM51NOnGBWuDo82R7BEqriy62wHWovrCQ9SS7Uq6P7cc/7x4Colm5eP+ByksVkkRr0fj2J/joOqH9wq5jKWazQNXVvVZ+N7vgx5KJKrZ/T6ba9k+XIirKVVbmmsSzSVPIKPT1p8hGL0gEjspEK+yNTWAVO6kqXdZnX0nsPR/5SbhCToLJvXMkfDK3bISW6/aDg6/VigtqJGXeUeY8dgFvSmXOsuq4Vm43PK1vnJ77cHWcggKpL2h74xDvPMUcLiwPAk3Xa0geVzXMOZX6ixYTyIlzDeG2q0zvieAH/kVpIo X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39850400004)(396003)(136003)(376002)(186006)(1800799006)(451199021)(2616005)(36756003)(1076003)(26005)(52116002)(6506007)(107886003)(6486002)(6512007)(6666004)(478600001)(38350700002)(38100700002)(54906003)(66476007)(66946007)(66556008)(4326008)(316002)(41300700001)(8936002)(5660300002)(44832011)(8676002)(2906002)(83380400001)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6634 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VI1EUR05FT009.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 1c702c09-84ae-4504-ae7f-08db98624aed X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fg/SmkkgRp4AmTyxiRPItlQFHxSxaWe6uIzqVnScU5gGynqo/1O4rurTJAUzyQ3+9XQuWvmZNI5lmAzg4YByQbiag2uAq31nN00vZchjhsbNbUyuRcj9a4KHFRXSvFS89sDZbJA0qThStzCymmBu0N+OGmSuFsueFzedvS0iVcm6bqeaU93ezVXRtr6RF982gGvxRxIBY88XMS/u18n39nw7br8sLMDh9RlS9w+yBNU898kOIcIe8/fYISbwmD0s0NFpjSl+Lx84hsVENT4gY297uoEDvUXAYh0/A8JLokqEhxj2ydgRINQn0lg08XkcXviDAfULnfkJq8ii8mXMp/Y9GyAVwTQbcFmQVpk/FDyHqIrgndgL+qkU4QY3LeMmeRxSTVrzByOU49xSZMMdX6oXFTTHQEcaVYt2uORwHRNyNrsIEgOpu9X0+wqRVX91HeEQhAU+Flv7dv+F4TWhx4YUGF/atDd10oNMyIIqR3LLOBrSu2tKy2Dl0DqX0+jcnfvWorMUyJvh1X3C+LGLqCby7PKMY81wblJL1IqjJDYJHYSBbYbUkfYQ1in8L2Xu1+YPqlREyMzJyIOovDh+RpxQFbvBgzDNMOartjx4lik7CIj9V4D787jgKkJBHti4kzHPKwwtm6L4udyQ3KyGiKVJs323bhsBQoK8YcmlIFZgG7cSoF0ZgK9Iaq3bIs+U2f6OCrdO46dY4LK1d0DVMzAAHXnZZPNszTryty+x6TfFQo+1kvepRewXpTq/MTdzlwKylXTAUr2C2/9TojxsWg== X-Forefront-Antispam-Report: CIP:20.160.56.81; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(376002)(136003)(396003)(346002)(39850400004)(82310400008)(1800799006)(451199021)(186006)(46966006)(40470700004)(36840700001)(86362001)(107886003)(44832011)(40480700001)(41300700001)(336012)(34070700002)(478600001)(8676002)(1076003)(6506007)(40460700003)(8936002)(26005)(6486002)(6666004)(2616005)(5660300002)(70586007)(47076005)(36756003)(83380400001)(2906002)(54906003)(36860700001)(316002)(356005)(7636003)(70206006)(7596003)(4326008)(82740400003)(6512007); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 22:53:40.4385 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 112ea3e0-fcca-43c8-07ff-08db98624f26 X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733; Ip=[20.160.56.81]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT009.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7399 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Instead of marking malloc as initialized as soon as relocation is done, defer it until after we call mem_malloc_init. This ensures that malloc initialization is done before we switch away from simple_malloc, and matches the SPL behavior. Fixes: c9356be3074 ("dm: Split the simple malloc() implementation into its own file") Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - New common/board_r.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index d798c00a80a..58a5986aa54 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -98,7 +98,7 @@ static int initr_trace(void) static int initr_reloc(void) { /* tell others: relocation done */ - gd->flags |= GD_FLG_RELOC | GD_FLG_FULL_MALLOC_INIT; + gd->flags |= GD_FLG_RELOC; return 0; } @@ -210,6 +210,7 @@ static int initr_malloc(void) malloc_start = gd->relocaddr - TOTAL_MALLOC_LEN; mem_malloc_init((ulong)map_sysmem(malloc_start, TOTAL_MALLOC_LEN), TOTAL_MALLOC_LEN); + gd->flags |= GD_FLG_FULL_MALLOC_INIT; return 0; } From patchwork Tue Aug 8 22:53:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1819075 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=uOmZep55; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=uOmZep55; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RL7lv3jyXz1yfB for ; Wed, 9 Aug 2023 08:54:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85F4786688; Wed, 9 Aug 2023 00:53:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="uOmZep55"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="uOmZep55"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 04855867C3; Wed, 9 Aug 2023 00:53:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0601.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::601]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 754C986763 for ; Wed, 9 Aug 2023 00:53:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MG1BE2ZxvEiKIqxaJxGIwLqRWWW4HIY4XKunHz4WoM0=; b=uOmZep55PIJjEGi9pTzjOlIEgXE7DmSFMwrIYYAf8e8H3g1oXfiRftZN2g7nF3HSHpuAiZ1Nb//ZlG+NKp9hgFcVwpIKWecsAP79bKgNRo2pHddxvxdm/nYnZF/pwD0Cv+Woba6UkrGi9KqWmUSNmRltGSAHnOsbACTqGbqJuyBfJoB941JB3nzPtbQF0Dh0yfuyNvxYQXl6nl6PM99Nj+EP6YeH3BlcKtYGRRZu2DRYJb6Loh4+BsPnT6Dhi/595OU8OP9esMeISSUYkgdc5z2pB8vRah1I+d0HFySCFEsXOPVKgnj6iiovJ6l5ySOXimD09wC10L1XSJ+Z3zTxaw== Received: from DU2PR04CA0027.eurprd04.prod.outlook.com (2603:10a6:10:3b::32) by VI1PR03MB6400.eurprd03.prod.outlook.com (2603:10a6:800:17e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:42 +0000 Received: from DB8EUR05FT017.eop-eur05.prod.protection.outlook.com (2603:10a6:10:3b:cafe::c2) by DU2PR04CA0027.outlook.office365.com (2603:10a6:10:3b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Tue, 8 Aug 2023 22:53:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.85) smtp.mailfrom=seco.com; dkim=pass (signature was verified) header.d=seco.com;dmarc=pass action=none header.from=seco.com; Received-SPF: Pass (protection.outlook.com: domain of seco.com designates 20.160.56.85 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.85; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.85) by DB8EUR05FT017.mail.protection.outlook.com (10.233.239.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.16 via Frontend Transport; Tue, 8 Aug 2023 22:53:42 +0000 Received: from outmta (unknown [192.168.82.132]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id EB5B02008009E; Tue, 8 Aug 2023 22:53:41 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [104.47.14.59]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 88C2720080073; Tue, 8 Aug 2023 22:53:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ki5eyyJvEAssdg0h4oD4iTpKrwCYotRPVXjIWvWAqnpgjo38aHK3ahbl4iie90lueQuWOTJRMkHVZH3zVZQVPr77D+T3fthkbNNiuFlCxOIFxu2cUnO/YnwbLZZBr5oxYN/3TSjVF8XlVu1qt4hk6Q/kaCxHl94OKhne8j/QnYNJe7skPuBoVb9YKZSr4GaxzoMx/YdiS81oeMhhES+6s2wUrE0UtD7L5o6SYltoqiIFo2rfUgvNa/xPfKGdhpMGfadIlpRvEhmNcX9rAguArhfQ8N3gxbv2BSpCz0XJSPBUzPsfJznG1S0+cqasCsEJw98MDWM6Qgy5coi/oY/Q4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MG1BE2ZxvEiKIqxaJxGIwLqRWWW4HIY4XKunHz4WoM0=; b=FstBV5bd1w/sxsSwp8attEY9U8hZgORS4S2QGWZR0Of1HCsEpf0lXSxz2npdIlatfbdaGM0xY87WiiuaDnozVA1uQlFalj0IeINv7NY5lVPlZvJK2Lj/CLmpDnAJR4oc/71tTXjK1g+oAaxWVsI3a7F0fs9zelmSYQq7s6TFGB668pVtM2RTPBIWItpB/1Y6JWTSF1SNvnZU9U2kq9ZfJaIT82X0dComQSzpXx9ledPJo5JOcm9fXdnuOgHBbArwLpBhR1zCc5fr57IEm0ZBUsCWwXPHy1ewX6dORiqTxEuqWreiYBGQExNubPbYnuEUBiZl8kKUMyN6tNzPA30fww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MG1BE2ZxvEiKIqxaJxGIwLqRWWW4HIY4XKunHz4WoM0=; b=uOmZep55PIJjEGi9pTzjOlIEgXE7DmSFMwrIYYAf8e8H3g1oXfiRftZN2g7nF3HSHpuAiZ1Nb//ZlG+NKp9hgFcVwpIKWecsAP79bKgNRo2pHddxvxdm/nYnZF/pwD0Cv+Woba6UkrGi9KqWmUSNmRltGSAHnOsbACTqGbqJuyBfJoB941JB3nzPtbQF0Dh0yfuyNvxYQXl6nl6PM99Nj+EP6YeH3BlcKtYGRRZu2DRYJb6Loh4+BsPnT6Dhi/595OU8OP9esMeISSUYkgdc5z2pB8vRah1I+d0HFySCFEsXOPVKgnj6iiovJ6l5ySOXimD09wC10L1XSJ+Z3zTxaw== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by PR3PR03MB6634.eurprd03.prod.outlook.com (2603:10a6:102:7d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:34 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6652.025; Tue, 8 Aug 2023 22:53:34 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v2 2/4] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT Date: Tue, 8 Aug 2023 18:53:18 -0400 Message-Id: <20230808225320.310926-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808225320.310926-1-sean.anderson@seco.com> References: <20230808225320.310926-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0036.namprd05.prod.outlook.com (2603:10b6:208:c0::49) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|PR3PR03MB6634:EE_|DB8EUR05FT017:EE_|VI1PR03MB6400:EE_ X-MS-Office365-Filtering-Correlation-Id: f461dbc1-1f09-44c3-0ad2-08db98625037 X-TrendMicro-CAS-OUT-LOOP-IDENTIFIER: 656f966764b7fb185830381c646b41a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: QwxwSo8uimhi6SSoM2KgLxr2JKGRKj6nF95EIRaP7zBlWX+CfW1zZlWmhd7lg5WX8m3bydMHP9jDc61K97nYIKuVWOnPRjh3qVZyGbVBMu87Be+8c+dEMxVV5h5TI90Z1EoSXy4CZmoa34Sj8S0bQG8cLzN80j2fPX9PXGVwj6jHU85ji0PkXkoXJGijhuUxGVXGo0sgaDpT9Lw1/l7HAmFg3GBleswm8eHv6Zu2NxkOYqAtL2a06H32qt0wpMv2cqcM58HGO0KERxTXdssg+bk7a/QV7wGBnD6fiPaigscvCebC14wlz55ON0WV9wDLhMVr87lvorjAkZknMkRbx0Wvq0G6q9D21vFLVk6tENeTtiVt064y1ytJbpOlrPEre9psMn2EY+gPiFswD4LKWl+SaYLRclwd0m+CVPD6jC7lkzsJN62jIdOdW71kwbQsn5M+4A225pWX5oLMPigyAAezc/tC7ubqoIoC7bM1xkMpjHzpierqNXIQVUvp4pryfXUrb5VAzuB8WTo0KpKsPzDkRLm+V4QL2lbp3ym6N4oTFnuxsQB6a8S3BSFHpGtNhscDgVidpFh5np/wdYVSBG7LvTXKkwrz/uAPrRdyfK5NPTyrSoaD4lzEB8sPZOCI X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39850400004)(396003)(136003)(376002)(186006)(1800799006)(451199021)(2616005)(36756003)(1076003)(26005)(52116002)(6506007)(107886003)(6486002)(6512007)(6666004)(478600001)(38350700002)(38100700002)(54906003)(66476007)(66946007)(66556008)(4326008)(316002)(41300700001)(8936002)(5660300002)(44832011)(8676002)(2906002)(83380400001)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6634 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT017.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c48b971e-7333-4dc6-c7c7-08db98624b8f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7TkdTDNWtINQ2ppohMZI4i+BtdJDv+hTmeX52m6vQpvZpAx6nvA0XyRQRzqVPT5ba5l0pEo3g5PVniD2lyi+wth9acR5+q3TRuQwDOei9LODOJ5cDOT0fHh8vd9/TZ2XCrYZSCDWhVqwOxZX2lxw+2V+MwYq79kDTPdjVZr4Tm18uCRfjvM8UAvxbs8RMIW0nxtLcQm8IZon7Chbg3LUY4EIe8w03Lmimx5HBvG67KHpT4nvQlZ0rUNUWM8kKRWzQaONz/jKQPO6UqtjLb7hD1RsWBITyD3Jofd/cJzgWj4/LY7bK2+9B9I0bZQQLK+PdvbUH/kLU6ayJvgeA8yQ58EXydbwolRS8rRzOynkvG/FxQqfr9zYbetLSvnD9+KYaO8q7l3IpsC5c0KFcx0C9j86bgUNHC5i+Vg+WY1OWXksC7NwwsZBdhQWPBp4AknlYePatplQ+4C7kDJG7kAbe8RBxJjPIrmMz4Y5M0okIHxLQo5bdZv0bExD7pXQeKusu/u8K7zIezHuHUUnoDvSFlssmyHfw0BIQtAYKzF/2MIXVXYvgDm0GHTXA+BVM76IWIcIjGoqDN1mVlMR+tkuHy2hmPLciIbEHtKC7MekBZYN5JBfNjCKps9PZFEdEBqarlur/zT5cOfQMZ76k/jU74ez7IEbYf0+ZvumHQ0K9e1PMKZWdxUY1kpEJHEFlcQhNdM8+c3CJArfTHz1ZVj6mRAwA3DLP65qUSRqbaCuWzsedwaTEo4lBRKEcDnWSXdx X-Forefront-Antispam-Report: CIP:20.160.56.85; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(39850400004)(346002)(396003)(136003)(376002)(451199021)(186006)(1800799006)(82310400008)(46966006)(36840700001)(47076005)(2906002)(83380400001)(36756003)(2616005)(5660300002)(36860700001)(54906003)(6486002)(6666004)(7596003)(7636003)(70586007)(70206006)(356005)(6512007)(4326008)(82740400003)(316002)(40480700001)(41300700001)(86362001)(44832011)(107886003)(8676002)(8936002)(26005)(1076003)(6506007)(336012)(478600001)(34070700002); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 22:53:42.2277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f461dbc1-1f09-44c3-0ad2-08db98625037 X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733; Ip=[20.160.56.85]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT017.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB6400 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean With CONFIG_IS_ENABLED we can eliminate some ifdefs. Signed-off-by: Sean Anderson Reviewed-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- (no changes since v1) common/dlmalloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 0f9b7262d51..30c78ae976b 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -588,9 +588,7 @@ static void malloc_bin_reloc(void) static inline void malloc_bin_reloc(void) {} #endif -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT static void malloc_init(void); -#endif ulong mem_malloc_start = 0; ulong mem_malloc_end = 0; @@ -625,9 +623,8 @@ void mem_malloc_init(ulong start, ulong size) mem_malloc_end = start + size; mem_malloc_brk = start; -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT - malloc_init(); -#endif + if (CONFIG_IS_ENABLED(SYS_MALLOC_DEFAULT_TO_INIT)) + malloc_init(); debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start, mem_malloc_end); @@ -733,7 +730,6 @@ static unsigned int max_n_mmaps = 0; static unsigned long max_mmapped_mem = 0; #endif -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT static void malloc_init(void) { int i, j; @@ -762,7 +758,6 @@ static void malloc_init(void) memset((void *)¤t_mallinfo, 0, sizeof(struct mallinfo)); #endif } -#endif /* Debugging support From patchwork Tue Aug 8 22:53:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1819077 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=wfxQv6Vk; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=wfxQv6Vk; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RL7mR24QYz1yfB for ; Wed, 9 Aug 2023 08:54:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 977BE8683A; Wed, 9 Aug 2023 00:53:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="wfxQv6Vk"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="wfxQv6Vk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B55086688; Wed, 9 Aug 2023 00:53:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20615.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::615]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 167C686672 for ; Wed, 9 Aug 2023 00:53:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rs15dwgzax/AgSExzFL2rZkJFx8N5DkEmMNAse43PaM=; b=wfxQv6VkuEwldXbCN7AcITfLU4GYMwn6TXY6K3je2vmnxue0JGW6UrOVDJSx+z+SUINeYOB1iAH3uGWvKN5osT0OVzdLZQ68DPlLA0446VjYbPdiYZvRIAlMN3xMmQtKariqqWxg/Qt+eeqfk+xQSg/U+xLlfNrWkbYkHDv9jrfKF+E6k7Q7UZ9B3f34lXGHavDRsdQlPxXG9ZYo3oQogiDIbs3Xj+S503qgeZMVbnYL8dh218VwqD+Gfd8W++ZdWmm+4ZEqPasOhJNBXlUYrTf/1SPiMQTtXh2CvQWoKXbjATd1fXgnZ1pu/BxbMftQeqsWbmxw7Oj3H1Zjb4k7iQ== Received: from DUZPR01CA0323.eurprd01.prod.exchangelabs.com (2603:10a6:10:4ba::24) by AS8PR03MB7570.eurprd03.prod.outlook.com (2603:10a6:20b:349::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:45 +0000 Received: from DB8EUR05FT042.eop-eur05.prod.protection.outlook.com (2603:10a6:10:4ba:cafe::a8) by DUZPR01CA0323.outlook.office365.com (2603:10a6:10:4ba::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Tue, 8 Aug 2023 22:53:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.86) smtp.mailfrom=seco.com; dkim=pass (signature was verified) header.d=seco.com;dmarc=pass action=none header.from=seco.com; Received-SPF: Pass (protection.outlook.com: domain of seco.com designates 20.160.56.86 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.86; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.86) by DB8EUR05FT042.mail.protection.outlook.com (10.233.239.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.18 via Frontend Transport; Tue, 8 Aug 2023 22:53:44 +0000 Received: from outmta (unknown [192.168.82.135]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 507A720086FA0; Tue, 8 Aug 2023 22:53:44 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [104.47.14.57]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 8A4672008006E; Tue, 8 Aug 2023 22:53:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SmNm5l0ETyKeIpPlIYdkvcthm4ouWCM5JvVAMPuKae2Ts3mNXBnshG2VwZCPh8qWhRcg7PD10VAXzGkTXIe1xdJYNu9fNdywaHVL1n/T1NygnYQ05yBTcp7oZOGhDX65WtZqJDFkEs/afA8Svz/kUNVbS6SPP8RL2Zlx29SOCOriG22H4ocpjCYerSyYtXNVC6xvgLCi+KGxAiTln173Bp8myngE2L95uGQpBeJq7abJ4ZLbP3Nd2rztOT2A23f+TsWYGjTVphxoqQvag3FbmQYpES7KF9sWYWObwzx9jiqMCwHdnEbl8knRaTtlcxb9IWA7aCiPGQwjXWpNhMWCuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Rs15dwgzax/AgSExzFL2rZkJFx8N5DkEmMNAse43PaM=; b=a63+UHk67hNTfnsWKEmuIaPo4DklWYp6ADEbSOKL6G/VsXxVaB3B/R0FR8C9uODQ/T1+teGQa4X8tfhtfruUgxS1o9GYILS6saxxZDFhb/fXBDU4vevxxSO0o+8H51pokrr0sy698v09++I2ZRn6wHoeBhVTn7+nd3dQuoA+R/22bv0TKHLoS0BEU6h5ZyoY8D9R+LjyyWtxC5SMONncKDZI34SvGki6+X2BUcmwMy6e1SBKOJmHKu7B+FF5JitbyWIodhI9N2ljuTx6BWTKjrMD1L6QLosuQMAOW+8gV1kkCaGqatGhJ8J1e6guKlp8wxPyDflfn6rLSlV8fkbqnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rs15dwgzax/AgSExzFL2rZkJFx8N5DkEmMNAse43PaM=; b=wfxQv6VkuEwldXbCN7AcITfLU4GYMwn6TXY6K3je2vmnxue0JGW6UrOVDJSx+z+SUINeYOB1iAH3uGWvKN5osT0OVzdLZQ68DPlLA0446VjYbPdiYZvRIAlMN3xMmQtKariqqWxg/Qt+eeqfk+xQSg/U+xLlfNrWkbYkHDv9jrfKF+E6k7Q7UZ9B3f34lXGHavDRsdQlPxXG9ZYo3oQogiDIbs3Xj+S503qgeZMVbnYL8dh218VwqD+Gfd8W++ZdWmm+4ZEqPasOhJNBXlUYrTf/1SPiMQTtXh2CvQWoKXbjATd1fXgnZ1pu/BxbMftQeqsWbmxw7Oj3H1Zjb4k7iQ== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by PR3PR03MB6634.eurprd03.prod.outlook.com (2603:10a6:102:7d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:35 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6652.025; Tue, 8 Aug 2023 22:53:35 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v2 3/4] malloc: Don't statically initialize av_ if using malloc_init Date: Tue, 8 Aug 2023 18:53:19 -0400 Message-Id: <20230808225320.310926-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808225320.310926-1-sean.anderson@seco.com> References: <20230808225320.310926-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0036.namprd05.prod.outlook.com (2603:10b6:208:c0::49) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|PR3PR03MB6634:EE_|DB8EUR05FT042:EE_|AS8PR03MB7570:EE_ X-MS-Office365-Filtering-Correlation-Id: 342f56a4-3604-46c1-284d-08db986251c5 X-TrendMicro-CAS-OUT-LOOP-IDENTIFIER: 656f966764b7fb185830381c646b41a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jMzpvFXuVyA4Ij8seDyAlS8Q2/PEUBvhrFTe/FR0X5HIcLYFo9XJottxG7FN7X0Czo3FnYHaa1TGEubUdNgwYc2dCWmPwy2SjpKStQ0OkIvx6X8yeWmA9QhHgYubYo18/GemUPg/mP2oPzqH21NMjVnnNDj0EHQLeHaqCWRucVPXe3jCSk87S58Ic3TiXZrffCd9YelJ1nKU8/GNaY3zOmHY0pPLlLfTKvr6PUkha90scq/jv1c4gXc+8KxQej+o+DII1kCEtEH9Ccw+bvBHZoAt+KS4ZifBYFVrw0oF06WjQ50YG4JCgJFpwIlLF+mhDnBoUE1BLX0oF/pSAH/h1FTBNVhdBIHovn90rE1gxCbOII9oz8gGysFzE3mrnx08EKjXeaRWcV8UdcE7INrl4Ksdi8wvNuc3yrpe77xfrpEVSIhj/NLX+FOzHNPBsI5Bovv9r+CdUETu30xRmRylgMYbi4aCXoren8dHefIloPpsssZ2DtQoLGR5CuHqO7LMvQ7J6i99KUDc3odA4UBPuppirzTswNbvdKiYn94H6eTzUi5ZeUqW5ZvuLkfhnufqPOt+eJjFI0RS54Vr+UYm6ZVn5c0bkzej7SUtCmhrMYihVprHegiOi+AyHMbkzn/Y X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39850400004)(396003)(136003)(376002)(186006)(1800799006)(451199021)(2616005)(36756003)(1076003)(26005)(52116002)(6506007)(107886003)(6486002)(6512007)(6666004)(478600001)(38350700002)(38100700002)(54906003)(66476007)(66946007)(66556008)(4326008)(316002)(41300700001)(8936002)(5660300002)(44832011)(8676002)(2906002)(83380400001)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6634 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT042.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 35c271f7-fa4a-410c-2e45-08db98624c21 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1VbbsNJJKsfgffzUywSZQdsmksw47veVfc3Gs3VVOFJUIbbByGaLQmHuXJGdwZCPCRQjM3IiW5wm2kBuPVOOEuKtmETtXFFKtE8fo7Pg2XWFwU/fgdOnWorhBOPqWcq+/dASXzhM6Q0m6cbhY6zSiK9LBIORZrwWkXQN/wQYZmmauzuSwR5RQNJhRvli5sfykuU5UxzAr7T0oW5VHtRNO0K8k63Bi9NcAMMdI01WrthsNeOO2FdLe0WaMEX7lfYsR6D9KcLVQJyPoO7E9inzM1XsYWMtvEXhFP5O7At+DJZCaLEZhEdNg63E0Q3oyQqnfby7GXi+YZSpeeCdb3XWeI1T8pjwaBPSmXZvXwecXZfLmVQrWlQEXkU0tiJXLcaMcJV3kmaTW5W1/oZyMhOu+X5bHLBkXfzAcOzAeavUgYJEKDJc4Pp+8CIo49iqCTA6oCTJpqGbMUDXVeBF7w1z+7poJ72wRRUG+s4MTACNFvCFxXMI4nVcebXAVNUOS+EdL1Nv1O3/KtTcti+Ra7viEyeqjvxDYwc3y4GBIjLjjxE7tpG3gurolKGewcMLnJKndfBP5P9qDLKSuYAWbMWhDq1bV+UTAkDWTdx5p53lwqRv+0QjCrUCZK1rSqzi5UM5XODghVwvn56yf5BQIhi/lO5qyStqngaNUJuW4R0cufE4wKO1TS/lPwg98Nr65Z0OInMB4jjwXsr3wn8z02RHkFOAe+bbWPWEpj303ztzKTOEM7DLB0nEmNkcGNOzV7YSMTA58bglmvpJ+BvifvVw4w== X-Forefront-Antispam-Report: CIP:20.160.56.86; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(376002)(396003)(39850400004)(136003)(346002)(82310400008)(451199021)(186006)(1800799006)(46966006)(36840700001)(40470700004)(8676002)(8936002)(5660300002)(70586007)(316002)(4326008)(6666004)(40480700001)(70206006)(2906002)(44832011)(41300700001)(54906003)(40460700003)(478600001)(6486002)(6512007)(36756003)(83380400001)(336012)(26005)(1076003)(6506007)(107886003)(2616005)(47076005)(86362001)(36860700001)(7636003)(356005)(34070700002)(7596003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 22:53:44.8524 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 342f56a4-3604-46c1-284d-08db986251c5 X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733; Ip=[20.160.56.86]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT042.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7570 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean When we enable malloc_init, there is no need to statically initialize av_, since we are going to do it manually. This lets us move av_ to .bss, saving around 1-2k of data (depending on the pointer size). cALLOc must be adjusted to not access top before malloc_init. While we're at it, rename/reword the Kconfig to better describe what this option does. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - Fix cALLOc condition Kconfig | 18 +++++++----------- common/dlmalloc.c | 9 +++++++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Kconfig b/Kconfig index 70efb41cc66..4b32286b69d 100644 --- a/Kconfig +++ b/Kconfig @@ -372,18 +372,14 @@ if EXPERT When disabling this, please check if malloc calls, maybe should be replaced by calloc - if one expects zeroed memory. -config SYS_MALLOC_DEFAULT_TO_INIT - bool "Default malloc to init while reserving the memory for it" +config SYS_MALLOC_RUNTIME_INIT + bool "Initialize malloc's internal data at runtime" help - It may happen that one needs to move the dynamic allocation - from one to another memory range, eg. when moving the malloc - from the limited static to a potentially large dynamic (DDR) - memory. - - If so then on top of setting the updated memory aside one - needs to bring the malloc init. - - If such a scenario is sought choose yes. + Initialize malloc's internal data structures at runtime, rather than + at compile-time. This is necessary if relocating the malloc arena + from a smaller static memory to a large DDR memory. It can also + reduce the size of U-Boot by letting malloc's data reside in .bss + instead of .data. config TOOLS_DEBUG bool "Enable debug information for tools" diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 30c78ae976b..0985fd8de2a 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -556,6 +556,7 @@ typedef struct malloc_chunk* mbinptr; #define IAV(i) bin_at(i), bin_at(i) static mbinptr av_[NAV * 2 + 2] = { +#if !CONFIG_IS_ENABLED(SYS_MALLOC_RUNTIME_INIT) NULL, NULL, IAV(0), IAV(1), IAV(2), IAV(3), IAV(4), IAV(5), IAV(6), IAV(7), IAV(8), IAV(9), IAV(10), IAV(11), IAV(12), IAV(13), IAV(14), IAV(15), @@ -573,6 +574,7 @@ static mbinptr av_[NAV * 2 + 2] = { IAV(104), IAV(105), IAV(106), IAV(107), IAV(108), IAV(109), IAV(110), IAV(111), IAV(112), IAV(113), IAV(114), IAV(115), IAV(116), IAV(117), IAV(118), IAV(119), IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127) +#endif }; #ifdef CONFIG_NEEDS_MANUAL_RELOC @@ -623,7 +625,7 @@ void mem_malloc_init(ulong start, ulong size) mem_malloc_end = start + size; mem_malloc_brk = start; - if (CONFIG_IS_ENABLED(SYS_MALLOC_DEFAULT_TO_INIT)) + if (CONFIG_IS_ENABLED(SYS_MALLOC_RUNTIME_INIT)) malloc_init(); debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start, @@ -2151,7 +2153,10 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size; #ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT #if MORECORE_CLEARS mchunkptr oldtop = top; - INTERNAL_SIZE_T oldtopsize = chunksize(top); + INTERNAL_SIZE_T oldtopsize; + if (!CONFIG_VAL(SYS_MALLOC_F_LEN) || + (gd->flags & GD_FLG_FULL_MALLOC_INIT)) + oldtopsize = chunksize(top); #endif #endif Void_t* mem = mALLOc (sz); From patchwork Tue Aug 8 22:53:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1819076 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=xUqEbJpt; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=xUqEbJpt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RL7mD6cRgz1yfB for ; Wed, 9 Aug 2023 08:54:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 50DC186826; Wed, 9 Aug 2023 00:53:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="xUqEbJpt"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="xUqEbJpt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 553AC86763; Wed, 9 Aug 2023 00:53:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2061d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::61d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 709B986688 for ; Wed, 9 Aug 2023 00:53:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VFvuwMShYYmOoC/54UcmL8z+TMJBjaRJBHu3qK/sOQ8=; b=xUqEbJptkuPfPnBvxqrrPbTQn9z0lEVO0gefjnEblbAQLCeMo0jpHidp0B8ICZRFnvHWUSPPtaBbQEd6P9+/rwc5sXpuVM2T2dcTZtMhphKH/pV4X+DQyO8EvLqFhXlvFPHZYrgEBN94kZQRV4VbtIwi3nCETHOW2+soJZo8Ly7wIM/ewaODTOc0xuT7HvGN8GKl8LL/DvKmDAqw2k+eyKU6FhPk1X3eevQMLuohHMrH2YvSUnNKFMb+yJYDctyf5eYVmXQJTBF9CTU+ID/O6XjTzPPxybmYsm9lvn5Pq0EtKSGpO319QAM4g/D1QfLmn++mU9cKwYmI5UgJxWQPLw== Received: from AM6PR10CA0104.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::45) by AS4PR03MB8153.eurprd03.prod.outlook.com (2603:10a6:20b:4e0::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:44 +0000 Received: from VI1EUR05FT061.eop-eur05.prod.protection.outlook.com (2603:10a6:209:8c:cafe::6f) by AM6PR10CA0104.outlook.office365.com (2603:10a6:209:8c::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Tue, 8 Aug 2023 22:53:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.81) smtp.mailfrom=seco.com; dkim=pass (signature was verified) header.d=seco.com;dmarc=pass action=none header.from=seco.com; Received-SPF: Pass (protection.outlook.com: domain of seco.com designates 20.160.56.81 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.81; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.81) by VI1EUR05FT061.mail.protection.outlook.com (10.233.242.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.18 via Frontend Transport; Tue, 8 Aug 2023 22:53:43 +0000 Received: from outmta (unknown [192.168.82.135]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 508302008009E; Tue, 8 Aug 2023 22:53:43 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [104.47.14.54]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id A4DF32008006E; Tue, 8 Aug 2023 22:53:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K7zskRrz31yesfMnvIYHl+INFsACnkXGVlggjRhdcYsAsftG/Qn1mGcC9KC3OirF7g9f+2HmrfCfXNACY55g3MEqV4bldOH2Se3AzMsePDOTEaeNW30+JJWlSQyf9riFOnAXwx5FfNS3wCdqaU2tbBHa16xkSgvyukJx4qnYYm0ycygKUNk/kY3mMLc4wIF5jMugGaNdCIfbW+lDToWyMXln1ShQt1DfqDXueMsnTtAKm3ex9r08yqgs0qem2+MlAoqevCBufTQPiJI15hCdRDHhGTKEBRk3Q7vHgZvKfDBc8Ty61L7UqMhM5lF63o2GElW1sk7SlWmNTuzBJI8s3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VFvuwMShYYmOoC/54UcmL8z+TMJBjaRJBHu3qK/sOQ8=; b=SPexcTzMaq+QshzVpFNopTlv3yMY11JyDCqDMFyfdea/Y1nPZeyiF3OUhUkj+8sL31OwT4jZWDeG9QftFrjCVBlVIYE+9QeGfs+HGR/DJtSlCJYRo8f+tMp46Gp7NeBYssTiPK24N71kyP4t7wTUWSc3cbnmBH9eiCrl7DMXwPMTi6DRRDK8Bhv/BFROqV+OIHWlLA2I5TufzEfK+tsxHB7d7ct8htqfJURgrn8MboO8XvO54E/v8ZfzXKOtM5xWsDoDXH/pEYBzdoBhgqs+sI2C1LAwukwO4nfk+7cUkaXHqy6odbvxJK/LygY5lV0K8DpaEKo/ZG4NrEdZ+Gwdlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VFvuwMShYYmOoC/54UcmL8z+TMJBjaRJBHu3qK/sOQ8=; b=xUqEbJptkuPfPnBvxqrrPbTQn9z0lEVO0gefjnEblbAQLCeMo0jpHidp0B8ICZRFnvHWUSPPtaBbQEd6P9+/rwc5sXpuVM2T2dcTZtMhphKH/pV4X+DQyO8EvLqFhXlvFPHZYrgEBN94kZQRV4VbtIwi3nCETHOW2+soJZo8Ly7wIM/ewaODTOc0xuT7HvGN8GKl8LL/DvKmDAqw2k+eyKU6FhPk1X3eevQMLuohHMrH2YvSUnNKFMb+yJYDctyf5eYVmXQJTBF9CTU+ID/O6XjTzPPxybmYsm9lvn5Pq0EtKSGpO319QAM4g/D1QfLmn++mU9cKwYmI5UgJxWQPLw== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by PR3PR03MB6634.eurprd03.prod.outlook.com (2603:10a6:102:7d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:36 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6652.025; Tue, 8 Aug 2023 22:53:36 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v2 4/4] malloc: Enable SYS_MALLOC_RUNTIME_INIT by default in SPL Date: Tue, 8 Aug 2023 18:53:20 -0400 Message-Id: <20230808225320.310926-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808225320.310926-1-sean.anderson@seco.com> References: <20230808225320.310926-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0036.namprd05.prod.outlook.com (2603:10b6:208:c0::49) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|PR3PR03MB6634:EE_|VI1EUR05FT061:EE_|AS4PR03MB8153:EE_ X-MS-Office365-Filtering-Correlation-Id: a21f0e53-52f6-4f8b-6b4a-08db98625116 X-TrendMicro-CAS-OUT-LOOP-IDENTIFIER: 656f966764b7fb185830381c646b41a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Y+ZpYOS+rhxeAiq0qasozaOgujqmk0zAhM2xyNCHpcJ6LSNkYfyLqMnHXU/wO5MuDCzcwjNLeS02LVaBkVT8JqALJ03WR8kK3H9YuCnTYMoKJmPKkuDU6csYFa7roYCzkQlKYBWUMgS5i4k37vD348KHrPMjoS2f8MUTGYFVERUfKlUmr7f+5qNLWxBwWoeDL6JDR03zLDkDEusnglrEBV6bPVOYQjcpnCsupKU9WLiDMX1vS/OELY46J6vmB3EnUGslnC6zaXul9OHMcWHRtUATkNbw8TXcU7ltDTdf6+cqRw6SZKIZUsE6Uj57UJF6x3BUTGvAwPRcfUAlD9Lq9LGTbFAI44P9b6uIHxhvkAj0jPTdYPyjD6tUGEFrry4mNf2LinGyYQfcXjsCLSCp5L8CnYDz0JPKFPnDCH2gHW6iUzX8gIDJwn9dmvFs3SQMUi3ycJRx0KHMFU10xEdYlWYlIkuND6HKZia4Pr/7VPDfIhGcC6F/21lrhdHEoRthdYqCI8YAWJaFMw+X9RoWrFmG964Xk5MGhTScFHUabaRchwZysMDaPGwox5tAggHB8txFwxCQa8vtIImScyPMzRQPkNdZ2iuye301MQiG9cZG4iBCX1lYgRxEnt1/fYZZ X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39850400004)(396003)(136003)(376002)(186006)(1800799006)(451199021)(2616005)(36756003)(1076003)(26005)(52116002)(6506007)(107886003)(6486002)(6512007)(6666004)(478600001)(38350700002)(38100700002)(54906003)(66476007)(66946007)(66556008)(4326008)(316002)(41300700001)(8936002)(5660300002)(44832011)(8676002)(2906002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6634 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VI1EUR05FT061.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 5d85d10e-26d0-492f-8387-08db98624cbe X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ybBaJklz8PtYmDmhQR+m+NC/HEL7ElRLR7XvJugdxY15Dcp/YWqRGEpxgvuOe6Bwk1D7MEp2YmccDkRceQ5cW3z8sj8lls90God117MUH1AMwDgCayO+eBzxAl2FKoJEl+MVwY1MUzQgKrC9a3wCYGoUhm/f6/sBShEokSfqEsoTiQsmqVpm9l++YIRbsBfTMQNN3mLFw+m5Mg5jdU052DFfKVP2M4yh1a9CfuZkqEbpGdUBSw2NEvHCEyb4F/fOxn/4nA2ScBp/8gmqH5FIYY6h2FqDXCwns39/aUmo9Pou9eZibHHECIc7Ev99oxFpiY32tV2RmOOcu512v9qIDsMe9LJW6NALIEtcGBvno+/thEV06r0J9jGkCoJBgex+eh1Gg9UhSxejcaM9UU5tXFBRDqhYnh2tkuU1LOFPpgLrKGLc82TJlpr5VQg3nzpwyaXdRigdZeZOc5eMs0BmPOFsE17EtZW6SPXFqxuqbhg7Je+ELwqgbRWk90/LHIFM0T6qdvzNbA5J/LFjPFB1ONj0Wpbj1QYfEcF8W/nji8VINoZYWsQaY/TlMJY6IRol1/m3QQzTwSPH3XVcnuzlozXcRwATBac3/owcK4adOzDPhlYLBvm0gMTmnjVkCpCV98J/iF9lQqGUI3Lwtl5jZse7kgTloK7DK/jzF/i34i2s5NGzK3JgYRj/YG2R8cr0Ji6iqSA96MMqus8XFVn2dZFU/3xhRLkP+jJtz5nBTe/HCbSii5Lp1e8gfuybWZO9QZPYEPdS1BgRymG7q0PmuA== X-Forefront-Antispam-Report: CIP:20.160.56.81; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(376002)(396003)(136003)(39850400004)(346002)(186006)(1800799006)(82310400008)(451199021)(36840700001)(40470700004)(46966006)(2616005)(47076005)(82740400003)(7636003)(7596003)(478600001)(356005)(336012)(36860700001)(34070700002)(6486002)(40460700003)(6512007)(107886003)(40480700001)(6506007)(26005)(1076003)(8676002)(70206006)(70586007)(316002)(8936002)(2906002)(41300700001)(6666004)(4326008)(54906003)(36756003)(44832011)(86362001)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 22:53:43.6916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a21f0e53-52f6-4f8b-6b4a-08db98625116 X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733; Ip=[20.160.56.81]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT061.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR03MB8153 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean On boards with size restrictions, 1-2k can be a significant fraction of the binary size. Add a new SPL version of SYS_MALLOC_RUNTIME_INIT and enable it by default. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Kconfig b/Kconfig index 4b32286b69d..3cb31a93464 100644 --- a/Kconfig +++ b/Kconfig @@ -381,6 +381,17 @@ config SYS_MALLOC_RUNTIME_INIT reduce the size of U-Boot by letting malloc's data reside in .bss instead of .data. +config SPL_SYS_MALLOC_RUNTIME_INIT + bool "Initialize malloc's internal data at runtime in SPL" + default y + depends on SPL + help + Initialize malloc's internal data structures at SPL runtime, rather + than at compile-time. This is necessary if relocating the malloc arena + from a smaller static memory to a large DDR memory. It can also reduce + the size of U-Boot by letting malloc's data reside in .bss instead of + .data. + config TOOLS_DEBUG bool "Enable debug information for tools" help