From patchwork Mon Jul 3 13:39:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1802769 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=WFGLg4Kl; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qvn9n6gmpz20b1 for ; Mon, 3 Jul 2023 23:40:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65BB686683; Mon, 3 Jul 2023 15:40:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WFGLg4Kl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B02358666C; Mon, 3 Jul 2023 15:40:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 86C7386658 for ; Mon, 3 Jul 2023 15:40:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jpewhacker@gmail.com Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-6b73741a632so3434804a34.3 for ; Mon, 03 Jul 2023 06:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688391607; x=1690983607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=78CsVqoiN0gAICuF3ZV+67ugcfcXhxv+8VaF7bUa8q4=; b=WFGLg4Klu5xY+XFxJ23C8i+rmUX9OUp5FDLEH2gB0cgDVdhWEFi6YFeFdt1Pf1Eppz rmsGD0Rdut8u9zG6cPaktQUlLiLtZVtMj0p47CFkNZuralWcb7LdTvaHb8OcI5uHTPYD 1p7BbQsD1fzOnNCZh/QLM4rIg6G1v3I/brhr0Mb90j0SDq6Firuw2fSr8BH42VUCuE5F EZdn8fD96mrBa9zTmoLX4pCJSTVuat+qNerwzBQIXvP7Adwf25B2vIQku/ta/WUwWhmH PAI4Ht61V+HUNGqvZSVXWyGR3Uvx+Nsg4ZLGLrq+uHnqpI27XfGnf6s/L0qGW94XhrrI RBnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688391607; x=1690983607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=78CsVqoiN0gAICuF3ZV+67ugcfcXhxv+8VaF7bUa8q4=; b=kWINTTpZbdsaBSKeMTLhh9nuAR1GeYDLc9yHGrFXu0WftTAkNtue3Jm7SHCoiNMuyY mBSN7+v25QxASXMLWz9cyBhHVg4RMEHOyUZzfFQeRqecOjGegtwGZw1jKYERf6TEWfwy UQpF8pSFj8f4zY8QiB+xapkvOdEzO0Llfyekp735YsEGlqc62jQj86icsaKiYleRSf5F 7f7gM2ApmlY/gbNQ5e+ZqU6RQPRDQxE3E7iO1lqbcui4wHbLOQKZgq5Ed/hP7OTF4h9F pntctBetLr85PnKOma1C+wPtmreWrv8Bn7ALH3oGaQMyotChxkO5i2YKGmWzD0thsK52 0GZg== X-Gm-Message-State: AC+VfDwjjY0AP2mPbSJFzmH/Xiy2qPhks8/CFi+8sohwIAiR2u9e+2Yf +01o5Axw7qy9Guw7oTmPz+q1XeqeHTw= X-Google-Smtp-Source: ACHHUZ7N/F0662fX6JWvaIcxCGFvJ8ZLrt4vEccvadluzTIqjsXKbc2pv78mcxOHgXlJynsHruz6aw== X-Received: by 2002:a9d:6b91:0:b0:6af:6de9:1c24 with SMTP id b17-20020a9d6b91000000b006af6de91c24mr9111505otq.18.1688391607221; Mon, 03 Jul 2023 06:40:07 -0700 (PDT) Received: from localhost.localdomain ([204.77.163.107]) by smtp.gmail.com with ESMTPSA id j2-20020a9d7382000000b006b8cf55a997sm535720otk.28.2023.07.03.06.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 06:40:06 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: u-boot@lists.denx.de Cc: Joshua Watt , Simon Glass Subject: [PATCH v2 1/5] dm: test: Fix partition test to use mmc2 Date: Mon, 3 Jul 2023 08:39:52 -0500 Message-Id: <20230703133959.3880305-2-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230703133959.3880305-1-JPEWhacker@gmail.com> References: <20230623200031.2689749-1-JPEWhacker@gmail.com> <20230703133959.3880305-1-JPEWhacker@gmail.com> MIME-Version: 1.0 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 d94d9844bc ("dm: part: Update test to use mmc2") attempted to make the test use mmc2, but the change was incomplete in that it didn't also change the strings that reference a specific partition. Fix these so that the test passes again Signed-off-by: Joshua Watt Reviewed-by: Simon Glass Reviewed-by: Jaehoon Chung --- test/dm/part.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/dm/part.c b/test/dm/part.c index 35e99eeb01..d5c58d6e3f 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -76,15 +76,15 @@ static int dm_test_part(struct unit_test_state *uts) test(-EINVAL, "#test1", true); test(1, "2", false); test(1, "2", true); - test(-ENOENT, "1:0", false); - test(0, "1:0", true); - test(1, "1:1", false); - test(2, "1:2", false); - test(1, "1.0", false); - test(0, "1.0:0", true); - test(1, "1.0:1", false); - test(2, "1.0:2", false); - test(-EINVAL, "1#bogus", false); + test(-ENOENT, "2:0", false); + test(0, "2:0", true); + test(1, "2:1", false); + test(2, "2:2", false); + test(1, "2.0", false); + test(0, "2.0:0", true); + test(1, "2.0:1", false); + test(2, "2.0:2", false); + test(-EINVAL, "2#bogus", false); test(1, "2#test1", false); test(2, "2#test2", false); ret = 0; From patchwork Mon Jul 3 13:39:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1802770 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=jHFwqwN6; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qvn9v2l4jz20b1 for ; Mon, 3 Jul 2023 23:40:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0349866DF; Mon, 3 Jul 2023 15:40:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jHFwqwN6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E3B4866DA; Mon, 3 Jul 2023 15:40:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B6D5486658 for ; Mon, 3 Jul 2023 15:40:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jpewhacker@gmail.com Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-6b708b97418so3688363a34.3 for ; Mon, 03 Jul 2023 06:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688391611; x=1690983611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EXWxTLmxUE2jaA97pb3y9BpGbfKh7u8lS6zy1FSor9g=; b=jHFwqwN6FJrdhcPUPWnEz2HGRtceF583WGGNnaKWEog3MONOgzJ1qCtcEG+vINWTfc 77gINMSDZ8qeOadEsTh/h1tAU0B4NvBK4LHKnT9UMiUmtNADOXAWnaCzMREaVvseeccR 7LZw2mmtRsasXu7pBehnGXh+5Q7Hxl5G48UoU81TiFtUEE1gEPFEbz9DSsEw8iNW6mCh xvXltBXbLbc7ZtjbGglWZDg58ntMMhhaLr6YePuZIpqNWyVhCK2l2K24HG2RSqfXdLA8 fDMyWMajgAvrj13L+4R1SXO0TthkABLMJJFLBMneq37XKGc68ZqZ06GgQHoQsfnwO5Pe 3EUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688391611; x=1690983611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EXWxTLmxUE2jaA97pb3y9BpGbfKh7u8lS6zy1FSor9g=; b=IFaRDWiazhq0tHhxg8RtzdsY/kjp5X4q76eMvhmW08PEZ+11ipRYS5ciFNOltdCzvr VvUPz5U1QwfViCz5rIQRomT8X0RzvkLZnDor5WWZhUSdfhvyLss1nNGgIHjkJGGX/rv7 goOAfArldMzN297rsp9zKtglKx5HnGB9aMtRjVddoD8SYpe79QtgMJQ0h9S2pSeK4mWp 5OODFThMaKCrFGbIkK7BaEmLPN/2kCUI1ms1O1ygntapw2EAQ0P3rJSiQTaDKWua6wKM pMKsUKeBrnO3Co2mmLnVOXzrOY1GBDnEuojlJ/A0/4iwTJmjcuirNBCuPFA5xUirUp0D 0QOg== X-Gm-Message-State: AC+VfDzJX7f8jaCmdhTExHhBsfqCjmfiYMcTig8DRAokm1GCxe7mJBpv BCHhpzhj987bkqHAud+47bOHQAkQZzg= X-Google-Smtp-Source: ACHHUZ6LAfeTKLesWAzLiTaUi5gekOO6bqHpad5yC5S0L0nTZGFRabUGIsZCEsfN2u62p0hbvPwdIw== X-Received: by 2002:a9d:7553:0:b0:6b8:82ed:ea30 with SMTP id b19-20020a9d7553000000b006b882edea30mr9451884otl.26.1688391610864; Mon, 03 Jul 2023 06:40:10 -0700 (PDT) Received: from localhost.localdomain ([204.77.163.107]) by smtp.gmail.com with ESMTPSA id j2-20020a9d7382000000b006b8cf55a997sm535720otk.28.2023.07.03.06.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 06:40:10 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: u-boot@lists.denx.de Cc: Joshua Watt , Simon Glass Subject: [PATCH v2 2/5] dm: test: Improve partition test error output Date: Mon, 3 Jul 2023 08:39:53 -0500 Message-Id: <20230703133959.3880305-3-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230703133959.3880305-1-JPEWhacker@gmail.com> References: <20230623200031.2689749-1-JPEWhacker@gmail.com> <20230703133959.3880305-1-JPEWhacker@gmail.com> MIME-Version: 1.0 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 Improve the logging when the partition test fails so that it is clear what went wrong, shown with actual values. Signed-off-by: Joshua Watt Reviewed-by: Simon Glass --- test/dm/part.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/dm/part.c b/test/dm/part.c index d5c58d6e3f..7dd8bc7a3c 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -17,10 +17,12 @@ static int do_test(struct unit_test_state *uts, int expected, struct blk_desc *mmc_dev_desc; struct disk_partition part_info; - ut_asserteq(expected, - part_get_info_by_dev_and_name_or_num("mmc", part_str, - &mmc_dev_desc, - &part_info, whole)); + int ret = part_get_info_by_dev_and_name_or_num("mmc", part_str, + &mmc_dev_desc, + &part_info, whole); + + ut_assertf(expected == ret, "test(%d, \"%s\", %d) == %d", expected, + part_str, whole, ret); return 0; } From patchwork Mon Jul 3 13:39:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1802771 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=cSGO69dr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QvnB55YJbz20b1 for ; Mon, 3 Jul 2023 23:40:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC0448677D; Mon, 3 Jul 2023 15:40:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cSGO69dr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 34C6286775; Mon, 3 Jul 2023 15:40:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 239CC8675D for ; Mon, 3 Jul 2023 15:40:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jpewhacker@gmail.com Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1b3c503af99so14577fac.0 for ; Mon, 03 Jul 2023 06:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688391616; x=1690983616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fNNa2gV/Wjm7yO2e2PBx88jzNXKRtb09Fi9Lvrdh6QI=; b=cSGO69drTfowmBfBXkwvurppPcaTwSakpQ1OKVxERo4ACAdZESRZgqX4P+5UkOv7rn xq1uyxTvawwONSWFtIWLqGGIgZ1t4tBybhcNTOG4/F4TuqEhzk2Vp0VmDUMEcgCHZNlR Yhm2YlZS9MxdTNMa4v2Qw1Rc2HI5+4Zt1FPeOpK5ioytyXg/mwb91EHhFTirLVgxEIiX 7TtjenXkKhEf7f8VgPqa5N6sHuDaLFAtoa4mSQDFsfXNf72uuTXgoryJDvAwPOvBSkDD TJ8StTy4rHpg+BE0TAP0/e6vT9uIL6ChGKWLoxRtCyejrXT/rNVUeJjl24a1Q8Mu3XE7 jGNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688391616; x=1690983616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fNNa2gV/Wjm7yO2e2PBx88jzNXKRtb09Fi9Lvrdh6QI=; b=GsRX9YIHFBrmXmPee+2I5uxhu3q4iEI5WctTEc/I1sg3WzxQ/HhqMJrlwmQez1vCc5 groXWgITgB5rzFjoS7V6V22fBl/e1dxoVvOwHiMmdFaJ+TUp42XLXya3QgzbYqh+pMYb VqefbC+9+NgJxOEnoyH4AWz7/fjmPV0yzNqxQjFiU2V4g1BVYH4pmjMvWtx9e1VWsTqk Zn44krZ8wBY9xyo/RCLd9Foaj3kz6t71PUkVRNBUM6FwfHe30mOBRRVJd4m3+FVIWTv6 mNcQ7CGixCJ8gy55DOOM3hwvCG+jIe6CQE9Z1O44BsEHtku8Ia2Gq/zDYQ6Z7GR4AZN3 G+lg== X-Gm-Message-State: ABy/qLZg1f8RRZnOEVUgpiwp0J0fovoe0tx4SErw89dNE5jKIWOCY4A7 Uhw4yPw48JA8y5Qcqu3lpl2Cjvl3leE= X-Google-Smtp-Source: APBJJlEKwLC5tNeZp0w4NT3PUSCX+eZpHBz5fQoYbppu7mkT+uNdUdrtqw3hMCWE3/cytORK2qBg8A== X-Received: by 2002:a05:6870:82ab:b0:1b0:7078:58ad with SMTP id q43-20020a05687082ab00b001b0707858admr15139855oae.38.1688391615928; Mon, 03 Jul 2023 06:40:15 -0700 (PDT) Received: from localhost.localdomain ([204.77.163.107]) by smtp.gmail.com with ESMTPSA id j2-20020a9d7382000000b006b8cf55a997sm535720otk.28.2023.07.03.06.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 06:40:15 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: u-boot@lists.denx.de Cc: Joshua Watt , Simon Glass , Tobias Waldekranz , Heinrich Schuchardt , Heiko Schocher , Stefan Herbrechtsmeier Subject: [PATCH v2 3/5] disk: part: Add API to get partitions with specific driver Date: Mon, 3 Jul 2023 08:39:54 -0500 Message-Id: <20230703133959.3880305-4-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230703133959.3880305-1-JPEWhacker@gmail.com> References: <20230623200031.2689749-1-JPEWhacker@gmail.com> <20230703133959.3880305-1-JPEWhacker@gmail.com> MIME-Version: 1.0 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 Adds part_driver_get_type() API which can be used to force a specific driver to be used when getting partition information instead of relying on auto detection. Signed-off-by: Joshua Watt Reviewed-by: Simon Glass --- disk/part.c | 38 +++++++++++++++++++++++++++++++------- include/part.h | 19 ++++++++++++++++++- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/disk/part.c b/disk/part.c index 35300df590..1f8c786ca5 100644 --- a/disk/part.c +++ b/disk/part.c @@ -26,6 +26,22 @@ /* Check all partition types */ #define PART_TYPE_ALL -1 +static struct part_driver *part_driver_get_type(int part_type) +{ + struct part_driver *drv = + ll_entry_start(struct part_driver, part_driver); + const int n_ents = ll_entry_count(struct part_driver, part_driver); + struct part_driver *entry; + + for (entry = drv; entry != drv + n_ents; entry++) { + if (part_type == entry->part_type) + return entry; + } + + /* Not found */ + return NULL; +} + static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc) { struct part_driver *drv = @@ -44,10 +60,7 @@ static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc) } } } else { - for (entry = drv; entry != drv + n_ents; entry++) { - if (dev_desc->part_type == entry->part_type) - return entry; - } + return part_driver_get_type(dev_desc->part_type); } /* Not found */ @@ -306,8 +319,8 @@ void part_print(struct blk_desc *dev_desc) drv->print(dev_desc); } -int part_get_info(struct blk_desc *dev_desc, int part, - struct disk_partition *info) +int part_get_info_by_type(struct blk_desc *dev_desc, int part, int part_type, + struct disk_partition *info) { struct part_driver *drv; @@ -320,7 +333,12 @@ int part_get_info(struct blk_desc *dev_desc, int part, info->type_guid[0] = 0; #endif - drv = part_driver_lookup_type(dev_desc); + if (part_type == PART_TYPE_UNKNOWN) { + drv = part_driver_lookup_type(dev_desc); + } else { + drv = part_driver_get_type(part_type); + } + if (!drv) { debug("## Unknown partition table type %x\n", dev_desc->part_type); @@ -340,6 +358,12 @@ int part_get_info(struct blk_desc *dev_desc, int part, return -ENOENT; } +int part_get_info(struct blk_desc *dev_desc, int part, + struct disk_partition *info) +{ + return part_get_info_by_type(dev_desc, part, PART_TYPE_UNKNOWN, info); +} + int part_get_info_whole_disk(struct blk_desc *dev_desc, struct disk_partition *info) { diff --git a/include/part.h b/include/part.h index be75c73549..8a0c8732a6 100644 --- a/include/part.h +++ b/include/part.h @@ -105,7 +105,24 @@ struct blk_desc *blk_get_dev(const char *ifname, int dev); struct blk_desc *mg_disk_get_dev(int dev); -/* disk/part.c */ +/** + * part_get_info_by_type() - Get partitions from a block device using a specific + * partition driver + * + * Each interface allocates its own devices and typically struct blk_desc is + * contained with the interface's data structure. There is no global + * numbering for block devices, so the interface name must be provided. + * + * @dev_desc: Block device descriptor + * @part: Partition number to read + * @part_type: Partition driver to use, or PART_TYPE_UNKNOWN to automatically + * choose a driver + * @info: Returned partition information + * + * Return: 0 on success, negative errno on failure + */ +int part_get_info_by_type(struct blk_desc *dev_desc, int part, int part_type, + struct disk_partition *info); int part_get_info(struct blk_desc *dev_desc, int part, struct disk_partition *info); /** From patchwork Mon Jul 3 13:39:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1802772 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=nuQJqrrl; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QvnBJ3GsKz20b1 for ; Mon, 3 Jul 2023 23:40:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1EB588676D; Mon, 3 Jul 2023 15:40:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nuQJqrrl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB7BC8676C; Mon, 3 Jul 2023 15:40:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 08630866DA for ; Mon, 3 Jul 2023 15:40:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jpewhacker@gmail.com Received: by mail-ot1-x32a.google.com with SMTP id 46e09a7af769-6b72c4038b6so3525721a34.0 for ; Mon, 03 Jul 2023 06:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688391620; x=1690983620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I5o1x2KGMCMib+PilCbNw5+/pB7NjEx8QfxHkHPGphc=; b=nuQJqrrlHyiPkm0e9kz0idzXrbw9FxLb69jcDPIRCbXhdRaEF1spTjVDIGeOQAfKh9 8KfF2EtxWmQhhyz+QuVriT0UYRQi9kc5SLUQCZ7QULLCY1Z3RNvi2zS7vhMWb/vRw4oQ L+OHtdQNolWKWtwuV+Fv6g06r/9EKs3nPJyBvNIji0CrI+/4mRTM0H5Y9MPRhY5mUQxq QtUnTr0QF8qgsTJRmaeB0WNmeI4RxmZrkyfjeJAyS78zyXQoXazv6/jQ0vlbzcP2E6L+ YO9VOfxo8pyyBL2g1AGM0VhrfkRMtOTMTlRdBi7qMWmFwijapGAjo9AicXccn7dM93S9 O5+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688391620; x=1690983620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I5o1x2KGMCMib+PilCbNw5+/pB7NjEx8QfxHkHPGphc=; b=VIv0Z49MjTPVJCbuImwUr3//LQF1sms4G0xb4kkix/dxMPy+yKy/XMm09+Cawp/fzf sYgR1MIcBQ7DFJMPOe8UTkqUq73jU1bDXu+NzQs08pIHNJuk3T58+vWUTEJMHUKvhY8U u7Ra8deZ5LdYgMQL4pCx27r7YXlZkJMweKgHXd914fKJ9+c3PWpX4LAw14TcBW24IjrE NAdtfssCiquMu9MBwTesc+W5yf0tqkbx+2nk8J7SfjZQ9wYW2++d1pFujCKBiXdOPw+a bK/AlJKSoyXvv/gS4NXFrN1G94BpLXEl6EugejitNZAQbbBQ/CZx8LxbaeFXoGMc6l3W 8dEA== X-Gm-Message-State: AC+VfDy+mAhOgEOexD3941TU7qs4aUEvXEq9e2EL6eRiR4ltTtNWu+9N qv0yjG4A4not2NsOs6cZqHbazWTODRM= X-Google-Smtp-Source: APBJJlFE7DO+DMzEas55Bp8kKG29Sh1rMrI36HlWEJKKGkk6cTi2rGEjrvRU0Xea20G/71BvwMmJvQ== X-Received: by 2002:a05:6870:b604:b0:1b0:579:195f with SMTP id cm4-20020a056870b60400b001b00579195fmr9212858oab.47.1688391620033; Mon, 03 Jul 2023 06:40:20 -0700 (PDT) Received: from localhost.localdomain ([204.77.163.107]) by smtp.gmail.com with ESMTPSA id j2-20020a9d7382000000b006b8cf55a997sm535720otk.28.2023.07.03.06.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 06:40:19 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: u-boot@lists.denx.de Cc: Joshua Watt , Simon Glass Subject: [PATCH v2 4/5] dm: test: Add test for part_get_info_by_type Date: Mon, 3 Jul 2023 08:39:55 -0500 Message-Id: <20230703133959.3880305-5-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230703133959.3880305-1-JPEWhacker@gmail.com> References: <20230623200031.2689749-1-JPEWhacker@gmail.com> <20230703133959.3880305-1-JPEWhacker@gmail.com> MIME-Version: 1.0 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 Adds a test suite to ensure that part_get_info_by_type works correctly by creating a hybrid GPT/MBR partition table and reading both. Signed-off-by: Joshua Watt Reviewed-by: Simon Glass --- configs/sandbox_defconfig | 2 + test/dm/part.c | 87 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 1ec44d5b33..cbc5d5b895 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -71,6 +71,7 @@ CONFIG_CMD_GPIO_READ=y CONFIG_CMD_PWM=y CONFIG_CMD_GPT=y CONFIG_CMD_GPT_RENAME=y +CONFIG_CMD_MBR=y CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_LOADM=y @@ -131,6 +132,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_CMD_STACKPROTECTOR_TEST=y CONFIG_MAC_PARTITION=y CONFIG_AMIGA_PARTITION=y +CONFIG_DOS_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_ENV_IS_NOWHERE=y diff --git a/test/dm/part.c b/test/dm/part.c index 7dd8bc7a3c..d6e4345812 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -108,3 +108,90 @@ static int dm_test_part_bootable(struct unit_test_state *uts) return 0; } DM_TEST(dm_test_part_bootable, UT_TESTF_SCAN_FDT); + +static int do_get_info_test(struct unit_test_state *uts, + struct blk_desc *dev_desc, int part, int part_type, + struct disk_partition const *reference) +{ + struct disk_partition p; + int ret; + + memset(&p, 0, sizeof(p)); + + ret = part_get_info_by_type(dev_desc, part, part_type, &p); + printf("part_get_info_by_type(%d, 0x%x) = %d\n", part, part_type, ret); + if (ut_assertok(ret)) { + return 0; + } + + ut_asserteq(reference->start, p.start); + ut_asserteq(reference->size, p.size); + ut_asserteq(reference->sys_ind, p.sys_ind); + + return 0; +} + +static int dm_test_part_get_info_by_type(struct unit_test_state *uts) +{ + char str_disk_guid[UUID_STR_LEN + 1]; + struct blk_desc *mmc_dev_desc; + struct disk_partition gpt_parts[] = { + { + .start = 48, /* GPT data takes up the first 34 blocks or so */ + .size = 1, + .name = "test1", + .sys_ind = 0, + }, + { + .start = 49, + .size = 1, + .name = "test2", + .sys_ind = 0, + }, + }; + struct disk_partition mbr_parts[] = { + { + .start = 1, + .size = 33, + .name = "gpt", + .sys_ind = EFI_PMBR_OSTYPE_EFI_GPT, + }, + { + .start = 48, + .size = 1, + .name = "test1", + .sys_ind = 0x83, + }, + }; + + ut_asserteq(2, blk_get_device_by_str("mmc", "2", &mmc_dev_desc)); + if (CONFIG_IS_ENABLED(RANDOM_UUID)) { + gen_rand_uuid_str(gpt_parts[0].uuid, UUID_STR_FORMAT_STD); + gen_rand_uuid_str(gpt_parts[1].uuid, UUID_STR_FORMAT_STD); + gen_rand_uuid_str(str_disk_guid, UUID_STR_FORMAT_STD); + } + ut_assertok(gpt_restore(mmc_dev_desc, str_disk_guid, gpt_parts, + ARRAY_SIZE(gpt_parts))); + + ut_assertok(write_mbr_partitions(mmc_dev_desc, mbr_parts, + ARRAY_SIZE(mbr_parts), 0)); + +#define get_info_test(_part, _part_type, _reference) \ + ut_assertok(do_get_info_test(uts, mmc_dev_desc, _part, _part_type, \ + _reference)) + + for (int i = 0; i < ARRAY_SIZE(gpt_parts); i++) { + get_info_test(i + 1, PART_TYPE_UNKNOWN, &gpt_parts[i]); + } + + for (int i = 0; i < ARRAY_SIZE(mbr_parts); i++) { + get_info_test(i + 1, PART_TYPE_DOS, &mbr_parts[i]); + } + + for (int i = 0; i < ARRAY_SIZE(gpt_parts); i++) { + get_info_test(i + 1, PART_TYPE_EFI, &gpt_parts[i]); + } + + return 0; +} +DM_TEST(dm_test_part_get_info_by_type, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); From patchwork Mon Jul 3 13:39:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1802773 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=n+uW8Zzd; dkim-atps=neutral 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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QvnBW56m0z20b1 for ; Mon, 3 Jul 2023 23:41:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A77186769; Mon, 3 Jul 2023 15:40:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n+uW8Zzd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 65FEA86774; Mon, 3 Jul 2023 15:40:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E3F18866DA for ; Mon, 3 Jul 2023 15:40:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jpewhacker@gmail.com Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-6b71eef1bc0so3433894a34.2 for ; Mon, 03 Jul 2023 06:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688391623; x=1690983623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gqfKpu2+Gxb2LkwooVes4uAnsxiTiqlZf/wFv2h46s4=; b=n+uW8ZzdIinVV7iLi9L6PD+k4vIFqWEOewx+YYzAmLnj80RpuV/pNFd8gLwLcP8WgP c53r98YSfIbAWIc8iNL3j+Z+Lgt+vPK6xSROW+IkQHUr1AAwIpXd0dTmQM7ElSBpuZjl Ln5rECzfsrYykBYaEiYmuu8jLucX0XRbWsffuJ95Y0DlQBlh1htSBKU0lMpe66InJAVB 7USuJyJjX34uM7qohHchtHdaF4kqLwqi37ehqV2YaeMLA5un4CK6kJVfVeXzaGdw4mje VLNX4Jl4ppOXehUQPwxLV0Pyhq/TGw2FvKqVmk1CqWnRJleok885SS9oU+XCbGM7BFqT eVZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688391623; x=1690983623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gqfKpu2+Gxb2LkwooVes4uAnsxiTiqlZf/wFv2h46s4=; b=DjZrYPbpdkF6S0F+p86+DX5pUsjE7u0SLGd3sMFuvvXMuTJJUVvLWKgvqOPE2HoIwF fVFqowWHXjoN7ns3L9QJa+uOn7Ok2TpsPRZJcb6heXYhLMPP47dTvtBrZTZp66/IbFfi l5qxZmXQ9aWd4v0ratZqNbFWSkOFaeV0iAPz6dwQvAZ0itURkb8ZE6U5HjDWGSLoKwwM 56xpEhj6gIIw48q3y0PVe46lU/VFAjyQEDzBi38bHmRjSy8aHOJjI4qEICwTyAmIrtqy 3URRJmOx5FXfMYwjQ0GtxkKMSXlaRSJoPXYHmfXwyMD0+/wqusuO4xyhLdaaeRJpBWAr 4CHQ== X-Gm-Message-State: AC+VfDxWsc+Lf75vBlGDPVVkR6QQNm0mUBltWsIEjoWJMBEFG6/ptv2i xTKNnJ79rnwDzPxAf05u7Z0bGCMhuIk= X-Google-Smtp-Source: ACHHUZ76Zw6PVJgSbid3nKkJr9B7cqnPdaSb/h3/yWFkziZRHUcWyxuG2Zqb2mzxHKsKYzYHp0lGdg== X-Received: by 2002:a9d:4d13:0:b0:6b3:d369:9c0a with SMTP id n19-20020a9d4d13000000b006b3d3699c0amr9030470otf.19.1688391622917; Mon, 03 Jul 2023 06:40:22 -0700 (PDT) Received: from localhost.localdomain ([204.77.163.107]) by smtp.gmail.com with ESMTPSA id j2-20020a9d7382000000b006b8cf55a997sm535720otk.28.2023.07.03.06.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 06:40:22 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: u-boot@lists.denx.de Cc: Joshua Watt Subject: [PATCH v2 5/5] cmd: mbr: Force DOS driver to be used for verify Date: Mon, 3 Jul 2023 08:39:56 -0500 Message-Id: <20230703133959.3880305-6-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230703133959.3880305-1-JPEWhacker@gmail.com> References: <20230623200031.2689749-1-JPEWhacker@gmail.com> <20230703133959.3880305-1-JPEWhacker@gmail.com> MIME-Version: 1.0 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 Forces the DOS partition type driver to be used when verifying the MBR. This is particularly useful when using a hybrid MBR & GPT layout as otherwise MBR verification would mostly likely fail since the GPT partitions will be returned, even if the MBR is actually valid. Signed-off-by: Joshua Watt Reviewed-by: Simon Glass --- cmd/mbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mbr.c b/cmd/mbr.c index c269833eb8..ec99b66283 100644 --- a/cmd/mbr.c +++ b/cmd/mbr.c @@ -244,7 +244,7 @@ static int do_verify_mbr(struct blk_desc *dev, const char *str) for (i = 0; i < count; i++) { struct disk_partition p; - if (part_get_info(dev, i + 1, &p)) + if (part_get_info_by_type(dev, i + 1, PART_TYPE_DOS, &p)) goto fail; if ((partitions[i].size && p.size != partitions[i].size) ||