From nobody Fri Sep 18 10:59:28 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 4hmV4c6MHzz6sHym for ; Fri, 18 Sep 2026 10:59:28 +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 4hmV4c45MSz3RGm for ; Fri, 18 Sep 2026 10:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789729168; 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=Y4R6i7JMzfze66wPpzHYCHtD1lgLuCjybpHuYZ2bjew=; b=mzzjBv6WqRN7jsD0esNRK6d8l/Xjg0XrT6uguyWZTYYLtHCH+lwLtPnHh9SP9JdYD67hKF Z0tt3DCq4zG0NZ8pBMJenp6qkW/nt2ESeS2ywX8NPguRo4ydGYvvmibC2LlFE2Z2k1PJ0M OWKt5W/BoGLylKxnfqE9T+lq9DL4gPtn4BLfYtafdZ0O2GguAwuFrMpMt6bop8xdOk8Zja ABQ5UK0xMfEn72QefdBHlVsLyk0kvPtB9KiEMXNGsN1Q809ywRodUx/cqNCCnjcjPKYGMz 9aDob3+QVhosTjd+heS28aSEO/vr+E8PtI2jyWuVXFCq+YgBjESD9IZ5/v0uBg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789729168; b=n7onpdx6qtQGMN2LZSkJ3thPYyFkWU8d4ys6CDo3SqkgSnMjC+e+kOx9Xgyo+1SpR/GhNM kDQSx/sFufZOZvv6m6x+hFzhWLn5DMxMvSX1muWi/orly1YH/Tw/u1++CU9nab0T15WXy2 7daTvNL20XdZ+GfSHOc1f29eHRaaowUpZefM5ooNFJxX37XPKNJ3eJbZkayxBrjONLD/pn Sv3HnlF9AAXUcLAKrapzlp/ki9Pk18gPeD43ks94Ul0iAoJrls1pmrPe6NMkwK5RJKvCwb j6ZnUUoT/FKhFfkeheVAdNYvvfeegBGBJyrw+x7zxvqamx/bv+5DqYBEf7Cj/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789729168; 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=Y4R6i7JMzfze66wPpzHYCHtD1lgLuCjybpHuYZ2bjew=; b=MgxOUpZamqCsEqK+quqcQnLz57kp+dCpe4X9oEWY4oTkRu4pE2RdjzW6d+9xeSxeo975+4 iG9TK8r3NLsPgvI5Rlo6/a7DmXv+cZelVIbJxoVpCTeK40HwhcwDURsGTYSZYC/cBKpoaQ 9OcsUBwhHbycdFA6WP8gUf1BXuvjyx14oHs709oCdWiFtZHgC/fMnSpRihvDy2H1r/qCtX 4lbMa6JDIcjln2On/2BHoRYAKzUKdhJjGEfDNzgpCmjtJUP7UKF/3qwjHJxF41z7XR/FeR psAfxkbrow/p1W+QFMGyfiJpKBOytbf5AAVzPT+JeE8g0TCeKhi7aKz3aCet7g== 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 4hmV4c1nGvzG9c for ; Fri, 18 Sep 2026 10:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 266d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 10:59:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 758578370f6b - main - amdsmu: Hints on what to do if IP block blocking S0i3 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 758578370f6b726299c19f0e87355b91af1b90e5 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 10:59:28 +0000 Message-Id: <6aad1990.266d7.3c9c697f@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=758578370f6b726299c19f0e87355b91af1b90e5 commit 758578370f6b726299c19f0e87355b91af1b90e5 Author: Aymeric Wibo AuthorDate: 2026-09-18 10:52:03 +0000 Commit: Aymeric Wibo CommitDate: 2026-09-18 10:59:14 +0000 amdsmu: Hints on what to do if IP block blocking S0i3 Reviewed by: olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59674 --- sys/dev/amdsmu/amdsmu.c | 23 +++++++++++++++++++++++ sys/dev/amdsmu/amdsmu.h | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/sys/dev/amdsmu/amdsmu.c b/sys/dev/amdsmu/amdsmu.c index 5902e5e9af89..f7edc073efea 100644 --- a/sys/dev/amdsmu/amdsmu.c +++ b/sys/dev/amdsmu/amdsmu.c @@ -323,6 +323,7 @@ amdsmu_resume_check(device_t dev, enum power_stype stype) struct amdsmu_softc *sc = device_get_softc(dev); struct amdsmu_metrics *m = &sc->metrics; bool any_blocking = false; + const struct amdsmu_diagnostics *d; if (stype != POWER_STYPE_SUSPEND_TO_IDLE) return; @@ -348,6 +349,18 @@ amdsmu_resume_check(device_t dev, enum power_stype stype) */ if (m->ip_block_last_active_time[i] < m->time_last_in_sw_drips) continue; + /* Check if this IP block should be ignored. */ + d = NULL; + for (size_t j = 0; j < nitems(amdsmu_diagnostics); j++) { + if (strcmp(amdsmu_diagnostics[j].blocking_ip_block, + sc->product->ip_blocks_names[i]) != 0) + continue; + d = &amdsmu_diagnostics[j]; + break; + } + if (d != NULL && d->ignore) + continue; + if (!any_blocking) { device_printf(dev, "IP blocks that blocked S0i3 entry:\n"); @@ -356,6 +369,16 @@ amdsmu_resume_check(device_t dev, enum power_stype stype) device_printf(dev, " %s (active for %ju us)\n", sc->product->ip_blocks_names[i], (uintmax_t)m->ip_block_last_active_time[i]); + + if (d == NULL) + continue; + if (d->expected_module != NULL && + devclass_find(d->expected_module) == NULL) + device_printf(dev, + " hint: load %s to allow this block to " + "suspend\n", d->expected_module); + if (d->extra != NULL) + device_printf(dev, " hint: %s\n", d->extra); } if (!any_blocking) diff --git a/sys/dev/amdsmu/amdsmu.h b/sys/dev/amdsmu/amdsmu.h index 3b600fab118d..ede275ac7168 100644 --- a/sys/dev/amdsmu/amdsmu.h +++ b/sys/dev/amdsmu/amdsmu.h @@ -115,6 +115,28 @@ static const struct amdsmu_product { */ }; +static const struct amdsmu_diagnostics { + const char *blocking_ip_block; + bool ignore; + const char *expected_module; + const char *extra; +} amdsmu_diagnostics[] = { + { "CPU", false, NULL, "this can happen due to other IP blocks or " + "because the system was on AC power" }, + { "MPM", false, NULL, "this can happen due to other IP blocks or " + "because the system was on AC power" }, + { "GFX", false, "amdgpu", NULL }, + { "DISPLAY", false, "amdgpu", NULL }, + /* + * On Phoenix, these seem to report USB4, not USB3 as their names would + * suggest. + */ + { "USB3_0", false, "tb", "see thunderbolt(4)" }, + { "USB3_1", false, "tb", "see thunderbolt(4)" }, + /* On Phoenix, the SMU seems to report garbage for this IP block. */ + { "USB4_0", true, NULL, NULL }, +}; + struct amdsmu_softc { const struct amdsmu_product *product;