From nobody Sat Oct 24 00:01:09 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 4jBKmQ3Jbvz6wjW8 for ; Sat, 24 Oct 2026 00:01:10 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jBKmQ0Dxhz4CQq for ; Sat, 24 Oct 2026 00:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792800070; 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=o+qvnD1bvwoyptC72StHWv+xc9kIVKenvMb6X7KMU8A=; b=NyCJ4ftItsp4cWZHwT508vAchcg+msOFd31wHm5pZpHbgeh813ndTSypFypn/iczyZILsY cYU4SQH3WByocv4/vCQlU/P+7J8P8oK0MFKaA1hNBZnrhOIe3+CmTMHk5+C2/fBHw7DrpG KI3HT/B6hzymXSZBR2LydqqEpSFiJ3H7JC8jHJB1Ji9CwYGr8B3fyM8gheK3ff2/NfCo9Y SvTRWBk2ShNQGtqGUByY4Z76ZWtgllXAuPWil8l4MDITgR22nsaLxWTVa9Vdg4R8AURJHd ypOatiBQrUSgjFCLQFuiM+w5YOzn9GR+LQAi7p+Y4VJu8zfHtYCRxIYGsv5XdQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792800070; b=iAFKTmFuSbts/HmZvzsM2igbeb4QA15XNtJNp1kgVUTDG+N0U4hOmiJ4TZAAcxgs2przlA /F2lMulJnxrvByVtQyLuhv7Xx2iHogwc+CRrupG8eqkHEJmx/f4Pd5JZ2YQEd6yq0jBVq1 Pb1nFSIsgRz0g2prMjvlS3q467VT4GZzvfHaH4BwpMitRC2uO+orQug2ArDD8+khVtdZ1D pyekkbKcQ9a7AZo0hS618/+gpIgCMAr943BevhL7Uwxm6XKgvCj0QEdRD9jPCyAvxkfGBp H6naDf6SsRk592TH17Gtdf+uQg+4C/sxTpMNghFUqPjLhL0BawAiYczj4pCdQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792800070; 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=o+qvnD1bvwoyptC72StHWv+xc9kIVKenvMb6X7KMU8A=; b=a8ItS6mseHraBBFk3YOonj3E567IClyDpxKHPN5WeWZfsHtgTsj1JY9CF1SehWA7azXkra 9USlae2iu7nam9Y5tVpbWhmTHGoa5nza5ov4Hvh9kKy/jm1KZ1QUtgS8I4PrvHJ3fK4yU1 AtKE0C+yNFnk+n0qXMdlIvCVcyd36P+0QpWQMCn67G62Nh0t7QPZ53ZXP3Y1YI2I8qbInM oh6ayJJErsbRyPZ8oUU3jxr23EcuGE+vF+WyKy6k3yk3sstNHmf/zsykFzqTtnUQR+35lc Lxavx+eWyptp2ykVmGWjBvt55j79RrbQti7Hn95evOaw7Z5u1FU040NbnYw3CA== 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 4jBKmP71R0zssw for ; Sat, 24 Oct 2026 00:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c452 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Oct 2026 00:01:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: cb77c4e846d4 - main - amdsmu: Don't rely on s0i3_last_entry_status metric List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb77c4e846d420af4d7d43f6616da213689a734b Auto-Submitted: auto-generated Date: Sat, 24 Oct 2026 00:01:09 +0000 Message-Id: <6adbf545.1c452.7c6bbc04@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=cb77c4e846d420af4d7d43f6616da213689a734b commit cb77c4e846d420af4d7d43f6616da213689a734b Author: Aymeric Wibo AuthorDate: 2026-10-23 23:56:58 +0000 Commit: Aymeric Wibo CommitDate: 2026-10-24 00:00:42 +0000 amdsmu: Don't rely on s0i3_last_entry_status metric This metric seems unreliable and I have observed it occasionally report 1 (successful entry to S0i3) when the time_last_in_s0i3 metric was 0 on Phoenix, which does not make sense. So just rely on time_last_in_s0i3 instead. Sponsored by: The FreeBSD Foundation --- sys/dev/amdsmu/amdsmu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/amdsmu/amdsmu.c b/sys/dev/amdsmu/amdsmu.c index 0e4f0bc17e22..555b263b5bc7 100644 --- a/sys/dev/amdsmu/amdsmu.c +++ b/sys/dev/amdsmu/amdsmu.c @@ -323,7 +323,11 @@ amdsmu_resume_check(device_t dev, enum power_stype stype) if (stype != POWER_STYPE_SUSPEND_TO_IDLE) return; - if (m->s0i3_last_entry_status != 0) { + /* + * XXX For some reason, s0i3_last_entry_status sometimes reports 1 when + * system didn't enter S0i3 during the last suspend. + */ + if (m->time_last_in_s0i3 != 0) { device_printf(dev, "spent %lu seconds in S0i3 during last suspend\n", m->time_last_in_s0i3 / 1000000);