From nobody Tue Oct 06 07:51:21 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 4hzT3G3Lfmz6cWQM for ; Tue, 06 Oct 2026 07:51:22 +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 4hzT3F5DWqz4H5D for ; Tue, 06 Oct 2026 07:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273081; 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=QF81VjBp38cVLDlDedeVL9ibjtpwWu6OPOZNnhChnQs=; b=cjTdv98LV6Pq0QZhfQGZLg7uasGF+6GfBE75D81kZTzB8eE8mkGwc0DbZiywMDkSfKr64x usOY1o9vkdeH0E4RrmKZGRm2ST6PdJCBgaGuBXsO7QQjSok1OiupSlQprhTKO/yFLb8vt1 mencLmoEXuqVk10g3sQRTRmz2iQ6DUSpYHfwVCMYRRWwT5+W/jnMtXjDo19/LN3x6xh7e6 sC2GWX83/0XlhYyzJlc5TVjE6nyVPXB0pozmn8BSKs/2iEbI8vNWF4Q63ZNx8YZdsGZ/h/ w6MLV+9mmO7vLyjSieOCZG8c8U+lUAq1IEK56U4tAjj6mJF4n7WjZKn0ZECwtA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273081; b=PjVA/Yyw8K9Sw7+LGll9htEIJryvwvdctFzCNT/kDas1z5sxynYLVLCcgUu0caqI8h6TRQ 6ujs5abVhxyWkAS4eqhUI1abHpppZgSfSAUC1NDcFAjXaiYPcTlw3Rd/B8AGD71PmFRh2S an5D36k2QcXkDvTaOn//poYNPTVyAKwLutk1H5kIZn0Y+8CVHd/5yGuQm1XRfYK7czAshr FExLgxNTELCeN2QTsO18B2uKSINunELGwnV3Q0HctE/Uo2aiL2Sp7NdfVYaA05EYhCap6b pZQ9rF24P3RHpO81w1x752ajycc4qROFf9oUne9/hM8I6SRGtrSeEg6av8Avmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273081; 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=QF81VjBp38cVLDlDedeVL9ibjtpwWu6OPOZNnhChnQs=; b=cwkm+F7TYJvdqrA242C0Y6Sk4towPcSVJsIbxEBUygkBr+YfQ0oIaXUd02ylHXpvU4PQIN vq4jiEPhEh/TD58sh8kbA2qCXzkvzZ26yJnjF18JdsxfVR3XgUFEDz5B39VydTdWwxFKBO BYJwc9MDF5zhImuThvUyKyUpvHMNqrlTg4xOPsOtJMhOBdK2s/ojgJlwoNLv8SR2mBzvmk yAq0DujMDQ1kwcuOAeuYStYADEeLF4vsvaG7VxAA0kafog/mnu1jqGmfWXBc9xRTwPBxQu uM+mzv1/bskp9gTgt1Kl+2iP0ZcTkp2ucxI5AG1gJkciGwB0UL9iluGFvPF7fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzT3F1ZdhzxKb for ; Tue, 06 Oct 2026 07:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4557d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 88fe4b75cf27 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 88fe4b75cf27064f9c19dac4be24440a27ae55fe Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:21 +0000 Message-Id: <6ac4a879.4557d.4c6ab52f@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=88fe4b75cf27064f9c19dac4be24440a27ae55fe commit 88fe4b75cf27064f9c19dac4be24440a27ae55fe Author: Jaeyoon Choi AuthorDate: 2026-08-18 04:48:56 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:28:02 +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 (cherry picked from commit a508a9f7238828fb5fb0f68e9f5df7d24072d6c2) --- 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