From nobody Sat Sep 05 23:32:23 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 4hcqPN0n3cz6rJj5 for ; Sat, 05 Sep 2026 23:32:24 +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 4hcqPM59QGz47fg for ; Sat, 05 Sep 2026 23:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788651143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7qFfaXf5uExbVSio02THsbRmpn7Oe1HTeU/xcgw5zCE=; b=SyWug/6VEa6oFL9otdS+UCZWT+EvjjsUIaO9hkbkRM+drEX9iUeFz8mXJ4CjTWbcRs5Xzh +m7gig3L1YHQ9s0wIx/R8o3PYNZB+G27yGC57GUv3CrxgJho0qHMmQF3q2F7eXmYNwptI5 9xaR55LikGVoVk8PqfbgR2/c3nIj6DHyQuhoBgPyWkf34mX7Fk/i6AXuRUIL37CksETQGb goCecWN5TR0DBLvv9uiu2fgjFV0klm+ObT1dQQCvV4lhBLLOZo849nt75xfkSN/DJw0oNs 3u2ydOeKfCZtQsQPL7Fec/DmH/85qo5hSCkYYuhFCbuMBEz4F9QBOmeaGAPs8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788651143; a=rsa-sha256; cv=none; b=egjmdoDTgR3w9jesaZnxfxwlfzkViH4e5Br/kv0D7tUPpe5KJ8RGH2PO0smWy2u8WPNPHU p8lPBJlH17H9Oh93divnh/BdzZHayNMBqx/iAejQaTsz1YWg4gcIhzzV3Ihr7cg8fb/aux Hjme5E4KkaLh9VK9LhYbrRuTgK8pHC6nwVl0HmOVZN1v28pOIc5ccC+c6ULnG/4ZNfP8vU JqjJyov0aTcTuZh4PVmWX5NuGG4GfQsdd0u7EiF+727OZ9YdAuk2adTWBL63R461hKPKOE wS9IpGV2qnE1T1FPUxuaa26zwKPxaNXSI0sqmguevW9O7Ydsb48RS0gHj8buwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788651143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7qFfaXf5uExbVSio02THsbRmpn7Oe1HTeU/xcgw5zCE=; b=sLCM+P2Cx2uLegXoSDE3JSzDft6+cR65kx4yFCoAc6W0xx/XYaQGFcuIaSPIvwGfrCslXa F/AFgeqg5C5SpNNNlNMMRwwdHYIa0Tkv5kncTsayiZGcLsiha/BkOT5jL/kbYGUFh+lxHd gYeJxMmD2vNYqDrq71tm7rb0mw5A5Q6FoPAK+jGDG6PWG23H4Spn0Q4vJSD6mEkgkGnw7D SFR2FYvDG2SB8fIyAT1vwdR2GX7EyqEHCiYjenMJvYL6WdcvDr7SkZBqbD1sJoXDQRnXeb yDU+8G5TJYLUEvlPw/cWZN+mrcC3oNKPaNuzXZgNYI4F7P6bOFFkD6hrxCfQOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcqPM3dMgz15kx for ; Sat, 05 Sep 2026 23:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2423f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 23:32:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 9537554b617b - stable/14 - asmc: fix asmc_key_dump() page fault on T2 MMIO backend 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9537554b617bb1a45d6b66a08153daca5686232b Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 23:32:23 +0000 Message-Id: <6a9ca687.2423f.3b96941c@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=9537554b617bb1a45d6b66a08153daca5686232b commit 9537554b617bb1a45d6b66a08153daca5686232b Author: Abdelkader Boudih AuthorDate: 2026-06-14 20:55:12 +0000 Commit: Enji Cooper CommitDate: 2026-09-05 23:31:46 +0000 asmc: fix asmc_key_dump() page fault on T2 MMIO backend asmc_key_dump() used I/O port macros (ASMC_DATAPORT_WRITE/READ, asmc_command()) unconditionally. On T2 Macs, sc_ioport is NULL (MMIO backend is used instead), causing a page fault when ASMC_DEBUG triggers asmc_dumpall() during attach. Add an MMIO guard at the top of asmc_key_dump(): delegate to asmc_key_dump_by_index() + asmc_key_read() for MMIO devices, consistent with the rest of the T2 code paths. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D56748 (cherry picked from commit e37e49bfaa2763f0ce522a3e54de9b494e346465) --- sys/dev/asmc/asmc.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 9b7adb61e6de..b55196e69c15 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1145,6 +1146,27 @@ asmc_key_dump(device_t dev, int number) uint8_t maxlen; int i, error = 1, try = 0; + if (sc->sc_is_mmio) { + uint8_t len = 0; + char mmio_type[ASMC_TYPELEN + 1] = { 0 }; + if (asmc_key_dump_by_index(dev, number, key, mmio_type, &len)) + return (1); + memset(v, 0, sizeof(v)); + len = MIN(len, sizeof(v)); + asmc_key_read(dev, key, v, len); + struct sbuf sb; + char buf[128]; + sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); + sbuf_printf(&sb, "key %d: %s, type %s (len %d), data", + number, key, mmio_type, len); + for (i = 0; i < len; i++) + sbuf_printf(&sb, " %02x", v[i]); + sbuf_finish(&sb); + device_printf(dev, "%s\n", sbuf_data(&sb)); + sbuf_delete(&sb); + return (0); + } + mtx_lock_spin(&sc->sc_mtx); index[0] = (number >> 24) & 0xff; @@ -1205,19 +1227,23 @@ out: maxlen = type[0]; type[0] = ' '; type[5] = '\0'; - if (maxlen > sizeof(v)) - maxlen = sizeof(v); + maxlen = MIN(maxlen, sizeof(v)); memset(v, 0, sizeof(v)); error = asmc_key_read(dev, key, v, maxlen); if (error) return (error); - device_printf(dev, "key %d: %s, type%s (len %d), data", + struct sbuf sb; + char buf[128]; + sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); + sbuf_printf(&sb, "key %d: %s, type%s (len %d), data", number, key, type, maxlen); for (i = 0; i < maxlen; i++) - printf(" %02x", v[i]); - printf("\n"); + sbuf_printf(&sb, " %02x", v[i]); + sbuf_finish(&sb); + device_printf(dev, "%s\n", sbuf_data(&sb)); + sbuf_delete(&sb); return (0); }