From nobody Thu Feb 5 00:10:56 2026 X-Original-To: dev-commits-src-main@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 4f5yLG1LKNz6Qrr4 for ; Thu, 05 Feb 2026 00:11:02 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5yLF5p6Mz3Sbn for ; Thu, 05 Feb 2026 00:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770250261; 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=ItqXlnRBbrB5+UKDc6Lw0zeafKKjlC7L3SjAL4CEarg=; b=t5QLh2nFgQZwlQFNBq9gOecqO5ijyie/Mzy7XcsOtC0jXGW+XYokNKWftB4Oyot48AlW4e LmfBlX96zYuNxtf4zG92P6Nd7NUX/U+OUl6AP0grT7hIEbuDwLTgNJly4KRnumJHXDu3Ti OJ08/JiakxAdUh9WZbN8HOd1Cx2P3Bzx/adBXVYI8E7zZqZqrSAc0LF4+Sb4GvdcjYecNb 4D+kZaLn4stqpfuQbOqdxaU0TvB02IB9xLOqa0rE6ToJ912/db9Z5lLOGvHtAFwhvsa7lU D4p9uxhM5oXH27bhATA9xKstI02cRXoBiHXCjKqfhdQQBMr/IqBY+EaPXBr45g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770250261; a=rsa-sha256; cv=none; b=UBTKSw9RJb903gfhUmsCORBXFi+276PPIMhh/dHcBBQzogCWN8pE56UtuZ0XyS/EFIaKV/ xtda7gx2Ld+F06q1nO86QTjunXXT9Kay0puN5jRk3bPBZLb/wkHYUsjFGSsShbIXPj9HU6 UMV4iNBfsVAA0XCtF16GeCRmozZk6o8OjeG48PwK0JHAWoc3cp7lKDonL0uwn5uEjdvNXu IMECnsN2GkRuzt/3mKSxdyHl266ilyXAClthKTWKKTCfLocI8ua2YetBfzdgnTe9GO+5A8 HT3yvpsV3eNzlwSYuM871bM+G5T8h13Kyg7BeovflZRreU5+cCg59mSQgjACCQ== 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=1770250261; 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=ItqXlnRBbrB5+UKDc6Lw0zeafKKjlC7L3SjAL4CEarg=; b=MbXtiMB4fE2VTNx1eI6dPXA0as/CNj03aVUbE+HxJL/6L7IN1LdlHAg2ywZ1n+TJucwlzn PZ/jc9zP6djOMCf07XicSCf1kzn2Q/lRl3yb9/wXUwh4OcIamGdago73LrI14lpRT24bZJ GKM9rU7HWeUII5OWqxS91XLSLaTnFvRysSpkyZC5slNzXwKv7zGHLF0UcrI0Hb3iVcM0nm aZPnIDaKL8nLd0ot5Bcuf6bGbWHi+1Klf7cya1vNk5BxOmrMv6tvjSGE8hMwUCRgkF3uFE pUYU0njA5Kw0MAcigEwlhHdx5rTA95ro5SyAcZoMufRKT9uMF4lKwYZrImwMPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5yLF59gDz1KwP for ; Thu, 05 Feb 2026 00:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 00:10:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 0f515c0a9748 - main - ufshci: Remove UIC error during initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 0f515c0a97489d8d35aca7f5e28c28b22f217dc9 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 00:10:56 +0000 Message-Id: <6983e010.31cad.7b90119@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=0f515c0a97489d8d35aca7f5e28c28b22f217dc9 commit 0f515c0a97489d8d35aca7f5e28c28b22f217dc9 Author: Jaeyoon Choi AuthorDate: 2026-02-04 23:53:01 +0000 Commit: Jaeyoon Choi CommitDate: 2026-02-05 00:05:14 +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 --- 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 b57142bf58fc..1634cf51c9fb 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -278,8 +278,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; @@ -398,7 +396,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;