From nobody Mon Aug 10 02:31:30 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 4hJJfW0zxzz6pVLb for ; Mon, 10 Aug 2026 02:31:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hJJfV49sQz40QC for ; Mon, 10 Aug 2026 02:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786329090; 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=LZKFIfYkkEezZC1A2YymeNrFkE2A4Ps6u97/RT5FbRw=; b=bkwxnQeNeckKc9xglckJ0yIXwYSlSCW8QKjDb6IP5/56UK0YrevRywAgw+WDgmfok299hz JaumhM3Yd8SO2zF3zix4I3sJvdwjM3yL8VdMmU9yy+FVuQRbPC0d9G+KQzG0aETyYQhYMq cDvicWBWaBMdukBX4LLX6Y9cyVKXQUOGXr8f8Frpu/6EoV+u0D29L2Z9J5YV1nKeVvLtQc NI57GdVGPd+kj5OJyIXEoULD13Yzpq1geY/tYQuf6mXa1meNdpB5L3P/mamUpaNhPLqv0L wiLFjycOaISYO+BsbpNarTjhisFYI1aG5c2itItfpFicdBAHmRd6mZYmz2PHvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786329090; a=rsa-sha256; cv=none; b=fSI/SSNkAWcnhQ2lFVGoVTFZGt52PrTAodD86SBxABqJfZJrw7fKcyuG93VXEW9jzh5X6h +zS5OL/MmswtJh2e9CbOrlrhCY6bvnUS+16aHJYel8LYIzmYDUxIfokA3cjlQBCIOYHBQb Udd+n5QvWXFpwzixnyd/hHXTJ08V7kQ7iW1aNLdDexkmGKPYT0jHzhA2G2DzLAvgJtoQKN m6Phw9TEQPgz/weO8CoAqhj0DHprOEBqzK1IMyVjTXENCymfS6UR1MfDEO7Ga0U4U893nL QgCZJzCoG2yvxjXtsc9iQFJp/ICGdj6gNZVzwQ5wDhuTHkssJ89rO6IzOybbug== 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=1786329090; 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=LZKFIfYkkEezZC1A2YymeNrFkE2A4Ps6u97/RT5FbRw=; b=ginC2sb8MljCuw/7Vk0NJiNhcTaO6O+tNqt5DfMC0+LRsYA7rqbLCunCuS5FPPU5PEPvEX rdrnrfm6TnAAy8Jx9dYCy9h8qnM+9g59bvT6X9xjht7gkZ4kpf1k3Vep2N96AcbvrvBR7D I3yCeEHVvWpBiythsBd+7/QcHaKDcoRRfrBsk8DZSSVFR4BHFoVxHnSNNG4tU/6+bbtX4+ U/JINB2wId1t+exiL7SDIWTsCB2VFcch9nck1LpZA/3C8WooY5KMlkJbq/qiaXP5jovB5/ kkVTss1KeLuMo1uvNrIvs2kPg8tBzc6XAzne8PCD4eyYwyjtRwUx110xGv3b9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJJfV2mk7zqD4 for ; Mon, 10 Aug 2026 02:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e233 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 02:31:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 266ce89fc231 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 266ce89fc231d58431293cf5b77e0854440aa13d Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 02:31:30 +0000 Message-Id: <6a793802.1e233.29cc2259@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=266ce89fc231d58431293cf5b77e0854440aa13d commit 266ce89fc231d58431293cf5b77e0854440aa13d Author: Jaeyoon Choi AuthorDate: 2026-08-10 01:48:41 +0000 Commit: Jaeyoon Choi CommitDate: 2026-08-10 02:28:52 +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 --- 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); }