From nobody Mon May 18 14:09:39 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 4gK06w6mh4z6fQFs for ; Mon, 18 May 2026 14:09:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gK06w57Q6z3RrC for ; Mon, 18 May 2026 14:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779113384; 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=X3WxHdvBlsPdkCo3oRqBRYReRiGM7mqMAhV81gL74cM=; b=b8XEpy14UzA3r4vjhJdAbJgRg1I0jNQkt5mVVUnd6KAIvCt2OVkrOp2DXA8ePS9SmgpmqK 15hTsBDMJprld6A764ruG2QYLg0ngbUlrfnvvhu5T45kFoZ+k9HIljXayzXdhobEDJ3PBt HuZOSW456um/1gad/+ke4bsOdlMyJ3IaHDv+A9EUC+ZoQdlJ4GCNYP+2V+HbgQu6D+Rtk+ lgBxuc2srcEBd8uJ5cFi2vw/vkSzCvpWL1RQD2DckkZKxBm6tBgfafXH/MzHfaLNo+zmUA 8/jkFuq7uIDn3v40lHBzvE3eS1WZdS/bEvYrxEL4mssOXPgXuYzSV7eoeKPqaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779113384; a=rsa-sha256; cv=none; b=b7CnTkqlSIHdCWQJLxYVdqQNBGms1a/myrJujJH4z2buYAUbu0wcHb6zRSkVHLA3cCu4Ws fhifFArsU5Lcn+YWg1aK6Krlq4RH7f9UR69VW+wgDjD7T894Unxj0arnDuKhVnClVvd3Au IdwezjJlNLOFRo9nBLiOps5Vy2M8tKB0O9qPOaCpVRvuJ672anDo6k8gHh3mt7kUBoo2hz WbiGyZ1H1mOyo+B9X3qyiCoqNZNA8ICSRt/vqLqhFLGstjSUCHSlHjmy1AuQudfVfq3/Sy Qc1svtuzxrjnydNINQ08fRCbun2v7TJUnrvr04RBU5DSqABft2BNiS1Rizfmeg== 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=1779113384; 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=X3WxHdvBlsPdkCo3oRqBRYReRiGM7mqMAhV81gL74cM=; b=ajZUCnFRx4r+A2xlhZznaxzfqYV3Kr79HfyADAAeeQzmCn0oN4c8uz+pvxQbkh90lpPilF lDdw6JU6KX/GQCxKuEXSkta+CqjTsWIYapQaQNHJQS4oZxCy0PdA6uVdrMjdc1MJGLIoe3 gs3odRYcxCLjpvH2Tqi5q2r9bu8Elq8nLGhwHivRKOdu/S9I7nIk4ZswjgEn7we1kQmAHU +JPhJ6FeqgERf26d6sTt8YhIm4g0itHEgmFx3Uz7xdENKCgEGKbeBT3LYoHQuBGa2uw6fF vGHXCN0KDlz5mbJaKr+zlmZpEeMWuwhH6JCDxmHL4w/Lr9Z4bh9JhB4fTWw9cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gK06w4kqSzWYY for ; Mon, 18 May 2026 14:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39eff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 18 May 2026 14:09:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 3abc07947c14 - main - asmc: fix asmc_key_dump() page fault on T2 MMIO backend 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3abc07947c14f5c30e5328d56a2da8dbf8412ebf Auto-Submitted: auto-generated Date: Mon, 18 May 2026 14:09:39 +0000 Message-Id: <6a0b1da3.39eff.45013213@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=3abc07947c14f5c30e5328d56a2da8dbf8412ebf commit 3abc07947c14f5c30e5328d56a2da8dbf8412ebf Author: Abdelkader Boudih AuthorDate: 2026-05-18 14:01:20 +0000 Commit: Adrian Chadd CommitDate: 2026-05-18 14:01:20 +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 --- 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 8cd7842d03fd..30c5da698361 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1090,6 +1091,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; @@ -1150,19 +1172,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); }