{"id":2228626,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228626/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/e9ca310e07d0e591339e0dbf3c1b893a1c43a03b.1777272283.git.weijie.gao@mediatek.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.1/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"","date":"2026-04-27T07:09:32","name":"[v3,06/10] cmd: ubi: reorganize command messages","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f68a3e090e039a5058b39ec569ab179007571dc8","submitter":{"id":75269,"url":"http://patchwork.ozlabs.org/api/1.1/people/75269/?format=json","name":"Weijie Gao","email":"weijie.gao@mediatek.com"},"delegate":{"id":1691,"url":"http://patchwork.ozlabs.org/api/1.1/users/1691/?format=json","username":"hs","first_name":"Heiko","last_name":"Schocher","email":"hs@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/e9ca310e07d0e591339e0dbf3c1b893a1c43a03b.1777272283.git.weijie.gao@mediatek.com/mbox/","series":[{"id":501588,"url":"http://patchwork.ozlabs.org/api/1.1/series/501588/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=501588","date":"2026-04-27T07:09:11","name":"Add support for ubi environment to create volumes (v3)","version":3,"mbox":"http://patchwork.ozlabs.org/series/501588/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228626/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228626/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=mediatek.com header.i=@mediatek.com header.a=rsa-sha256\n header.s=dk header.b=MYWS0mjo;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=quarantine dis=none) header.from=mediatek.com","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=mediatek.com header.i=@mediatek.com\n header.b=\"MYWS0mjo\";\n\tdkim-atps=neutral","phobos.denx.de; dmarc=pass (p=quarantine dis=none)\n header.from=mediatek.com","phobos.denx.de;\n spf=pass smtp.mailfrom=weijie.gao@mediatek.com"],"Received":["from phobos.denx.de (phobos.denx.de [85.214.62.61])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g3vpt5Lwxz1xvV\n\tfor ; Mon, 27 Apr 2026 17:10:30 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id F37508423D;\n\tMon, 27 Apr 2026 09:09:43 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id BC0A080077; Mon, 27 Apr 2026 09:09:41 +0200 (CEST)","from mailgw01.mediatek.com (unknown [60.244.123.138])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 6719784236\n for ; Mon, 27 Apr 2026 09:09:39 +0200 (CEST)","from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by\n mailgw01.mediatek.com (envelope-from )\n (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256)\n with ESMTP id 1939886707; Mon, 27 Apr 2026 15:09:34 +0800","from mtkmbs11n2.mediatek.inc (172.21.101.187) by\n mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.2562.29; Mon, 27 Apr 2026 15:09:33 +0800","from mcddlt001.gcn.mediatek.inc (10.19.240.15) by\n mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id\n 15.2.2562.29 via Frontend Transport; Mon, 27 Apr 2026 15:09:33 +0800"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RDNS_NONE,SPF_HELO_PASS,SPF_PASS,\n UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2","X-UUID":["0bab4116420811f19781c1a04af40193-20260427","0bab4116420811f19781c1a04af40193-20260427"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n d=mediatek.com;\n s=dk;\n h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From;\n bh=WywvU81hE9xLd1+NmxfLtXqKNcergSde8lLMFIrOMvc=;\n b=MYWS0mjombavimRjio84gszZeOisoWi54KlK9Kyl9x2DwCwNjfrXNRaAiODTC/yBISufr7oTf0zaUA0vAzk3YT9LmHuZ+ysH0kFy3kut4VpKcZdEOBITkkjarkhJisO/vWg7bMv8SO749mdyAnw+VipiURiStzurDh1e/py5OyM=;","X-CID-P-RULE":"Release_Ham","X-CID-O-INFO":"VERSION:1.3.12, REQID:15ea1ac7-527b-4e8f-bc78-c14b9d53b6bb,\n IP:0,\n U\n RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:\n release,TS:0","X-CID-META":"VersionHash:e7bac3a, CLOUDID:5c2a7fbe-65a8-4b41-ac18-3671578a914d,\n B\n ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|836|865|888|898,TC:-5,Cont\n ent:0|15|50,EDM:-3,IP:nil,URL:0,File:130,RT:0,Bulk:nil,QS:nil,BEC:-1,COL:0\n ,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0","X-CID-BVR":"2,SSN|SDN","X-CID-BAS":"2,SSN|SDN,0,_","X-CID-FACTOR":"TF_CID_SPAM_SNR","X-CID-RHF":"D41D8CD98F00B204E9800998ECF8427E","From":"Weijie Gao ","To":"","CC":"GSS_MTK_Uboot_upstream , Tom Rini\n , Marek Vasut , Simon\n Glass , Weijie Gao ","Subject":"[PATCH v3 06/10] cmd: ubi: reorganize command messages","Date":"Mon, 27 Apr 2026 15:09:32 +0800","Message-ID":"\n ","X-Mailer":"git-send-email 2.17.0","In-Reply-To":"","References":"","MIME-Version":"1.0","Content-Type":"text/plain","X-MTK":"N","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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"},"content":"This patch moves normal subcommand messages into the main command function.\nThis will allow current and potential api functions being called with clean\noutput.\n\nA new function ubi_require_volume() is added for finding and printing error\nmessage if volume not found. The original ubi_find_volume() will be silent\nfor being an api function.\n\nSigned-off-by: Weijie Gao \n---\nv2: new\nv3: Fix use-after-free and \"ubi read\" command message displaying error\n---\n cmd/ubi.c | 109 +++++++++++++++++++++++++++++++++++++++---------------\n 1 file changed, 79 insertions(+), 30 deletions(-)","diff":"diff --git a/cmd/ubi.c b/cmd/ubi.c\nindex 8d04ff61fb6..9f121ea2931 100644\n--- a/cmd/ubi.c\n+++ b/cmd/ubi.c\n@@ -241,8 +241,7 @@ static int ubi_create_vol(const char *volume, int64_t size, bool dynamic,\n \t\tprintf(\"verify_mkvol_req failed %d\\n\", err);\n \t\treturn err;\n \t}\n-\tprintf(\"Creating %s volume %s of size %lld\\n\",\n-\t\tdynamic ? \"dynamic\" : \"static\", volume, size);\n+\n \t/* Call real ubi create volume */\n \treturn ubi_create_volume(ubi, &req);\n }\n@@ -258,10 +257,19 @@ static struct ubi_volume *ubi_find_volume(const char *volume)\n \t\t\treturn vol;\n \t}\n \n-\tprintf(\"Volume %s not found!\\n\", volume);\n \treturn NULL;\n }\n \n+static struct ubi_volume *ubi_require_volume(const char *volume)\n+{\n+\tstruct ubi_volume *vol = ubi_find_volume(volume);\n+\n+\tif (!vol)\n+\t\tprintf(\"Volume %s not found!\\n\", volume);\n+\n+\treturn vol;\n+}\n+\n static int ubi_remove_vol(const char *volume)\n {\n \tint err, reserved_pebs, i;\n@@ -271,8 +279,6 @@ static int ubi_remove_vol(const char *volume)\n \tif (vol == NULL)\n \t\treturn ENODEV;\n \n-\tprintf(\"Remove UBI volume %s (id %d)\\n\", vol->name, vol->vol_id);\n-\n \tif (ubi->ro_mode) {\n \t\tprintf(\"It's read-only mode\\n\");\n \t\terr = EROFS;\n@@ -334,8 +340,6 @@ static int ubi_rename_vol(const char *oldname, const char *newname)\n \t\treturn EINVAL;\n \t}\n \n-\tprintf(\"Rename UBI volume %s to %s\\n\", oldname, newname);\n-\n \tif (ubi->ro_mode) {\n \t\tprintf(\"%s: ubi device is in read-only mode\\n\", __func__);\n \t\treturn EROFS;\n@@ -360,7 +364,7 @@ static int ubi_volume_continue_write(const char *volume, const void *buf,\n \tint err;\n \tstruct ubi_volume *vol;\n \n-\tvol = ubi_find_volume(volume);\n+\tvol = ubi_require_volume(volume);\n \tif (vol == NULL)\n \t\treturn ENODEV;\n \n@@ -402,7 +406,7 @@ int ubi_volume_begin_write(const char *volume, const void *buf, size_t size,\n \tint rsvd_bytes;\n \tstruct ubi_volume *vol;\n \n-\tvol = ubi_find_volume(volume);\n+\tvol = ubi_require_volume(volume);\n \tif (vol == NULL)\n \t\treturn ENODEV;\n \n@@ -434,7 +438,7 @@ static int ubi_volume_offset_write(const char *volume, const void *buf,\n \tloff_t off = offset;\n \tvoid *tbuf;\n \n-\tvol = ubi_find_volume(volume);\n+\tvol = ubi_require_volume(volume);\n \tif (!vol)\n \t\treturn -ENODEV;\n \n@@ -514,7 +518,7 @@ int ubi_volume_read(const char *volume, void *buf, loff_t offset, size_t size)\n \tloff_t offp = offset;\n \tsize_t len_read;\n \n-\tvol = ubi_find_volume(volume);\n+\tvol = ubi_require_volume(volume);\n \tif (vol == NULL)\n \t\treturn ENODEV;\n \n@@ -529,12 +533,8 @@ int ubi_volume_read(const char *volume, void *buf, loff_t offset, size_t size)\n \tif (offp == vol->used_bytes)\n \t\treturn 0;\n \n-\tif (size == 0) {\n-\t\tprintf(\"No size specified -> Using max size (%lld)\\n\", vol->used_bytes);\n+\tif (size == 0)\n \t\tsize = vol->used_bytes;\n-\t}\n-\n-\tprintf(\"Read %zu bytes from volume %s to %p\\n\", size, volume, buf);\n \n \tif (vol->corrupted)\n \t\tprintf(\"read from corrupted volume %d\", vol->vol_id);\n@@ -619,13 +619,10 @@ static int ubi_set_skip_check(const char *volume, bool skip_check)\n \tstruct ubi_vtbl_record vtbl_rec;\n \tstruct ubi_volume *vol;\n \n-\tvol = ubi_find_volume(volume);\n+\tvol = ubi_require_volume(volume);\n \tif (!vol)\n \t\treturn ENODEV;\n \n-\tprintf(\"%sing skip_check on volume %s\\n\",\n-\t skip_check ? \"Sett\" : \"Clear\", volume);\n-\n \tvtbl_rec = ubi->vtbl[vol->vol_id];\n \tif (skip_check) {\n \t\tvtbl_rec.flags |= UBI_VTBL_SKIP_CRC_CHECK_FLG;\n@@ -698,6 +695,8 @@ static int do_ubi(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])\n \tint64_t size;\n \tulong addr = 0;\n \tbool skipcheck = false;\n+\tstruct ubi_volume *vol;\n+\tint ret;\n \n \tif (argc < 2)\n \t\treturn CMD_RET_USAGE;\n@@ -806,31 +805,65 @@ static int do_ubi(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])\n \t\t}\n \t\t/* E.g., create volume */\n \t\tif (argc == 3) {\n-\t\t\treturn ubi_create_vol(argv[2], size, dynamic, id,\n-\t\t\t\t\t skipcheck);\n+\t\t\tret = ubi_create_vol(argv[2], size, dynamic, id,\n+\t\t\t\t\t skipcheck);\n+\t\t\tif (!ret)\n+\t\t\t\tprintf(\"Created %s volume %s of size %lld\\n\",\n+\t\t\t\t dynamic ? \"dynamic\" : \"static\", argv[2],\n+\t\t\t\t size);\n+\t\t\telse if (ret == -EEXIST)\n+\t\t\t\tprintf(\"Volume %s already exists!\\n\", argv[2]);\n+\n+\t\t\treturn ret;\n \t\t}\n \t}\n \n \tif (strncmp(argv[1], \"remove\", 6) == 0) {\n \t\t/* E.g., remove volume */\n-\t\tif (argc == 3)\n-\t\t\treturn ubi_remove_vol(argv[2]);\n+\t\tif (argc == 3) {\n+\t\t\tint vol_id;\n+\n+\t\t\tvol = ubi_find_volume(argv[2]);\n+\t\t\tif (!vol)\n+\t\t\t\treturn 0;\n+\n+\t\t\tvol_id = vol->vol_id;\n+\n+\t\t\tret = ubi_remove_vol(argv[2]);\n+\t\t\tif (!ret) {\n+\t\t\t\tprintf(\"Removed UBI volume %s (id %d)\\n\",\n+\t\t\t\t argv[2], vol_id);\n+\t\t\t}\n+\n+\t\t\treturn ret;\n+\t\t}\n \t}\n \n-\tif (IS_ENABLED(CONFIG_CMD_UBI_RENAME) && !strncmp(argv[1], \"rename\", 6))\n-\t\treturn ubi_rename_vol(argv[2], argv[3]);\n+\tif (IS_ENABLED(CONFIG_CMD_UBI_RENAME) && !strncmp(argv[1], \"rename\", 6)) {\n+\t\tret = ubi_rename_vol(argv[2], argv[3]);\n+\t\tif (!ret) {\n+\t\t\tprintf(\"UBI volume %s renamed to %s\\n\", argv[2],\n+\t\t\t argv[3]);\n+\t\t}\n+\n+\t\treturn ret;\n+\t}\n \n \tif (strncmp(argv[1], \"skipcheck\", 9) == 0) {\n \t\t/* E.g., change skip_check flag */\n \t\tif (argc == 4) {\n \t\t\tskipcheck = strncmp(argv[3], \"on\", 2) == 0;\n-\t\t\treturn ubi_set_skip_check(argv[2], skipcheck);\n+\t\t\tret = ubi_set_skip_check(argv[2], skipcheck);\n+\t\t\tif (!ret) {\n+\t\t\t\tprintf(\"%s skip_check on volume %s\\n\",\n+\t\t\t\t skipcheck ? \"Set\" : \"Cleared\", argv[2]);\n+\t\t\t}\n+\n+\t\t\treturn ret;\n \t\t}\n \t}\n \n \tif (strncmp(argv[1], \"write\", 5) == 0) {\n-\t\tint ret;\n-\n \t\tif (argc < 5) {\n \t\t\tprintf(\"Please see usage\\n\");\n \t\t\treturn 1;\n@@ -877,7 +910,23 @@ static int do_ubi(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])\n \t\t}\n \n \t\tif (argc == 3) {\n-\t\t\treturn ubi_volume_read(argv[3], (void *)addr, 0, size);\n+\t\t\tif (!size) {\n+\t\t\t\tvol = ubi_require_volume(argv[3]);\n+\t\t\t\tif (!vol)\n+\t\t\t\t\treturn 1;\n+\n+\t\t\t\tprintf(\"No size specified -> Using max size (%lld)\\n\",\n+\t\t\t\t vol->used_bytes);\n+\t\t\t\tsize = vol->used_bytes;\n+\t\t\t}\n+\n+\t\t\tret = ubi_volume_read(argv[3], (void *)addr, 0, size);\n+\t\t\tif (!ret) {\n+\t\t\t\tprintf(\"%lld bytes read from volume %s to 0x%lx\\n\",\n+\t\t\t\t size, argv[3], addr);\n+\t\t\t}\n+\n+\t\t\treturn ret;\n \t\t}\n \t}\n \n","prefixes":["v3","06/10"]}