From patchwork Wed Nov 15 12:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864234 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=fWlOHDJp; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SVjYF663nz1yRM for ; Wed, 15 Nov 2023 23:44:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E155A871D0; Wed, 15 Nov 2023 13:44:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="fWlOHDJp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7C58871D0; Wed, 15 Nov 2023 13:44:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 E86F986FB2 for ; Wed, 15 Nov 2023 13:44:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R3wYcm6FU3GFA1rSOfmBUAoR6EwNJX+o6UH+jOffaa4ZVf9z5GjFG8EAT0nkys+HdeyMqAisG2AgnCSDX9qyP1xwP9r3pb0W0uARQ2PNbuw0Q2CWD1nPQpok21J3ro6+jccKGaAgaMLqp7+QlGIwkxLx+urV/xbua7PP7601cihqXIn5eEmoKqfJyu8UvdKbKY9qGo2M5F7Y2HsdUW0O6sJnSXJPB874rGyIe1uJ6Opud364I+/iFvfWjeLVXy5lQyvZrTdmVa8cO9F1p3Fnr55mHjBzXg/QgwZgTkuRLaazDpbw5uBIx6DV3ZOTWRiKRw86+YZeCG4zFHez24CIKA== 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=MRX8i8FtgzzH84rGOHYXqam9Kuh47u0YWv6Fl+zBniU=; b=CxqS5RvbNJocBqgiaHl4jkkYgzuLAEFzByb2skNLZq70QvXhvly+Hi5NL5SpGFKEyeEqnk4MFfOd16Vanpx+F61mIgsQ9JjQFLMWBa1w/oE9Mi/tCvVTR+oCkTkHFvmyI7iNDHMHbWORcp4960TgBstIgSLxCX8CcjiHsQxWY5eJpjfVIrLadv7mIMK5q65ZjimfV/kcZ0dgdZpmTzRyEQd8LTphLUTKxjlkfBmw/uc0sUlqAYb1FC27eTqUSmwDheNZmu0jBzohVX2wGDtGLp5lxz7KpquER6fTJLaEpPduqCfA81roiV120JAvZFIdtf3XargFCF5jNqvEPQTuPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MRX8i8FtgzzH84rGOHYXqam9Kuh47u0YWv6Fl+zBniU=; b=fWlOHDJpNwU2yihFZLUxFE9POWl2/2mcMJoBaty+1tccMbV1RTIYPBFMC0nsKk0Kqa0IgZDueboz1HmhXQ3SL1G5YYH2AtauJ4miC6NnSzN/qCtuTIDk3ovBQOyMvG6JpvWATkdyxEcLFg1JgFnXq6ygx3BcpkRU0EjiaO3l348= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:34 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:34 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Bin Meng , Heinrich Schuchardt , Ilias Apalodimas , Simon Glass Subject: [PATCH v3 1/9] fs: fat: use get_unaligned_le16 to convert u8[2] to u16 Date: Wed, 15 Nov 2023 13:44:16 +0100 Message-Id: <20231115124424.125823-2-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|AS8PR08MB5911:EE_ X-MS-Office365-Filtering-Correlation-Id: 93943735-5ad1-4758-ff08-08dbe5d89ecd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F5HwgRQSp7doP7ZEXuzdRflKrp0MKBqx9DQIDm9PotU+ACYv42KaYIMV+iNt0UH5upF+wC/pbbkYgCGQEqGJNkhxmRw0ckgHQUxvl5ZyOoxKxkRiP0sha8gFakBR2I3NNnmjk3NaFs/Y2C9zZROQqCQ6hVfh1j+5M49LQVrzFvlAotjk1VTT2OgqtkqPpc3VTTwI2ojwm+v5/LywZJQAShbKfzUXKePbOjdbW/7L/f50PWxYjfIkZiDdkP4qgj2DwNTshsv1ZK23Dlr3HbydsgEnzQYui8fJqjMJVkoRWmlzU96m15MNI9SblJCB4iLEmrwQyC9d71c1BUx/PQNuDSXkUSrPs9U15tP92W+i3LAUwCjbg4+DeESWTfQwWtKBeFLsupVcn7ZcR6p4ydLHAWHMC22uHrxGIYq4v02NljpYA779uvzJx+c2yH4Mh9VXhXKijwWCyw8vFrYJVXfO9DX4g392crVwog4Doure0e5BNjd15Qk1+m6M+H1gPXGnqdohMOpwe+zfLQUhQUWspY+tB8cT5R0BfdaOHKU0H7BwEp32h3XfVIvcJv9gCLVH139Gaah5FD3IOnHJf8whNGCQJFJwe3kqqjeFKRu8AqYRXS80c0HqbCXM0RjUgKQi X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(66476007)(54906003)(66556008)(6916009)(38100700002)(316002)(66946007)(36756003)(86362001)(6512007)(83380400001)(9686003)(26005)(6666004)(6506007)(2616005)(52116002)(478600001)(2906002)(6486002)(5660300002)(41300700001)(8676002)(1076003)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aZTewlhS39bloxehAz+ED+JWJVQYR8/JVJvjkj1xPoafKbCpTrE8DWPc1foB0x1ARZdAm5vcXX1qNXLFgLxzNpltzEpb6G5JV3s6HOiaZ/MCZbXwbMV24VeO02Ae6xaXDy6gwiTt3tCWEWaZ5Kg7gDpW4zTENBMfRTQsd7n9ubyHFiF/E0I2UpLzafeSKlRepnINp+IG3hexzZXEYzjoNp/cumsAK9wXr4GJmGuavLlXkvhKp++r5UoNhPq57W9CL9IkDcdowVFHMxo3ozD1udjk8F/NDKlGaFUeUQld0pVL472ouMr2bVPMP3FYicIy70CCkt7jT1Oy4/+ifNz2ytCUSW7aMg2QqdhZXa3UJfwvwgONLCqejVnZ7czlbpc+ikL1cE05t1T2hMqznrPVeix41zeCeUK8VuzFn1oMXhoACEe/Ky03FQiWRmewhEfy3Yhi5CXHDPhqBYxZ46vQCdetISOcqqmlT6cR6PnSFN90M45xZ9riYSu/1KfT9t4tmFsqocgZj/EzRj3HGWDB6LumThgNyQh3s2k2y6U3ILO1nMOq7qq/ELUO/Wli2ZxxdtNifK7+z07WCPelaAWlbtPqsiRU+8b7ICLHPd7l3ewy72x4d39jio4WWAB2emikOQUmVdib1I4IVe9DMels27tgE6NqyadGmABbeFivziGBkppoYyndR4TAOrEYNezruhonSOr1mRQzIZU3Y/fHflbwirWQyGtOXv980em0XCMs1mlmmF3PZPkjWqm7o79iCkUSOLzVT6v8BDn7YKw9hzPBfs/uyKCqwF5q1GWrC6Rm5phvf6DP0JvjySEcrRq7GE7o2RwEUbf9JEK/glatklRyvkv9ru/J74hNw0QqrApUEUYQImxWZPPklj2WHuKhfYRGjzhcCrg5PjNRLxAOTnswA4xdcgoL4teNTWNmRPHw7jUGRK0aR6AR6S3BAI0p/RA/ue4yLrgvvRp3vue1ojKMjQxVIwq+FzfcKI7Fniu17E3dDrCQJFuFnkc6vuD2XVZcshxhKZa//Eli5JKVoHMYXmrY0i+wsm7cPTmKtaNCjI0hbf2oJ3FqazbmenhTgy8BnBs9CvG1X6eZ5lH7RDpkQWMLjIz1uOnY6U3+eAbRSfoB9bC8V50NI67o5nannGxkypff7WFF9869Zl/br//Vd8S3NXgqjbFDfe4qhwVqLegrC+Ft1uR0ZNkDnxDbmH+u0hbxr7a4jzhPYzgZTUPsOYb1u2LOcuzzcNakltTTsMKtS+wyuz7mpUYGbXET7Qtf5pHymyW9h6Nd7FhrZsd4CJ7a5/QOE7TZFx3eoZrrEWQkCgc42Z3KAQaOYDiPqqRfCOwCvgVpJuoc0rycMEKgtDegZ72UYrblcU36ZtuzHRzTjXmuuCGRz5MZRTamvsKO5UmitxSqDAkxiqQrjpgAHJuBj9IarOj2vmTmqf/1q2SR+lvcuukM+fOFU2gBrZ8CfkvCQ9amIqHajCmsTiz/ZY9usT+xsilvcEQMTSdeuvLkGd3CyZIjL/0jgcQ5AtJt1duh/jU4oMeXK2r4kJ7sv2I1UZnWJJePqVGtwWwzI7n5yGuCuP7MAfJKJXKFCerJQ5MzcS2l1FGXejjzQe3rjRykkCPVpe6GUT7QL/iyfx5WWXzKGwvaPSu88OV7 X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93943735-5ad1-4758-ff08-08dbe5d89ecd X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:34.4548 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: f5os2p6mIoM/Nn9OHPvNlE5YstCAXEkmQBq+Br/GSNVhwTHnEliUkZsSNwMTvoYV2MtWRH0WXEfoQ02yYFPp3YUiXM4vov2WCr64Y6IO8YmTnaESTgS/arcluxWByDnk X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 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 From: Christian Taedcke This reduces code duplications. Signed-off-by: Christian Taedcke --- (no changes since v2) Changes in v2: - Use get_unaligned_le16 instead of custom macro fs/fat/fat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 8ff1fd0ec8..a3522340ef 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -571,7 +572,7 @@ static int get_fs_info(fsdata *mydata) mydata->total_sect = bs.total_sect; } else { mydata->fatlength = bs.fat_length; - mydata->total_sect = (bs.sectors[1] << 8) + bs.sectors[0]; + mydata->total_sect = get_unaligned_le16(bs.sectors); if (!mydata->total_sect) mydata->total_sect = bs.total_sect; } @@ -583,7 +584,7 @@ static int get_fs_info(fsdata *mydata) mydata->rootdir_sect = mydata->fat_sect + mydata->fatlength * bs.fats; - mydata->sect_size = (bs.sector_size[1] << 8) + bs.sector_size[0]; + mydata->sect_size = get_unaligned_le16(bs.sector_size); mydata->clust_size = bs.cluster_size; if (mydata->sect_size != cur_part_info.blksz) { log_err("FAT sector size mismatch (fs=%u, dev=%lu)\n", @@ -607,8 +608,7 @@ static int get_fs_info(fsdata *mydata) (mydata->clust_size * 2); mydata->root_cluster = bs.root_cluster; } else { - mydata->rootdir_size = ((bs.dir_entries[1] * (int)256 + - bs.dir_entries[0]) * + mydata->rootdir_size = (get_unaligned_le16(bs.dir_entries) * sizeof(dir_entry)) / mydata->sect_size; mydata->data_begin = mydata->rootdir_sect + From patchwork Wed Nov 15 12:44:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864235 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=tnlfsUoN; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SVjYJ5sW7z1yRM for ; Wed, 15 Nov 2023 23:44:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 69C7387160; Wed, 15 Nov 2023 13:44:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="tnlfsUoN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A500287203; Wed, 15 Nov 2023 13:44:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 5C7AE87197 for ; Wed, 15 Nov 2023 13:44:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CD2Qd+bHvG3QqtX4DmPV3MdR7I2vH1aWsxCr+sOj2jnXHxIJjBMF7To6qFdPhYiuxT9ipfb+l/boFm4VipBMvw3246fMGgj6xyB5VZ0xJqcdf5HVOXa/EnTvSFewVlDFI+16kbxSPM0JQEVKLT/OdCaPF/fkOX4VHyQ7qzZ0/SWES1s6HfJf2rt/d+ftWeLLOT3AsmPQieJo0HltHJFtiYWqi337OSC3WfFvS0TUX5j6+3rTHiNbDZ5kkkK/3RRSyIS2fdW0cODbEy99y+QRx5IpKnZXdxWiQikCfxmfXXwsb9GsAmiBNt2PGkNOnXsqIFtMkbEzTGnjSYuSa4Zi0Q== 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=bajOy97ohS/9FiAb2NXA5PlGBl2TXpLlxSJyQZkvc9k=; b=HogFouxrUNiCEmOEeDi8LXT7gNq3O+TxluDsHwYxf+iyF/mrnvLCsSRQu273ULSQNaoSaWqIJMEXbMWjI9m96wWa745hKWHBzOhLIp3e/OxtRRhow6f+iMQ/rLS11BAudHMQHAUIMUlHm7RNo8ZvYfWWG7jHgW1cu8AFewK7PMsYgDrA8o+8IdLHK14/ekM0HMiUEUKueRmr9ESPyh1b7nfOuUknjrFIbM0EFPpK+EC1RHGOkTqiNGewo3TNadCXuQJsOAFqX8mVSMobuelPWpSSkz6v3IZChLOsBcgO2gPRBDpv8Q4Qo7Ov1FQhZ81TGu03kLO2NwqudsefacmcVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bajOy97ohS/9FiAb2NXA5PlGBl2TXpLlxSJyQZkvc9k=; b=tnlfsUoN2j/mIgRx2MDZWis0zpGwp7x307W5IFwj4RFMQCtdcOsXiTP5NBz4VRjAxh0xT12ZeEcJk3X5Ke0Hglnt1HyRzKUEQqWyvJgDlSpUkxujFDHAw3U4tKlZvg2Rmbj9oy91JUcBNUUacmZ8Xx58/ChgF+ymLRzIsoF3Cq8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:34 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:34 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Sean Anderson , Simon Glass Subject: [PATCH v3 2/9] test: spl: Remove usage of FAT32_SIGN Date: Wed, 15 Nov 2023 13:44:17 +0100 Message-Id: <20231115124424.125823-3-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|AS8PR08MB5911:EE_ X-MS-Office365-Filtering-Correlation-Id: 883d3d2f-75b0-4687-fc09-08dbe5d89f0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k9nn/i87nMHKfLuNB1GLTMmMQ3sIfcRbaDI5Fo4Po6y2KzkRzE1av2SdkGwDuSZT4lkODQ+B1NOnSke+5SMTTncCEbp6cT/Mj35oODabX7xcYE61uuZB/725YlIpYhw4ZEiJLU2W/hkTVpcm8p7OUxrjdra289R4Oa3NLhcUQ6eqZtQKGS0UrYANdNrmHUKO2p/hfRvaInl3++8MnJMH4lOwN1ihlaBT3OKFy/2t6LU/0Ekg8c1pJQ225/X17Mvo755ATZXRb0i+ZfFow37fzPvPeAEL7HysDAjKYszipxMIusK9aU7awJMvtcDrj9FozCBnJC2tTdbvJcVpzZi+8kmWHhS3sgTP/nCzBv0/hwHNzGXU7yA4gJAP6KxOShkpUSZFrxIxrUVPZvWvZjgnNvmgkygkLYmkEdOj/5NL5wh4ssyLrcpDd00/pK+pNi9ucEolwqBl98X2fWFZbfk7Kqo+xxokSMoqQx1VWrW04Y2NUjTe4hEYadcOb62wbe/MlVG8gKNYLgMIQp0h8xS2+S1TK3qBaQJ4dccr6+/S3aNF3z4l/0nDfAlqoHbZOhhbp9mht/iL7uOD14CfOqHK/YFNaUJ7cHUbRaVSnBX+jSc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(66476007)(54906003)(66556008)(6916009)(38100700002)(316002)(66946007)(36756003)(86362001)(6512007)(83380400001)(9686003)(26005)(6666004)(6506007)(2616005)(52116002)(4744005)(478600001)(2906002)(6486002)(5660300002)(41300700001)(8676002)(1076003)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0vncYr1X7kHBtjtcPUWsYZQXg6TqKuuHBff/zNc4SfzOFSsz42fdsvh/NzP85b6jk9hXjyiSjhfimqUVgNjJdObWV2K4jGNj569+VnMYmowZzaYrhMvwthqgQXeKbMr/HRR+MfCyHvrnVDsG84O5P4JZse/H5A/Puhe4by6+2xURYCb3lypfwr7wNxhT+TTz6f3uTMPY/fMZENpNSb3F8lDkxFLILkhwbS4/WToJou2hXffqL80VsPtMjFWHsj78qXaBqdCODXJ5Bltjs6/bbQwlmslR+ArKVWo6gBZ2tewxujqOJ/nFdS4MZhvkL39IZX0j0l/A98Lf6ttmx6UP/Jd23GhyfxnQnpY1nrLxijvWUx62W77p3p+iSGgEeaWWzDoeOA2c/tewHSTElNEHC3vaIGlmTGFSiF/MEhrqHgp/m1MVzyG6qSm2MV7F25e2zm9qGhvETB9TdDBiPtf4iAs2oSfFpTQYUxKn9BonSYnltcb2m1I7AyYreJDm1S56tRTGWn7mL9eV/70A2kFUW4H+yITWhjbZNtkUPe65oE3QxIHQ1RbZJuLeAt6vDqBAMeJGaLxReup+04di8/JKq7WytP9GtQX5LQj/W2FnKBZgRwCTMeLy/cVMYZD3UPiIfyJM4o44AmFkqnZZCFRkRWXDbU/pYOgJebS7XWlDA9gZnOZI/geljPkvw3NlflvId97r4mLgCvsYFVlPUjAI3mjNn+F5NOK+epGFdfgnY6CLbKYZcNiu4foTj7laIkXjXZVF4WvFDjxjzuO6e0Vbq0zGK1ZXrTz9zPTP1ymtMGQ3FC9OITDSRA2cXxq9NvKUQWqUs1Gxned1vOARPYmHYt1ynYcb3/L2n4WSK7kNaibeT3Biqys3FmV/pjGjnR6Q+P6Wavs0OBmTnuv3v5rfF3QBGYqwOwdchO9lgqvZ8xwru663VcW4ewF2lUZXhieLidnGPdGHvO51cww1HnklFqJCxZddV+ndqixsgjILsR275PQBU9kN8TZ4oDfgXOlMP5IQVm7/mzDOCTUK+9htk0O3ozc0im7dN+D2z068EpcS2c3w0ApNcaqHTNBEO39WFUnhvfmFJG+e+OpQxLMpgZPjzk396vMr9m8Y73936vTpFBoKs/DNTySizvU89EDUfK4yph9xg3gYbEdotWIXLSlJcIzONQ3ZVES5DfqS+fwDEcS5bnbUvdBoVzETnSlKynK1ZjhawgLa/my3A9zG7nGjLeaFMb+KiJJ4jolCUw9Zvk2zqWZ87w6/8fSn4+qtMQEk3AJx2YKnTb6WOpGq0gXLWntLy5z+4yFmOjV64Nkx+6bg8zzbKjMZnAYWGGg6AWQCelS7TueBFLAvJ7ZzhjAKvWj4o2TPOE+AGxibr4ZGRwmRatuvvku50QBjLbgPUrvZVlv8XYuVoMQE07H22l61sPS8wj5GLdz/fAm0OEipZ01CdxplAxHD7M2C65+Lz9PHGayAV5c7nkNEFbcpd53JghSXWg0Tj1MTepyheexHISPBcOv0lTT34IeS8+6h2pUPYXQoWyP82Tm1exCpICQ9Jesc1SjeNGNIKLavT5/1GjvV+Hd7t+P/rDN6J0Gu2HJlMJV/pZ0HJGFRuitLPLVRyZ1aUkKx+A5+zes+7tSwirVoIi3oSQ19Qf3Bv9ra X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 883d3d2f-75b0-4687-fc09-08dbe5d89f0b X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:34.8249 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vDijgg9/qU8cItSn8uvecg+luQdNM5BKoHurj/KlEYCp5v4p8HydL2aTrDmLs2GAB2CXvdjFRDs7DslVO8H8/mf6HO5Pgho0ZF/0jezVOvqlNcu7F7azjBZITGgC3yA1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 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 From: Christian Taedcke FAT32_SIGN is removed in the following commits. Signed-off-by: Christian Taedcke --- (no changes since v2) Changes in v2: - Move code change in test/image/spl_load_fs.c into separate commit test/image/spl_load_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c index 297ab08a82..90e640b5de 100644 --- a/test/image/spl_load_fs.c +++ b/test/image/spl_load_fs.c @@ -220,7 +220,7 @@ static size_t create_fat(void *dst, size_t size, const char *filename, bs->root_cluster = cpu_to_le32(root_sector); vi->ext_boot_sign = 0x29; - memcpy(vi->fs_type, FAT32_SIGN, sizeof(vi->fs_type)); + memcpy(vi->fs_type, "FAT32 ", sizeof(vi->fs_type)); memcpy(dst + 0x1fe, "\x55\xAA", 2); From patchwork Wed Nov 15 12:44:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864238 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=VjmLQlWw; 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 4SVjZ15gp2z1yRG for ; Wed, 15 Nov 2023 23:45:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D788F87208; Wed, 15 Nov 2023 13:44:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="VjmLQlWw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0D39187160; Wed, 15 Nov 2023 13:44:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 80435871A6 for ; Wed, 15 Nov 2023 13:44:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jk6/twQHA/8Kd3ru+QoloqPCGftTXEAqLje/dOtEe7t1MKiq/flahEVqa7IkAjyxmnHVauhIBVtaR3CLdFgQ3IDWmv2CvOP5HkszbiVjPv9CHbVj2CwpuYj0sfiXDnoZDCgcc6F6J265ltdNxU4+qMAvdG6Ck9SYUVu/S2sSUdriGosFhgwnx6fCqQxJKdq5StfYzT/mZ282qUez06733u1ig7in62QW4bdMnLBJlV7jQeqSVBAv2pC74AltsSfylcocQtYjbMrSvQh6M5ATZ2Pjy5cs3ThpAjDxMjIoBVPzAFB341lZoIJzNUEQ4IroNGAutFoU9/8GBzICOhcUdA== 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=lkDbHcu2XzzhXhsT6ZX79W1rj03OXni3DzwEdYQ1yQ0=; b=SA2pdkLduO5aQqeWBQrSWTPl3jUMgwuddlzuc2PKPZ4mrqnN88EnymKQwMu58HGnOvfrCsQbpiuvlAr3ZsgnJcwvYwsOLI383zq6ORiJjKBxN6qI8moTPAeY9OjeZveMLU/hpN2H8L8TDNm6Quw5W3pwA2kSuAqdVhAXCW6fJVqXWYDU10s9mfM8t1YDBTHGi3ZyudV+D72iwH3OW20mKf0H2ZA1TAifQBB5V5F6mvzJTompIkjk4UJarzTEjmwDzEx23enDmVcwGAZl6hZXYvb+bx/39f9XCioxMvoAJ6zWFrQYy2M3icAMGrIBuz9r2VpkpVNV7+ylJF+hMTwU1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lkDbHcu2XzzhXhsT6ZX79W1rj03OXni3DzwEdYQ1yQ0=; b=VjmLQlWwPnVevwSLIN1EbnLQNQYmPe5vUK8e4l+KqlVoOne1n7r+2sTy0gdZEpgJ7a8KA9eg81oxi4bAFH9cxaSVJwPFO28BxitJWtShVLRofraPxU8D4ONag23cEWL+Ch1JU2h5DPyayda7mF3+9aVi9y4nIDx6DC1yq0jwxcU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:35 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:35 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Bin Meng , Heinrich Schuchardt , Ilias Apalodimas , Simon Glass Subject: [PATCH v3 3/9] fs: fat: calculate FAT type based on cluster count Date: Wed, 15 Nov 2023 13:44:18 +0100 Message-Id: <20231115124424.125823-4-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|AS8PR08MB5911:EE_ X-MS-Office365-Filtering-Correlation-Id: 96492b8b-7742-4f8d-5b6b-08dbe5d89f4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bie7pz8nfCDb673rjaA7uRIAfM3rLSX0l3DHE2vtlals1a8n8uRvhsGeKXxBptoBllXzwEyhu2fA7tk70/W6DcpGJsr4WE0TslOAx+ObF6DSEm2GM4aiVJVXoHs+jkY4HFRrYhqR+Zn/uiBT7C+oTBh/md1FVMM3424LbgbcmW2Yd8RHltTIqLlW3V0QLuVK0LHDsQY+/r0UTx6Q5jeTuadMjI+zlIVFzZKGcTCCFZGCCFVHIxBzaVT2X2fLYNeKZV0giFjbuzt6USFWZtlMA9BrFk2UjfAdbC2chtooXp1C8peDcvnMzz8+3DmzSDfwbUR3W7wjLb1Vy1cy/qMFlE0S3547rq9yUrmcG9SF4L1tjNnDMqqLS0dpeahd9Q6QkJ33NF2VCjCaXjZvB4wHmI1E9NlO3wfuGB4wvd7HtkARzUn9cQPb9InzCb1N0LzAI/BSlEnALy6PWiSgk6qgnIqJjezKBalaOsJ7J1XYCHETE+ahr8MKaMKML+uxSf8zEz3ipd4zGLJabL99xXFF1nP+mwRGwY4zAMwMWa6Ru2Vs5v9D8SAz9cxAMaVUOt7vD7pDK8eBhBECU1bKnrYRCs8OkICY6OyCCJSPodZYIk4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(66476007)(54906003)(66556008)(6916009)(38100700002)(316002)(66946007)(36756003)(86362001)(6512007)(83380400001)(9686003)(26005)(6666004)(6506007)(2616005)(52116002)(478600001)(2906002)(966005)(6486002)(5660300002)(41300700001)(8676002)(1076003)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MbRMwYZU2Aysxmg/9WOXjxHeY7kZKLJwS5VLFV+WiyKeH50O0M8PVZ+hi9+QlaxLMHCRJZrKgNyaypkdAIozbn0Wlq/AZFnGF+4IfULjd77wfwtSdcylSbBKr8E3D5ti757M/eDtWeFZfrlpIssqgt78hgjwni+Ur2tZPfkgYanaYTISQw4fapgoTum0wZCpTcF6JNff1jdUsTqsVJRHBizg3jguTalMrZuPEUGF3q8pMSJqEImHFVyWn61rgaN0FBUovu5mlTpXLwdlAASz1OiGFKRhV7q7KNXy6ZITtjgm3U/4cK76dj+mnLusZyq+AYQlOB1Onvdja9WhJ31+9rp9t8aV610htHGNYkLlJ6TmHnAVM3F9Qa04oo5GzHveq8FeKiHqdKf06pSUF8IkAWe+XuGkM6SY6vnjs7umEAnJGKP6WfrKwIb/vzeJNrxKr9h0yv7xJTEZ90qsXp/Zk0Ty8GJHUtSv3O/6s3/rQt3sIocCtIu4EpH++C4qirVlLA6gHD1xKbs0MPt9v0Fcc4GEmKZLHgrEF1qZfChUw5197eH30KY6V7hBKsCBNhHDJBiY2OChsl6Iti7FKeDROhNpMQzetgcV+sYTO5XX9VGrR0PvAkcmwqdg9jfRWXOLhn741/w5nRxzrYoAjOiM7wXu7dS1K9wxd7skUvR8vKib/wN7bqmGP8EpKv7KHVoOHMzSBkpsrRQaUw7CwMW5xZC1toIkEc3JAanPJy42zwwLhxaRz/L2Ssks/q3OM5F2xR8Fz1tlZjNK/HQJXpEvYeFA4i5+ttxK5CnXSL8R7JGYI9I48MBTcqnlXPAbrDxLUJPTdM67RPrU1HwZB2XykHc56pOVnduIAJ3Tjf+eyjtqiqRl2qXHjTHOz+5+94sI+MYEdUziGmUiGkMMaynE5+DLx+e+SbxXeYGjZ3OytTtF+3Gxb9yLj5PdJzvtlP/7Fv5I4aOMDLnzMNHJZkHoCkSHMdJQrKXINASFrzCaJCA2FbctwoobC31PuXnKNolTLMweiPcD7kV5mnx/idZUW83IbAfc59fOOkTfTpd3QSRTv8TmKzjzyRnMQTRW/65sx0Wz8HeW9INGSW7c0L9IYEzryPjAhvkXKS7Yf7TRWN35hfZGyl6ET9iGz149bpUIJYc3ta4cLV8kZA4+hUxCn5yxiVOOXHn6cdlxRnnY5X/B1nvquGqYrJR3T4XMTtX3JaBkYsUDs+MzJt5/XkXNtYISkE4GtP1p76xAzww3h8lap4Y67lH9q6GqMVUWemjUvK7e9SV8THUEnvYoQTbqSH9ENASXnuYh1AguWeeFY2Qn7UTWR0qmt6WBHmrwCneW526vBqFlUES23W2RdO7DvLsf928IoVNYdggF5DFxROqU8c1ReSAZNPKA7WsI+M9p6yQvP6syZEjC/TyQizs13MthEx+gOjyyYYPllnE7UOM7e7tQ5M2XJMVJwXxUBY9/qThIRIwgxW5/orpxrhFsx6otSbnFNwzn8SF/Yr+a6gzMV0I4Ci42svl00/wbR7rr12UZ5FP5FNgXBIwa+5rKjM7M1d48tNTrAi96M0vMOPRNinMb3YKBKYjBY9aw4SF5BAPbNBgx6vjlA8PSSTDy20CM3SceYdWX5vkrfIWtJW+R1PYKhcmuoUZkOlAlHqVL X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96492b8b-7742-4f8d-5b6b-08dbe5d89f4c X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:35.2179 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0FNMOXijiqsbLMV1dWkFUMP0uTscjgHpAvKnEeaC6bE6PTjYLCn2SHj036o2jpxqgNeKvQh0SWf5JaBURuNCfMpB7QSVUZqG54djPxlBgqBPtj4hA09s2PNJj42UHaVw X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 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 From: Christian Taedcke This fixes an issue where the FAT type (FAT12, FAT16) is not correctly detected, e.g. when the BPB field BS_FilSysType contains the valid value "FAT ". According to the FAT spec the field BS_FilSysType has only informational character and does not determine the FAT type. The logic of this code is based on the linux kernel implementation from the file fs/fat/inode.c function fat_fill_super(). For details about FAT see http://elm-chan.org/docs/fat_e.html Signed-off-by: Christian Taedcke --- (no changes since v2) Changes in v2: - Use get_unaligned_le16 instead of custom macro - Extract FAT32 logic from determine_fat_bits() into read_bootsectandvi() - Rename determine_fat_bits() to determine_legacy_fat_bits() fs/fat/fat.c | 48 ++++++++++++++++++++++++++++-------------------- include/fat.h | 6 ------ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index a3522340ef..c368c3b076 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -26,6 +26,9 @@ #include #include +/* maximum number of clusters for FAT12 */ +#define MAX_FAT12 0xFF4 + /* * Convert a string to lowercase. Converts at most 'len' characters, * 'len' may be larger than the length of 'str' if 'str' is NULL @@ -484,6 +487,27 @@ static __u8 mkcksum(struct nameext *nameext) return ret; } +/* + * Determine if the FAT type is FAT12 or FAT16 + * + * Based on fat_fill_super() from the Linux kernel's fs/fat/inode.c + */ +static int determine_legacy_fat_bits(const boot_sector *bs) +{ + u16 fat_start = bs->reserved; + u32 dir_start = fat_start + bs->fats * bs->fat_length; + u32 rootdir_sectors = get_unaligned_le16(bs->dir_entries) * + sizeof(dir_entry) / + get_unaligned_le16(bs->sector_size); + u32 data_start = dir_start + rootdir_sectors; + u16 sectors = get_unaligned_le16(bs->sectors); + u32 total_sectors = sectors ? sectors : bs->total_sect; + u32 total_clusters = (total_sectors - data_start) / + bs->cluster_size; + + return (total_clusters > MAX_FAT12) ? 16 : 12; +} + /* * Read boot sector and volume info from a FAT filesystem */ @@ -518,7 +542,7 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) bs->total_sect = FAT2CPU32(bs->total_sect); /* FAT32 entries */ - if (bs->fat_length == 0) { + if (!bs->fat_length && bs->fat32_length) { /* Assume FAT32 */ bs->fat32_length = FAT2CPU32(bs->fat32_length); bs->flags = FAT2CPU16(bs->flags); @@ -529,25 +553,10 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) *fatsize = 32; } else { vistart = (volume_info *)&(bs->fat32_length); - *fatsize = 0; + *fatsize = determine_legacy_fat_bits(bs); } memcpy(volinfo, vistart, sizeof(volume_info)); - - if (*fatsize == 32) { - if (strncmp(FAT32_SIGN, vistart->fs_type, SIGNLEN) == 0) - goto exit; - } else { - if (strncmp(FAT12_SIGN, vistart->fs_type, SIGNLEN) == 0) { - *fatsize = 12; - goto exit; - } - if (strncmp(FAT16_SIGN, vistart->fs_type, SIGNLEN) == 0) { - *fatsize = 16; - goto exit; - } - } - - debug("Error: broken fs_type sign\n"); + goto exit; fail: ret = -1; exit: @@ -1157,9 +1166,8 @@ int file_fat_detectfs(void) memcpy(vol_label, volinfo.volume_label, 11); vol_label[11] = '\0'; - volinfo.fs_type[5] = '\0'; - printf("Filesystem: %s \"%s\"\n", volinfo.fs_type, vol_label); + printf("Filesystem: FAT%d \"%s\"\n", fatsize, vol_label); return 0; } diff --git a/include/fat.h b/include/fat.h index a9756fb4cd..3dce99a23c 100644 --- a/include/fat.h +++ b/include/fat.h @@ -34,12 +34,6 @@ struct disk_partition; /* Maximum number of entry for long file name according to spec */ #define MAX_LFN_SLOT 20 -/* Filesystem identifiers */ -#define FAT12_SIGN "FAT12 " -#define FAT16_SIGN "FAT16 " -#define FAT32_SIGN "FAT32 " -#define SIGNLEN 8 - /* File attributes */ #define ATTR_RO 1 #define ATTR_HIDDEN 2 From patchwork Wed Nov 15 12:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864236 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=qosrZKeX; 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 4SVjYV1jk3z1yRM for ; Wed, 15 Nov 2023 23:45:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D6284871BB; Wed, 15 Nov 2023 13:44:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="qosrZKeX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5F3687197; Wed, 15 Nov 2023 13:44:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 A5416871BB for ; Wed, 15 Nov 2023 13:44:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lpww0G7M4sMnntQu055IYrf/c6I8gzl0t1HIUNUw10t8V/rsBwBJi8ptsVUgd60J2JJR4aZOH88nH+/tvSNHrjy94Q5vgw83RNCW7wnY/oXKKj4ExejrkaJ3nC5BY360vXIpvtTY7HsLDAyBkE5XtsDoiv+10uTM/cGpKiLbrQikiHfwUWyLDF5NgOBLY/0dj5iGEKG4N+tZaLpJxk1tVstTuUrLyW5n55DjLoHbVH6ABCyjiC3UhOtHzYDa9VPd09MjImwrwwRCSdIYiMQOtTYFY1iIS6l6TsS8VNa5s0zshKOwoKc4lG7Gy0gScKBs4bxWP10pN0ZI9fksEzJrvQ== 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=7QyzByOpswYWSGcnTTX2Ydz8oKAnBXwYa0XwwwawiTY=; b=HK5JJDQ45AjhYRqViba0smEE7Exzyp2HOt0yeuOh58YQqQZvJ+i1MKK4SOJ0TSAE04ZsgYy0EaIp3T9lFuymHnWL1tWOrURAwzPHU1MXuNqt5RgItw1uF6HfWX0s+qb808eH+IjLb2lr+EEl+7PsDct4x6pk2LU28NXHPTNbN+GX1uIW8XZqZG2f1lGrJXSredxojnuGtutIlROpDvDhfc5i+iQbYsO6JcqNhO+T6kF7nfVN9leImTWii5UnL/tWKkIB5Lm/LaMhexIKaHWFd+qai9xZJOjHbldAcVcGZAE/0UmX8Nm9U96sRcNAftlwNtiawiTIf3o07Q3Ir0wWXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7QyzByOpswYWSGcnTTX2Ydz8oKAnBXwYa0XwwwawiTY=; b=qosrZKeX9MAKMMYlq9tLGMoJDavS3cX65uIwH5fV3Ktz4VGKupdrb49vTOTVefiSi/Vjz3Xej6L10XWsitXP8dWSciShN+kvqWd5joAVwfQ+ALUFLG19THwBvz8g8vo8Pd1yJ493Z/hWZpzfEh44g9v/beusZ9WkFCxssPWnc3U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:35 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:35 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Bin Meng , Heinrich Schuchardt , Ilias Apalodimas , Simon Glass Subject: [PATCH v3 4/9] fs: fat: simplify gotos from read_bootsectandvi Date: Wed, 15 Nov 2023 13:44:19 +0100 Message-Id: <20231115124424.125823-5-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|AS8PR08MB5911:EE_ X-MS-Office365-Filtering-Correlation-Id: 88fe08f8-9484-4027-f601-08dbe5d89f87 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WesNUEbSzU4+rCeo5ZQVyC3BARtY7afUFv+0tRiq1uln3ExrABJ7ufKarRm7+T1T3dn6I84E41LlKIrK6HQIn+MDX9hglxC5LSD4QWgwkc9JblmgPditeG1c83uKLhlly1XduUXFqxAFG6wBO/9tpo0eTRN/snkqGXVdirDuf0UfmjuJzQ5kAsjcydVYoCCI2CwBxGzpYNKQ6qrgcYEb555FxLuckOalePcYL2b6FFyEgmKq86Vh7WvLNeMUQ2Ig1/DsmcDvuRWGdVR4q//+3sbc5hQHQiw9SCS7O3Cp9xgE45OQsUZRZsNQ76eVIeGThuneqhH5XQopL9D3jacABxLcaDv/qYqiHjwvDu0fmCOb2/jjU+a/e9EzAX93dB1DWCYUu3gj9sYEv3/jpW+SefgLUzPH9k15+rPpTz3tXZu1LSEcBMYbpY8SWuuDdWMy5meWNitXt6gqXuWsFtKdzw5NK4dBVtKePyJLj+RNMkl6gXEahwb6Mk5WKLLhYQSU6XDIFCRG4eXBFb0EDa8eeRW+U3lRBh0wwP/98qDj5lSqCfNxBP0mkcwAU1jHqAQPCXkq6YF20dDA5UjKOvcu8jsvbJTRgEgHyE2QXfIwxpY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(66476007)(54906003)(66556008)(6916009)(38100700002)(316002)(66946007)(36756003)(86362001)(6512007)(83380400001)(9686003)(26005)(6666004)(6506007)(2616005)(52116002)(478600001)(2906002)(6486002)(5660300002)(41300700001)(8676002)(1076003)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2+djrOKMR+1WF3iHSYoAyJk+MyrtfpvPbHVhiSVI83i3wawabeYN4TTY64eMmoqcDoJpvRG5/NurZlQj/zjDI+3+cr9y13oxz656IzaqIhadvHha4nWiF5z7ZL8Iwtehx9yfY37pycMJj9v2bw+9VjXsJf+toWxkGRdPJm5fYJIKwoemB9FHQSFZ28N5Q7fAl0FTG7mfAfAz5piQT9ywUc7ZiDSArbfafmGhYWPEJkqpblimYpByuL57h2vrFEOZO67WP4vQtNqwMy12Mfm56XwRD/fyvbviMPANqzgQT8/P8yqZmdo/p7H0lD6w0ukfM0NqmLB8lU6QjIFpzI2pA048iI+/8WllC54fh8lzRPNR+u3V8gryKVcLMccIFaRj8gmUahf3J71JjFvVKlsC2BLleeAOClzPxNgMiPmUSLrHOzYkQ4WNr2fq/A3DLO7y+Ub2vtcUi6VPj8FF8WeXv4e3MymkY/VyOy4QvumqBVS5aaNtMttAZZ3LXC+1NdaJ2/WWrFpqs0e0mf4LBH4WhFvPSAj/UYWWxPwSSxyjsFWOyTyGq3VBdySpkaYdeTF07nZnJjg8AMQKE62Tm9Pvxu9H1TOBe+r1fuoDzqe4XvdVsmw3BMTjsXSUobnlJmXvl7akAprtpoXAHR8uB2oJP9JvxI5Yr/IAVuRa6UefHvtji50wfbq9TGu2oXyjPjOXLKUh2f3GMyoY1+tUjEh2pWaYAJ0cLheuiKEi1w5+ewd6PTstGmlJYOCVHRwAMhgtxc/4BcTMbg69ny2wmBoVIzO5t3CN3Bct0rAK9xTB1x62Bcx/QCl3iiSUbvqdBeEb5xNfk1HQnBw2cwDm61rsSZ6RifiQbtKUUIWSPXnSuwTFdC5XAtjf5kPP0A3zrsvd37sNHAj5V7+2+4dPfp/qeRKnUFsv6vjgx2zs86WRP4cNkOCfTG4UX/dvwjIC8m6d+qZ3VOlRzE0wBEqp+L2ydZbhOQwfdkIeVB90vrCvc9JaRF4Om0boqTQs/yIQPu5T3YOECNKU403QsVXOef3Dl7liezWTflq9aDYbg1L7sSGXya5Cid9cSoVx+PvEpGI8HLXxIAjsTmePcQ2sFxuYSj5abxu8g9HSjIiOfwONPCs3Y8G43R7Mu0ntTu957xJ12bAqh6SMy4ousE6WW42NhRzW+bp4uiQGLbnhzfiPdqJ5cN2jdDGnO3OmbyA0Z34cNU/P4xsL4/8R3+fO9GONsJrqo47wuB2ICdNgAj2xawUfxMiXrYoujEvEjnAq+JVgx+fFcqStAs3QePcEoD5bjlD8LJooqQkHor8srRJu6jCjWgDfAPVPTyENbE3QkDlViD+VSZM8hQ+XJSL9/ie9bUkMdpzm16aCTqs8lhTUWasqNvLixs2Hr9ioRX9w7e0Ern+oDru9X9Fu1JUB+Fpfr0BKwglC4ikUQQ7A9FX5RHdtX1f8XHg6gQFFwFymsmLTgyls376MlT0eFcb6XmQpMYN0lpnhvsaCBqF2XxmpPBNFDCjqgeUXY2VjGdUcnOGm/CviGoatNPp97p7KQkfbsJoYlFPoC3lZMTZEI0YctcMtfB9uxNlpJQtBaVeAw7kxI1KybO+kk18ZJ+/MoA9xoJg9LyYW319tAW1t6kb29rgaJ7ZTLHH/8FfXkdFbR4b7 X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88fe08f8-9484-4027-f601-08dbe5d89f87 X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:35.6377 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K49nwIeVvbOI5BaDvS32yRd3uRMoBMVbcEeq9J0GOr9XNdNFiX+Dzieim5QbpftDyg8KThyLU50nv6dEuo9L+14f+rMh1O0y2rhyNgPemsT2OSWghh4zWMYF13lSb/v+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 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 From: Christian Taedcke This simplifies the code a little bit. Signed-off-by: Christian Taedcke --- (no changes since v2) Changes in v2: - Keep one goto label instead of removing both - Move changing gotos from read_bootsectandvi() into separate commit fs/fat/fat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index c368c3b076..77f225ccd8 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -531,7 +531,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) if (disk_read(0, 1, block) < 0) { debug("Error: reading block\n"); - goto fail; + ret = -1; + goto out_free; } memcpy(bs, block, sizeof(boot_sector)); @@ -556,10 +557,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) *fatsize = determine_legacy_fat_bits(bs); } memcpy(volinfo, vistart, sizeof(volume_info)); - goto exit; -fail: - ret = -1; -exit: + +out_free: free(block); return ret; } From patchwork Wed Nov 15 12:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864239 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=g9JFvLZn; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SVjZG0rFnz1yRG for ; Wed, 15 Nov 2023 23:45:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 552ED87230; Wed, 15 Nov 2023 13:44:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="g9JFvLZn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A0F287160; Wed, 15 Nov 2023 13:44:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 C8C51871C6 for ; Wed, 15 Nov 2023 13:44:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TdG2r+x+PrxPVxe908fjy8Wviw1k2RlnuAD4TrV+Z1MjNI4ORLeJRR7kB+/lN7/TWoUwtmjL3g5bEPBdi5JX1JX/oByKDDPa7VGgZRnQRlZ64uCMJQR4o++qahdlFjNAegHgjY+B3a10oFLDlHocskd56y84TYwTAsE9k7XWEQEyX2/EDZ6Z3fMbdDNgOiBaj5/T43Fe9KkMSfSa8AAE5p7UpxHJMBb4wHqpWDm5KFxe/2xWSrK8fiMWSH1sXuAFbVPsj82m0hOLmN/HlbUF0CmBWzDruzLXLGhve8eseDYsOQ4+iPOmM53J68vqGiPCSK+zyznKbe5VocqEyOveYw== 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=6oCfaMoZC2F+L6vODr6ALaGQ7XhCYDjrZVLKBDbnx7w=; b=ZQC5azfocnSD2K44tkUROiB26eCuTAAw5RLv24zVFUn9wmtxjyxKMT/ekTPzF8bqjHEWGNInLPYrSKTYgmR1UVQ0rETZEGNao2y4MkR8+UMp0CgPwtLVLTzywrkKG8QR9hfEny+9lRL8bU7azObX8pStvf3xfuJSwfcBUDlRaq1sE4g8gKS40G+vQmvfyAoViPJVjUhlTcPmvC43pfvWx5PkJEEpt+1YLUiFaWWSj7eqD4ibvrRuZFH9aXhXPQ1pmnXzNO3uDBy+KpCpV4NwgevTw9XyVHSEp9vaB5bGwYidysMFVd7t9oKORHSsRbrasGhzawF3jVCWcRUo2vvqig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6oCfaMoZC2F+L6vODr6ALaGQ7XhCYDjrZVLKBDbnx7w=; b=g9JFvLZn2fmcWq4C1pxPvUC+a7af0mJEiGhrbMbvmC3llmHzwVV2Ae12b5gYgApVY6RjtTxYJJm3FLD/341wsf4TRlg/5LCNzVQxTkHJFyJxtawiZJfIJnQxao3WApMDjjTKBzInEYBPKrE/NnWq3AAr/cUJ7REyKeHnJF9eevU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:36 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:36 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Bin Meng , Heinrich Schuchardt , Ilias Apalodimas , Simon Glass Subject: [PATCH v3 5/9] fs: fat: add bootsector validity check Date: Wed, 15 Nov 2023 13:44:20 +0100 Message-Id: <20231115124424.125823-6-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|AS8PR08MB5911:EE_ X-MS-Office365-Filtering-Correlation-Id: 7143c0bd-4071-4b32-558a-08dbe5d89fc8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ObRj8tlB/Fc9tAlyD88YGwIp+gHLzMNYPIy8uan4OyoKqi4fJnQDX2QYvpsqPaHlNxg8DiSmiNblIp0/dhDel2V1q8NY19p1vmSY8rI0wAySNoix+KFHEU3lItFiIZf0/1+6jXF0VQ6Si6HTpBV4fM+Y4Fwjuj49ZKTN4bJp3ugWHJUfBxeoE8hBl6/MoeUXp5rehb0R9HfeDZLZx2Uh+PeXhI3KrV0oVnpc7ssJoyXmMA13AyAccYy1lnlPO9pxkRUfW+MaN3WT3l8QeLtIONkxvbRB8KDDAVdKrxvjNJmme1LrZd0/kAJNJr/wVEzgcmYKWifranU6oibU9yhN4ZGRVVyhr2YfngFcCI+v16WTYMLOAMA1fTmFnJ6Fg0jCWp8OAz9uvGVLkMBClBBeQMzu81ASUagAn+F1x+lDohCTs0QOASCuyRzcwTV/iNd14k5guysrToU6vOGTYFWYF+hDGaWAPjTsD93/sS+QURYzcuHAMAUWtUf9otg0/xQPF3wIXaePc118CX+UkD6m1UNNY9buwY9jytgk6UTbM5fXx9Y0EjJ5CVmp42Qyi52lz+Xklk7uIT4M7pMeP1SqGpMVT1lAQ1fZKMWTp7r+empqbcnRIhL6I9BeKIMmMTq5 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(66476007)(54906003)(66556008)(6916009)(38100700002)(316002)(66946007)(36756003)(86362001)(6512007)(83380400001)(9686003)(26005)(6666004)(6506007)(2616005)(52116002)(478600001)(2906002)(6486002)(5660300002)(41300700001)(8676002)(1076003)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VI7PXsDQjdUBhe7LSuf0xZG5/FNU/PHajrP2r7p81JBoF3vq5lv719U+FAWkW5jYrvbcC5tPQj35yUd0RbTaNicUWre2Hcmbu/SP1ngigfSD64tNy5cY5XL/XK/hlkNov2WBm4K/mCggf0lkSyu9EGTIEMBYKN53l8LwaGJodkuI/mB2mCxlCBSxVe5K/9AdJy5DbITAefpoioj+9qJ7zpd2kKgqNPOAglVcF1UNiNpSbA9pHSN4u5rAkP4lwCB6wMbKh45I1vtrZynY8XUD93a+PQQ6JWU54V9+2aM6Mkd85HD5Qj+57JBRcWy5EDOn9Wk31GF61MTJw9VUUVxIbZBUZeXhePZZkeIpLVMDxCJvo7i9jIKQcnpwOhwKA8SA4bGc6ihH5DyDRkbxYYQVNxIhQ3vmg7SsWhqMJr5apHp6E567lSI2mig1B53b1P37CGWV5VvE5junI4O306/y4HA+OvQIfnrzkO8d2uoBp64lZxDaBbOWuoSKxNwbfOV8q9/J0zDPtRL3RwkX+c7tvGioB2bfy/qvotXOVBr5g/u7AdUHmlaGUliK3mnYQmQuNHrJh2IFCGmsnO5tSat/4gl4LTktHz+EDWGiB0Gs3aTnePFVWNK9bTyjL/Eeqej6Ttxa/8dndLuLMALwpYI9gj7tT4DutoZ0k85FUvrWE82l4JLJKSH5EmtJhyOKTDxNNuxaue94xa8v/XYciFqIKyx5WiEaFc0rXk+Ish0Zn55R014bUOQTJ9vGUXO4SzqJOSOmG1L+Jb87NsTLN9tDu32nNcoSBHho8GNcHlMJD4XD/XH5YzKwZWnIUaBR/oOUYQSAV3+LBLziJ9Ohu3YbOYYpHYeijAAgB9f926CC0wlttMvW26dSvtPamG7fa8oi88qG0D7FwU2bL0yZc094DFgL3BK/fjuH0zUifC/M499LbXm6rI8xWpQQstz92YBnz0nbgc0vDyUDDR+j/ph1kZTUF0KBGOW2q1B0slozhudmXhgNcUc3C7/po2WXGMdlWD6nShglsHwFhTAMsf04tQhcZUOB3ZvpVYMtRrssHz/Jwmid4LVVkB5yBR1BzFIXHi9Ywo9A7H1cibWm3TZnONa6pYg0q15AhgaYTctoriDvc4jagu2rOnGoCwYSalPoRDJtMrD9R8zBunF083pBxD84RJfDxe1fQUGCQN6DFotv2sYHIm9CG2pouxVeXuOF6Dc0CflWIHx5WlHn7kotLdV+L/lnjNKCUhh2IhRcnMq61A8ugnEth/doPdEm/dwNTzqDZpA64lAVhGd1ZIsnKBsbjo7LnbGbzpvyFdNdExPLW4Y3WC1hH3rQkfmy2N71IkOx1t4oE6LGqOW0jQkMmP4ihO3gPN098bD+LiG6eptqCM1qdh6bW7NLpvAsxFV2DncAZwXaQ77Jmt47ueXaE/G04jHtBpNTQUNsfyBVylLjF9f/80HhCEqydOGctCfq8PwZoVnlB09S4PqWkMNIZ3DWgBc5E9vSX7Hks1yO9banilnSjhW3mbVfz+WUZ1nZuGNmtHFl184pGMr3yRrcyChhEJwveswt84EFoOKGd/A+Ox07NEMFw9qFUJnMvZffd+pPu1rl9PZ3Cpa3B+BtKfD9dUQ75Y+JPj2p4uxtsgeIFZ5wDCTymHMTD3zk4/Mb X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7143c0bd-4071-4b32-558a-08dbe5d89fc8 X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:36.0485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Fu9WGF1f6cU1PEt9VVMApPnwfsmlwGvI6Uo3s8iDCGdDoJkM/PqxLbWUT88ytBNOgI/aQq371ZAjmoNXmueUZ+zKE+p4y2Les4WW37pNdwjZHIhS/AsTLh2fhuK/D5rR X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 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 From: Christian Taedcke The performed checks are similar to the checks performed by the Linux kernel in the function fat_read_bpb() in the file fs/fat/inode.c. Signed-off-by: Christian Taedcke --- (no changes since v2) Changes in v2: - Add validity checks for boot sector fs/fat/fat.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 77f225ccd8..14e53cf2d5 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -25,6 +25,7 @@ #include #include #include +#include /* maximum number of clusters for FAT12 */ #define MAX_FAT12 0xFF4 @@ -508,6 +509,52 @@ static int determine_legacy_fat_bits(const boot_sector *bs) return (total_clusters > MAX_FAT12) ? 16 : 12; } +/* + * Determines if the boot sector's media field is valid + * + * Based on fat_valid_media() from Linux kernel's include/linux/msdos_fs.h + */ +static int fat_valid_media(u8 media) +{ + return media >= 0xf8 || media == 0xf0; +} + +/* + * Determines if the given boot sector is valid + * + * Based on fat_read_bpb() from the Linux kernel's fs/fat/inode.c + */ +static int is_bootsector_valid(const boot_sector *bs) +{ + u16 sector_size = get_unaligned_le16(bs->sector_size); + u16 dir_per_block = sector_size / sizeof(dir_entry); + + if (!bs->reserved) + return 0; + + if (!bs->fats) + return 0; + + if (!fat_valid_media(bs->media)) + return 0; + + if (!is_power_of_2(sector_size) || + sector_size < 512 || + sector_size > 4096) + return 0; + + if (!is_power_of_2(bs->cluster_size)) + return 0; + + if (!bs->fat_length && !bs->fat32_length) + return 0; + + if (get_unaligned_le16(bs->dir_entries) & (dir_per_block - 1)) + return 0; + + return 1; +} + /* * Read boot sector and volume info from a FAT filesystem */ @@ -542,6 +589,12 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) bs->heads = FAT2CPU16(bs->heads); bs->total_sect = FAT2CPU32(bs->total_sect); + if (!is_bootsector_valid(bs)) { + debug("Error: bootsector is invalid\n"); + ret = -1; + goto out_free; + } + /* FAT32 entries */ if (!bs->fat_length && bs->fat32_length) { /* Assume FAT32 */ From patchwork Wed Nov 15 12:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864240 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=1icQnK3A; 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 4SVjZS4gymz1yRG for ; Wed, 15 Nov 2023 23:45:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C48AF871CD; Wed, 15 Nov 2023 13:44:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="1icQnK3A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6423186FB2; Wed, 15 Nov 2023 13:44:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::62e]) (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 54435871CD for ; Wed, 15 Nov 2023 13:44:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HiECj/uFtLjnJaIp3N+rByO5E5G0/Tf3x7gWm0VFgPLDwHHOSUBEt47ZbP5/y4dGdTdiJgCrI5IxIScTYa504tr7oDqIFEojOwv5griDCZPtUtolzW6O+rNvOHntzeXiB6fz13ppXFdvH3bFzL2b60teYiEYgBDhP82zf+D1EGg1G96s7d7jX2hSdnXNsBPTel5gyCVcGaNBWWDSLozlWEj8/EsGT0lCcz1fOtiIt072aF4TrO0+4Y8pJHbL5MEtIrCfeU46F8RT/wu3kqk4A6C/2cRS2rWLKgeOH+DKOksag/pl/fx3aFmXxmw+1rpTA18eurz84Sv2syYix4EXJA== 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=AH8ouZQsrKdFzaz9ClbGTsB4WLEGZctl0duvIlaNyMk=; b=KKEIrMgWiIo1hQ96eC/VLmoP/VvZBEGJ8LEmwFk33Vi9dz3CkfIIYlpLO27RIAwvcNfmeWji1PAnIEo88d0xMyhkpOHtKZwUaeyWgBxlhSNfhgn3DLWbG+bnZBqcsYy3MISYxhhAZsY4qRTvIOMT5pXUqr1F0gi9dL8Zo7M8chfoRAnpxvDCjxL4YQsTLvDw4SevwebAp/PYg4jDwour37b3SgpOgsevLxcwlxKjlaZjfSVnxeqbdLlyX4ZN9+V0Tqbp0+FgGmplDPx18WvA9iNkYDeUq2UDKsO0lx+b04bn1Y8ZAt/JS4cqRWXXAM1BZJf5mzudppiJoQgpYYlPvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AH8ouZQsrKdFzaz9ClbGTsB4WLEGZctl0duvIlaNyMk=; b=1icQnK3AcNLR8gpzTYiJQkiS9XDQnyv1JWdsPToCGZkluyqQhU/7M2R/gDaynWiswqBhqHBbj9F/uxNpq84hURhLZeNJp56GKqu6sYkUu6ypclO6AOeg1q/2XMjnzZ2V8PvyGHFG/SGbkJ9Aq50R3mU1cR/2oWQtEwmsIx1kp2M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:36 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:36 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Simon Glass Subject: [PATCH v3 6/9] test: Add support to create a fat12 fs Date: Wed, 15 Nov 2023 13:44:21 +0100 Message-Id: <20231115124424.125823-7-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|AS8PR08MB5911:EE_ X-MS-Office365-Filtering-Correlation-Id: d71a3430-8121-4782-2b6a-08dbe5d89fff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TX7PBD1adhsdSma1XjQtg+dBNy1GthqRiEUx+HWXzxtkPFaCbdwI0JUiTY8yQZlxUEJuoqJbz0jZvu4Al4uZrpDCW6Z8dMvRj7F+mHHfdjGe5ehEzMl+g4UCqDuTzGPMLZVTkCQBhJHLPIEYhvQyN6kd4k1qrgLeqKT4VFeuDgF+Q0R9wk++WRE4w4o0/scxjWxkMCS1qbdbTFVS2qlR2v2wkzImo3BuvRWjrh2PhzvfFW1x2SpJ8p7TXVQmS+rsn8RqPr6s4T8PIqMjSUYQQx9LOmMNpR+NZ/p/fULCAujJAKIqtsLGhjq2efJPYU7eTCPBHnDlbjjziWqPgjOEMDfhAc5PFqUQXUP3zHFODmv9msouAHbLh3OSh3tFLweru6ZAMu6WZrI3S5bS6eA6HueVFeV5W5JyoM4BjChveRoydiobYf0mQv8i0SA6vxmn8EIGEUbdQhngwW9T3w1R+Fa5zD691liZifUitCbFboj+x4h7gccMg7p75CtYYTsZgNn2VcT7Dg2bQX1E/uE61+giepVfOcFawstXsymXj1gwaM+97q8ZkcGU7hrghiiX0DYw2t/jtonrOhqf6e2tXtNpE+5TVLLGUOuQn71sClpyRxQUd6b47ik0ywDz7h9F X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(66476007)(54906003)(66556008)(6916009)(38100700002)(316002)(66946007)(36756003)(86362001)(6512007)(83380400001)(9686003)(26005)(6666004)(6506007)(2616005)(52116002)(4744005)(478600001)(2906002)(6486002)(5660300002)(41300700001)(8676002)(1076003)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lR3546tQvUghNA9mk+rwSq7+PMOZ1UqSA7+r6zMMQmHQSY/wj0ZikZJGZeXbsXNTj6gVIeQrcX7KbeHoT6NRrLweTfALsHVaHUCRsQe57HDr6ZN/juaW55WNpxgSPur+LTFJiidK7bAt/C90NQf/bkg3pkDIZWYgQ2GzLPryKGVTVeDHktwwQbekNx1i3uTY4DLUd00ri4wj3rY5nNDJcdnG/QmFLWEdJhEOttr4NRkEWyU4Dl135HQgVw/tcfkce4shEVZxbndIFILDjdOr8ZjXDnXdrQy2gRXCGfUn9YFnfirENiULPWSliXa5IMfuzUprocTqPVO4Z4iiBSAtEgB/xxJrzf3zvSPC6Qu5kGLM4owyY7fFndzTdXX3dqOs4Vg3pdhw581lKMT8rdkbp4poHrw3HkYdvBSVqzUPJOJtFvuha0az1yTdKMjFp2QnSV4IQWYajgVB+7oKmzDniMDFSczzzPEH22VDG3kEKKasPAJqu5OkLclSYY1L543P5OpZWeZXnLEPX3mtcwXZ2B8+MKHNBmYjLD0TgFUlt03zI/G+5hzcvTerEdndcWlbtBr7+UuaXE1mLb+UmGR3O+M9bfSL3zDaPKNDMabkL49iN5PUU6hKGlDdG2q2i3paI8gCytv2+6qUK63hzZx97lttMXSGZme41Hp6I83ZBO+HIYEuNeZ4fb1g24zfhcNVrpQMtoXPFbD595zxznul5k+RhjABJ02DcEZM6c8oZvAae229P+FxF14GivWx8uVrvaazRkoocX3iToA72F4wcM5ZQPrNwKU0+IUkROmFjq/8jx0gfU00+c1iT/PqzPxPM3LMYfP9cfsCHJz2NwiDrL7grcW4qzSPKbwWDmoIwwspX0/JnX+SCYY914bTAnxEthk1jQJAwJch+8TAbYN9pAdmtDUb4sLBJyKfJlcM8zjsnAvfswQqjA+laQajeK2J2xwW6IQb+XceZ0wQst9PXzf6AGQACtK8QBgTwiW2Sv9300ZMIf6P8fgkUcaL8FdwoZawpOBxsN9oEZfi0d70MxAFwlqeqM1xPLULwdVnheQNiluwNIslolqrvS4gq95Y/moSjVSuJrnJOeY9xx9AWabLdyyV5wMJwmKaapo4G2ADcyQXfGtyMgnF3ylBn1/oBZql0lrOoDE8vQ4OGpyVveGj4fQBi1NoN3KDRFAnuTK36v6hWLc3+I1YDgT9/f31TiO3US3kwTg7DFq1j9OIvXOR3iDQhphzXDqSzSwgreTYArllAqA/o1/1shksxScvMQJ/Ps3gFWOxZpXG0tuXMIuw7JfpIZ17BtMB/4Db56TkrLLZRKb8m9KV/9pgx3gx6bb7XQEn4QGPcMNHloZw87jVQ6zLhIpHkw9D0oQXhx5yNXkehCbnLP1SJolf4h4yMOorYc1yYheH68xVlhPJa43FDYOY9d1zYMUg/VeRcr7foN/YH3ITmZD0ZYRt1X2ycxAoaTeb+zEBIiER0ScMRLxfx73+aPVLOqmbBoB6OiB33malGKYhuJbt527e8s9aMPVky/5FetE5ysRAAgc9su/7vWKmgX599WP2Sx1nk9Lb9ZAGdwz/ubSSettcxUkxKAxwGqG7JGdi2GMsSVYZiJTeoPf7DsQZMGgWxaH0C/En3pQr0CzFqohTEO+ls5PC X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: d71a3430-8121-4782-2b6a-08dbe5d89fff X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:36.4085 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Gto/xgwqN3nXC7+blS/hhFEfNAIU4ViL9TFpWhqqOYYQp7A+9c7r1zTHPFYFe3GT8xtXJKm3Tl2CSgy4T7p90+wB0CQ1TOrWK0q+Y4puucab8nEW52dshql7gLqhKUQT X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 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 From: Christian Taedcke This enables to implement tests for fat12 filesystem. Signed-off-by: Christian Taedcke --- (no changes since v1) test/py/tests/fs_helper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/py/tests/fs_helper.py b/test/py/tests/fs_helper.py index 9882ddb1da..0ae7a4c4d7 100644 --- a/test/py/tests/fs_helper.py +++ b/test/py/tests/fs_helper.py @@ -24,7 +24,9 @@ def mk_fs(config, fs_type, size, prefix): fs_img = f'{prefix}.{fs_type}.img' fs_img = os.path.join(config.persistent_data_dir, fs_img) - if fs_type == 'fat16': + if fs_type == 'fat12': + mkfs_opt = '-F 12' + elif fs_type == 'fat16': mkfs_opt = '-F 16' elif fs_type == 'fat32': mkfs_opt = '-F 32' From patchwork Wed Nov 15 12:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864241 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=RLGSGhyw; 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 4SVjZh0rflz1yRG for ; Wed, 15 Nov 2023 23:46:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 364FB8721D; Wed, 15 Nov 2023 13:44:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="RLGSGhyw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C7CA687197; Wed, 15 Nov 2023 13:44:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::628]) (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 65188871FB for ; Wed, 15 Nov 2023 13:44:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WxgYW83/5ODXsbXiwcKuWNnh7UI8PVEv5mDRPGOeeeV/cSZ0HOyKXPqM0SLEyNit5D0EFSJd6QHSu3/EfTc+fUXBgZnNSThnbMaHfwLCTE24xT9bwOyGEejlc/Dgjzr3G3y+Q3i+5Qqo1+2gddbTmpGQahIArWrh+wTMBVrduottjoRrVaPRU1EvBcU62Bg8p4lSzVew/Yg2i1eH+RuupRBJrQGV9hSmVfbWIVmbc1D0zJQNeL8RwjvJ4RiAO7HKAaw7LT42ESdu4SyoPa1hs+gRncMrVkeyU2ag7HTb/skOEfkb8TuGgF0620M8Kr25dCKovlXhta5Oh8YYWRE7Rw== 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=/SqmBDvRsCVAX/TUj+re1ySFIkrriHJDcaLFI3PrOvA=; b=mTjFm87H+RVJwxu4DwqkxyZP3PURv8EuRHkd6prXPCCC/SEUgemoKJ81V8Xqz0AUK4/rfnHOag8sKBNfrmQLQDw1RaMkpTyO790ax5u5PSedzi1K/ZPLkc4waU2bcpAg7MozywFM3Q9Kde7PpwmzvvFhqEARch6H7cAXo394/o1RJe5ZzybunFjL7TwT2pZR+BGcH5hnzt/88Rz6/bl+jXl0nW7wuCyXxSthb4qU70LgIstTMxssCX5GMkjdyGUMeEKDX+S+1RMaGJDoAZXzVesHnoVfi4X2ZR5DLl7ZN1USahxr/2aXJ7enhEMMZ9b3Gw0X0Qt9oZhYnRKnMq/H5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/SqmBDvRsCVAX/TUj+re1ySFIkrriHJDcaLFI3PrOvA=; b=RLGSGhywzi+ZK9mBzSa8jJqi7Yu4nwtuDApORSZxFa8fQ8Anu6TRVnUqKq0AvAFql9YN/nbSfPqrjX/PkWAQGN2uZfUpy4p5rn0Jd30yPevQYAEn5r5f0CUy+uuxC54qjLMOBPNTSbiAOOlTJIKGZFdaBcmM5gsK91erozTYgis= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by DU0PR08MB8614.eurprd08.prod.outlook.com (2603:10a6:10:402::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:37 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:36 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Ilias Apalodimas , Michal Simek , Neil Armstrong , Qu Wenruo Subject: [PATCH v3 7/9] test: fs: Add fat12 to supported fs of some tests Date: Wed, 15 Nov 2023 13:44:22 +0100 Message-Id: <20231115124424.125823-8-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|DU0PR08MB8614:EE_ X-MS-Office365-Filtering-Correlation-Id: 221c6632-95cd-4be2-8adf-08dbe5d8a03f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z01/yvp47N3XYx8sBPPYnNOlw0pei6BBJ97RPsxJ1MbAnigHKCMc8wt4dRS48+WrHVDMpt0xrHml+MJigSTtSffs9jz2OlvCqogWiUe+t5LYRTX6CwWfv1VAGdQ2dLJUEduM29RMInhZJLYp42E+06TI40R2tlaCaT37Rpv4ylENZs0F+c7IRQ6pUqqzFCTAsVoysHPnk2e4otLQ3JZG2pcfwUHZ6fvjFpo5O+WpvwvPTcII8/BbRCI6ELiYfBdlZMFCFM/zGWkYiYO2PKXhNaeJLoUTuU0OfrGpmID3tP0y8t9Tgj9bcroeRtiq2mjP3AF+/qEDhfuSbVD0bnpM8ADxvVSF/CL/6jGD+MHeQxua/ZOKlzwX/Mrb5GllExVul58lL0uLMi5R2Dv+bZj87OD7QWCAVobLAUB9cY3scX+mj1Dv29c6KX4Fslq1CvGYE4osL14DlNKpOP6e+kgCQ7NyRjN9jIPRXYSpUfzhLDBC39jpv9VAUDhSklTKALXulyAIpeq/pJ0GhUDj+l1wCr0hYyBgImuxXZN54+pmmT8BC0fUBZVVZ9kYGpMDB6d3eD/KXgyYlrS2r++/Pr1SeV7ekhHF2p8mNyAK/HuN9LPvFBAH1G6P1amx+UNncHEs X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(376002)(366004)(136003)(396003)(39860400002)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(2616005)(66556008)(54906003)(6916009)(38100700002)(26005)(36756003)(316002)(66946007)(66476007)(86362001)(83380400001)(6512007)(52116002)(1076003)(6666004)(6506007)(9686003)(6486002)(2906002)(478600001)(8936002)(8676002)(5660300002)(4326008)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ziqt3upJmi5R4k6X1/XWKG5T+Rrjr4LL2gLfwaYLUDRwVQkCyS78EiRH/UGe0GWvdNrivYBlz/kpKs2LqcBrV4fYdr1WFz4jx8+kONW4VDyb+Jk86MuykZenuJtzpmk5Hlcku94BpQRpZdQ8f9rnzjMMygKhKtwF/vAIGZzasGP8KmtvScR9f8P9U5CCO61Hc5MQOoN7Pls+Pb7JAc9QeJh/0UWKBwmV6mML1GkQ7J2GGhXZZD2dPhAmNbIlVC0c5MSxK0IMqzpF5e1SAIzAW4O5AO+wwd7biQkIIqvOWvVOz9w0I3JMOMK5utxrjij8+2s1lHivI6rVd0qS9RBMYEu1Z9qcTNKc24op/UMZ1rD0iTxOjfQ0JT7YTWw1JTvs1Layauuj4XGvG7mf2nxU8SVt4FHAsx0OCdOnXo/eoPYO5xjA8UYUXXrGlWnMcyAlwu1hWtAoAxI8udsKOqmf+RSCVCi3lIYecnzkOOY33uZasOAuJsGGLa5avbnZObRsdFo8IRuX2UNJ8Sf0F4LSLxjL74fyF93hcaGscLTVNZXZAQjf+Hb3YtHcaDAPjtG/g+FkvAlSBpiOecTYpomS558UduH+TSbmuBodjyybR3bQaTqNTQI0zVp5DmsJjEEUq5LVdgTM9NlLRt8i4bvddGlyFuo+8rtocEBuXbImTbBl2swsw3Amr4S4x0ERvQjQAiqfmTGP30LdSWdEFAvogUZqP4+SWTLFa+clI3mxqTsq6WDk6uWTrWlzX9bj3xxz/+9itiZU1YSz2B5A4xu5VSBsxdYHEnatLqw0V57Oo0q0yMGe8TxXlMftPk36xpK1voILDEQu34ZEzThhoozt2mLR0XrLfiZCAeAy1ht5/LK+2+6gn7m/3fhEw2rrNB0Wb/KtiTQBsX1lc+XHB2HvG2n50e6ft2sdeB9LS4KrhewcBJGnk7K2X464oczZ9YuM4CNyy79Yf2vUtC/Xj5BvjQ8Em8y5AqO6bPy0NPvFSnilnoyofeMBI5zb5gqQfzZzI4s3Ce304eCgB1LW6GqJsZYKkYCs2zad21qAoCVPl5Qiati3kARaLINwvCl2RTeGysa9GvJolh3YOUp+1+VGuhRzcDCzC1et07E9GKidqIq5W+RyyK0fNmUMHEX+w0JtAS7FPmtYfwITOZYlqG5I2toZLC5RDghOxJGxfn6uyXYb2nxDZLP4eGeFkqGG9vm4NNVmeCX3mN0b+QqRy9JtTw5JQaQ5qCxDzDmbxAz7oF10z8jdsJNRUyaavKmMdNKiLKXpKCHpDyJRqfv4i1diiWRPjIewn3hb4GvYIfiewik2cJ8vrI8dysApESjdX5F/4spp4Wn4NAHrjSV640o9vgx8z3X9teWhWsh4q0eqfITTpI4HjATpsSewUJOCLfW1u9uMgoRowNawisYSTys+DuDjnP7wXOEipbHvJ2USkL0Y4AWFYfzyVAdXSlNllyzmMQjGj4WC4GhrLBbMeG77huRmRY29zbbRDABC+8arLdMxRfuABHQ7YRH6qmerFaI6vc0sdYdvPPYTN2NjQM1VlaH261nV3XXJjuTbUVbWF/NLqfyoHpTO9zlvXKZIraXJQ/FNoDxAxh1zEFiCX3JifcEpjMqdq8q8hFFK8yJZ0N/WQTgm2pgzqKCIFkpo1JVX X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 221c6632-95cd-4be2-8adf-08dbe5d8a03f X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:36.8495 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oMiISKpFHOlZPbXoAcGwL+kjbKQ2z/TQ3zOWK+oYGuquYQBWaub9o6pQyfGEcqJDH6zCBh+hkF0v+SDGb2dnJR8510wPPJakWFLY37kAxKG9bHHLH+ybtkGFtxIh4xCp X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8614 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 From: Christian Taedcke The tests fs_ext, fs_mkdir and fs_unlink support fat12 without modifications. The fs_basic test uses a partition that is too large for fat12, so it is omitted here. Signed-off-by: Christian Taedcke --- Changes in v3: - Enable some fs tests for FAT12 test/py/tests/test_fs/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 0d87d180c7..fa637a22a0 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -12,9 +12,9 @@ import u_boot_utils as util from tests import fs_helper supported_fs_basic = ['fat16', 'fat32', 'ext4'] -supported_fs_ext = ['fat16', 'fat32'] -supported_fs_mkdir = ['fat16', 'fat32'] -supported_fs_unlink = ['fat16', 'fat32'] +supported_fs_ext = ['fat12', 'fat16', 'fat32'] +supported_fs_mkdir = ['fat12', 'fat16', 'fat32'] +supported_fs_unlink = ['fat12', 'fat16', 'fat32'] supported_fs_symlink = ['ext4'] # From patchwork Wed Nov 15 12:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864242 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=cJuNuaS8; 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 4SVjZt6wCjz1yRG for ; Wed, 15 Nov 2023 23:46:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A9AF287251; Wed, 15 Nov 2023 13:44:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="cJuNuaS8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C996F871B4; Wed, 15 Nov 2023 13:44:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::628]) (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 36304871E7 for ; Wed, 15 Nov 2023 13:44:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uwfgml9gnTpVo+P6VtVKoA6zcDlyCuefLLEKcziIrJ1SskEnt4AAyHKH8IfqCg81y9uj5xg5NzK9dNIQfeadkX9Xa7hpGgN9v8pghvrsgKJFvBQ4zZ8koe23CeLvrrbWmgZZe0krJaR5bO7OIIIS+0D6M2IRn/gpWhlzOCKbtpqoWW8zDnsHsTsZ6oZ+CYu6K1XKTktInNHEQhhj/KaAbZkGAWaCelCIdWWsxfQZFmOWzxpT+R6cVHApCqTKcreE1/7mai5zusBzzzeAFSQdu6ZyLND0FAK70/sANJS0CTmNmmqL40c/iV7RjihIF2fiz4S91XebWGtA2SKB1MK7HQ== 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=HNQxAqlclIcN+HCjVSTxU2p4pbdd11q73JZoDbxnFjw=; b=HeQ4yYBWC0Zfe/7NfADFDRpAT//KGw8SByQ4K0Us0KFwj7Djo/hdqvzFkKB7h+VsNQwoAXbNQnfCgEkoU4IooLCM3na/+Evqv8UYD0eojeyVyBueenwsHOweaFcA7XCdYDd8ba21FQF7J+gSXBO4q5c7IRJnBXu/7T08l+pLil8vZoTbagkimJPru+M8uHTCvnsar2ivdkTOEtCcO/Gyp9WQbx+z152mte6vODRJbtiXZe0gYCCd+GF/mkzbz77XDSVGjxBfZpoBhWqRHOhUAfOYgl/asNpAl2VAde2ncs/JOlE9v2KSW42xNEsvrCTdTMCUmiDKD/v+Wer2w0deug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HNQxAqlclIcN+HCjVSTxU2p4pbdd11q73JZoDbxnFjw=; b=cJuNuaS8877RyTzV7WqsIA7WJJUUfHlft9N4SXlv6KH0n49xIjdXK8towNsuLR636dMM7Ue8ocoC5uVAisSYVDzH8vHSinFOa2o9qYfFIIqfYy9OOBu4XJo0cBT6lbieAZ8ufBKlsYtKQILlWHKupnw5gGGmpevKhl+s0jAG4IY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by DU0PR08MB8614.eurprd08.prod.outlook.com (2603:10a6:10:402::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:37 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:37 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Simon Glass Subject: [PATCH v3 8/9] test: Add size granularity parameter to mk_fs Date: Wed, 15 Nov 2023 13:44:23 +0100 Message-Id: <20231115124424.125823-9-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|DU0PR08MB8614:EE_ X-MS-Office365-Filtering-Correlation-Id: c6e28c82-f85a-48ca-610d-08dbe5d8a076 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UtI8otNxLS6Ka5nlVkocDTov/veIzSrY1f+nv4aYKr3S7gwucPzM4dN2XZZBXa6SLMNEBytmDSHoLBtucGm7xqA6Xh01wJ9tnA0I+QnWnC0okaFn6rMcP/28T++dFnwGIR4HvQmn6GVygJlCme2yp+tZyTSoH4yZCLWcPASpYjE4RCvsdwQAzmUT6OEvo2b02qGV/yUfAcb2AiMZQR+/2aSRTkG44nOigY1d6B4E7aR52Haq8gnuvHWfmF/+y7lrllXHT8Tq4C8cOUc/50yaHHCCFkRpIlikPQXmNda1BrwCP5+Pm5TgRT8Ngm+JLXMzK+LclGM5J1WUveXVO5r13171QS+2GWmdrox7D3eB+2KhyiN/WUF0pEylC4Y5z2kzJ5Xe1Ow6hWHZc40UkziVdCn/79Kqo5b7WMfW0+YVF59ZtlLBPn8v3koKYwwtBDGeL62Gc+vSg9m9NSWM1VVyAjLNzrMx2Fz0ScUysHqzUTemNYtpo6/HyOM9YGTDSMXjCPWm2JdC0UhxNViFcAo+q3fABPOAFVIfFgr95r1AxaRe4wFoeQnzKPRu9tHq2mLh2ZAS5rd7Z3GHvAxmiLLcHzSHiVJDCfz1/Kc2XTTjvTukc6sQ5NN7tW0jgsAIaDg9 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(376002)(366004)(136003)(396003)(39860400002)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(2616005)(66556008)(54906003)(6916009)(38100700002)(26005)(36756003)(316002)(66946007)(66476007)(86362001)(83380400001)(6512007)(52116002)(1076003)(6666004)(6506007)(9686003)(6486002)(2906002)(478600001)(8936002)(8676002)(5660300002)(4326008)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: soIgpeLbUbq+2UWplg5RdUgiosURKtFHK9LzfG7adk3MW1ETJTEzqP6pivRcwiU9oX+p9/B6jQiUzuYHznVOQ9OAfwIvFzcje9RmajdkrJLEAW+fyWfdBduDAfUXsLy0BVdRLR0bjXlpS6mlSxEluLiueHg9H96THJ4Z3CYDbZneEugGmr1C/++0fVD6whDeMaTs65UlCO7HJsFRJ2gBFQxSVolRmcUbLE6yB8vS393MIyucXVCYpYez/C4Gx9GgZyU2kp8ynMBv+eCrHc9eZrns97YIqdSV7ZdErYnAFR9kHBj16747R0JvusKv4LxJ6QCqL08ERzgGZCbQI7o8OKFvr4/Ao4KvUsTh7Vq5WjT4sk5vGti+pA5O1BkTdrpMQ6ZbEcrgWNoDY5qLQ4m3kHKDokDuhyx5/yiFkxktbyJkpGOhVkNpTjQL/Z9O053kY386i0odWdgxezUsSX6pvsSyQhexK2CxakEseRKcGwrPK5mPFFu8PgGltb62lpjJ705O3UXd3aclgSu1BotfH9+5q0waH78ZwmSHOsQ0cs51aZ5PKg5ofd9mzF6PYVz5wP40TFnuCojtqeCG6cC5YULs3lWa+ADs8nNWP97Il7jWPvcVtuzQOOfsp8RoeTF05cLzd5JAifJwpCDNvUIrRvq0PxmLDQSwrR2WvpcCS3cEaNjv9x8PoXF8v5DACr5ZIonJCwB7vlXdPpcA+0ywTKVseylOgpw2dxjYgZQNmS//4kCXdGKnI5JZ4+WuaBxqQrGYC+093kRjTOS7BhNqTx/ZLIdW8RHZ9MGc7+MCetxgQGC8NSvpvesc//swUh0jaDs4xHltzmokiN428Xi9FaQUUZ/4HsfiYxZMkDijMWYm4CfyIw5LgjLitssWJV2HHmlrmKkwmDMxPv6zY6tYAcmGaTo9An9+84tzyEgscEbyQqenN+/D+XWqZrs0vv0hA+fWwTu1WszzF69lZMtKbt+h6SeZdHh4aIfQ3Td7Dp1W2Vr8FDXT8fYqPvUkQbGLcgrpbnIP4A3jQKV/dnOM2ZypELgpozYqqD02tLOXCJsbXcK9+Z0Emzk+GRIDvn8h2g14n16OtD6oNciJF9MeUaJxPoETDhlZc1Nv5iRcDOs47yGq1Xaj7+vNOzrowNo6ISCjHMDEEvx2b2vHHiYJqN6zJpqOcz2Onst5l3oYA9c5K+VPVYCdynEjx8at9zkAQLoojfalAcm+/x/Bu4e8agquAGVqBfMfl/Gac0wiu3zpNZDngyTfEZH4afZ8OK1ZQVlcssdRG0Kp2Z9nlcWE/QGY6piHXZXK4UM0kiWyUgGNVCfsX4Np5WM9bTbeUYiOz5NeuOz5He+sPt0H1Vw0yZztw64iGMA4CLt0MeftDF0PKJDTGjx8EmMM8XO+Ho2N+bgcdcyhuQbNMtaph/l7eMfG0Q7Et1hVQrc2FoXBuUAoYALEEt9+J+UMMa864CsQCFFb/738KqYrJoHD5Wt6ULJa/v4z7boMwlgkZGezBbwocJjzLRoT/x2YypjUhDhHHZCUlmftzZ77paEisDz+YLYpEHbqzXhcb7aSQD9Z0OQK1j4Bmq1fFogD6L3Jrk/qKVR1npjm0yxjd2YzC8NJ+mIIOQiaXqGW2yliLBs3A4KS0E99hsuzn3hDefJRRUvG X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6e28c82-f85a-48ca-610d-08dbe5d8a076 X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:37.1768 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jdkq8iatSb8ZmweLeZYaKvnsTtO6XbhCYJ46eO9rotINgZVuHVp/Od0Ns19WRhsVCaK96sR0nNIms9Wrd8r+jhyVbocUPKnwTWD2YExCKs+owE3X+lp8Gw8j558JYQQq X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8614 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 From: Christian Taedcke Without this commit it is only possible to create filesystem images with a size granularity of 1MB. This commit adds the option to create file systems with different sizes, e.g 8.5MB. Signed-off-by: Christian Taedcke --- (no changes since v1) test/py/tests/fs_helper.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/py/tests/fs_helper.py b/test/py/tests/fs_helper.py index 0ae7a4c4d7..380f4c4dca 100644 --- a/test/py/tests/fs_helper.py +++ b/test/py/tests/fs_helper.py @@ -9,7 +9,7 @@ import re import os from subprocess import call, check_call, check_output, CalledProcessError -def mk_fs(config, fs_type, size, prefix): +def mk_fs(config, fs_type, size, prefix, size_gran = 0x100000): """Create a file system volume Args: @@ -17,6 +17,7 @@ def mk_fs(config, fs_type, size, prefix): fs_type (str): File system type, e.g. 'ext4' size (int): Size of file system in bytes prefix (str): Prefix string of volume's file name + size_gran (int): Size granularity of file system image in bytes Raises: CalledProcessError: if any error occurs when creating the filesystem @@ -38,7 +39,7 @@ def mk_fs(config, fs_type, size, prefix): else: fs_lnxtype = fs_type - count = (size + 0x100000 - 1) // 0x100000 + count = (size + size_gran - 1) // size_gran # Some distributions do not add /sbin to the default PATH, where mkfs lives if '/sbin' not in os.environ["PATH"].split(os.pathsep): @@ -46,7 +47,7 @@ def mk_fs(config, fs_type, size, prefix): try: check_call(f'rm -f {fs_img}', shell=True) - check_call(f'dd if=/dev/zero of={fs_img} bs=1M count={count}', + check_call(f'dd if=/dev/zero of={fs_img} bs={size_gran} count={count}', shell=True) check_call(f'mkfs.{fs_lnxtype} {mkfs_opt} {fs_img}', shell=True) if fs_type == 'ext4': From patchwork Wed Nov 15 12:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1864243 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=F4/n0JGC; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SVjb66JgMz1yRG for ; Wed, 15 Nov 2023 23:46:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23FC587264; Wed, 15 Nov 2023 13:44:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="F4/n0JGC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 045C6871C6; Wed, 15 Nov 2023 13:44:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::628]) (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 8BA59871FC for ; Wed, 15 Nov 2023 13:44:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oaCHTdyaC/G1BO75mV6NJR0w+elF6+AqwDSnglwpImj+vN1zMU4uvkgSewY4yyJ+aLHSu1NdTw4VoRDytfnBCfEsiVqrM2PDq0PFKd1PL7YB3exgfn8XnIMj9iKAVEvfFQx+rp0oKmDcnjMh8VhXjPS7fr9bNOQp99oeIopOFBriZ5OenMn2nmJ32kCPV159RgFs0K53H2V0l7AZWtzrZxE/Z3VMNXQT0F+raxEXkeCKT8mD5mMmyzjvNMYOGGdXjbX1BRA840LmNKwsxphuHPfKf3DsuTIS0PXaAGrbsd42t8e2VnvIxariPbr2OC5Upp5/onacJt8/gOqOMbHTfQ== 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=pm1zTecHuxnHD5HMXDfQ3xetTe/diNo8JANxYsyKHqU=; b=YBdpNovEtVxAVTZTeYUMtuIGY8WS3mXRSX1u9jdq4h+MxpT+NqrOAnNX3alPYUIuKYa7rc5tciWqCVR3cCEE7DHJrOYl6k424apE0+iL36kCPKYQrMjlKMCoCvA/Uwk1WQBJUnrL5DrEm0WoB5PA92QmqYczb0EkMZeBCNjQ0dASgACSv82fDRHcqUe4chJHu2vZnfZrDDlZqXqsHez2uK6RbGtKrkvFwwSRnfcs6xSDZ2OGl2hmzIGbxm1QgMkvpO4W/MMdsCUH8TGfmIF9utuLTlaP9ye5AIekXL7M3FMlyV5Ye8rPGp+siUSEbxewYp07eguM4aPzJgFz5Yusyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pm1zTecHuxnHD5HMXDfQ3xetTe/diNo8JANxYsyKHqU=; b=F4/n0JGCoAacFcSzVVsPWCBEunWmAyD51z0/L+NsbSIhIXUUVt3nMfW5/CVVIAeSrqgAdUxRqa/V1NcRX5fGE1PJkFKml92oWyog6oRHObxOIlviWT+kdHDQWYoamUWEqOF/40YnZLu0E2E5VcV9OI+A1AYRMeA3BgClQvRRnDU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by DU0PR08MB8614.eurprd08.prod.outlook.com (2603:10a6:10:402::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Wed, 15 Nov 2023 12:44:37 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a732:6327:19b0:b4d5%3]) with mapi id 15.20.6977.029; Wed, 15 Nov 2023 12:44:37 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Ilias Apalodimas , Michal Simek , Qu Wenruo , Stefan Roese Subject: [PATCH v3 9/9] test: fs: Add test to detect fat type Date: Wed, 15 Nov 2023 13:44:24 +0100 Message-Id: <20231115124424.125823-10-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> References: <20231115124424.125823-1-christian.taedcke-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::11) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|DU0PR08MB8614:EE_ X-MS-Office365-Filtering-Correlation-Id: 3222410a-2a34-4675-5dcc-08dbe5d8a0b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HpysBMNbFcbR7Za+uvIGCd14fwJ9/h/NurTBV++ilRXtoT+fCme22k+Vf8KODMSlHoqDtU5biGEUCETAJ4kCtLhHAW5UvHtbm6nZK3mUpJKbTHVil8kjCPuROVptDS2QXjWkWI2XkYANMbnzbOxUzb7Th/z0WlB9cJxfP0rgJQCf6aynegCnE/238HlF3WI5+BQEhyC8jip6q64Ha6Yc2klcxT2pANFlYJp2/bOcqlolULaqnWaH/HlK5Kbn1RGFKzf1DDWXxkPWi2Jga6G+MXMlgvMhyfTh+qVsG35ccnuyR58wxIxCOioHa4AZs5UDSC9yJdKQZAPbK+rcRTEu5r9Wojb/Ml8EsfM9fxXGGAzDxnsgdwyjZ4am6EgMZXCWFXhLeSh442Xp5B9/fRxqHQFhrUbUquSJ7BNKJQ5eGN127J8CblwmdzJ8TRaVYDLQjQkV2nwPXYrg8Ddm15QP0T34appfIEO47qBHO0sv4z78CQ17R7FWQQwNA53xZIxTa1Oz+0yJVp4BpeXbqWJ3h4lQqaCpPLO936bpAGn+653YgKSVIod7Xt/u0vmUrdFHX2hRACOraAstrs5KJx1H3cD1I8V8m2tgN9oyv2nZQZ0ZVKinLIofAAP2BdB5Fd/Z X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(376002)(366004)(136003)(396003)(39860400002)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(38350700005)(2616005)(66556008)(54906003)(6916009)(38100700002)(26005)(36756003)(316002)(66946007)(66476007)(86362001)(83380400001)(6512007)(66574015)(52116002)(1076003)(6666004)(6506007)(9686003)(6486002)(2906002)(478600001)(8936002)(8676002)(5660300002)(4326008)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?2H2WvbFUMMf+Dyn4SyJa4xjg9dU9?= =?utf-8?q?7t3OJs0z/4xkzv7FEB4khupWMCuTs36xMyUVDs5NcDgsNTuyv95snQARcj/nkYEBi?= =?utf-8?q?lBUCcwB1GGeVHbESga81tqaKYqKPFMPveOaGzdOcjJCukib+Ira4Y5fEvFauNnbJD?= =?utf-8?q?6naieN8oJ4TLVTqkjUY+a/NBpKXp93VK0dqHFqd+cFg4EKyCPcIRWfao9ZiWwO0Kb?= =?utf-8?q?OBi3dFaRJPgBAlSOi1tvYTKqx7oFzz/8p1jkSxZDW6r+eKWTWyh6Nt/DUPEEOP1Xf?= =?utf-8?q?w/QkSHeoEqRgOKcUS38cNNcV+jQzcc22uYfZ24j9RkH04Oh6Lyu3/roxk9qPdnsKl?= =?utf-8?q?S3KRxo19Mmw6od7nx3VlK1gSy/isRhPqQVFjgNWzFuIevYLgyLpmtaHSi8Y43pnZu?= =?utf-8?q?FLzZFWe2k1y8/OSzSKXB5iM5TGjOPW3iOt0AC41NEzVEsWpKS6NwC+jdonEaeNpPo?= =?utf-8?q?Rbeea1p18/vcopaNSBv44CAy9gKF4V0krZ8/LGC501Tq9BFAsOx5LVBwv1NPKnxZ7?= =?utf-8?q?xTOh9w08FdMEU+cofeKgX46K8T6UYu1xNcK8P/c6GoeP0JOxjSPBwZSkvO2GLIVbw?= =?utf-8?q?VIjqBbGPYME3ZADQrErBPBC3YYuvZhh3rCfhZxaZsru87rzqSolqIom6tbM7dn/P6?= =?utf-8?q?gMaUsA9Hg4GD00xHn9G9LQXSpXNbnpPVWQe84VHSib64TV7/0ESIcTe2X76304YIm?= =?utf-8?q?AV6zuP0a5g3JjJFUvCmwa64G6GoMcKNC31O6rDyB7SatvqE3kiYoXahgE8fiTIjNd?= =?utf-8?q?IFRk9dxCALTeemyfMGuw1g3H2DRxzF56+k07dCEYsAkgMSqX+66R7V7QQfCflIE3z?= =?utf-8?q?TDjQ96Cy/KiVLcqjVHBfhWrnDPy/+y1aaFX2sHpp6k3T2k5q6i2yhmH4HfgetKmc5?= =?utf-8?q?mzpO8jor2XikhvjRCLDO0fHyexOlsNt5shoMSZ0B8FcqPxcrzK+8EaYIRILN7qyee?= =?utf-8?q?pA2T/Rx5+oOqISPaPz1pJZQhhPRATCtsr2V8Q1S1cK5s7CtOrMyXVCrhoeoaaCoeg?= =?utf-8?q?vG2IrxQTxFe7FNEjyilCj/YzrGt+MvbNoNiI+5VFHwVYs3l/jjsSq8hS7MNon14E2?= =?utf-8?q?LVLVrurNv/PV6wZwEC4TQePakT/o+iXVe5rhqalSNQgRTbLpocNjgykoljbzffMzD?= =?utf-8?q?RTyfFuN3v2GkCscPKk1GjwQ6MJnkrPmD/ZuVXNJSSKu7wW5M/r/sha7fgtdkJKZad?= =?utf-8?q?3KHUqHoRk4aJ3k6wZv+PUzuvYsO2PMw108toHoW4VWvI8++873P06bG7Z4hN/rATN?= =?utf-8?q?S9C0p+PLQ5L8DJTs5QmN9077wXHEj+DCp7e4Y/pR+rpZBePfrap5l5TDU4dvoemGh?= =?utf-8?q?hozMK1gDsKuQaNaeF86S/xaF/V1ewY+zNoU06cWLQz9qzwi72cxd0XlwVpd9tJso9?= =?utf-8?q?dpMUvokQ++S0hWg6E8vmkhh5/fakvxtXDuqqB4iGh6MAPALERW11V1J3DY2VLTJgV?= =?utf-8?q?T0rH2SqoAYHNe4zp2tDmU/p0G/WRcmw+SWmOp/J2yLIbnU3DF1q2b5vTmZVLr4uTM?= =?utf-8?q?cihEBOgqR3HYhK4qy7VNZg4JIluio3n7PVplEahT4WZSSGzOXZsM7eNfmxHu9Lmti?= =?utf-8?q?9IqQOtC7Xgu?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3222410a-2a34-4675-5dcc-08dbe5d8a0b4 X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2023 12:44:37.6078 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cJMMWDaTmPMhRKRA06XVxzPDPictKkNqMP1MyIsLVwOENNvmyTgFM1fhp4/+ADuEkqvEryHWB+/fUq82FN1BFGaL5tut/WbwNTXpao0RBURspl+wVpHH+91TA9q6cCB9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8614 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 From: Christian Taedcke Ensure that a large FAT12 filesystem and a small FAT16 filesystem are detected correctly. Signed-off-by: Christian Taedcke --- Changes in v3: - Add test to detect fat fs type test/py/tests/test_fs/conftest.py | 47 ++++++++++++++++++++++++++++ test/py/tests/test_fs/test_fs_fat.py | 25 +++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 test/py/tests/test_fs/test_fs_fat.py diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index fa637a22a0..fdd138d6ee 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -13,6 +13,7 @@ from tests import fs_helper supported_fs_basic = ['fat16', 'fat32', 'ext4'] supported_fs_ext = ['fat12', 'fat16', 'fat32'] +supported_fs_fat = ['fat12', 'fat16'] supported_fs_mkdir = ['fat12', 'fat16', 'fat32'] supported_fs_unlink = ['fat12', 'fat16', 'fat32'] supported_fs_symlink = ['ext4'] @@ -49,6 +50,7 @@ def pytest_configure(config): """ global supported_fs_basic global supported_fs_ext + global supported_fs_fat global supported_fs_mkdir global supported_fs_unlink global supported_fs_symlink @@ -61,6 +63,7 @@ def pytest_configure(config): print('*** FS TYPE modified: %s' % supported_fs) supported_fs_basic = intersect(supported_fs, supported_fs_basic) supported_fs_ext = intersect(supported_fs, supported_fs_ext) + supported_fs_fat = intersect(supported_fs, supported_fs_fat) supported_fs_mkdir = intersect(supported_fs, supported_fs_mkdir) supported_fs_unlink = intersect(supported_fs, supported_fs_unlink) supported_fs_symlink = intersect(supported_fs, supported_fs_symlink) @@ -83,6 +86,9 @@ def pytest_generate_tests(metafunc): if 'fs_obj_ext' in metafunc.fixturenames: metafunc.parametrize('fs_obj_ext', supported_fs_ext, indirect=True, scope='module') + if 'fs_obj_fat' in metafunc.fixturenames: + metafunc.parametrize('fs_obj_fat', supported_fs_fat, + indirect=True, scope='module') if 'fs_obj_mkdir' in metafunc.fixturenames: metafunc.parametrize('fs_obj_mkdir', supported_fs_mkdir, indirect=True, scope='module') @@ -624,3 +630,44 @@ def fs_obj_symlink(request, u_boot_config): finally: call('rmdir %s' % mount_dir, shell=True) call('rm -f %s' % fs_img, shell=True) + +# +# Fixture for fat test +# +@pytest.fixture() +def fs_obj_fat(request, u_boot_config): + """Set up a file system to be used in fat test. + + Args: + request: Pytest request object. + u_boot_config: U-Boot configuration. + + Return: + A fixture for fat test, i.e. a duplet of file system type and + volume file name. + """ + + # the maximum size of a FAT12 filesystem resulting in 4084 clusters + MAX_FAT12_SIZE = 261695 * 1024 + + # the minimum size of a FAT16 filesystem that can be created with + # mkfs.vfat resulting in 4087 clusters + MIN_FAT16_SIZE = 8208 * 1024 + + fs_type = request.param + fs_img = '' + + fs_ubtype = fstype_to_ubname(fs_type) + check_ubconfig(u_boot_config, fs_ubtype) + + fs_size = MAX_FAT12_SIZE if fs_type == 'fat12' else MIN_FAT16_SIZE + + try: + # the volume size depends on the filesystem + fs_img = fs_helper.mk_fs(u_boot_config, fs_type, fs_size, f'{fs_size}', 1024) + except: + pytest.skip('Setup failed for filesystem: ' + fs_type) + return + else: + yield [fs_ubtype, fs_img] + call('rm -f %s' % fs_img, shell=True) diff --git a/test/py/tests/test_fs/test_fs_fat.py b/test/py/tests/test_fs/test_fs_fat.py new file mode 100644 index 0000000000..4009d0b63a --- /dev/null +++ b/test/py/tests/test_fs/test_fs_fat.py @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2023 Weidmüller Interface GmbH & Co. KG +# Author: Christian Taedcke +# +# U-Boot File System: FAT Test + +""" +This test verifies fat specific file system behaviour. +""" + +import pytest +import re + +@pytest.mark.boardspec('sandbox') +@pytest.mark.slow +class TestFsFat(object): + def test_fs_fat1(self, u_boot_console, fs_obj_fat): + """Test that `fstypes` prints a result which includes `sandbox`.""" + fs_type,fs_img = fs_obj_fat + with u_boot_console.log.section('Test Case 1 - fatinfo'): + # Test Case 1 - ls + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + 'fatinfo host 0:0']) + assert(re.search('Filesystem: %s' % fs_type.upper(), ''.join(output)))