From nobody Tue Oct 06 07:50:46 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 4hzT2b26ZMz6cW3K for ; Tue, 06 Oct 2026 07:50:47 +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 4hzT2b0TdWz4G1J for ; Tue, 06 Oct 2026 07:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273047; 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=DFTmH57dxtyB9MwqfJ8hmr9LYyt+OOyxSaSS+RxNTAc=; b=ZHj+6/HHbd/Pp+5HsbehM3YaXS9GnAl95Nv6NjZY1iFBJ/OjhNDTlOkVr61S+7Z81VDNv2 HOx4L1g7G2fzuRUT5VrD5euHfSKKFAMA+Iiy52/vbgosiSaRk1H0GY8IL4g6+/Quj05T43 cTYd4eANnIpAIlK+Tfo9xf2geEMN36mX9aconfu3MIWySJWH3NCgdBrzTxPQx0S0paW0iz f2dGGxPTfmIPWvnpu0yux+utkLkAIFhpyzSaYfminEfpJz3cU9q9jH3DpIZQBR0TsWlirB SrcwpaoGpq3P55tcMhx1yPbhEHT5MpINflYAU1Kon824Ro0dXkTGE3eTUo7EMQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273047; b=mO5uIvhzxLi8lByO7xKjiV2Itvi0IUJo1ZNJ69Ng5cItU1tjHxR6xnsBkyoXVto6Q+UleY pPdgGd50qVL+E5T0z9d4HWhR9OHfRMQccRIBIbRPD4SUurjfOq15J4kS77hVjPpd5d2Vhb lTOPdPRqiLLx2Ck391XkoR2jYFJ7PIKJ5m1VhTjAHdrlii1nh0a7WCdXFGcjQKkRMCQUI/ Fye7rNxc14V8kdInsa0FkkoL/pfXxzryJwNbtPzrX6rkrIQpIsN4vr1lFGa80f2cJ4Sf+k 3qCVmdCgs8XSxEFhtcGv8v6cRIJaGNRyDstnvKe9wFv2tBfgN+XqM8YG/9iNag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273047; 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=DFTmH57dxtyB9MwqfJ8hmr9LYyt+OOyxSaSS+RxNTAc=; b=KzS2t3iU9Aqkxs8zY5yI43dhBesGup45cimtVbttuT7zKa3uGi67F1YIkznPLOfkVF3I4M +RQWbBQH04OfTr70bnEFo/Hf2SnsPSn4O8gg9/t6YMRWpZHmDrMAnv+eF/V6pBSGCFdMfn qAySwePYqDtqsNLgDot/Csn5Fp6VnhwSL1LP0RttcQJeOnpzhAW8tUU3LwSfylQBXWUz7a tuz3jgTMGXAxE/r4ITVwfigRdY8ZSAGV70G4FWNRNUPw/h5nHyZSRx1MOK4bqBbmxvCa/h xaEkk/cTTBrXBv7LaxfdY2pPdQjIQIackIPJivUvFg9pai43/xhi55HTVFCzAg== 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 4hzT2Z6ffTzxnr for ; Tue, 06 Oct 2026 07:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 474d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:50:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: ae109f0cba29 - stable/15 - ufshci: define the sleep types locally for stable/15 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: ae109f0cba290849a75f4be9eb0c52c853dc6cbe Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:50:46 +0000 Message-Id: <6ac4a856.474d0.770fad99@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=ae109f0cba290849a75f4be9eb0c52c853dc6cbe commit ae109f0cba290849a75f4be9eb0c52c853dc6cbe Author: Jaeyoon Choi AuthorDate: 2026-09-28 23:51:39 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:47 +0000 ufshci: define the sleep types locally for stable/15 The suspend/resume support merged next uses enum power_stype from . That enum comes from the generic sleep types work (c43473dc9b83), which is not in stable/15 and depends on ACPI changes that are not here either. Define the enum in ufshci_private.h with the names the driver uses, so the following merges from main apply without changes. This is a direct commit to stable/15. Sponsored by: Samsung Electronics --- sys/dev/ufshci/ufshci_private.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index 22e77c9b9326..5ded8777753d 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -50,6 +50,20 @@ MALLOC_DECLARE(M_UFSHCI); #define UFSHCI_SECTOR_SIZE (512) +/* + * stable/15 has no generic sleep types in , so define the + * ones this driver uses here. + */ +enum power_stype { + POWER_STYPE_AWAKE, + POWER_STYPE_STANDBY, + POWER_STYPE_SUSPEND_TO_MEM, + POWER_STYPE_SUSPEND_TO_IDLE, + POWER_STYPE_HIBERNATE, + POWER_STYPE_POWEROFF, + POWER_STYPE_COUNT, +}; + struct ufshci_controller; struct ufshci_completion_poll_status {