From nobody Mon Dec 1 06:23:21 2025 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 4dKYkK6P9Dz6J9lb for ; Mon, 01 Dec 2025 06:23:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKYkK5V7Lz3BvV for ; Mon, 01 Dec 2025 06:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570201; 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=/Prb7ibirxUtFpj5w4OSXS/FW8DXMhvj2oEyctK3wAI=; b=oDmx+CZhj+OaVtsXB7EZCg0WTGr+lgcWURdakC1UgNbsNPYJ4feXzrxyUVUXCFBKubZaLx HS/ssmW+md5bv7vjCPbXXV1ud5IhcQffBHfLAbcreFqrWLwwoNEUIQdhXe350qxYasIXg3 LrJsIhX2LFsveBDUqhbUl4+SNcBwJfgLQtCRkG2Aq1M9jimW2N9O18eg1MyIep4wGvWNeX nRa6i3Lnaib7ne1Z65mmKns+8Dlhkxko2PLQfYeTNoB3dQWzF6ITYgcK/QNhlxb5J2/dKd ng0rFtuLYJL4r7KK4+LAr4dnjMJgiKWQbltdKslaa1xrD+oxMQBTRCc0msEwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570201; 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=/Prb7ibirxUtFpj5w4OSXS/FW8DXMhvj2oEyctK3wAI=; b=h/7fRAZl6691aFnQm0sSLwhKTxYCjcG3iWOISJNeInzLAT6tiay+pdBiXtD6q5oCaOnlmm S8a12Vdhll/At5MrDEY/TGq9Mlj4GNJcA0l5e/QrPcl+B0nR6nHlU8SSkojmeuDudXo+OP LNiTitK54obR3ey68gtl1NrytLfelnTnYmbvG1hmPArqrcnceEJk8cgYxJn2qba+Tuxit1 3BThNoGoi+q9Aip4wTEDk4aFXJdxn8B/f7zrBP1l5KbygpTW8uzg3O9Mr28++Qu7ga6h/6 bzVihkQUa6sLKEWuv31Wn2qKhm4shAuwy051docRR2pJyFjTKaaXWh7ichhiKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764570201; a=rsa-sha256; cv=none; b=hOJtHWPQgMutWgKZ5Lpm/Be1zc4dLmvLYQpS8XKVGpsWoimB21UA6MP2/bIrQVo+IaxoaV 2PIRgU75i4rOZBJYRYSD2PE7oK8oFsdDKh/FaMZpto0wda52gh6qba5Xr1PwWo3jRnsOvN KlXREbCMEdyeNG0PCzlykl4ha1/ZpinZ381OnwFJoBHYKcx4Wd+f8N3Go+4XrjYfbN1mXx N8tOHnaHPEkbtTLiAJPINd3rW16j9zR7fjRlhLe97qKi54cIzK6PrKHJtCgYUP2F9ywfqo 94dPpJcbcnRgaByt4T0K2B2ZSNGqChx5eikjlYdHiKg7idb2zc1AN2kSuWf8lQ== 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 4dKYkK4qWnz18Bp for ; Mon, 01 Dec 2025 06:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f9ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 06:23:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 3e3d7e590566 - main - ufshci: add helper to convert SCSI LUN to UPIU LUN formats 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: 3e3d7e590566c7e1a55bfb0f084c9f64c6c46898 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 06:23:21 +0000 Message-Id: <692d3459.f9ca.1e27a8a1@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=3e3d7e590566c7e1a55bfb0f084c9f64c6c46898 commit 3e3d7e590566c7e1a55bfb0f084c9f64c6c46898 Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:38:24 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-01 04:40:15 +0000 ufshci: add helper to convert SCSI LUN to UPIU LUN formats Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D53919 --- sys/dev/ufshci/ufshci.h | 2 ++ sys/dev/ufshci/ufshci_sim.c | 25 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sys/dev/ufshci/ufshci.h b/sys/dev/ufshci/ufshci.h index b055d2d2d769..188f8c41def1 100644 --- a/sys/dev/ufshci/ufshci.h +++ b/sys/dev/ufshci/ufshci.h @@ -335,6 +335,8 @@ struct ufshci_upiu_header { uint8_t flags; }; uint8_t lun; +#define UFSHCI_UPIU_UNIT_NUMBER_ID_MASK 0x7f +#define UFSHCI_UPIU_WLUN_ID_MASK 0x80 uint8_t task_tag; /* dword 1 */ diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index 828b520614a5..1b80df089a46 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -72,6 +72,28 @@ ufshci_sim_illegal_request(union ccb *ccb) xpt_done(ccb); } +/* + * The SCSI LUN format and the UFS UPIU LUN format are different. + * This function converts the SCSI LUN format to the UFS UPIU LUN format. + */ +static uint8_t +ufshci_sim_translate_scsi_to_ufs_lun(lun_id_t scsi_lun) +{ + const int address_format_offset = 8; + uint8_t address_format = scsi_lun >> address_format_offset; + + /* Well known logical unit */ + if (((address_format & RPL_LUNDATA_ATYP_MASK) == + RPL_LUNDATA_ATYP_EXTLUN) && + ((address_format & RPL_LUNDATA_EXT_EAM_MASK) == + RPL_LUNDATA_EXT_EAM_WK)) + return ((scsi_lun & UFSHCI_UPIU_UNIT_NUMBER_ID_MASK) | + UFSHCI_UPIU_WLUN_ID_MASK); + + /* Logical unit */ + return (scsi_lun & UFSHCI_UPIU_UNIT_NUMBER_ID_MASK); +} + static void ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) { @@ -129,7 +151,8 @@ ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) upiu->header.trans_type = UFSHCI_UPIU_TRANSACTION_CODE_COMMAND; upiu->header.operational_flags = is_write ? UFSHCI_OPERATIONAL_FLAG_W : UFSHCI_OPERATIONAL_FLAG_R; - upiu->header.lun = csio->ccb_h.target_lun; + upiu->header.lun = ufshci_sim_translate_scsi_to_ufs_lun( + csio->ccb_h.target_lun); upiu->header.cmd_set_type = UFSHCI_COMMAND_SET_TYPE_SCSI; upiu->expected_data_transfer_length = htobe32(payload_len);