From nobody Tue Oct 06 07:51:15 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 4hzT381fC7z6cWQB for ; Tue, 06 Oct 2026 07:51: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 4hzT376SPYz4GtH for ; Tue, 06 Oct 2026 07:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273075; 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=jGYb4BLyEivEVNVCJxBsz90krNmGVIJ26+tY50Uo/9o=; b=ZLI+n7GYwhivBQSNx4CCFiwbxpDqPOxTIpVYSfT61jy/XEwAm1ChHQs3Qc8cEgXsFTbgp9 rrKiSr7V0mIKC9L6Q6dvfdHmpKdRM5CZzcZRttftSxgI/s2ZQGtczG2GDxMFUcAIxgP/5x dcbreB5Ryqv1qv18pIWYwZ/WDSZsT/ysojUuccVystEYEHVuqQ492qYPq9KANPU4B6ITIk fcedmH1zNwLFGfut/crfxv2fLKKDkhZFI9qGlzF0Ud2cyyfJ2jAZv1ic860Rk0As5e8aeO 4jfRaRPyEDleVGUHvEZiqJvUnKmpj2Kw/O/dONG3xMlLB+ndss3EOHacx68V7A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273075; b=tLLfVYtwiv91TXqsAWm6cygmtNFvVRyapVWoqnR3UVJEEWp8sVUrP2+8bA5VIGSWne0bl7 +DubDVf1lwT4r+p4KEPLGdWuKYyN9ySAyknmgxnmUkdaBBJlwk4HhxJNXrdjKhNQer2Wjb 49Y+zrRmJVbQe+R0jMOJrGtLc8e0UcyKKsIiJ7DFSmCzu7koOdhhQVebk6ta5mOFYTJRct XhVPknXlVixKKZDgO9SF+UATRb7J55HCXKkZ6sNjadalilVo03TX6WA3wIpBQEPoFfEeij y4mC/GiNZ+TpjbPGAsP/lJE+vgzgFuquTuJ4z9wLMRsZgZrVQEKx9IyZBJveHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273075; 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=jGYb4BLyEivEVNVCJxBsz90krNmGVIJ26+tY50Uo/9o=; b=Wool4AD8jvYAT0EbpSwef8wOE/Uh35L+SoR5kwMtGrmHOeGw0valAo7B7xJ90VF38e8B+u uIcEobFq/ngWjglnHzPWZJWQ8K959Fua+P9r2yQuWUhmMKVTcIdQbac0n9Z6ApjHc/TAWq bDOBJWI4kVmVIoP9b6+WWZnw/ohsZFaqlv3Eg2aovas2yqhzQSvUv0lgv5avSY4M/tLEU1 jhPjzpNtM7EAjqskoFGCvJS96N+hw/HKmIMZr3pT4gMd1+t6DdmYkz81F/8rjet5L3XIMB LaoHyWIJxqCQtvLBdjosZsV1oe8WJ2UtHt4GoWE/Nkfa0JBUyUZilCgwefVqfg== 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 4hzT374j1QzxcP for ; Tue, 06 Oct 2026 07:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 475c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: d3ff4bd64c07 - stable/15 - ufshci: read UIC command results while holding the lock 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: d3ff4bd64c07b1c28c38222a89307482d6df080b Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:15 +0000 Message-Id: <6ac4a873.475c0.63f3fa20@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=d3ff4bd64c07b1c28c38222a89307482d6df080b commit d3ff4bd64c07b1c28c38222a89307482d6df080b Author: Jaeyoon Choi AuthorDate: 2026-08-10 01:48:41 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:59 +0000 ufshci: read UIC command results while holding the lock The UIC result registers (UICCMDARG2/3) are only valid between a command's completion and the next command's submission. They were read after uic_cmd_lock was dropped, so a concurrent UIC submitter could overwrite them in between. Read them into locals before releasing the lock. Also mask the generic error code to its [7:0] field when checking it, so unrelated bits in UICCMDARG2 (such as the attribute set type echoed for DME_SET) cannot be mistaken for an error. Sponsored by: Samsung Electronics Reviewed by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D58667 (cherry picked from commit 266ce89fc231d58431293cf5b77e0854440aa13d) --- sys/dev/ufshci/ufshci_uic_cmd.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/ufshci/ufshci_uic_cmd.c b/sys/dev/ufshci/ufshci_uic_cmd.c index 03ea8b2ba9f1..45ded2a120c6 100644 --- a/sys/dev/ufshci/ufshci_uic_cmd.c +++ b/sys/dev/ufshci/ufshci_uic_cmd.c @@ -170,7 +170,7 @@ ufshci_uic_send_cmd(struct ufshci_controller *ctrlr, struct ufshci_uic_cmd *uic_cmd, uint32_t *return_value) { int error; - uint32_t config_result_code; + uint32_t config_result_code, result_value; mtx_lock(&ctrlr->uic_cmd_lock); @@ -188,12 +188,18 @@ ufshci_uic_send_cmd(struct ufshci_controller *ctrlr, error = ufshci_uic_wait_cmd(ctrlr, uic_cmd); + /* The result registers stay valid only until the next command. */ + if (error == 0) { + config_result_code = UFSHCIV(UFSHCI_UICCMDARG2_REG_ERROR_CODE, + ufshci_mmio_read_4(ctrlr, ucmdarg2)); + result_value = ufshci_mmio_read_4(ctrlr, ucmdarg3); + } + mtx_unlock(&ctrlr->uic_cmd_lock); if (error) return (ENXIO); - config_result_code = ufshci_mmio_read_4(ctrlr, ucmdarg2); if (config_result_code) { ufshci_printf(ctrlr, "Failed to send UIC command (Opcode: 0x%x" @@ -210,7 +216,7 @@ ufshci_uic_send_cmd(struct ufshci_controller *ctrlr, } if (return_value != NULL) - *return_value = ufshci_mmio_read_4(ctrlr, ucmdarg3); + *return_value = result_value; return (0); }