From patchwork Tue Apr 19 08:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bedel, Alban" X-Patchwork-Id: 1618821 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-l2task-onmicrosoft-com header.b=g4GXeRGA; dkim=fail reason="signature verification failed" (1024-bit key) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-l2task-onmicrosoft-com header.b=WldzEDfu; dkim=pass (2048-bit key; unprotected) header.d=aerq.com header.i=@aerq.com header.a=rsa-sha256 header.s=hse1 header.b=geoqreYj; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KjLZw4pclz9sFx for ; Tue, 19 Apr 2022 21:06:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2973D83D44; Tue, 19 Apr 2022 13:05:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=aerq.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.b="g4GXeRGA"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.b="WldzEDfu"; dkim=pass (2048-bit key; unprotected) header.d=aerq.com header.i=@aerq.com header.b="geoqreYj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AD43583AD1; Tue, 19 Apr 2022 10:14:36 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx-relay54-hz2.antispameurope.com (mx-relay54-hz2.antispameurope.com [94.100.136.254]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5001383531 for ; Tue, 19 Apr 2022 10:14:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=aerq.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alban.bedel@aerq.com Received: from mail-he1eur04lp2052.outbound.protection.outlook.com ([104.47.13.52]) by mx-relay54-hz2.antispameurope.com; Tue, 19 Apr 2022 10:14:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=l2task.onmicrosoft.com; s=selector1-l2task-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v5eynqRyVJkGbx/5p4SbrqqqgMd63Wa65U1viEKAmPc=; b=g4GXeRGAGJ72xqi0zOPsOnguFw/1wT8HkqkXPs2kOMkhVzH5dZV7HCgUKwsYYMNdR0V5yeD4y6mz0ak6MrVCpQai/vToouUeSu1GcYxM1rURMjPtE3biM4iROs+ZHvJpQWN2T/DcrcLfPlsA4x1lFUdSi5j0Xks1SbE/8NMsPRI= Received: from AM6P191CA0093.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::34) by DB4PR10MB6144.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:388::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.26; Tue, 19 Apr 2022 08:14:24 +0000 Received: from VE1EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8a:cafe::c1) by AM6P191CA0093.outlook.office365.com (2603:10a6:209:8a::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.19 via Frontend Transport; Tue, 19 Apr 2022 08:14:23 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 52.169.0.179) smtp.mailfrom=aerq.com; dkim=fail (body hash did not verify) header.d=l2task.onmicrosoft.com;dmarc=fail action=quarantine header.from=aerq.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning aerq.com discourages use of 52.169.0.179 as permitted sender) Received: from eu2.smtp.exclaimer.net (52.169.0.179) by VE1EUR03FT003.mail.protection.outlook.com (10.152.18.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5164.19 via Frontend Transport; Tue, 19 Apr 2022 08:14:23 +0000 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (104.47.8.58) by eu2.smtp.exclaimer.net (52.169.0.179) with Exclaimer Signature Manager ESMTP Proxy eu2.smtp.exclaimer.net (tlsversion=TLS12, tlscipher=TLS_ECDHE_WITH_AES256_SHA384); Tue, 19 Apr 2022 08:14:23 +0000 X-ExclaimerHostedSignatures-MessageProcessed: true X-ExclaimerProxyLatency: 6534468 X-ExclaimerImprintLatency: 418039 X-ExclaimerImprintAction: 6f077ff0949b4bda8e37aaafbd7497ab ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nJ3eLF5GdR518DMMmAMHO/GYRZUjeAVXBGvT2CF4RC2Tqj0DdSdiVeYsLAwgBVzk7aGo7LaytOtR28+bxoQOSSibu24Vb82jQMANtzRhaNqepsGk9tRBM+PuWpvx0XxpnQd8yKK+DuhQtZnxdY0cIdAEfjcmMyBpeO1eP1z8l4WkAYv5lVW8CwZsYtycdDfZPXe1fb9SyyrhOGy+2pg4IrsgIjNmvvTc3IG7xEDbPeDt12GCOoQCEt0+jYBiyVtgcWIbKp5OPzc8+Gv32hA6xxBJvQuhTvuBDBW8ZKxxCDUIl6fcitFgZLYxXIbtJ7m609ZNVNceUku0eQv8k7mqKA== 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=DsT47KhFmuDHEKEYpTLlZt84Xht8CDpHisnk1INbjwU=; b=TwzTl9LHzNHM1oAvdC3WmMoDcRqhWn7ukwsa3nqZ8L5NBAhh14DSypvP7jD+AP94PfU3mA61f+qTWQgxYlMbtZWLIWwFdfnlpZH7XcPkgG0FOG2bt0paFRh4gdZKso/rsdE/BWTx/9epLg7tQ2cv2DDfPTcCu8MrzbrsLklRrEITJ3xtv5T2ra3rZ9BkI3gEvcxOQdODlR8m/BlTZtBCONfNWOmOzcbvpVbPPj+u6+kjdheBNf9yK/3T2N3Z9eZqwOXMBLcMRDedamlX1LTejerjLimYG+VWcTh6xRwRLYCRBm6pwrKbA1hy7aYYzXIRSf57L6KYKiSDmAF0VxUNSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aerq.com; dmarc=pass action=none header.from=aerq.com; dkim=pass header.d=aerq.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=l2task.onmicrosoft.com; s=selector1-l2task-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DsT47KhFmuDHEKEYpTLlZt84Xht8CDpHisnk1INbjwU=; b=WldzEDfu1wwJlFqt5dszUx88SOSyTH9LVQNFgufbA4ibFJiVoeGEj7vj+JX7J9nPNnDMOW9bh5ZYriUHlzokuQq8vluW7s7qTqUo3S3nlaWIkZbH4KM0gPEOsaF24p4dGzV2xEE/BNC2hHpxIkgCh+d/LPx9p7fSDSbGWKH8XGg= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=aerq.com; Received: from AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:405::24) by GV1PR10MB5818.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:51::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Tue, 19 Apr 2022 08:14:19 +0000 Received: from AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM ([fe80::c88b:46b9:deb7:c8c5]) by AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM ([fe80::c88b:46b9:deb7:c8c5%9]) with mapi id 15.20.5164.026; Tue, 19 Apr 2022 08:14:19 +0000 From: Alban Bedel To: u-boot@lists.denx.de CC: Simon Glass , Alban Bedel Subject: [PATCH] devres: Use the correct devres implementation in SPL builds Date: Tue, 19 Apr 2022 10:14:04 +0200 Message-ID: <20220419081404.75391-1-alban.bedel@aerq.com> X-Mailer: git-send-email 2.32.0 X-ClientProxiedBy: AS9PR06CA0233.eurprd06.prod.outlook.com (2603:10a6:20b:45e::14) To AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:405::24) X-MS-Office365-Filtering-Correlation-Id: f05b47d9-da61-4905-11ca-08da21dc9cc8 X-MS-TrafficTypeDiagnostic: GV1PR10MB5818:EE_|VE1EUR03FT003:EE_|DB4PR10MB6144:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: +l+qlFsplliP5GXIgeaBCGpjy72IufyZDTQrv4fXlPD4YHz7ZaMYgCqPIyy6VpJBW1f+g2nTCAQqxy28M+lhZduEgRkYR31EwyeiKl+9kNRwmGHTgMyibzspEd3XZjEB/1dNckTDSy2Ts/t77Vql7syaHIuJ63DPyig9Fx7E+jIzef+K/qBgTRwTxHbVeRkzJh8AwWXMDL3Czo0v4emN0UNKkKS9nk8aovP+F0FS2D78u0r9cpD/VRq0EX/5vQXQEnJ3ENVAINBRjbDAL30WU411td3XkCfvszgEzP6WhQAT7lS9BR0ihjMGfVWEAu5lHkxNR7QP+jTn4oOMtKFMRZakmKEfoEt+QZJjO9UHn5itr9YJgtTf6GqtGwhsmiQHg0D0kBS9BjpWu2JCgoCZnAV7dGJPKoej0/DNk7+p+6xb5UwjU+atty4cPfZYATEttO1iqGg4xvK2Jrpsvr0w8rr1ep+fz8lDGsyDQJPLbU9l1GnhfcwaF0wVCz6mQH5aAgxkZ97XstcCl8InwqGHAf/LtV6at6hYxatLzMf1otd2dIVyktqEhcGciHV14e6BTubthvSTXt9yG0QZ7fCQGxu2UDCosXQzkQqYj4/Ln02E/m12CRzRMkrFBapO/DvlUFzQYZo0RI/KHpzXnv0YlQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(107886003)(6666004)(316002)(186003)(6506007)(66556008)(4326008)(66946007)(66476007)(54906003)(52116002)(2906002)(6916009)(1076003)(44832011)(8676002)(36756003)(86362001)(38100700002)(83380400001)(8936002)(2616005)(5660300002)(6512007)(6486002)(82960400001)(508600001)(4744005); DIR:OUT; SFP:1102; X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR10MB5818 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: a3891e06-a50f-4da4-70e4-08da21dc9a23 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9dco370U+wyy94z5vJDyis5wy4RipCPH7acKTsi/+iHiB/BoG9nAbhxXnpZgdyWPIVqtanlz5AGXFEtUpzMk0ZPXBCSBg8paRUKLQW80V9Hy6wiPEm+pjaO61cN3QTV4Dr3g9p2fV1MX7f9MCGfHufqUrTQ167Na/XJ5uFcjbziDV7vLEkY10Mye8Mn9yDTLPZsa/5h42QK1OmmNt9LsWvgGHY9xdIqE6/QvqBje3/rPIE4jYU2WE5DYSDujR0/2cz68fHCxBiQ3AcIIatOrJgKTG7Px3B6fcOedjazVGSpAYyxJ5cBJepDaNSY6G1HdzhbJ1EM246s71mMw8IMX9vUmfygeuSNodWftJsH8haurxBa6vJYvmzgvFCSFJ5ot+9bXSrqaSkjXXsEf20WQkUoooDPd5ygyWvxSxJRXepKZnQ0mln2lykiDREa0aplBvUAHBLXQWtg+WK3QlcFTA0v1hrJSUmi9K4jRlgwxeW++At+1L+EqpSeoW8HEQ3q7ViH6BE5G+395/AlfzJKTjKT3j93lChxs23xJXizLKvTWgFJrBlT1tIauFtj+Jnv9vrPPls86GIU4n9Tr9HWsl6KwGunIAkdp+Rm6a22r7OHEgvgIaOzmLhoo2epptxVGqV8r+C5JGDGQqqg78Wlu8A== X-Forefront-Antispam-Report: CIP:52.169.0.179; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:eu2.smtp.exclaimer.net; PTR:eu2.smtp.exclaimer.net; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(26005)(86362001)(508600001)(186003)(6486002)(6512007)(8936002)(2616005)(1076003)(107886003)(44832011)(2906002)(6666004)(83380400001)(5660300002)(6506007)(4744005)(336012)(47076005)(7596003)(36756003)(7636003)(70586007)(70206006)(82310400005)(4326008)(8676002)(54906003)(6916009)(36860700001)(82960400001)(356005)(316002); DIR:OUT; SFP:1102; X-OriginatorOrg: aerq.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2022 08:14:23.0882 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f05b47d9-da61-4905-11ca-08da21dc9cc8 X-MS-Exchange-CrossTenant-Id: bf24ff3e-ad0a-4c79-a44a-df7092489e22 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bf24ff3e-ad0a-4c79-a44a-df7092489e22; Ip=[52.169.0.179]; Helo=[eu2.smtp.exclaimer.net] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR10MB6144 MIME-Version: 1.0 X-cloud-security-sender: alban.bedel@aerq.com X-cloud-security-recipient: u-boot@lists.denx.de X-cloud-security-crypt: load encryption module X-cloud-security-crypt-policy: TRYSMIME X-cloud-security-Mailarchiv: E-Mail archived for: alban.bedel@aerq.com X-cloud-security-Mailarchivtype: outbound X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay54-hz2.antispameurope.com with 0A67859CA16 X-cloud-security-connect: mail-he1eur04lp2052.outbound.protection.outlook.com[104.47.13.52], TLS=1, IP=104.47.13.52 X-cloud-security-Digest: 0ca907faa59b8711aa9b1b83916f20c0 X-cloud-security-crypt: smime sign status=06 sign_complete X-cloud-security: scantime:2.049 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=aerq.com; h=from:to:cc :subject:date:message-id:content-transfer-encoding:mime-version :content-type; s=hse1; bh=Se1AsL7FDZgSvtxftVIajRzay2F9LDLBPzxwJX 1B7GE=; b=geoqreYjWVs32vRm+kdtmGEIjxOH6BswTwmqbqnRNQ9csjq5YUgJVx CKiNfxae9EG45iTP/250iHnqOO5Um84fxAyuDERvIyXj/asboDldOK6K3IWVZ0Lt W0fzAaW49zZUUSuCAFAu8AJf6XO2dFkpNNwDR+eH+qzegW6yFOvEWbJCrw+2ehqR oVE151l0fEwmrEuMcPcyk/706G3WYRRtdvooqJgxOqQJ6S6I9rBuYNrIrjIXibac gseUdPFqv7vcyskEnjNFo4ZHF26QHRGLURVUpyTzF/06ibELUvFIyf2wfyQlKbqC +qzZpu72O1L70E6jiiBZE9Fxp41CRTbA== X-Mailman-Approved-At: Tue, 19 Apr 2022 13:04:55 +0200 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.5 at phobos.denx.de X-Virus-Status: Clean When CONFIG_DEVRES is set, but CONFIG_SPL_DM is not set devres code is not included in the SPL. But dm/devres.h only check for CONFIG_DEVRES to select if the full implementation should be used. So if any devres function is used in the SPL with this config the link fails. Fix the ifdef in the dm/devres.h to also check for CONFIG_SPL_DM in SPL builds. Signed-off-by: Alban Bedel --- include/dm/devres.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/dm/devres.h b/include/dm/devres.h index 0ab277ec38e9..8765b73d5e90 100644 --- a/include/dm/devres.h +++ b/include/dm/devres.h @@ -30,7 +30,8 @@ struct devres_stats { int total_size; }; -#ifdef CONFIG_DEVRES +/* devres is not available in SPL unless DM is enabled there */ +#if defined(CONFIG_DEVRES) && CONFIG_IS_ENABLED(DM) #ifdef CONFIG_DEBUG_DEVRES void *__devres_alloc(dr_release_t release, size_t size, gfp_t gfp,