From patchwork Mon Jul 24 18:09:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1812026 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=aJgUitu5; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=aJgUitu5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R8p9P3PLwz1yZw for ; Tue, 25 Jul 2023 04:10:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C35B866AD; Mon, 24 Jul 2023 20:10:13 +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="aJgUitu5"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="aJgUitu5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A01CC80ADF; Mon, 24 Jul 2023 20:10:11 +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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0616.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::616]) (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 56AD88674E for ; Mon, 24 Jul 2023 20:10:09 +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=AqKBzLZ8vQo+Lwm3qagKeS/dblv/hSKZmAWnsDsTwT8=; b=aJgUitu5JbsbtZfexqopMfztnh8SIwp0swriKz8rHki9CUhBjPh6A6zDFoGfVC0R5EbIoq/NTlk/02HchpcYzv5ThL9SJk5gW5WMtvXC1IohQOcU9quxTwrBIyemR2ZPUNOj2dSUCbKNx8+dJ9TPbCJ2tpOyK8ydtt1GY387znjubo3V2Y0AV44lbIbPWfODzEdkeNu7+08lwL52qR4ZvUvLmg4wA7koAvTVGdXuWt8ZzBLmoylnbly7JikfO54HS6Pbil5JzcfbB/yHs227sl0vfOD6WDNTJb88NJ40DSw7UuGMadCI13Jz9tXgvXRieox330YHVrr/LxXfOBT8BA== Received: from DU2P250CA0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::27) by DB9PR03MB7387.eurprd03.prod.outlook.com (2603:10a6:10:221::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Mon, 24 Jul 2023 18:10:07 +0000 Received: from DB8EUR05FT020.eop-eur05.prod.protection.outlook.com (2603:10a6:10:231:cafe::2e) by DU2P250CA0022.outlook.office365.com (2603:10a6:10:231::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32 via Frontend Transport; Mon, 24 Jul 2023 18:10:07 +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 DB8EUR05FT020.mail.protection.outlook.com (10.233.238.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.25 via Frontend Transport; Mon, 24 Jul 2023 18:10:06 +0000 Received: from outmta (unknown [192.168.82.137]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 2BF9E20082C89; Mon, 24 Jul 2023 18:10:06 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (unknown [104.47.12.50]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id D2ECB2008006E; Mon, 24 Jul 2023 18:09:58 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EdI5xJe5wqxeoWCzj3f9L6V1HPRxCkrVFsYz+kz+eeLdVKwgJDvt6dzYxKOUbRAOnrS22BiMxELES3X9SWOI864Y2LE7jJr7MuKxbGdyq+Hp1HsIij/wwFPBNfvcQncW+ymDKmsC8nstKqS4Ubu62NQWN6PaMBzNQC2KUIY8XjceiyibIrW/BH2eLYdtuQf0h46+K/wVW+9dgiWD7MCuPoJ3bx7vNEVcfd/0nlKqHbMUCVAm+Zl3qXhtQPrwyXQprkpWsQyH3d7UaJLsiO+kQOI7GfHPSOyusJXAUm71N+QON+M7mRHvTCRPhKYU7Zi4x9RE0xGDCXZEsJ0bHgRpAw== 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=AqKBzLZ8vQo+Lwm3qagKeS/dblv/hSKZmAWnsDsTwT8=; b=HzRjjvxZDfGc8ut2/jYSTJr9DYix33PL6cvjHr5hh2yhhu4DWTMeAZjemSOfF5vJiV1AUjTsQ5G1C+JqkimImw6L0t1VTLI+hcWf/GPy6XdmTocM0Qhb3IxutSVvn4rofIRHJawOXZF6p9/XwzPhLyqY0eOnqpuOKN1yM+lCOMCaphPcdCdahZjL2NJ6KxW8u8+E4M2J/agxmJb2N9dH86qeFP5yJLbrjEbDhpuWeSAOPDTgEp71HoCa1yKJnQVp362zJIBZVhtdMC/3FdK095NwRZX+BPOjHiBQvOf7uIlmdd0XxP5XCpcjtvaEH0xnPQsIcrJ7bfYHntrzX0vMgQ== 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=AqKBzLZ8vQo+Lwm3qagKeS/dblv/hSKZmAWnsDsTwT8=; b=aJgUitu5JbsbtZfexqopMfztnh8SIwp0swriKz8rHki9CUhBjPh6A6zDFoGfVC0R5EbIoq/NTlk/02HchpcYzv5ThL9SJk5gW5WMtvXC1IohQOcU9quxTwrBIyemR2ZPUNOj2dSUCbKNx8+dJ9TPbCJ2tpOyK8ydtt1GY387znjubo3V2Y0AV44lbIbPWfODzEdkeNu7+08lwL52qR4ZvUvLmg4wA7koAvTVGdXuWt8ZzBLmoylnbly7JikfO54HS6Pbil5JzcfbB/yHs227sl0vfOD6WDNTJb88NJ40DSw7UuGMadCI13Jz9tXgvXRieox330YHVrr/LxXfOBT8BA== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by DB9PR03MB8282.eurprd03.prod.outlook.com (2603:10a6:10:309::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Mon, 24 Jul 2023 18:09:56 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6609.032; Mon, 24 Jul 2023 18:09:56 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Xavier Drudis Ferran , Simon Glass , Stefan Roese , =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Marek Vasut , Heinrich Schuchardt , Sean Anderson , Nathan Barrett-Morrison , Mayuresh Chitale Subject: [PATCH v4.1 10/9] spl: Convert NVMe to spl_load Date: Mon, 24 Jul 2023 14:09:35 -0400 Message-Id: <20230724180934.930554-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20230724171256.914133-1-sean.anderson@seco.com20230724171256.914133-1-sean.anderson@seco.com> References: <20230724171256.914133-1-sean.anderson@seco.com20230724171256.914133-1-sean.anderson@seco.com> X-ClientProxiedBy: SJ0PR13CA0043.namprd13.prod.outlook.com (2603:10b6:a03:2c2::18) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|DB9PR03MB8282:EE_|DB8EUR05FT020:EE_|DB9PR03MB7387:EE_ X-MS-Office365-Filtering-Correlation-Id: 3df32ba8-415a-45b9-30f4-08db8c7135e5 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: JYBqP4C0qw4YOS2YE30nDe9UaDsT9twWqBVvmJf3uPDlZNvrTuoUD7sduKOmSSjsrGjlWyw5mShCCmZjxVxwQF3W1X1PXDHpg4CrrrkBRwg6FPxcZnRQ8pHu4aKCB2QRkmx2F3KuS6FyVsTAQpa+5n7qmAn5nT2pmIaSAeG1PbpU4/dvMiWSXPkG4Xaua5d+dXBf/ibUHk3YFbX/z0AnJykvhC7oE/b2TpEqriaJMAocqoZyGjVHRbo0wphglMe2lKuz0CK+9z26xNpSEW9iXFZnzmZM/Y2iok7Jqi8JFx0RDeNyDIKOrfrra/YFiXMbyKWzTtCuWo2OaZMtWsxobFFBaSd5OaZgBRQ1D7UFqS4hFWUrivDm1zo0i4DSOtHH7SP5bKrK/oMeTsohcDwqDkdjf3vXBhS2Qjz+8nvFWIArONjVnrQiugaXOAAbJsKAgXFYZZ3xpsy1ILr4zz3hHLTmz8JZ1sa95THM7m6GpeX2dj/hiKvsJoYORe+nYPlBRpdUgzZGsu/PXpNnKexOof864QJO//rYBmmpTiaFpEigyHjie+jAEYgXbo/DeybHwJdLrWTmsYh6IHJqXIupoRJUdLrGY1pdmgO+uGaHaUHqIzycq07sX2p1wihxzDmR X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(396003)(39850400004)(136003)(376002)(451199021)(2906002)(66946007)(66476007)(66556008)(4326008)(6486002)(52116002)(6666004)(478600001)(86362001)(6512007)(83380400001)(54906003)(36756003)(186003)(2616005)(1076003)(26005)(6506007)(38350700002)(38100700002)(7416002)(44832011)(5660300002)(8936002)(8676002)(41300700001)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB8282 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT020.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: aca12170-199c-4e7d-2464-08db8c712fbc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m4vygs7zly8YkuDWMYYNtCXDTfAW5z78V185AvNrxQ3IFF4LnF8KXUP+txe+F7D7cdVVEWQRxYwlezZ4DMN0Wx9ucU9D7ypi5MULkyZFi96YJa/MIoO6OKD960MV/VivMZcQyXJ/g7gEX6HVAvFuOp+ewP9SAqzfH3A2lfqq+H3bjJGCVDk+gQvn1UgTnimShRMMX5DVOeXy8iKI5T4XdOsWgV/0oNkl4SZFIkVYNtxEx30MpTRRlWmWj8ZstzbaqcQOjWmoc1EAk8IEZpqRyjtVxNtAZWkQP0UAGHxQEYDY8+xObondd4L+44pWA0qkd4YwakptjuCyMqCYduG+Y5YqpnLL7nFGHaC/GQ+Ad0ysSt8fN3s43dTO9LLj7HLZ+3fo9wo98xL+ehaE850Ii4WlZv1Tzewl0TnijZZX1nfEkIEwOJs5b/NBFflT02psJufnFY2mh1zit+O2gWMijIrYJbOlYISBATPSZsNzhPdvUgEUDhWUnmWNDx6jVJ1JVqGf4rbuum3NPiJRN/jy/3ufPIQWErHw6+GD0SK3zpM420ig6kXTlZxwk8VqCgq95sn2zqTH6YQRE8dblAE5Oqp6yuYjfhg10vohEEPamGe5LCtw56RL+WUGFyY/dP8BNapnkhSkq3idG9hV5cdKfm4ExEHUlCOJ4hl5Qoy4ON7ozPJGN6o+EhgLzBlzwh27zElVzg1y1luJW4VL04GbhS92TZkdebHaVMTco6p7y82d6Hlfa7dL/NoYNYbcdFE/mhzX3kCXSj1sGsezs5nNlw== X-Forefront-Antispam-Report: CIP:20.160.56.81; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(376002)(136003)(39850400004)(346002)(396003)(451199021)(82310400008)(40470700004)(46966006)(36840700001)(44832011)(2906002)(40480700001)(34070700002)(6512007)(7636003)(82740400003)(7596003)(356005)(83380400001)(47076005)(186003)(2616005)(336012)(36860700001)(1076003)(6506007)(26005)(40460700003)(8936002)(86362001)(5660300002)(36756003)(7416002)(478600001)(6666004)(6486002)(70586007)(4326008)(70206006)(8676002)(316002)(54906003)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 18:10:06.5681 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3df32ba8-415a-45b9-30f4-08db8c7135e5 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: DB8EUR05FT020.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB7387 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 This converts the blk load method (used exclusively by NVMe) to use spl_load. As a consequence, it also adds support for LOAD_FIT_FULL and IMX images. Signed-off-by: Sean Anderson --- As suggested by Heinrich. common/spl/spl_blk_fs.c | 62 ++++++++++------------------------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index d97adc4d39a..a0992f3838a 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -50,6 +50,12 @@ int spl_blk_load_image(struct spl_image_info *spl_image, loff_t actlen, filesize; struct blk_dev dev; int ret; + struct spl_load_info load = { + .read = spl_fit_read, + .bl_len = 1, + .filename = filename, + .priv = &dev, + }; blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum); if (!blk_desc) { @@ -75,6 +81,13 @@ int spl_blk_load_image(struct spl_image_info *spl_image, goto out; } + ret = fs_size(filename, &filesize); + if (ret) { + printf("spl: unable to get file size: %s. Err - %d\n", + filename, ret); + goto out; + } + ret = fs_read(filename, (ulong)header, 0, sizeof(struct legacy_img_hdr), &actlen); if (ret) { @@ -83,52 +96,5 @@ int spl_blk_load_image(struct spl_image_info *spl_image, goto out; } - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && - image_get_magic(header) == FDT_MAGIC) { - struct spl_load_info load; - - debug("Found FIT\n"); - load.read = spl_fit_read; - load.bl_len = 1; - load.filename = (void *)filename; - load.priv = &dev; - - return spl_load_simple_fit(spl_image, &load, 0, header); - } - - ret = spl_parse_image_header(spl_image, bootdev, header); - if (ret) { - printf("spl: unable to parse image header. Err - %d\n", - ret); - goto out; - } - - ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); - if (ret) { - printf("spl: unable to set blk_dev %s %s. Err - %d\n", - dev.ifname, dev.dev_part_str, ret); - goto out; - } - - ret = fs_size(filename, &filesize); - if (ret) { - printf("spl: unable to get file size: %s. Err - %d\n", - filename, ret); - goto out; - } - - ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); - if (ret) { - printf("spl: unable to set blk_dev %s %s. Err - %d\n", - dev.ifname, dev.dev_part_str, ret); - goto out; - } - - ret = fs_read(filename, (ulong)spl_image->load_addr, 0, filesize, - &actlen); - if (ret) - printf("spl: unable to read file %s. Err - %d\n", - filename, ret); -out: - return ret; + return spl_load(spl_image, bootdev, &load, header, filesize, 0); }