From nobody Tue Oct 06 07:51:35 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 4hzT3X3Qvlz6cWcZ for ; Tue, 06 Oct 2026 07:51:36 +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 4hzT3W6ljKz4HCq for ; Tue, 06 Oct 2026 07:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273095; 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=JTWFQcgl70he4fwpLLl5LJRgJJYvM5s3qdIjR3xd7hU=; b=j+0A9cVOJ/FZMemjQNo2TnrcWHSjwambalfTCxALodvLzcBJS5CFSuMVnCBvLl4/jq94nK +xQNdaiVRnVfv8CM4JFB821lZwCzI4oB3X7D7YXqqYjoIenLGrNlw7Sze80prnOni0s4v/ wi4Xt1H2Pyoji7n20fzILcZZeRyZRdmVEtnhKf8kFNEXM1TVjJO6O7nKNILSB+3c8p2UnL QSOKHb18ObBAcqdY0nnyn5rKhxgun3NiLlV7VF27/N3E26GTFLChpLyCvDct6oJP+Qmyk2 jtT2chQeI5JRDhQt16pfw3MlqaWKnA+CuQrPVuUebVuzkEJjf8rYxrZJ8Ti0IA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273095; b=srj7p2qoQvqnuHW3YDaDl4AvdWu9fOjuzRQwzm9vau/JJt8Dbs1acU4Iurfsx8Dz6YmTLm EX4x07VmjVbYXV8OUVmKgYX4Tb/1QxT2ArtwXROPK2eU6vDJ+o4jkaA/RV+PGOTG6bgQzU WaqBstJSRxcM6/5ajiqylT0lBCKzCqKkP62fPy2nDnLFw6WHYZJR2p4hNrIK8IqohBDZSg inv6Lrb5uaQ3e4eFOV38g3es4Kp22xE2wor/igxt5dnrDEA5Ew/IJKSnHwkw3s1cKOZ+9M rhAHC8PJKp46jt/obxqdHppDlVnYZG5g3DNYl1K2gcAR/L/gDpPWdHbxEtWwtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273095; 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=JTWFQcgl70he4fwpLLl5LJRgJJYvM5s3qdIjR3xd7hU=; b=IpTyWukA27XmjXcDv8c2CdxG35GBbJnCkXoTMtbZjACnwpZDtOmdYYj46V3m0SRQYXEdX2 MjmSlW2X5e3HkGRMlF0uYzIFBdyb8XeUxTuy0tJ8cZWoDazTx3psBI6eeJYDbBgIvuMgUE LtEy1M8voj4+UPF0BXJAvRMjtjg+jdgvTlvaz4JllNMollrU2HI6ZE/ca1WVXK8vaYLe+j UonnejqHw4hGS29BcOspjLuQzrzYn0v3OJClnDlMmsuYFCjfLGzEU/Da+nPS6JZC3EL5CH pw/2PQJMY/5tbv3FMZpJ+f9EesgyoCRFvFm5XGRDz6lSw0LIYQCerG05cGMhaw== 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 4hzT3W4fHczxpT for ; Tue, 06 Oct 2026 07:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18834 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 6f162827ada7 - stable/15 - ufshci: skip the reinit when the new link works 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: 6f162827ada7e1cf8cb038a03a26a346bb71ffe6 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:35 +0000 Message-Id: <6ac4a887.18834.344ba8b8@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=6f162827ada7e1cf8cb038a03a26a346bb71ffe6 commit 6f162827ada7e1cf8cb038a03a26a346bb71ffe6 Author: Jaeyoon Choi AuthorDate: 2026-09-02 01:52:48 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:28:08 +0000 ufshci: skip the reinit when the new link works UFSHCI_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH always rebuilt the link after the gear switch. It threw away a working HS link and ended up in PWM. The reinit is only needed for a dead link. There the local side reports HS and the peer never answers. A local readback cannot tell the two apart. Peer traffic can. Probe the peer with DME_PEER_GET after the switch. Skip the reinit when the probe succeeds. Log it when the probe fails. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D59299 (cherry picked from commit 9930150214d1ca4ad21561d2e0afce9ebf2cdf6c) --- sys/dev/ufshci/ufshci_ctrlr.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/ufshci/ufshci_ctrlr.c b/sys/dev/ufshci/ufshci_ctrlr.c index b3b9abbe867c..480bbfd43d81 100644 --- a/sys/dev/ufshci/ufshci_ctrlr.c +++ b/sys/dev/ufshci/ufshci_ctrlr.c @@ -127,10 +127,25 @@ ufshci_ctrlr_start(struct ufshci_controller *ctrlr, bool resetting) ufshci_dev_init_uic_link_state(ctrlr); - if ((ctrlr->quirks & UFSHCI_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH) && - ufshci_ctrlr_reinit_after_max_gear_switch(ctrlr) != 0) { - ufshci_ctrlr_fail(ctrlr); - return; + if (ctrlr->quirks & UFSHCI_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH) { + uint32_t probe; + + /* + * The reinit is only needed when the link did not survive + * the gear switch. A local readback still shows HS when the + * peer is dead. Only peer traffic proves the link works. + */ + if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity, + &probe) != 0) { + ufshci_printf(ctrlr, + "link probe failed after the gear switch, " + "reinitializing\n"); + if (ufshci_ctrlr_reinit_after_max_gear_switch( + ctrlr) != 0) { + ufshci_ctrlr_fail(ctrlr); + return; + } + } } /* Read Controller Descriptor (Device, Geometry) */