From nobody Tue Oct 06 07:50:55 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 4hzT2m16qmz6cW9t for ; Tue, 06 Oct 2026 07:50:56 +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 4hzT2l6vHGz4G07 for ; Tue, 06 Oct 2026 07:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273056; 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=QIB1QRcanwx0yXHijn7m/2NXEE55o4P8Md9DA0tOlZM=; b=TcxFohWlchAjqpSHmRlJjLHegXpfXhNzbALkElusBss4aEZ3ZXaNgqsc4VFIerdmxSaI8o XsnEw8fWrjauWBLsYlcc0PK0yjRQ8KT10kwGKZ3izit35Oi3gCfIvJV/hrwsnzziIodaXV MCGzSgCNI4ljhydca5Xq6FDMJrFzLzo1So8jx5Ky02TqJAc8biHJebVa/bQAg3e/RfhmTz 2nKy+Mm0QN8rU+yGzmLsBz2MvtZK+/HAB38wQ4c5tp3kx2+btUaMgv2SUt8VkBGuIjwGDa LEo6oOuE1miEQXv8RZ8zYS5AcLUyKGYvd1dXVlp4vZv1g9VoH7u7y1k4QvqnVg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273056; b=VoBqfNYHFah6nJiO/WcbUTwOOMPb+arm809anLIh34u84aSBrzEp1jEeKLDjqxyoepDXp3 bSfBsJnBz3Qw+bxyRIjedEsCxuzUrP32dKfsfarQt1XuYyOV2k/07BWwCcJV/Cxe6ZEfqS tjeb8IUU47AlsameEHvjpV5YlM0fVsa1jaTT4/XkzHG5ABWJNrgKrsPtMSr3XCYhnWcv8+ VISSjxa6GB2ZrRtM7MLjR9F5iVZqTtiAg7+KANzdcq22M1l3/Tt6lvG+Y/Avm9KVp6CM5S Aa8bX7Gq2RGHQN4c52Cg84MFmJxu1na2xmW5/iyGDrNu/5gJflsgocR9rkTkDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273056; 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=QIB1QRcanwx0yXHijn7m/2NXEE55o4P8Md9DA0tOlZM=; b=JsOnXLEm0eLaJxWLX/MjgZxlwA4Dqp0mh6e6+JBJueAF7W5+wDdK0FOv7/bs4oGo76lk2x rrXgRvpp385hWuPsVDdmVHS7nPkxTLq9eW74xdJYcjK0xAXt4NIRERX/Qzxl46RU52oPHc w9E4QGCV1FaCVy2y64fTPiTbGo/XtYrfCOMX6tOprFtkfqJKAMr4/Ay3t5qdYqf5Zz7d0P ju456MYgNXkpXVodywKQEbTpkVUu4GcFYEfyJ4uN6FP0ELvOyJBP87K1f2s84XXbt0K/Dj loivJZT/VGSixfkh5hEkHhI0ShnQa9Xbfq3uE/46ofonRHZbabsb7Fp3aASQ5w== 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 4hzT2l5LtWzxqk for ; Tue, 06 Oct 2026 07:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 185b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:50:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: c6c2c22ffe51 - stable/15 - ufshci: Remove UIC error during initialization 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: c6c2c22ffe51d456882e18e1a3c2d8bc0b6e018a Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:50:55 +0000 Message-Id: <6ac4a85f.185b4.5dcd468f@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c2c22ffe51d456882e18e1a3c2d8bc0b6e018a commit c6c2c22ffe51d456882e18e1a3c2d8bc0b6e018a Author: Jaeyoon Choi AuthorDate: 2026-02-04 23:53:01 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:51 +0000 ufshci: Remove UIC error during initialization This patch removes the UIC error caused by QEMU not supporting certain UIC command. Additionally, it removes the unused unipro_version. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D54513 (cherry picked from commit 0f515c0a97489d8d35aca7f5e28c28b22f217dc9) --- sys/dev/ufshci/ufshci_dev.c | 55 +++++++++++++++++------------------------ sys/dev/ufshci/ufshci_private.h | 3 --- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/sys/dev/ufshci/ufshci_dev.c b/sys/dev/ufshci/ufshci_dev.c index 406130c537a7..3167945b53b6 100644 --- a/sys/dev/ufshci/ufshci_dev.c +++ b/sys/dev/ufshci/ufshci_dev.c @@ -273,40 +273,31 @@ ufshci_dev_init_unipro(struct ufshci_controller *ctrlr) uint32_t pa_granularity, peer_pa_granularity; uint32_t t_activate, pear_t_activate; - /* - * Unipro Version: - * - 7~15 = Above 2.0, 6 = 2.0, 5 = 1.8, 4 = 1.61, 3 = 1.6, 2 = 1.41, - * 1 = 1.40, 0 = Reserved - */ - if (ufshci_uic_send_dme_get(ctrlr, PA_LocalVerInfo, - &ctrlr->unipro_version)) - return (ENXIO); - if (ufshci_uic_send_dme_get(ctrlr, PA_RemoteVerInfo, - &ctrlr->ufs_dev.unipro_version)) - return (ENXIO); - - /* - * PA_Granularity: Granularity for PA_TActivate and PA_Hibern8Time - * - 1=1us, 2=4us, 3=8us, 4=16us, 5=32us, 6=100us - */ - if (ufshci_uic_send_dme_get(ctrlr, PA_Granularity, &pa_granularity)) - return (ENXIO); - if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity, - &peer_pa_granularity)) - return (ENXIO); + if (ctrlr->quirks & UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE) { + /* + * PA_Granularity: Granularity for PA_TActivate and + * PA_Hibern8Time + * - 1=1us, 2=4us, 3=8us, 4=16us, 5=32us, 6=100us + */ + if (ufshci_uic_send_dme_get(ctrlr, PA_Granularity, + &pa_granularity)) + return (ENXIO); + if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity, + &peer_pa_granularity)) + return (ENXIO); - /* - * PA_TActivate: Time to wait before activating a burst in order to - * wake-up peer M-RX - * UniPro automatically sets timing information such as PA_TActivate - * through the PACP_CAP_EXT1_ind command during Link Startup operation. - */ - if (ufshci_uic_send_dme_get(ctrlr, PA_TActivate, &t_activate)) - return (ENXIO); - if (ufshci_uic_send_dme_peer_get(ctrlr, PA_TActivate, &pear_t_activate)) - return (ENXIO); + /* + * PA_TActivate: Time to wait before activating a burst in order + * to wake-up peer M-RX UniPro automatically sets timing + * information such as PA_TActivate through the + * PACP_CAP_EXT1_ind command during Link Startup operation. + */ + if (ufshci_uic_send_dme_get(ctrlr, PA_TActivate, &t_activate)) + return (ENXIO); + if (ufshci_uic_send_dme_peer_get(ctrlr, PA_TActivate, + &pear_t_activate)) + return (ENXIO); - if (ctrlr->quirks & UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE) { /* * Intel Lake-field UFSHCI has a quirk. We need to add 200us to * the PEER's PA_TActivate. diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index c76483ab60ed..de311e659c53 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -292,8 +292,6 @@ struct ufshci_device { struct ufshci_device_descriptor dev_desc; struct ufshci_geometry_descriptor geo_desc; - uint32_t unipro_version; - /* WriteBooster */ bool is_wb_enabled; bool is_wb_flush_enabled; @@ -412,7 +410,6 @@ struct ufshci_controller { /* UFS Interconnect Layer (UIC) */ struct mtx uic_cmd_lock; - uint32_t unipro_version; uint8_t hs_gear; uint32_t tx_lanes; uint32_t rx_lanes;