From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FC8AC433F5 for ; Mon, 8 Nov 2021 16:53:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 42A196120A for ; Mon, 8 Nov 2021 16:53:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 42A196120A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CFD68834AA; Mon, 8 Nov 2021 17:53:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.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=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="vMTdAWu8"; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="vMTdAWu8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9AAA4838E1; Mon, 8 Nov 2021 17:53:18 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::623]) (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 163C0834AA for ; Mon, 8 Nov 2021 17:53:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Peter.Hoyes@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dOq9NnEo4+GS4Ef9ZXjp7G+AoG+oq9EmupauPqq/5e8=; b=vMTdAWu8IkUED3TIW5jiQmZDCJ1bDUp/pbDlcPQb1oJjpo1tCaV/RhA7Uf2akkxKMw65hSVIbiw2YGoPOknDDc52JN3UuMMWv+pRLRSsBGhLXgC5UomyYKIYI5BABlxnas82oU2lfjkULVPVemxE09/s+KHEKZBX+tY1JOo3Oa8= Received: from AM7PR03CA0020.eurprd03.prod.outlook.com (2603:10a6:20b:130::30) by AM0PR08MB3875.eurprd08.prod.outlook.com (2603:10a6:208:104::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Mon, 8 Nov 2021 16:53:12 +0000 Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:130:cafe::4b) by AM7PR03CA0020.outlook.office365.com (2603:10a6:20b:130::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Mon, 8 Nov 2021 16:53:12 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=temperror action=none header.from=arm.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT004.mail.protection.outlook.com (10.152.16.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Mon, 8 Nov 2021 16:53:11 +0000 Received: ("Tessian outbound 6ebd41198c5d:v108"); Mon, 08 Nov 2021 16:53:11 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 6153ac6858abd553 X-CR-MTA-TID: 64aa7808 Received: from 0f3f77b5ccf5.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 40AC6AD5-30C5-423F-84D8-AF078B6EA5C0.1; Mon, 08 Nov 2021 16:52:59 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 0f3f77b5ccf5.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 08 Nov 2021 16:52:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QDcVkzp67di/5cs4o0CVjWV22lyXDMHdHYRXbqMMAcBpvksIT518aVE8KNQ8xWgKJ3I4dIoRxrDN8iiXDyUMdiW7rAVA35Anq0Qz2k+Cys+hPev+wijsEjhKb2fVltwzgJkmpGeEQo09UTewFjWHYtHbNqbsNx7JTxpMrZ4vbqG9i46mEKXo/X+gZaBF7qtgGfEV5iqmzaob2RF24fj/98Mu3DHlVJri/uXmkogvoSFjux9yS1GckMpXpNZTk9h5qTEIlTGcFE+AoRQKTszYm0/9adu6MDqLJfq0HQF9MEqZWPAdZCfChxdMerXiVRcnfBFKmy3vdUmFTp1fGgBV2g== 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=dOq9NnEo4+GS4Ef9ZXjp7G+AoG+oq9EmupauPqq/5e8=; b=K05qQx4qvU+GkLxeJIfFy/h6TaPACkf4LFX+kUf6ebMmnaQ6kI5BmDo5oY6BmuyL+Z9Vlk0vKVyvPBsvR+W2MfkvbhkkqCv9NxTMQkLFpUlkywTfjjzWx9NCuYqhyblkmKCyPAyFK5RS5IF/tf6EJiEELonZSmVif0iSwGmry7oUtXcGNhuNeBi88W6+QRk7b9WczsoCqlDSB6zNIf5V9artzCl61HHM/au/EZ8cOmIf7sUAI5vd0UwvdbxrTNrD6i3eQf5FPzvj43zK2EtSNOG5LSLj21ZixIdIKQoEPr0eJVH4d/blkGJ5nAzKlj4pkjpl8bW7gAkWHNzBGxMkdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dOq9NnEo4+GS4Ef9ZXjp7G+AoG+oq9EmupauPqq/5e8=; b=vMTdAWu8IkUED3TIW5jiQmZDCJ1bDUp/pbDlcPQb1oJjpo1tCaV/RhA7Uf2akkxKMw65hSVIbiw2YGoPOknDDc52JN3UuMMWv+pRLRSsBGhLXgC5UomyYKIYI5BABlxnas82oU2lfjkULVPVemxE09/s+KHEKZBX+tY1JOo3Oa8= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AM6PR08MB4280.eurprd08.prod.outlook.com (2603:10a6:20b:b6::19) by AS8PR08MB6294.eurprd08.prod.outlook.com (2603:10a6:20b:29a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Mon, 8 Nov 2021 16:52:58 +0000 Received: from AM6PR08MB4280.eurprd08.prod.outlook.com ([fe80::a1ef:2d00:96bb:ab94]) by AM6PR08MB4280.eurprd08.prod.outlook.com ([fe80::a1ef:2d00:96bb:ab94%7]) with mapi id 15.20.4669.016; Mon, 8 Nov 2021 16:52:58 +0000 Subject: Re: [PATCH] cmd: pxe_utils: Check fdtcontroladdr in label_boot To: Ramon Fried Cc: Andre Przywara , U-Boot Mailing List , diego.sueiro@arm.com References: <20211014084004.3173835-1-peter.hoyes@arm.com> <20211015122055.18406866@donnerap.cambridge.arm.com> From: Peter Hoyes Message-ID: Date: Mon, 8 Nov 2021 16:52:54 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-ClientProxiedBy: LO4P123CA0161.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:188::22) To AM6PR08MB4280.eurprd08.prod.outlook.com (2603:10a6:20b:b6::19) MIME-Version: 1.0 Received: from [10.57.81.172] (217.140.106.13) by LO4P123CA0161.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:188::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13 via Frontend Transport; Mon, 8 Nov 2021 16:52:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2435bef2-f75e-41f5-b31e-08d9a2d83fe9 X-MS-TrafficTypeDiagnostic: AS8PR08MB6294:|AM0PR08MB3875: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8273;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: EWErGPmUoxBAJ+ydMoAUN0U+vsqMSUBaCxyj3VFFgOFH7DFQrFNlFQYC+Bn9bybipw+/WcGpba2pqp6Hfy4kAZvccW0i2RKU0oUJecIOH0pT1u9HsKhPsjvHvp9iVU//nQrZQyEvqtot26NtzJOAKPTz1nLaEnpZtrz9ae4vhHh9GAZGT93/hGhyed2vshEqka4XqknUkx7MGxj5C2nWLrDwc0A874zHISD18w593rqWlmObv3//DOj31r2xpcMe/DMfrIG7vs7yLZBomatfux8TF7uVIzt5T64vcJaVtv6MD9GY1OXjYCj8B8KPNYlLP2NPNO3RJVH+nauDYEBqSf4dkqjsZC1LoMbwfAesJPMpjNYB0iCACTO+XUtOGBPDRn1M8Gq91OuvOYWbLr0fMX1EtwAkXVHHnlg2YD4vAYTXSNqd+QMToqDEcU/4JOYViR4i73VduAOer0IeJH0OwiJST85ss9lJfX5tBmwLMnX13HXFgb2o/Vh0oVHXjp1I4b8VSCwLJlwV3YYUm7FMv4a+x8myZmAjd8fjTYnrr7Y/d1OQsnRmtVqFou7UBRiZ1s3DjWdrlSSGnIWlOR8S8vtRhByBgGqIhCeDwIS4smpKe6xevSyptP/ujBkEsQfjl0f57CpUqswKIwajXT1oh0cwFQSmUcr5uZPaaIOv/j3tAas5mBJKsk1TXtyMuxvwr9pWCR6Qy0Xkc0dQg0Q0skP0zxoDZlrF5LuOpKSmhHvlu8eWrXwWojEnNPrzgQrLvE5xKhBQkNy8UTBdr53MYFmOxYrZv/dqFAGrVVj1sQHVUGyNDypOIqDJ+Cgxf6ga X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB4280.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6666004)(26005)(6916009)(4326008)(8676002)(31686004)(53546011)(6486002)(8936002)(186003)(2616005)(956004)(86362001)(38100700002)(2906002)(5660300002)(54906003)(16576012)(66946007)(31696002)(316002)(508600001)(36756003)(66476007)(66556008)(83380400001)(966005)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6294 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 29a4539d-4f3d-4574-2f4b-08d9a2d83764 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9bWU36GuPyNLg9YmFfDve66RDbQ23EKQx0QL+DxIIbGZwAxT3igaqFB5mWN2+arDk9qA4CK5dNz8zlRxGWzNfmFGHPje8PqUvmOAOOlKMT2GzL/UtcRbS0d8ejDb/Q2UeElAGdvNjwoo0GAEFYSvvcszPJF4k4tLc/9sGboaTzDe7KTEB6karnGo5/S6VIwKyJOLJtEH2imFQOA6MDH9FXbvGQ7bGIFv+A+kdPX4cZEdwfBM9g2y7OxQRytQ7SXTvuPsl7g+3PFNsOFAgt8uH3V5aelOZUhly4q6X4IT3rOilk8xCgP3fP++7jDtgVe9UdgaPY/z3OtUGoqGSWrLtAXsrn5/6zLgRIq6pITflaWzsL37ThW/NTaXO/aNXvG7oeB2RTgZSYGX9stQmoalsmDyfapCflGaDxpPLDFlEDbVaodehA8HVAoH7cfF/s4XDibYJKPG83STphxVZO1G8aoVaVkRkR+N4F3YqlQHVVUA7GjKo7ltRzE3ak8KyS/FLrM/BjY8AHSQuMbjtWpSmucCi+jXD0iYHokCdDm5R68xIXZsjmWlisyM2m8XCWWSATpXQZj+YeKGzvEg3O5SAiuoqGXeKuGa8+yJLLhfMW/OwBz0iquLWj1+hpNR6DrMRB3Jld9BqQnMf1mQT0HTNckVO277v8+9e0WIJRWWAG3NrBNWhfSareRweIzUpcAhiO7p38RJlQ8/Abs7w0yvyGL8oB86tcMYfJm413mekFrUy7W+Qbt88LdxdG/fXeimrgNUU+Fw9Z1UaVBVuukVDmRIaHnXbjNeTNt5Vvp5WXOeWgvh7atKUNp85RDv+G9q94n+bW550rMeFIURBT9+Fd5WlptBn9q+uOo03BE4Q8Y= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(83380400001)(54906003)(316002)(82310400003)(16576012)(86362001)(70586007)(31686004)(6666004)(8936002)(8676002)(356005)(2906002)(31696002)(966005)(47076005)(4326008)(81166007)(36860700001)(63350400001)(6486002)(5660300002)(508600001)(336012)(53546011)(2616005)(26005)(956004)(186003)(63370400001)(70206006)(6862004)(36756003)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2021 16:53:11.7922 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2435bef2-f75e-41f5-b31e-08d9a2d83fe9 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3875 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean On 28/10/2021 19:55, Ramon Fried wrote: > On Sun, Oct 24, 2021 at 10:56 PM Simon Glass wrote: >> Hi, >> >> On Fri, 15 Oct 2021 at 05:21, Andre Przywara wr= ote: >>> On Thu, 14 Oct 2021 12:24:45 -0600 >>> Simon Glass wrote: >>> >>> Hi Simon, >>> >>>> On Thu, 14 Oct 2021 at 02:40, Peter Hoyes wrote: >>>>> From: Peter Hoyes >>>>> >>>>> If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configu= re >>>>> U-Boot. When using PXE, if no fdt is defined in the menu file, and >>>>> there is no fdt at fdt_addr, add fall back on fdtcontroladdr too. >>>>> >>>>> We are developing board support for the Armv8r64 FVP using >>>>> config_distro_bootcmd. We are also using OF_BOARD and would like the >>>>> PXE boot option to default to the fdt provided by board_fdt_blob_setu= p. >>>>> >>>>> Signed-off-by: Peter Hoyes >>>>> --- >>>>> cmd/pxe_utils.c | 8 +++++++- >>>>> 1 file changed, 7 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c >>>>> index 067c24e5ff..8f8e69ca97 100644 >>>>> --- a/cmd/pxe_utils.c >>>>> +++ b/cmd/pxe_utils.c >>>>> @@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, str= uct pxe_label *label) >>>>> * Scenario 2: If there is an fdt_addr specified, pass it al= ong to >>>>> * bootm, and adjust argc appropriately. >>>>> * >>>>> - * Scenario 3: fdt blob is not available. >>>>> + * Scenario 3: If there is an fdtcontroladdr specified, pass = it along to >>>>> + * bootm, and adjust argc appropriately. >>>>> + * >>>>> + * Scenario 4: fdt blob is not available. >>>>> */ >>>>> bootm_argv[3] =3D env_get("fdt_addr_r"); >>>>> >>>>> @@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, stru= ct pxe_label *label) >>>>> if (!bootm_argv[3]) >>>>> bootm_argv[3] =3D env_get("fdt_addr"); >>>>> >>>>> + if (!bootm_argv[3]) >>>>> + bootm_argv[3] =3D env_get("fdtcontroladdr"); >>>>> + >>>>> if (bootm_argv[3]) { >>>>> if (!bootm_argv[2]) >>>>> bootm_argv[2] =3D "-"; >>>>> -- >>>>> 2.25.1 >>>>> >>>> This is a bit strange as fdtcontroladdr is the control dtb that U-Boot >>>> uses. >>> Yes, that is the idea. This DTB should be as good as any, and this is t= he >>> last check before giving up on DTs completely, so "U-Boot's DTB" (actua= lly >>> there is no such thing) is better than none at all. In fact EFI boot do= es >>> the very same thing: >>> https://source.denx.de/u-boot/u-boot/-/blob/master/include/config_distr= o_bootcmd.h#L144-L148 >>> >>>> Can you not set fdt_addr to that, if you need to? Is it not >>>> already set to that? >>> According to doc/README.distro, fdt_addr is reserved for DTBs residing = at >>> a (fixed?) ROM address. We don't really know yet where the DT comes fro= m, >>> the cleanest seems to be to be passed down from TF-A, in which case thi= s >>> would definitely not be ROM. board_fdt_blob_setup() knows this address, >>> and this is what will be written to $fdtcontroladdr. >>> >>> FWIW, this patch looks good to me. >> OK. >> >> But note that OF_BOARD is going to become an option, not something >> that let's us leave out the DT. Board vendors must provide a DT in >> U-Boot. So long as that is understood: >> >> Reviewed-by: Simon Glass >> >> Regards, >> Simom > applied to u-boot-net/next > Thanks, > Ramon. Hi, Thanks for accepting this patch. I wondered if you could give an indication when it will reach u-boot/master? Cheers, Peter IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.