From patchwork Thu Sep 28 14:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1840906 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; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=JqUrAH0D; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=JqUrAH0D; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RxGWM32wvz1ynX for ; Fri, 29 Sep 2023 00:46:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2475086E64; Thu, 28 Sep 2023 16:45:29 +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="JqUrAH0D"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="JqUrAH0D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A6BF886E7E; Thu, 28 Sep 2023 16:45:25 +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-vi1eur05on20622.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::622]) (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 B8CA686E74 for ; Thu, 28 Sep 2023 16:45:23 +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=cOmAD6z+IjusRQWp426FOsLRBYMkAjV5sXHsBLcvNjM=; b=JqUrAH0DW1z59Q2lAxlsi88eJJxZMw6OXxsqEZUvkjxlfqMbX9r8vmIRD/HYY797FTJtw1Vh0f8sufJpcpjDcS1P/LEHINDENadkAB+Qdtw7/kivMbkhUJPw4GXFHV47Sa1GEDDPB6A+k9vYNX/nymT6DdQLE7aZR3GSJsrV58Pkwu+L+deyY+9kUlQ8uNyPDEyLb9rk5Cu3gLUi+H3r45tqKmefnSKkcpNITJT5MMcsNCU0hdSvSi68X8fw7jhwc51mD8EAkWPcUyQkk4XRxEbKRHTHHS+Kw4IaP2YrCY2kIscCERF1JVXeYDbrSuwR2aHz4PKD8FzrTUvBYi2PjQ== Received: from AS8PR04CA0148.eurprd04.prod.outlook.com (2603:10a6:20b:127::33) by AS8PR03MB7831.eurprd03.prod.outlook.com (2603:10a6:20b:34f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Thu, 28 Sep 2023 14:45:22 +0000 Received: from AM6EUR05FT042.eop-eur05.prod.protection.outlook.com (2603:10a6:20b:127:cafe::d0) by AS8PR04CA0148.outlook.office365.com (2603:10a6:20b:127::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.23 via Frontend Transport; Thu, 28 Sep 2023 14:45:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.84) 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.84 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.84; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.84) by AM6EUR05FT042.mail.protection.outlook.com (10.233.241.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Thu, 28 Sep 2023 14:45:20 +0000 Received: from outmta (unknown [192.168.82.133]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 3C460200813AB; Thu, 28 Sep 2023 14:45:20 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [104.47.18.110]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 99A0D2008006C; Thu, 28 Sep 2023 14:45:12 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a6+bW2mUWmkY08fJ7sw2aHOepI/I0RCjIqjRxXDFYYfkQ0FWRSN63Kj+ijcUpcmV340hSdy0sUqxVntnqh5zuKxMHzM88NWcwDRDfitV6C2UH9w7fBR1/xVOwaRnWLGIQfmmH01JksJrzuOMZSxhavcSKhKuy10efUcmELLiz5IArr8idsxUzy/Ou/FKnOk1u+p5ePCCqVyURu1yH6t3YCWfTW9Y5R4FWCUTs9Nd2ED3CTeQ2iRSfqipjPW7CpUxnKJv/wDRTfcQi+AlojxiSL4dAnjXUaZ5btdl/IX5ad6QBwqRseI4ZIVm6hgJyarEQcULS2vmg4RZPN68r606bw== 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=cOmAD6z+IjusRQWp426FOsLRBYMkAjV5sXHsBLcvNjM=; b=mbnZ7/bn6NcfQvu4wQ0aA5el1IupFYdzAHUKZKO7U2la7WJEX6uYso9ugKWjj1nkmF90tDLZima0l0bq2w7LxbQvnz4Zk7gup88jDQ3JEHKOZ8DFUGyu5OYsjUZR7XkDekyJDGQOyU3dqyApEyUbtyLeP0wUY3dlH8xfl+CTR4IiDGneQZ4SKspBTLg8CVt3soMWB/aO7tQS92LAF7CFbhftTNOBfLsLPYr3HtuYGjP7tB5HhrEOPUtKWWUx6JzpmBog4ZoMzgAIrfnMa+S9uRAp8W89jKbpN766rVkRjywV/zlLCSLj5L9PSX3TUyj9Myq9wtaxdKkNtedlMT4yFw== 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=cOmAD6z+IjusRQWp426FOsLRBYMkAjV5sXHsBLcvNjM=; b=JqUrAH0DW1z59Q2lAxlsi88eJJxZMw6OXxsqEZUvkjxlfqMbX9r8vmIRD/HYY797FTJtw1Vh0f8sufJpcpjDcS1P/LEHINDENadkAB+Qdtw7/kivMbkhUJPw4GXFHV47Sa1GEDDPB6A+k9vYNX/nymT6DdQLE7aZR3GSJsrV58Pkwu+L+deyY+9kUlQ8uNyPDEyLb9rk5Cu3gLUi+H3r45tqKmefnSKkcpNITJT5MMcsNCU0hdSvSi68X8fw7jhwc51mD8EAkWPcUyQkk4XRxEbKRHTHHS+Kw4IaP2YrCY2kIscCERF1JVXeYDbrSuwR2aHz4PKD8FzrTUvBYi2PjQ== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) by AS8PR03MB6870.eurprd03.prod.outlook.com (2603:10a6:20b:29f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 14:45:11 +0000 Received: from AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5]) by AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5%5]) with mapi id 15.20.6813.017; Thu, 28 Sep 2023 14:45:11 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 1/4] common: Only mark malloc initialized after mem_malloc_init Date: Thu, 28 Sep 2023 10:44:55 -0400 Message-Id: <20230928144458.2511087-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20230928144458.2511087-1-sean.anderson@seco.com> References: <20230928144458.2511087-1-sean.anderson@seco.com> X-ClientProxiedBy: BL6PEPF00016415.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:d) To AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR03MB8832:EE_|AS8PR03MB6870:EE_|AM6EUR05FT042:EE_|AS8PR03MB7831:EE_ X-MS-Office365-Filtering-Correlation-Id: e2ebc3f5-1e38-4fa7-1b89-08dbc03189f6 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: +xgP5tRl/WdH0daalmkrkhCVFNkKtDbbnTUJElKFoKekoJ5YSVSIGFnca0O0U+CWjF6+i+L/LC4ZcWZHQSz/uGmjHcmSEIb5gnNHzT5np0bfWg9Q54nSfQUR1UNf1JiswRlJfDlkjtq3YQNFzvqavtsDe8mZGpR7XdDelaqkQ3VbKMSo5ZCmFOCzDzRt5nqvlDocpm2WYEGGeaD+dpuTR6VcTe/fbNTNA/rtqj2JuHtc4GMb9faXYdZOCl2UXg4SpHVRnw9Vsxl417+SeHTg0A5iCieCVIcWwh0wrcKGW8rSUJkcnvD+rUEmP6eb8kiRe0keTECEPvi2cgWnjthUYebX8qCICRH339sbXVganSWEs3y+NmK8cXzVbQ/IL+uRpr2G2r5eu7ZSWHY26UI7nUqQiefutnpSuAt/n/oPpIBZQgAUnV0h//uj5yjSsQoFvSSiWYBVw5WU0sLn6H9nD2f4mFPItOuIPSVuNAWP7eU5mWyumKfhSjuVlYH0AV1a/ukBZOZ17Ax505Y1GRrsibEiL2SihNNOka2V4O6kw4DgTyGqvNR7fWHy/OPkYdooMCYhO9wZboL5rJXyuio5gJGVTKh6T5N6ZRHWraDkfrhV1zs8LNZ/jjp2BDKPvTQo X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR03MB8832.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(366004)(376002)(396003)(346002)(136003)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(2906002)(4326008)(41300700001)(316002)(8676002)(8936002)(44832011)(36756003)(5660300002)(66946007)(66476007)(66556008)(86362001)(478600001)(1076003)(6506007)(6512007)(52116002)(6666004)(2616005)(107886003)(38100700002)(38350700002)(26005)(83380400001)(6486002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6870 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM6EUR05FT042.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 052ba972-0a89-426f-768c-08dbc03184bd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2LqpE3q5ex26huxrLzWDN8ozopqGIR1xHVHekdUQvimeaa/HA6KZu/XQBd9YgZr6G4PVXbVEp9YbiTfWEf014Og1XZgmQSlUsD5nKBPPq9RQ+qjF3tVb4Z+rzKfkyDXVUBb5liRODhIzWHeXYY6d2tEw+m6bYfqM7s4/0wQeL4/jGJ2kLyFGMKG+fUfnIrUJpD4EP6Xw0oqbYxgA+rmdSzwIxEOyLf9+l4uSFAYBnzKV/M1ic4vM26sMsDrl6L6YK/7UwIZPQ4VKTBx+2EqjjyyyfXvdawGzH6IoOSwB3ht7zAtDwH9ydWSpbJIhX2Y4UWzaQOTjtvX9zHY6Xke4apATriv2mYuls10nLgrFIHQ6nFcbqaqsLaQI3WZ5pPEPVhVH5RSLIVZiSPRSDaVMenButDFi6pPFDwkTuC0AucfeS3lbkNkPMjstAFyUEdImwY9j+IbUivL15mrQLa5rulaz7qjkSv9KVE+UkD+d/HYsytbCa/eMa9LzD6+d1oOGrdmcIgnuTUszi1lR9Qts1MetEHqGxqax64j7PKJzyXSnKzlUICYJhsT2fzcSKWeu44Ol40XNYuZH+yApRvgme6JcLlBrwUHtz0U+phakYdyxIx16Aey5Iwf2yZ9VjNOvKN5FQ98GtO27v4zNU1pY0acPo6bmtIAcSV3+3ESvhM7XuEk+X63EUuCdjHcn3Ze7GFhWTnx9ClBLQ+cP3lNlhp2xcPdAMmdrEsD0a6v1sxQz0ZvVLQw2x6fSEk72/aETuVeAT/Q64H9yUsSUup87HA== X-Forefront-Antispam-Report: CIP:20.160.56.84; 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:(13230031)(396003)(136003)(376002)(346002)(39850400004)(230922051799003)(64100799003)(451199024)(82310400011)(186009)(1800799009)(36840700001)(46966006)(40470700004)(41300700001)(40460700003)(336012)(70586007)(7596003)(356005)(316002)(83380400001)(7636003)(40480700001)(44832011)(8676002)(36756003)(8936002)(70206006)(4326008)(5660300002)(2616005)(6486002)(1076003)(6512007)(47076005)(86362001)(6506007)(54906003)(6666004)(107886003)(26005)(82740400003)(2906002)(478600001)(36860700001)(34070700002); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 14:45:20.3126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2ebc3f5-1e38-4fa7-1b89-08dbc03189f6 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.84]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: AM6EUR05FT042.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7831 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 --- (no changes since v2) 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 52786901be5..cd1e5a3a4c7 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; } @@ -204,6 +204,7 @@ static int initr_malloc(void) gd_set_malloc_start(start); mem_malloc_init((ulong)map_sysmem(start, TOTAL_MALLOC_LEN), TOTAL_MALLOC_LEN); + gd->flags |= GD_FLG_FULL_MALLOC_INIT; return 0; } From patchwork Thu Sep 28 14:44:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1840905 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; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=jF3Je05S; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=jF3Je05S; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RxGW84gpkz1ynX for ; Fri, 29 Sep 2023 00:45:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B405A86E77; Thu, 28 Sep 2023 16:45:25 +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="jF3Je05S"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="jF3Je05S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A45F38655F; Thu, 28 Sep 2023 16:45:24 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0619.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::619]) (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 BECBD86E5A for ; Thu, 28 Sep 2023 16:45:22 +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=C7F9S8FwiYr/5t6O7zorcU52qmbyc95ntyL9yojuj+o=; b=jF3Je05StrRyPmrk0YG18GUAqiYcuGeoKq9uiRZfQ5fXEuobPWM/9xhzaPyDNpNjE0G0J7dBiQfhxN4j6hNqm6lmTZj/FkHWXkAyceeaACNHcO8N5zcQNWZWcBJMSL4JVFZJxwCqo9Y96UBCzQiceBOYRrOmTwbhNFFvu9YEOHnyBp824807v3XCC0np1KlvPOl5n/OOLUsvw1VLoN5AhUZX5becLAvAG7kejglLvRty2h/3Kx+C5DaY5ZOKUtwgatL/Q4OF3BfeN5sa6XRDa6hxt+WVjP1j6PlfUthGHjRe23DyzB3F8yOTlw6QQ7ciCKAtjAHeKwpZRoz1qMi6gQ== Received: from DU2PR04CA0339.eurprd04.prod.outlook.com (2603:10a6:10:2b4::18) by AS8PR03MB7157.eurprd03.prod.outlook.com (2603:10a6:20b:2ed::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Thu, 28 Sep 2023 14:45:20 +0000 Received: from DB8EUR05FT048.eop-eur05.prod.protection.outlook.com (2603:10a6:10:2b4:cafe::73) by DU2PR04CA0339.outlook.office365.com (2603:10a6:10:2b4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21 via Frontend Transport; Thu, 28 Sep 2023 14:45:20 +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 DB8EUR05FT048.mail.protection.outlook.com (10.233.238.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 14:45:20 +0000 Received: from outmta (unknown [192.168.82.140]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 371CF200813AA; Thu, 28 Sep 2023 14:45:20 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [104.47.18.105]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 971952008006C; Thu, 28 Sep 2023 14:45:13 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fJKnkTHqWaYYwK4wB6eqOMGvyRiT6vQjKZ4uHG3Fu/b84LKhO3myERcPC1LPoybLj+ni0ICECnPTL2PTQyUeew/nDSBWBknqlEZ9LT/et4/Mz0oiX7b82X8K/hCIAykdkx+ci/5/BktgqyyzG4kgfwtdXXi4+6UcxDU+/A9hj/7gnfTgWTpH73NKqBKKQzp5wLzrlh6yuQ3wjhj6+1ujNNa4ZZzgo613antuc91jqsV1FdxWi2dvHYEL5BQR+Bvxt3BdyEIATJl9C/Ex8R1BW+x82cjQPK/mQf7C7IoiXpI9AEmuYRS9Yvre1vuYjObGU3/3MGuTxOSzguhTa5AMaA== 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=C7F9S8FwiYr/5t6O7zorcU52qmbyc95ntyL9yojuj+o=; b=KrFdzEF4YI+sRYLM0NL+syiYO2AfGjoYn+k8zMas00fWdSc5Zxph4HvJeZMNyzeTdH606BKJwqgNlMFmxidJwb0T7G8OMdI1LHbJ2rJErJAfZxUkosQ5JIuBOPwEpDc3JAKatoU12LYT53jv0E6FGBR17eJJd6+LAW7VnrJ7QKj9AzoloZfq5RbzqCTwNQdMUpJqdljgAaLF7eUHk4S4iJiOpXMwmo4+fBlhQjI/wAQnmyK4yFlNCJhVo/y3cSCElwROiV4H58JNE+njTPRe1QzxFgSzuoIFc4Ht70uAdMfH8AIaoP8jmVfoUAIHFlzQCElRjQRVtp6cIxhStclVTg== 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=C7F9S8FwiYr/5t6O7zorcU52qmbyc95ntyL9yojuj+o=; b=jF3Je05StrRyPmrk0YG18GUAqiYcuGeoKq9uiRZfQ5fXEuobPWM/9xhzaPyDNpNjE0G0J7dBiQfhxN4j6hNqm6lmTZj/FkHWXkAyceeaACNHcO8N5zcQNWZWcBJMSL4JVFZJxwCqo9Y96UBCzQiceBOYRrOmTwbhNFFvu9YEOHnyBp824807v3XCC0np1KlvPOl5n/OOLUsvw1VLoN5AhUZX5becLAvAG7kejglLvRty2h/3Kx+C5DaY5ZOKUtwgatL/Q4OF3BfeN5sa6XRDa6hxt+WVjP1j6PlfUthGHjRe23DyzB3F8yOTlw6QQ7ciCKAtjAHeKwpZRoz1qMi6gQ== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) by AS8PR03MB6870.eurprd03.prod.outlook.com (2603:10a6:20b:29f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 14:45:12 +0000 Received: from AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5]) by AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5%5]) with mapi id 15.20.6813.017; Thu, 28 Sep 2023 14:45:12 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 2/4] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT Date: Thu, 28 Sep 2023 10:44:56 -0400 Message-Id: <20230928144458.2511087-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20230928144458.2511087-1-sean.anderson@seco.com> References: <20230928144458.2511087-1-sean.anderson@seco.com> X-ClientProxiedBy: BL6PEPF00016415.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:d) To AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR03MB8832:EE_|AS8PR03MB6870:EE_|DB8EUR05FT048:EE_|AS8PR03MB7157:EE_ X-MS-Office365-Filtering-Correlation-Id: beeb77c5-f820-4c2b-d11d-08dbc0318a16 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: /lzQuSuLdZDdLbStDwP2qojxMXHfVzJ/JTOOXK+ItmjlBuFVUtGfhy+VbTpChK1ntRoTfpv2GGht0Afcq/64Joa/6H8x2/do67Xw+QuTfFJZYowmavhvU950MiTkr+WNYzKRt4yllu44tyvZIEfO2MdxS1Xbtk7cOp/IzpCz+/Fp1Mw1zeyryePGWcOCeRR9JU8umXEEgCJblao1MBUqCz0OmXgYSJfWXBHr8nvu4KKVICOObb+UAv4yONDC7rkYfwOlQV8F/4X7MAh5xRR64cSKFMUR0xbcjsISOkeYmekcZ3ux4QD+3VOrRyrgBw5wyCFTi+BRrhFAO8kC8mzQ/daeJge3Hwcl8KCtZ38445UEo0JEZrSiFqtXHaFVofMS6xWZSX1OON22f9QlD8Grq9H1CUS8bL5e3+F5jve4HS05nkK1l5r707rhUurSc37FpXKNYkvZiexj7LirqNPxnxogfUjuPAbR2q1Gu3Z5+7UyEfS6Q4AbRT2IE71KnFmW5ePxNBh2CFEjqGnkdXmK4E+ixPrEivNvYJIJO+BE/qzQkPMXCzbwQunKxdBoJRb8roZ43pEx2Nq6dVq4HSPIUevJVSRi6Bv1n9M+9E1OhBkF5oXk9YxjJ1Kpy52cA5CI X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR03MB8832.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(366004)(376002)(396003)(346002)(136003)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(2906002)(4326008)(41300700001)(316002)(8676002)(8936002)(44832011)(36756003)(5660300002)(66946007)(66476007)(66556008)(86362001)(478600001)(1076003)(6506007)(6512007)(52116002)(6666004)(2616005)(107886003)(38100700002)(38350700002)(26005)(83380400001)(6486002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6870 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT048.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c961f89e-84b3-4016-7a1c-08dbc031856b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qdcw4hK3BKqdmbR+NP3xPsy/cl/OZu7pP3fRJtejLTT/Edss8MlWNzLGQa8l/XaJMsy5QJ+US/ki8yVm787VKjRiyQ2+nUwizTGY9Bq9y/ZjsFUmDaFDBQyKwMAvaq3tL0r2AguWhYNLPmR2kc4RbAlHyh/0xy4YDOV1swTnE/qICmvIIuQVQ+TanVlbrsyc3Cdu8wxPNIY0Xe4HOqPBK5e6rylwApd8yXGWziNYGGwz4eEnuAtU9yR3IDQdhASfQ6mbxNTnQDfRWKuiuk9FeQj5Iwwy/HWwfRGLKylylCc2UDOUOFTOk/16JKPAmODqaRiRcHfbQ0ZoxEJWhDz+lVB9gS+2D4GQ0WtmpZHz383v2KjySoozBVso4Zsxs/IOPZarCsnOFSlE9VCsLq41lijosBUoWhPCMiFWgZmU6cDjtn8kt2hIsOuEPVn2ratKP4wpPohxL74NhG0hRZ7PXKdgdsan7s4KtxNZwRleN7p18TaBRFCv65nMIu9GK3QLTzqtZ5MWfkZa16LsgOmQr0wZbw7J6VoVTFqhbNTlvSDWaeEH7ATZUCbmzLyTb2nAo94R66ACC2BX7j3bYU7Wo4ICLd4P8/7tStuHu+niUT4Rb034Ok74UtCKOdbL26V4XEzebZK53FOs+DceOUr3Ao1QZ+Zy5vGDYX3Xx+9oLKBD5zDL4uyDgSTaWb+MxHsPizSI+rz8zzTEGMWzaZhcMS5LcSzbvfNy0YXx0xz91z7alr5CilTRkjRs6NTJWEGfIUlPh6i28Yblg82hBHbzYA== 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:(13230031)(136003)(376002)(396003)(346002)(39850400004)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(82310400011)(46966006)(40470700004)(36840700001)(41300700001)(8676002)(1076003)(2616005)(107886003)(4326008)(8936002)(70206006)(70586007)(316002)(54906003)(26005)(336012)(44832011)(34070700002)(86362001)(36860700001)(40460700003)(2906002)(478600001)(7596003)(356005)(82740400003)(6486002)(40480700001)(47076005)(7636003)(36756003)(83380400001)(6666004)(6512007)(5660300002)(6506007); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 14:45:20.4957 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: beeb77c5-f820-4c2b-d11d-08dbc0318a16 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: DB8EUR05FT048.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7157 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 c2f5a7347b8..c7cd7815a27 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -575,9 +575,7 @@ static mbinptr av_[NAV * 2 + 2] = { IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127) }; -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT static void malloc_init(void); -#endif ulong mem_malloc_start = 0; ulong mem_malloc_end = 0; @@ -612,9 +610,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); @@ -719,7 +716,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; @@ -748,7 +744,6 @@ static void malloc_init(void) memset((void *)¤t_mallinfo, 0, sizeof(struct mallinfo)); #endif } -#endif /* Debugging support From patchwork Thu Sep 28 14:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1840904 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; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=VudOYSqT; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=VudOYSqT; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RxGVy15Dmz1ynX for ; Fri, 29 Sep 2023 00:45:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F49986E6C; Thu, 28 Sep 2023 16:45:25 +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="VudOYSqT"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="VudOYSqT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13E1A86E7A; Thu, 28 Sep 2023 16:45:24 +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 EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe16::62c]) (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 DF48886E6B for ; Thu, 28 Sep 2023 16:45:21 +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=uQ9Sh7tf5IeqiGsKmB3XeGslnSTZaVJb2zDUYMPOF5c=; b=VudOYSqTeVk2Ax2VU2zjDG/5es7L+GOxtmVK/GNMRlsAQf/AHLbX6nFfs4xmRVtsOy57xpoYBsbE9T3bOYN4M34CrFpw7wBPsHlAuUI9FiLs1W5xHHsbHPhSOUGBzzT8biWJkHwLxQIXv+SGKD/6+9ln5mBPkhi0u6PM/fleQ4nnmZEU1TI7wIkL7jsLpXqQOPbasFlxpKOjHdPg63ew5yDYQDXDHhgSx2VrWZHYQcYoVDjIWIs7bDz87hhn6a/VZf/a2g2FAtI/hFRhPCh2GiNSa5bRmDuTkmF114l6OXPYMFqLqedPM30Ts8tOy09cI7trHuhZ7r6t0RdKttvjfA== Received: from DB7PR05CA0004.eurprd05.prod.outlook.com (2603:10a6:10:36::17) by AS8PR03MB9649.eurprd03.prod.outlook.com (2603:10a6:20b:5ef::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Thu, 28 Sep 2023 14:45:19 +0000 Received: from DB8EUR05FT028.eop-eur05.prod.protection.outlook.com (2603:10a6:10:36:cafe::6e) by DB7PR05CA0004.outlook.office365.com (2603:10a6:10:36::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.35 via Frontend Transport; Thu, 28 Sep 2023 14:45:19 +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 DB8EUR05FT028.mail.protection.outlook.com (10.233.238.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 14:45:19 +0000 Received: from outmta (unknown [192.168.82.133]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id E5A33200813AB; Thu, 28 Sep 2023 14:45:18 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [104.47.18.104]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id C3A492008006D; Thu, 28 Sep 2023 14:45:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ThIqykB7OnjXAUaTT90T5nwVt56nPpcb8LVaHBTJ0N7A2NXY8WLqMFiBmGCuFRhzBc70bpbtvWCY/caNicL9IkYFUONwgA3tvZ0ouzHP2s3qB72woRWMOldMFM9HjJvBlIsiwRFnp2rUtVoH/rfi7GXlQonr/xCWjbz7mprTGZ4vPNS1rm1t1HhydQwl6Z2itmdu/KSiWCyCTKebWjUgmKYr/uoJcMyBbJHXqM9HIXbg0yVBhrUi1ic8OVnq7XndTykSVnkXrZGx3zLPeJ/tTRjq1InPELlmgks5DhJskFD9Dt7IGxqoNiZr/MluXjDSArhDZJSmLaMqyJLW8cmPZQ== 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=uQ9Sh7tf5IeqiGsKmB3XeGslnSTZaVJb2zDUYMPOF5c=; b=MT/U/bH9Z//X0WiUe5oGHg5ILSQiKBQWThdU5lc1BE7mweXMViKRrZCiySEoYIju1j3HTQEJRk7GeNIIBe0Xt/2fPGdrgNrY2pjPIlgb4m0n9hmhjocA+uYFq0Nn8B8trK8D1VSS+z61wNH9J731QrGQ+7XUrJKEw6BSlnuXNxlf6a7rqsajtsz/6aBtYquPC0T268eqzl0+4990McczrLwC+QA+GxsyxSjK0IbGDXP7lxGiELdhbIldQPACeKmL1yR/h7eldOvowoAc+01yZ3jxICGZsYna5jcOQM6Ex5RCwrUAUXggNJP4GvpO9XBgecOuasoXIHjuXZgMTqQt+Q== 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=uQ9Sh7tf5IeqiGsKmB3XeGslnSTZaVJb2zDUYMPOF5c=; b=VudOYSqTeVk2Ax2VU2zjDG/5es7L+GOxtmVK/GNMRlsAQf/AHLbX6nFfs4xmRVtsOy57xpoYBsbE9T3bOYN4M34CrFpw7wBPsHlAuUI9FiLs1W5xHHsbHPhSOUGBzzT8biWJkHwLxQIXv+SGKD/6+9ln5mBPkhi0u6PM/fleQ4nnmZEU1TI7wIkL7jsLpXqQOPbasFlxpKOjHdPg63ew5yDYQDXDHhgSx2VrWZHYQcYoVDjIWIs7bDz87hhn6a/VZf/a2g2FAtI/hFRhPCh2GiNSa5bRmDuTkmF114l6OXPYMFqLqedPM30Ts8tOy09cI7trHuhZ7r6t0RdKttvjfA== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) by AS8PR03MB6870.eurprd03.prod.outlook.com (2603:10a6:20b:29f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 14:45:14 +0000 Received: from AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5]) by AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5%5]) with mapi id 15.20.6813.017; Thu, 28 Sep 2023 14:45:14 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 3/4] malloc: Don't statically initialize av_ if using malloc_init Date: Thu, 28 Sep 2023 10:44:57 -0400 Message-Id: <20230928144458.2511087-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20230928144458.2511087-1-sean.anderson@seco.com> References: <20230928144458.2511087-1-sean.anderson@seco.com> X-ClientProxiedBy: BL6PEPF00016415.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:d) To AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR03MB8832:EE_|AS8PR03MB6870:EE_|DB8EUR05FT028:EE_|AS8PR03MB9649:EE_ X-MS-Office365-Filtering-Correlation-Id: a6e57847-3073-4fda-7eb7-08dbc0318948 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: PGDakCuUn8+WCelprGftBdmV0xm72l/JnLTydpx9fJC6njImUqp80z47dAoUDQuaOH+00y/n329hcjkBO3EMovtpXgoQYs1jF2G0fXQdsB2uQ9gfcY2EG0K6QG8KwxNjNYbFGStwMxVPwGA4CP9WMZO99dQpTlyb6uwhb7IZVzwkAK6XQbka7GkaTemiFEV7FP45np4ljUnCG/u2LmuaHYfMFZoHzsTPtMC5RwcxJFgvWt6YInpPooeEctWejMldF+yZ2ZhTt6G152FDs83+/jZ3GqkvAZzEDI8Ule3y6dRvrwjk3rMyj/vq8uQkY849wJ4LoAKv9HeMG5yFO9pwdLJRFUUA2UnRTinOmoi0IBdKStomqppbyAe035mT2HrxVA1uTGu73Bz/LQ6MYADbI1bJeXJlGHlUdXJYw7/adOFSo86IYmKm/mP+xouBWuFy0Xn1gDHUsj+rJuTviAwNu9bYdMihH4H1IjvD4hvSJv1f6jXtH23PRgM1XyP6Wzqh2/Kcf31T/E043N+iPu06pu+EsRbtDvrByMXvp0Q+0o4i5l+PvVl1vbl8q9uZXsS4SmQxIv/O7+Rp0VNjjdxfaEobGmnqqtcwe0O0VrZvBhq2SPqG7TpJWXDMhg1Z5L6u X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR03MB8832.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(366004)(376002)(396003)(346002)(136003)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(2906002)(4326008)(41300700001)(316002)(8676002)(8936002)(44832011)(36756003)(5660300002)(66946007)(66476007)(66556008)(86362001)(478600001)(1076003)(6506007)(6512007)(52116002)(6666004)(2616005)(107886003)(38100700002)(38350700002)(26005)(83380400001)(6486002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6870 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT028.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: ffeb1cba-ff85-483c-dfdc-08dbc031861b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EgQGGUv3Hbu3SQJQVKlsMdFxX1QqeqNKz0baGJTjIlh8eukhIW3Zs8TtS0AfR6gIuEv5T52s+p1PQf6O4vZByn2godZ0/w9Gc2HVtdScmZz/5a8E0GTvYeYYMgZipRb8fbR+ql8jnHB0dBxOeY2U1B+ndZ6EV1HwczNa8uKRX1ysxlcjthUsRxLJZnRo1azJBsfKWhPPyTukBxg8VSEYZxEFKzdti9NOgDMqxElOsef4F6ygfmgmsx5VcbaPQBLSB/m6AQN4FZfqBo7qCtjmnsrIY5Mo43V7Ij7ccGpvtY7qPQs8R5CWdzjVd1KZusKzFue0qJ8gA/rxOEycGQuI38n7tRePixYmbrHlhbge6Qa5YnYxGZ/u1B9MhvCbPNxhxATQ/vwzzURUo39PKu+4/g5nZ8ShhPLkQJJzl0cwKHBZgu8nS3BFtt8NcFZOdWgSYeZC94PU9IJX7dR9/CtVJkfxzKi3mmEdXMjdKEUNNnFihvWzHjrGHcrnpow3jZQxGc/k+PbO4zv0blKTzeV7bXjDPvQ27T4Zs5ucP522Qz+5t5H95UPMOEDKcDBp532/u2e2P4Kh3S+NYhggbNTkqYXgUBmzvrHY6FZMnVtgr8FYWxwj6jluTFtWs5pGE9+TfmzLqt6RU3FBO995P5P33RUj9xSJGAMT4mbr9hrj1IcJizX8QCsaa8fIuZM6FJMSMdZrtSfuCoVVM1rJdYyC5yYAbdf6qyQRQPbM+15tR3SyZMvrwelkYAw/7DxYabVeEXvysQW2Vm59PnIDw7OTIg== 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:(13230031)(39850400004)(396003)(376002)(346002)(136003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(82310400011)(36840700001)(40470700004)(46966006)(40460700003)(2616005)(336012)(83380400001)(26005)(107886003)(1076003)(34070700002)(36860700001)(47076005)(70206006)(2906002)(316002)(54906003)(6666004)(6486002)(4326008)(8936002)(478600001)(6506007)(70586007)(8676002)(6512007)(44832011)(41300700001)(86362001)(36756003)(7596003)(356005)(5660300002)(82740400003)(7636003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 14:45:19.1436 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6e57847-3073-4fda-7eb7-08dbc0318948 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: DB8EUR05FT028.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB9649 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 v3: - Use CONFIG_IS_ENABLED in conditionals 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 a3061c86124..3967613b232 100644 --- a/Kconfig +++ b/Kconfig @@ -405,18 +405,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 c7cd7815a27..ec1a20fc3d7 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 }; static void malloc_init(void); @@ -610,7 +612,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, @@ -2137,7 +2139,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_IS_ENABLED(SYS_MALLOC_F) || + (gd->flags & GD_FLG_FULL_MALLOC_INIT)) + oldtopsize = chunksize(top); #endif #endif Void_t* mem = mALLOc (sz); From patchwork Thu Sep 28 14:44:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1840903 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; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=2XPlTBH3; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=2XPlTBH3; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RxGVp5TLmz1ynX for ; Fri, 29 Sep 2023 00:45:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB48286E76; Thu, 28 Sep 2023 16:45:23 +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="2XPlTBH3"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="2XPlTBH3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BE3386E5D; Thu, 28 Sep 2023 16:45:22 +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-vi1eur05on20621.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::621]) (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 AD13686E5A for ; Thu, 28 Sep 2023 16:45:20 +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=LPUZSpuq56AV6UfStoLp7dp9l1ubcWbUL8cDDAoe0X0=; b=2XPlTBH3mgAI+S5hkXoFnv0DEZSenQw78SKK8Bv373giH/vfw3+FfI6ev7U19GyE7tqPS+vaNCOjwKRFHN6hFUfvRWlORk67Dxe4Z0ZWRLrDE1p0QF0zIUkw9NIbDFkxffWB4CN1nYL4wVs+k0b9oOCjzX+Zn/cREpZ3W1nAiLDqyje3G3IB9oSDEQIfafYq/AddQPDygDHC+Je6dzHB9nCNgu/0pylwhtQciAynp1fSUeBAUaigoy4kcDyrp3TC/DcY4WI7fOONcaHbFHIsFjGuB74pMmpA1eew/Y2bnpSb8eC39QXZOCdGOnvMN88nPrS7RQzeRNNgzyR4Ccz64A== Received: from DB9PR01CA0024.eurprd01.prod.exchangelabs.com (2603:10a6:10:1d8::29) by AS8PR03MB7285.eurprd03.prod.outlook.com (2603:10a6:20b:2ef::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Thu, 28 Sep 2023 14:45:18 +0000 Received: from DB8EUR05FT014.eop-eur05.prod.protection.outlook.com (2603:10a6:10:1d8:cafe::49) by DB9PR01CA0024.outlook.office365.com (2603:10a6:10:1d8::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.24 via Frontend Transport; Thu, 28 Sep 2023 14:45:18 +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 DB8EUR05FT014.mail.protection.outlook.com (10.233.238.247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Thu, 28 Sep 2023 14:45:18 +0000 Received: from outmta (unknown [192.168.82.135]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id E31A2200813AA; Thu, 28 Sep 2023 14:45:17 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (unknown [104.47.17.105]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 53D972008006C; Thu, 28 Sep 2023 14:45:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WVydDt7w9748rNiNjJSeEtju72mPat70obap3kMcaAcwDn3hm/MYAijRRwfh4Mcn0SW5mthM1UUDfNmt2x5OKGLdX8Qc98lQYRzpejqZV8dYZCOUnT8f8LGKt5kh0sL4XHOzDM4rY2bGjVgI/Kyucy4LABaSgtsUM8EioO6LW2hmlM21H6DyCDlNrUzGkqblJd5wdt+c/mkfI2MyEi/3NDdZJciy5jZUktDtYFqpbL3ZugakP2I3eftGunVXF1j8gORo/j6nQPILJ+yU810z0j0d+xOEYK/+7AcYk4/qBf+nb9d9+uHD8WUibVhvadA4Fd/6Bcr2o4S6gYceNQzWsA== 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=LPUZSpuq56AV6UfStoLp7dp9l1ubcWbUL8cDDAoe0X0=; b=QWMufJ1asHfOoseC2aAZ2aUdEfJ1DWqadY9RuPcJYUfJ1lbacxbuWgCDd7v2FY1Q4QmFTxiQLADqwp85yqJd8X6RwvHKFzU8mORGEvoIrE0XAwO6ua1nm8361uWTvxZ720YsSs4Dlmql9IhzWk4CkjS898D9ngQTg2ScrtxcYGHlhC98maTLqqE5qR5s9Qk8zpBVzmjAJcWYCLDPJTVwzpcSGhZEDp/idg68ZgPi5s1+RC01xZwHWvs+/f9OHNiRMsK1/h7xd21qpIxLlujEDLYb+uYJ5/UpCGVgfDQAprVvDeuvvJzHWq2s2OyYbY/X3eJGJuLDYTn8eK7wIbI6Ng== 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=LPUZSpuq56AV6UfStoLp7dp9l1ubcWbUL8cDDAoe0X0=; b=2XPlTBH3mgAI+S5hkXoFnv0DEZSenQw78SKK8Bv373giH/vfw3+FfI6ev7U19GyE7tqPS+vaNCOjwKRFHN6hFUfvRWlORk67Dxe4Z0ZWRLrDE1p0QF0zIUkw9NIbDFkxffWB4CN1nYL4wVs+k0b9oOCjzX+Zn/cREpZ3W1nAiLDqyje3G3IB9oSDEQIfafYq/AddQPDygDHC+Je6dzHB9nCNgu/0pylwhtQciAynp1fSUeBAUaigoy4kcDyrp3TC/DcY4WI7fOONcaHbFHIsFjGuB74pMmpA1eew/Y2bnpSb8eC39QXZOCdGOnvMN88nPrS7RQzeRNNgzyR4Ccz64A== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) by AS8PR03MB6870.eurprd03.prod.outlook.com (2603:10a6:20b:29f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 14:45:15 +0000 Received: from AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5]) by AS8PR03MB8832.eurprd03.prod.outlook.com ([fe80::afab:7dfd:192:dee5%5]) with mapi id 15.20.6813.017; Thu, 28 Sep 2023 14:45:15 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 4/4] malloc: Enable SYS_MALLOC_RUNTIME_INIT by default in SPL Date: Thu, 28 Sep 2023 10:44:58 -0400 Message-Id: <20230928144458.2511087-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20230928144458.2511087-1-sean.anderson@seco.com> References: <20230928144458.2511087-1-sean.anderson@seco.com> X-ClientProxiedBy: BL6PEPF00016415.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:d) To AS8PR03MB8832.eurprd03.prod.outlook.com (2603:10a6:20b:56e::11) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR03MB8832:EE_|AS8PR03MB6870:EE_|DB8EUR05FT014:EE_|AS8PR03MB7285:EE_ X-MS-Office365-Filtering-Correlation-Id: 037d81bd-676a-4cc9-238e-08dbc03188af 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: PzrjJoPUFY/kQiamQE2TUjlJBG1wJzxn9rkfIHCpydNqsqatqYFW/6f/B2UqFXZUIrtFYIFJ1dgFozM0RKoe0aYukG3YQAaMTMldhM9nx6kKnn62v5bNWG17oRjo9Y8z0B5XOwUHTEZB7BwYq16olEfUbtobc56T6LeNPqICuoA4xM0h2bE7dm2qZkKVCLsUVzqRF0sJjShDmvJxmj7Mhn71ILwH/r28T6/uiJDUKGRm5ataQRZGogAGQrSm4CmVIOLoFud4j1GVwYUVL7HrJd7oHtcpTBFIfR23j2mnZS3Kgkm3HtRXJRtFRr+b7sv++zWMzzVoTtOqviPuKhAiVMdHg+7tVp09P2Br1OzvGrqMbuaNH+ScbawPluTpSFt8lzEpa1dLnLdHNTgQsnhWB0tZaftclMU+uKjOW1Jpwr+kvF+VUQHWtcevlgfVOmrww9k5mYxCTVbtib7W40yd7Mibir1ljZjNaWlT5kWM/rvAXezVbRGbjqziHHIpru5Tz282xG1nFQvoDPSwOZszgLo5zXD1RNDaWUc2HhCwcxMkakXGbpkUJItljCHyfKPBJ99vWdx7KNsvcHXSKC0pQc/9j8AFEvG5efdcaX+OuHY3gtIkv4H8xqee/KyqiZ2+ X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR03MB8832.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(366004)(376002)(396003)(346002)(136003)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(2906002)(4326008)(41300700001)(316002)(8676002)(8936002)(44832011)(36756003)(5660300002)(66946007)(66476007)(66556008)(86362001)(478600001)(1076003)(6506007)(6512007)(52116002)(6666004)(2616005)(107886003)(38100700002)(38350700002)(26005)(83380400001)(6486002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6870 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT014.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 31953179-73c3-4c22-5a79-08dbc03186c0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VOUVOlCtORNrG+44qpAjrAXojpQ9SKUfEQ7dwxa7jWttcM9Pm+lFpOEi1N1UIilvi4ZK0h/5vsvIN+x/jLde3cTqjWBL4z6Q2xUt5TiNno8W6t4Jq7cnhQeu2eDUcJ2q0uRrWS+XrNw/qqCK7+crdbTvzaaKK2V5hawIMOaKPZRTCj65gF8k5QDEkP/PNnfa+NpActoTAjihXIkwmIQSlExpgqOnF4q7uv/9JkieL7GhOgIjvh8uX/JMVSH31uEDQ/guAoPRTHmnvSN2OyPIJLdz/NT3Fn4ZzRyiJiDBl3zkrmTZrRL3JLwjPNXsvpqUnMnTexYvrF9IUoeuajJOQ1Y4jw6aEpwmCZp1mMlMP7bl+ttxVsuJDjoNZcPs2DbTL2bwyobLlAvvSPjl1nDKg5ZSQsy+pHgjB4Vuk4arftEsuNY0EWhYDXPqFvCRF4YEHzr0hPMQM8RXSSXvE2LmE9UzqQNHME4kjnPWLkqwxupmfM6qSIM/OLF5wnR73ezaNMJSkYoKIObqXDRXLzbhu+JY+kxR8VP0xIw0L5bT8nmxSNXDT40K+AsCdHrIiMvvGAhScxibmJrzXg1UbPZVTBpuJbzChm1Ir7J00u2qmJDyz6UUyviBXsC9dzffAkppEdlgTiEVxmoKgKKWsGtzHNYJyM2/ZaTOMf2WYc/QZzYBcoeF2tq06W5yqhjvsSeZWAO5u3QzccgsN3WEJGXDMw6B63WxXcE/e53i/Rg6SgQEpHVV9Y/ahEwD1bOTGhRQh2XC303CVvuc00o34lUcMg== 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:(13230031)(346002)(376002)(136003)(396003)(39850400004)(230922051799003)(451199024)(82310400011)(64100799003)(1800799009)(186009)(36840700001)(40470700004)(46966006)(316002)(41300700001)(336012)(40480700001)(26005)(2906002)(5660300002)(8676002)(44832011)(70586007)(54906003)(70206006)(4326008)(8936002)(478600001)(6506007)(6486002)(6666004)(6512007)(40460700003)(107886003)(1076003)(47076005)(36860700001)(34070700002)(2616005)(36756003)(83380400001)(7596003)(7636003)(86362001)(82740400003)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 14:45:18.1385 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 037d81bd-676a-4cc9-238e-08dbc03188af 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: DB8EUR05FT014.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7285 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. As this trades text size for BSS size, enable it by default only for boards with at least 16k of BSS. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v3: - Don't enable SPL_SYS_MALLOC_RUNTIME_INIT if we are short on BSS Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Kconfig b/Kconfig index 3967613b232..da5986e2fe8 100644 --- a/Kconfig +++ b/Kconfig @@ -414,6 +414,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 if !SPL_BSS_LIMIT || SPL_BSS_MAX_SIZE >= 0x1000 + 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