From nobody Tue Oct 06 07:50:43 2026 X-Original-To: dev-commits-src-branches@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 4hzT2X1Yz4z6cW65 for ; Tue, 06 Oct 2026 07:50:44 +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 4hzT2W52JLz4G0y for ; Tue, 06 Oct 2026 07:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273043; 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=r3R7uD9TQCXxjMj2FSC4KM5Ocky7rMP+SOnLtKM0zKQ=; b=nRWywKthjah/IlYWX/smCPLtU7InKs6DxEGb7fvZkSULa4mzJDsrOwq0jVya7tlGl7+I/p Sq2DfGP/orDDVWw6OFY6ExNGYSRBwxFvbYeSkO7KwzBmeJXQg279gLG+/uTyuBaKExm+pH rNpV3xDQk/QHI4F2aTc999yWaOBRpxmvtnv+ugc1+NecKL+cTXWDbW3+guy4sMQutObvYd Xb0QULXEaU+NR3kP6pWyqPF4YjUVfQHIV1fIYY2b+enaqZ/nFor/eBGMm6IUW20k5ct3a1 jjhszsU+Ecz8v4SnHdQW5oZaIubFotz5ChPidV1EBJ9Eldhqw+uebqW8/sVS6Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273043; b=Rdb+emQkNCkemqXwm+5Bi6BS1CW5jA1VWI2eaRqCZNIRxfn1dMm90ndfjb+u7+2deA388U 0nGYsYvpQPUse3USAh7VCsGhTiyGBIJEq8uC0f4RDhADHKdZNx4/lA7VeA2U/EPRpyGz55 WNpDayrLeKvDLeF6FXg2UtZOJZce0gPHS4VBjCcyokW79WrSp1z43X2SSOpeOe/dc8Xq+V JcKY2nylXRAYl7XsGiLb9ZiRJQdR2pYGEmZtI9pq4CcvLEppDRxOrP41KUsnOt2Llgg8h4 6GpKOZ2Uq2Syw7cUC0YLvl45HHQhOFeojI5S4Kf6er8dhXbTwoWJde/GdoP0Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273043; 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=r3R7uD9TQCXxjMj2FSC4KM5Ocky7rMP+SOnLtKM0zKQ=; b=BJf/h+GpmxxUWPiwe1KwN9HpwaJv8B0B2AE72nvqpMtPIP0Hia4uCG89LS5pBPZv50ohW2 jIre17cORx1jo8z1pSGbed/kFMIj+V+++MB7VbF3aifrsnkpiK9HUaLE0UY0JCjDqCBibu 8HeQOFEVjz5oI1r+HuDdvtLf2H1mjnDDXdu3IVQk7GGBDjvuMOlosIXTrB07El35U/j52r CbOytuTFyFKTp1v2Uic6UEtLQ/Ci2Y956YwhnuX/77BkhTyUfqX9hTmT1hf78yfZkf6FC4 MxVQjD9QWu7JYBEjfFvvASifqsZTJyFfp3fS2A53RIdG+23lTSJMfYnW4e2hTw== 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 4hzT2W46Zszxbx for ; Tue, 06 Oct 2026 07:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4782e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:50:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: ab96d69e5c77 - stable/15 - ufshci: Enable WLUN scan List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: ab96d69e5c77783c31cdc71c5ba72c19e3580802 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:50:43 +0000 Message-Id: <6ac4a853.4782e.58fad76c@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=ab96d69e5c77783c31cdc71c5ba72c19e3580802 commit ab96d69e5c77783c31cdc71c5ba72c19e3580802 Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:39:14 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:46 +0000 ufshci: Enable WLUN scan QEMU ufs device does not implement WLUN, so QUIRK is added. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D53921 (cherry picked from commit 5e0d065b5b90d4f4264d8248f39f199f1a2576dc) --- sys/dev/ufshci/ufshci.h | 8 ++++++++ sys/dev/ufshci/ufshci_pci.c | 3 ++- sys/dev/ufshci/ufshci_private.h | 2 ++ sys/dev/ufshci/ufshci_sim.c | 6 +++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/dev/ufshci/ufshci.h b/sys/dev/ufshci/ufshci.h index 188f8c41def1..766d8de0535b 100644 --- a/sys/dev/ufshci/ufshci.h +++ b/sys/dev/ufshci/ufshci.h @@ -644,6 +644,14 @@ struct ufshci_completion { typedef void (*ufshci_cb_fn_t)(void *, const struct ufshci_completion *, bool); +/* UFS 4.1, section 10.8.5 "Well Known Logical Unit Defined in UFS" */ +enum ufshci_well_known_luns { + UFSHCI_WLUN_REPORT_LUNS = 0x81, + UFSHCI_WLUN_BOOT = 0xb0, + UFSHCI_WLUN_RPMB = 0xc4, + UFSHCI_WLUN_UFS_DEVICE = 0xd0, +}; + /* * UFS Spec 4.1, section 14.1 "UFS Descriptors" * All descriptors use big-endian byte ordering. diff --git a/sys/dev/ufshci/ufshci_pci.c b/sys/dev/ufshci/ufshci_pci.c index c518c6cf6aae..756ac6540632 100644 --- a/sys/dev/ufshci/ufshci_pci.c +++ b/sys/dev/ufshci/ufshci_pci.c @@ -50,7 +50,8 @@ static struct _pcsid { uint32_t quirks; } pci_ids[] = { { 0x131b36, "QEMU UFS Host Controller", UFSHCI_REF_CLK_19_2MHz, UFSHCI_QUIRK_IGNORE_UIC_POWER_MODE | - UFSHCI_QUIRK_NOT_SUPPORT_ABORT_TASK }, + UFSHCI_QUIRK_NOT_SUPPORT_ABORT_TASK | + UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS }, { 0x98fa8086, "Intel Lakefield UFS Host Controller", UFSHCI_REF_CLK_19_2MHz, UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE | diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index ec388c06e248..3cee021880a8 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -266,6 +266,8 @@ struct ufshci_controller { 8 /* Need to change the number of lanes before changing HS-GEAR. */ #define UFSHCI_QUIRK_NOT_SUPPORT_ABORT_TASK \ 16 /* QEMU does not support Task Management Request */ +#define UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS \ + 32 /* QEMU does not support Well known logical units*/ uint32_t ref_clk; diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index 1b80df089a46..db2e194b699b 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -231,11 +231,15 @@ ufshci_cam_action(struct cam_sim *sim, union ccb *ccb) return; case XPT_PATH_INQ: { struct ccb_pathinq *cpi = &ccb->cpi; + uint32_t need_scan_wluns = 0; + + if (!(ctrlr->quirks & UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS)) + need_scan_wluns = PIM_WLUNS; cpi->version_num = 1; cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE; cpi->target_sprt = 0; - cpi->hba_misc = PIM_UNMAPPED | PIM_NO_6_BYTE; + cpi->hba_misc = need_scan_wluns | PIM_UNMAPPED | PIM_NO_6_BYTE; cpi->hba_eng_cnt = 0; cpi->max_target = 0; cpi->max_lun = ctrlr->max_lun_count;