From nobody Tue Aug 18 05:26:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hPJ8S1TmZz6pyjl for ; Tue, 18 Aug 2026 05:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hPJ8R6J0tz3RXS for ; Tue, 18 Aug 2026 05:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787030775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9KLzbevou20k40TnnMUWa+sV4c4ZBehf+xzkH4vOw8=; b=nd2tjHsLlklcrsxm7y3H+U45rgyF3SiYFHN8UlTjCloYyJLaLgfPpdj6RBT5g0os4Cgkdw BhqD+iJ67AdTI/TCCHP6AeW7DkkCYiYmcx6Ld6R7hqnwxagemXx4h8s6v2TSdaW45wvE+H VSAb7MX+RYqvwGWpLZPZ7slEJtbzVT26sNFEWxk+yO9a89dRnWaCgi/haAYjyM2JWDHu4O dd9J9koQDYZloK4lDtFi0vY+jGzp7G86MlDSzkTN+ogZ7pHiNqEn7E1FC7+wH1mCrQG62w bBrCOjMBCe/XtUyveAmKuKZZKqR05Nb7+kccXqwy7Pge5m/CMqPDXbZkXphxzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787030775; a=rsa-sha256; cv=none; b=Z/evnektTlLZK7V6XH4ve/qpsfhNktF7N/AONNe7w7jv18oCIV8Cn8/UAc3QfGT+87lmyu xI6Q5TSiawcz2YtDQwnzr+2oZJFC8VVPdKU3kuiawCqNx/mTEcnLUoNJBz2P5nk7hygf7+ nPlaWJTGgFaUBnhhHN6Ii9Rghfb7CP0FeCFPdodlALm1+gHTIzPHswKpe/t1DMbY3996h4 oBMJ9TOlb10LcqMfyvP4xrtmqjS+o+HQbaDNUxxyp0OrxXvA9OSJqrToq5bKF4oIiKrlph 3Fwji8OwSkzbRA4lGoiPSfRiWg0pfS0TdXJh690dEwus4jct7kswbeU8L8WuKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787030775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9KLzbevou20k40TnnMUWa+sV4c4ZBehf+xzkH4vOw8=; b=XypS/eT4w3dvMdeXUZ3QdYNMouoaY1BFKaXLs9WVe4aabkqPla1nScHFaWgyjO5ozCebaD NYQ85zWGGDcS0VCIdA+3YZgyoIiHjmMBaxE1/Wt+L39tsaMo2oJIDcIX5CfcIo3hCfrNvn hIm3EyD7FfsV7kYd/5bdYXfIabcRKldOCSLYSCkXcGUSFoKMNSKHBDdhTfC5L8Mw/zvT4j fWt6IXMQHbr7NZK2rmMxOInEp/nIySBmCjrcjKnX+qRI16g+wYXfxu2Rek2xEZGWpef2Gc 2SPo9ZtBjQIyOb64Zyf/dU5Glvxn601TnZBXRvpYpzkaOLNzJbM8KZhSt57tnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPJ8R5BJBzV1V for ; Tue, 18 Aug 2026 05:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39bd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Aug 2026 05:26:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: a508a9f72388 - main - ufshci: return the real errno from SDB queue construction List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a508a9f7238828fb5fb0f68e9f5df7d24072d6c2 Auto-Submitted: auto-generated Date: Tue, 18 Aug 2026 05:26:10 +0000 Message-Id: <6a83ecf2.39bd3.527c35f4@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=a508a9f7238828fb5fb0f68e9f5df7d24072d6c2 commit a508a9f7238828fb5fb0f68e9f5df7d24072d6c2 Author: Jaeyoon Choi AuthorDate: 2026-08-18 04:48:56 +0000 Commit: Jaeyoon Choi CommitDate: 2026-08-18 04:48:56 +0000 ufshci: return the real errno from SDB queue construction ufshci_req_sdb_cmd_desc_construct() and ufshci_req_sdb_construct() returned ENOMEM for every failure, so an EINVAL from bus_dma_tag_create() was reported as a memory shortage. Capture and return the real errno, and drop the cmd descriptor construct's now pointless out label. No functional change: no caller inspects the value beyond propagating it, so this only improves the diagnostics on an attach failure. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D58815 --- sys/dev/ufshci/ufshci_req_sdb.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/sys/dev/ufshci/ufshci_req_sdb.c b/sys/dev/ufshci/ufshci_req_sdb.c index 80c4e53230e3..51e72c4ed4f5 100644 --- a/sys/dev/ufshci/ufshci_req_sdb.c +++ b/sys/dev/ufshci/ufshci_req_sdb.c @@ -109,21 +109,23 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, if (error != 0) { ufshci_printf(ctrlr, "request cmd desc tag create failed %d\n", error); - goto out; + return (error); } - if (bus_dmamem_alloc(req_queue->dma_tag_ucd, (void **)&ucdmem, - BUS_DMA_COHERENT | BUS_DMA_NOWAIT, &req_queue->ucdmem_map)) { + error = bus_dmamem_alloc(req_queue->dma_tag_ucd, (void **)&ucdmem, + BUS_DMA_COHERENT | BUS_DMA_NOWAIT, &req_queue->ucdmem_map); + if (error != 0) { ufshci_printf(ctrlr, "failed to allocate cmd desc memory\n"); - goto out; + return (error); } - if (bus_dmamap_load(req_queue->dma_tag_ucd, req_queue->ucdmem_map, - ucdmem, ucd_allocsz, ufshci_ucd_map, hwq, 0) != 0) { + error = bus_dmamap_load(req_queue->dma_tag_ucd, req_queue->ucdmem_map, + ucdmem, ucd_allocsz, ufshci_ucd_map, hwq, 0); + if (error != 0) { ufshci_printf(ctrlr, "failed to load cmd desc memory\n"); bus_dmamem_free(req_queue->dma_tag_ucd, ucdmem, req_queue->ucdmem_map); - goto out; + return (error); } req_queue->ucd = (struct ufshci_utp_cmd_desc *)ucdmem; @@ -139,7 +141,7 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, if (error != 0) { ufshci_printf(ctrlr, "request prdt tag create failed %d\n", error); - goto out; + return (error); } for (i = 0; i < req_queue->num_trackers; i++) { @@ -148,7 +150,7 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, if (error != 0) { ufshci_printf(ctrlr, "request payload map create failed %d\n", error); - goto out; + return (error); } hwq->act_tr[i]->ucd = (struct ufshci_utp_cmd_desc *)ucdmem; @@ -158,8 +160,6 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, } return (0); -out: - return (ENOMEM); } int @@ -227,15 +227,17 @@ ufshci_req_sdb_construct(struct ufshci_controller *ctrlr, goto out; } - if (bus_dmamem_alloc(hwq->dma_tag_queue, (void **)&queuemem, - BUS_DMA_COHERENT | BUS_DMA_NOWAIT, &hwq->queuemem_map)) { + error = bus_dmamem_alloc(hwq->dma_tag_queue, (void **)&queuemem, + BUS_DMA_COHERENT | BUS_DMA_NOWAIT, &hwq->queuemem_map); + if (error != 0) { ufshci_printf(ctrlr, "failed to allocate request queue memory\n"); goto out; } - if (bus_dmamap_load(hwq->dma_tag_queue, hwq->queuemem_map, queuemem, - alloc_size, ufshci_single_map, &queuemem_phys, 0) != 0) { + error = bus_dmamap_load(hwq->dma_tag_queue, hwq->queuemem_map, queuemem, + alloc_size, ufshci_single_map, &queuemem_phys, 0); + if (error != 0) { ufshci_printf(ctrlr, "failed to load request queue memory\n"); bus_dmamem_free(hwq->dma_tag_queue, queuemem, hwq->queuemem_map); @@ -289,8 +291,9 @@ ufshci_req_sdb_construct(struct ufshci_controller *ctrlr, * UTP Transfer Request (UTR) requires memory for a separate * command in addition to the queue. */ - if (ufshci_req_sdb_cmd_desc_construct(req_queue, num_entries, - ctrlr) != 0) { + error = ufshci_req_sdb_cmd_desc_construct(req_queue, + num_entries, ctrlr); + if (error != 0) { ufshci_printf(ctrlr, "failed to construct cmd descriptor memory\n"); goto out; @@ -305,7 +308,7 @@ ufshci_req_sdb_construct(struct ufshci_controller *ctrlr, return (0); out: ufshci_req_sdb_destroy(ctrlr, req_queue); - return (ENOMEM); + return (error); } void