From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 26 Nov 2025 11:26:11 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vOCix-0052kk-1F for lore@lore.pengutronix.de; Wed, 26 Nov 2025 11:26:11 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vOCiw-0002Lr-8O for lore@pengutronix.de; Wed, 26 Nov 2025 11:26:11 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cajXcMz2mIprdyhDTzwAFevqMdh7t/QvAtcLQoXcaxs=; b=unLdmhHSthhi1PtrtaM2+ntNxB JOhE/rS8JOKXlcyTdChTrpqaqIVv4cmTDaWCkj2AP8LgGK5lrYGlTvppT7dYg704+vxZkmlT5acZa W1y2Cuf0VswYLBj+HHaxdBR8+/ZIlVSnbaDIc0w/SnGa6Hl2Q/VCx+tkiWlIltasfRAvGT2zZRS2S X7LWmx8Z3oMJ0IDqelmgXNJRBNPW7s/XYEHyLP7ZkeNNlN5av9vevKcTnoFniixphDumfawIniV/C LQx6yl9xFHknq9PmJ+OWwchxOkr1X/F4LCr6dD5ZjhAmNcomxKSiNar6LP2OUt4YLZ4Jo9e2LmeDK Yir0w5GQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOCiO-0000000Emc9-1fR2; Wed, 26 Nov 2025 10:25:36 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOCiL-0000000Emav-0tno for barebox@lists.infradead.org; Wed, 26 Nov 2025 10:25:34 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vOCiJ-000293-PG; Wed, 26 Nov 2025 11:25:31 +0100 Message-ID: <4b5b8672-ce9b-48d4-992b-e6db018d55b4@pengutronix.de> Date: Wed, 26 Nov 2025 11:25:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Fabian Pflug , barebox@lists.infradead.org References: <29c84edc-9619-4524-a698-1edd3a60ac89@pengutronix.de> <20251126064710.3721039-1-f.pflug@pengutronix.de> <20251126064710.3721039-4-f.pflug@pengutronix.de> From: Ahmad Fatoum Content-Language: en-US, de-DE, de-BE In-Reply-To: <20251126064710.3721039-4-f.pflug@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251126_022533_255493_9CFDEB17 X-CRM114-Status: GOOD ( 25.30 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 3/4] bootm: use new api to get kernel command line params X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On 11/26/25 7:42 AM, Fabian Pflug wrote: > Getting root device adn root kernel options seperatily any combining device and root kernel options seperatly and combining > them in this function instead of getting the full string from the helper > functions. This is in preperation for replacing the root= string in the preparation > kernel commandline with something defined during runtime. > > Signed-off-by: Fabian Pflug > --- > common/bootm.c | 34 ++++++++++++++++++++-------------- > 1 file changed, 20 insertions(+), 14 deletions(-) > > diff --git a/common/bootm.c b/common/bootm.c > index 17792b2a1d..5d7dc00e3e 100644 > --- a/common/bootm.c > +++ b/common/bootm.c > @@ -4,6 +4,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -841,33 +842,38 @@ int bootm_boot(struct bootm_data *bootm_data) > } > > if (bootm_data->appendroot) { > - char *rootarg; > + char *root; > + char *rootopts; > > if (bootm_data->root_dev) { > const char *root_dev_name = devpath_to_name(bootm_data->root_dev); > struct cdev *root_cdev = cdev_open_by_name(root_dev_name, O_RDONLY); > > - rootarg = cdev_get_linux_rootarg(root_cdev); > - if (!rootarg) { > - rootarg = ERR_PTR(-EINVAL); > - > - if (!root_cdev) > - pr_err("no cdev found for %s, cannot set root= option\n", > - root_dev_name); > - else if (!root_cdev->partuuid[0]) > - pr_err("%s doesn't have a PARTUUID, cannot set root= option\n", > - root_dev_name); This warning is useful, because it's very confusing otherwise when a MBR disk image is created without a NT signature. > - } > + cdev_get_linux_root_and_opts(root_cdev, &root, &rootopts); > > if (root_cdev) > cdev_close(root_cdev); > + else > + pr_err("no cdev found for %s, cannot set root= option\n", root_dev_name); > } else { > - rootarg = path_get_linux_rootarg(data->os_file); path_get_linux_rootarg() is stale now right? Can you squash its removal into the patch that gets rid of linux.bootargs? > + struct fs_device *fsdev = get_fsdevice_by_path(AT_FDCWD, data->os_file); > + if(fsdev) > + fsdev_get_linux_root_options(fsdev, &root, &rootopts); > + else > + pr_err("no fsdevice under path: %s\n", data->os_file); > } > > - if (IS_ERR(rootarg)) { > + if (!root) { > pr_err("Failed to append kernel cmdline parameter 'root='\n"); > } else { > + char *rootarg; > + if(rootopts) { > + rootarg = xasprintf("root=%s %s", root, rootopts); > + free(rootopts); > + } else { > + rootarg = xasprintf("root=%s", root); > + } I wonder if we should add a helper into a header that does this, given how many times this is repeated... char *format_root_bootarg(char *root, char *rootopts); which consumes (and frees) two pointers and returns a new buffer.. Cheers, Ahmad > + free(root); > pr_info("Adding \"%s\" to Kernel commandline\n", rootarg); > globalvar_add_simple("linux.bootargs.bootm.appendroot", > rootarg); -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |