Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5F8C0C433FE for ; Sat, 15 Oct 2022 09:19:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2BB7984ECA; Sat, 15 Oct 2022 11:19:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=sancloud.onmicrosoft.com header.i=@sancloud.onmicrosoft.com header.b="QNuyNg25"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1654684B20; Sat, 15 Oct 2022 11:19:21 +0200 (CEST) Received: from GBR01-CWL-obe.outbound.protection.outlook.com (mail-cwlgbr01on2133.outbound.protection.outlook.com [40.107.11.133]) (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 5969584D30 for ; Sat, 15 Oct 2022 11:19:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sancloud.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=paul.barker@sancloud.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FdlaonP+Ir2MZqxWrFUHcCJeKBUVjtD2XiaKzrSEhQBqzkNgxfRNPJOXnvJ/uGGnsTyne4s0dS2IkLOnPTb2B9vVpXq143ypXDc/HAjLdAg7oIR6lxrOliFizsHASXDxBcazZbznRdTjri3TwA554VlHzYlvcdC292fPcbbeMBTHazmifWW1aTe3qzeyI5DRbDQ7caJmjIJGCrrU56DFqKkfCqm4dT32qa63QYjJok5ge8nNCFZQmFdSb6J0pbJfgMM0fTd+Ikaaol024CdV2AIvPsR5u0cXLUCt1aytwKTySXQ+SKONnRNfaFJyQIYhi1cFbo2gYzGP1SbZ1f4mJA== 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=cm5aiYANDMFz305C3runVBX3RyP2VaN1rioR7yz2Ya0=; b=DGLy8tDksQCHJEoRvotkxaK9hEWrn7ts3UBPoZsfE9xkGR6tmKYyttTG9+F+1GOFzmPSV2jUGNXEgnsoVrRp9e4CRvw1pyZVj8VPcUCrMmoBKYuI3loOWSlWuAdUIC2832eunjPnKOuRubPHhw58d2GL6h5+lSIW7mGSwm1H+Fg+JTuxBlHYiyb+TH/zXJsePr5kZ9hd5Xx3lkCFPdqGMiokPYHjapWZj301EP4oiSsYBz4CIOTFfwtVjO2aGlEBKsBcgnJXLeYhYtU9hQ9CoN5ZPohtc4HZOK3op/ia+hbURIrAtiQp6h/Ha2En3197KQaAqTyuIV8l/M6N0vNQPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sancloud.com; dmarc=pass action=none header.from=sancloud.com; dkim=pass header.d=sancloud.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sancloud.onmicrosoft.com; s=selector2-sancloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cm5aiYANDMFz305C3runVBX3RyP2VaN1rioR7yz2Ya0=; b=QNuyNg25bgu+xUXg3a1h1dF4vq1M+A8U39ah0iNTlTrBGKoG3bKD8145kKF06qzzSEqJrpSP7edDw+fNkC3XN+xNP4QFvRbI/we9ctnlsQpwufPwB3X+zkN+aLN9zc1VFf7tyFmN8MdwMP848vz9RVbSE4q4kUsc9kcUVwBIruQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=sancloud.com; Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) by LO6P123MB6789.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:300::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Sat, 15 Oct 2022 09:19:17 +0000 Received: from CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::11d5:40af:9060:6b08]) by CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM ([fe80::11d5:40af:9060:6b08%6]) with mapi id 15.20.5723.029; Sat, 15 Oct 2022 09:19:17 +0000 From: Paul Barker To: u-boot@lists.denx.de, Simon Glass Cc: Paul Barker Subject: [PATCH 1/2] dm: core: Fix iteration over driver_info records Date: Sat, 15 Oct 2022 10:19:08 +0100 Message-Id: <20221015091909.3957290-2-paul.barker@sancloud.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221015091909.3957290-1-paul.barker@sancloud.com> References: <20221015091909.3957290-1-paul.barker@sancloud.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P265CA0040.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ac::9) To CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:61::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CWLP123MB2241:EE_|LO6P123MB6789:EE_ X-MS-Office365-Filtering-Correlation-Id: 776ff95a-3b6b-4e32-7801-08daae8e55aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YUjjlP7ohzxGS9BrbY2L6vKasNICa1YfAYFeDqJoDTL1DAXQI7j0zzv1f0Cit1B1FhUYRJHCOdI9ZyGd/q/zZMzQl52yMRK2S+029HH3GZi+H7cDBpkqspvl740pwhTGhNmEfA0qUvDoXln93HXYlHKMDUyDLQftzowFyqHLmCvSUClBFPugp4UUZCfSx9IGyTY4lmgtZU/YvoBdSASTySzyAuG1dLS607ieMkT02/aoEZCuQxETQYpwP3Qg2Yu4BLjjPHXOIIgAb19Ote/NufKmQ3V1lUPACHE7HhWPJGhB6KApqpZzTau5CXQwqV3wKRIp2KN3BnhsX47zmuK18iu5UhkaHBNpQ10u8frPyRdC9rDTHK1rEEbAwVqvuimgq7WG3y9WSy+YLtHFW08uA9rzWbc0bJropAfq/34ooQsdMs5P+bJsCkAyeBntA9FjXpK86qa/AzsMrQ5yaVeShN6Xx9OTS5gFnlvELkUWdGpHcQDrp/kj5899JTF3/QFlKXgyAdYEBgnCVMI8lTvvDPS7EsG0CJBMGnUgk9Vo3acjEv/8FHK4RzepSKfx7Z0gJ2es4ZvSCeit3k3d/jzxvqXwE4pMTHxEizTQNlawWeEpBFe8XBR4UqwcxwXjvTLPA7t8PgYoYIABMbjanfxH1WdtKHe99CNo0KLuBaPFuuXZ6igE9DRA1d/xcck0TowAt9CSSULQAnUCDadPluFnhH8/oThkz0HywNcSPZvGtZkNrOw7qd8UBOzlIJ/KdO/P5ALd1eqCylAumrH8c2eXTA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(136003)(366004)(396003)(346002)(39830400003)(376002)(451199015)(86362001)(36756003)(38100700002)(38350700002)(2906002)(1076003)(83380400001)(5660300002)(44832011)(6506007)(6512007)(26005)(2616005)(107886003)(6666004)(186003)(52116002)(6486002)(316002)(478600001)(6916009)(66556008)(66476007)(8676002)(4326008)(66946007)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jrITtNS4iGNAgsqMB3yH1tUy2nnTao43GDEOBG6Pjb15vbO74GN6dICp8d1w?= =?us-ascii?Q?AMWqTGAcwe/8krGuqbNAS3juIQhxky4QntLWkABdJCIIVxBQs1wlgDWKwvgl?= =?us-ascii?Q?Hb429MCDUSFqHvnZVESaouZFxLYaDMnoPM2PWD76OQzsmS2RkMSMjq1C+34N?= =?us-ascii?Q?7AUwbxsmceBCD3tc6dPBhqKaMJGmSmKdEnmRLDbvSprQWgm7tEV1E/I1ehKA?= =?us-ascii?Q?xLUV1hwAolMCs9kX5HgHDxFs9Q1aMf876iAswH8UILiD7FkokAKWwMH9fcuX?= =?us-ascii?Q?tV4mKgw0Yi0NyI+L+84tFlYM6B9aZ5izh3Jv55Y7MKLvcB4Wuekgf3YtfD2I?= =?us-ascii?Q?EzAmp2mXuy9Eyoel9679Z1Gx71vWqDjK8CxNuLo1//Et/kNoDshR5jUjE16E?= =?us-ascii?Q?j7mx/i2kLka9EJiQ/EuKoy34QzgMRourGBttF4liR4+6hfx2u/pz/XdlSTf4?= =?us-ascii?Q?mqrz3rklYgPis9AGG/iEl+aHv6jLdvCVJSFI3gPHbhij+l+yHyaIHstm8iHA?= =?us-ascii?Q?+iK3S3xXmOWXtdAf9ViYd8k8q4f6NCM75du3I++09WQurb4z812B9VvHRkNh?= =?us-ascii?Q?h7W1kDbaTEk3GmqW1grL32chpS2QDZ1UILj0hwFwKCQffbi1qd/op3ikA6Q2?= =?us-ascii?Q?KH19gri9vuhNGF50GAk2IN4neZXg+AhaKN/TjplXT7CspZA/Z61V5jpyc+3d?= =?us-ascii?Q?QfV18fa439tq3AIxtTjdT57PiQuChUFrxYMY3cqc5ZssYH7aZBEmXSpc9rhA?= =?us-ascii?Q?dp5RgeMq8kIBLL0nFoWWc/ndwN16wlH29/QrQzkIK7SnJ04ZjGZWPH8e5HRO?= =?us-ascii?Q?qehOaV6x3ATht4h2UoeFx88kuITxYc2PVSk+aapvwC97ZSWfd+kLjmdcfG0b?= =?us-ascii?Q?iDSyVBjYsQuhDeNenISClGrFPzeiKE+r1GoMkDsQh97x3vJj5GD+9Xsa19Sx?= =?us-ascii?Q?xBh65OL2jV2G0g7+lPpDVd9zzz0ToaVbGHTDHQIzIQFzsFXnPbtQrh4AOujq?= =?us-ascii?Q?31dWbCkpMhQb6qBJw0kUgAY9REfk1YJi/SI+80qCqqabQKwsxzplqRWGliTA?= =?us-ascii?Q?uV4TWgoXb3LlnEmJ+6MrjzhPEzruXbecsq/v7OYBmQHav41M8nIfqDtJo0JT?= =?us-ascii?Q?dJYFfItZehpNDZ3Sk8lONEqMfT4IMc1CR/9pVeJ/+bplv8kE8z8oANk/Yz/Q?= =?us-ascii?Q?81n7gno1GKZ4ScC0HTnbgzUcLn3r/tSWt+2g1DeCMfEuy/gHY3DYhKEdeFGY?= =?us-ascii?Q?CzW0UQVHkuYEQIcuwnC2XDeUtKf0enGNfOaCZb6RjHGsnVLNhYQdo4VEZdUR?= =?us-ascii?Q?VYVrVYtBRGbP3hV+p/8IDt2dAdOVoyLpG9sSPTTMyYgPoeAS/jSMlKYWsgWf?= =?us-ascii?Q?9cYQIbgqGHwxU0LfVCWH/JDxsS2MrOV1Qh9VX6yRgTrZfUaY4o9x1Xi5M5s6?= =?us-ascii?Q?9+u4ks4vQ8XjuYF8jY7rK8zH/6OfGMdmVi9jd3Ck1W7bRcehBcpft+6yYn5R?= =?us-ascii?Q?K3qc2gwoDLE/gSiqDs4ccjocWxlqMrNRpNmLwHN7ceLxpaM8O8QjnJbp7B0Q?= =?us-ascii?Q?pah/ziEuCRycGChhAaFrMrYb/kkuanbyksYulmgXQ0Au5Jyg6WgMBW/67fVs?= =?us-ascii?Q?OA=3D=3D?= X-OriginatorOrg: sancloud.com X-MS-Exchange-CrossTenant-Network-Message-Id: 776ff95a-3b6b-4e32-7801-08daae8e55aa X-MS-Exchange-CrossTenant-AuthSource: CWLP123MB2241.GBRP123.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2022 09:19:17.3420 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 840be37c-244a-450e-9bcc-2064862de1f4 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ufRpKBZuTHLJy57yzIs4EBjrcQ3PnWeFlaUtPhzPZ92i9ztoyBpjgcqS9P4PAOpptoFmcogJ+WwP7ZZyK3OG9hynfHFBhLuq8MboU//DGDA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO6P123MB6789 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.6 at phobos.denx.de X-Virus-Status: Clean We should only perform additional iteration steps when needed to initialize the parent of a device. Other binding errors (such as a missing driver) should not lead to additional iteration steps. Unnecessary iteration steps can cause issues when memory is tightly constrained (such as in the TPL/SPL) since device_bind_by_name() unconditionally allocates memory for a struct udevice. On the SanCloud BBE this led to boot failure caused by memory exhaustion in the SPL when booting from SPI flash. Signed-off-by: Paul Barker --- drivers/core/lists.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/core/lists.c b/drivers/core/lists.c index c49695b24f00..82d479564121 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -51,13 +51,13 @@ struct uclass_driver *lists_uclass_lookup(enum uclass_id id) return NULL; } -static int bind_drivers_pass(struct udevice *parent, bool pre_reloc_only) +static bool bind_drivers_pass(struct udevice *parent, bool pre_reloc_only, + int *result) { struct driver_info *info = ll_entry_start(struct driver_info, driver_info); const int n_ents = ll_entry_count(struct driver_info, driver_info); bool missing_parent = false; - int result = 0; int idx; /* @@ -98,12 +98,12 @@ static int bind_drivers_pass(struct udevice *parent, bool pre_reloc_only) drt->dev = dev; } else if (ret != -EPERM) { dm_warn("No match for driver '%s'\n", entry->name); - if (!result || ret != -ENOENT) - result = ret; + if (!*result || ret != -ENOENT) + *result = ret; } } - return result ? result : missing_parent ? -EAGAIN : 0; + return missing_parent; } int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only) @@ -117,13 +117,8 @@ int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only) * always succeed on the first pass. */ for (pass = 0; pass < 10; pass++) { - int ret; - - ret = bind_drivers_pass(parent, pre_reloc_only); - if (!ret) + if (!bind_drivers_pass(parent, pre_reloc_only, &result)) break; - if (ret != -EAGAIN && !result) - result = ret; } return result; -- 2.25.1