From nobody Mon May 18 16:59:33 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 4gK3tt0Csxz6ff3g for ; Mon, 18 May 2026 16:59:34 +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 4gK3ts2XB3z419G for ; Mon, 18 May 2026 16:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779123573; 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=jqgacgh3ehoi8Dw4BXAWAOfRob6fXoebfBiQbp49dUM=; b=VUTUMkWYnF5pjun3EIxLrP4/HK1iVR99V2fWclAQQVr3e8ilvnZhA4AeBTC/N1FlGYSs1f dEWF4RupVaWQk2qvaK/uOQAClZ/sPRZuRzYABuDGu8CDRDI7JBQQboHDWOI1TfJDqFQL0d h6pbVNeNgYQS6EWLuVKs3wpV1oW/UrPmMK9gyhFm7d07kWFGIQsa9CvVHmMydlSjy7aSor +bgugEApnjLVtGthrzxpqzuUVssRu6bKMSDKhLvJCCIlN3jla+xyB77EWxDkM2fhojeZ4A Qa8UXFhtrVy4kjLFMOlD58z6rjnFZLLL/cG6AtlTr83D2xp6cSH2b11FUJWHGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779123573; a=rsa-sha256; cv=none; b=wbH5+VZm+vbLNvETHcwXyHWEI5PMT9dbwhTTi757Uo0IcHVX54qrEOUQ3Z988RVeR6NhnX JD3NENk44HmVp0VN73YZIZFnO0HWeETQWL/q2pM2jyDD5kOfGSV3bF+Vdu2Vi4/6hXrCef 6/+mkTlW9cPTcFk9KCBtOuv5W4X4wGG33RDZHoNC1GAXDN1piJYQvBHw1Jp3KSM4arLFIi hB84nwwvDcWchWKdOJMYjwtwemHahLA5lxiNfxf4+0Ss7svg5+pYyupL0qDlfrRlsYuYY2 KSyBlIN4ErW4xGjXTLgmAwf46S3AKYwtoj7C1SkuQY2o4GMYImv+8Pl6VK1vKw== 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=1779123573; 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=jqgacgh3ehoi8Dw4BXAWAOfRob6fXoebfBiQbp49dUM=; b=gN70X5wGrKGoCp1us3ooq6IorpDeIlEOWmtPi252NmLErpj5ZJ5vBUhfx6bmZJ2vdKKQNX vBAXJKHNT9NAxo34tUaAfwuDhgvVYHi5rZEkatZC16urwd4L6bG56n+B3R8jcM7djemCDv kNZhfg7w+A1Lw5ngaSz7oSi++03YwPwT19HJlD1wtZt1Rs6CgcuWHOWwqiuEAxZfQ4J+tx BEomrpLaoOAyihHS+4ZGuPGoTF3Pm6/mwBopqk5D+01d1CTgwxntuojr+7smmPrbHBVjMD WUfUvAXE1jaKuipNQY4tAoRZ+AaL9ybJ85ZRo788omPy7F2RewrDx6kf28lVHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gK3ts1Zdhzd2C for ; Mon, 18 May 2026 16:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cae9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 18 May 2026 16:59:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: af5cdcd8b18c - main - Revert "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: af5cdcd8b18c9a24cc317f1886dd3c32b253ef27 Auto-Submitted: auto-generated Date: Mon, 18 May 2026 16:59:33 +0000 Message-Id: <6a0b4575.1cae9.512a95e9@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=af5cdcd8b18c9a24cc317f1886dd3c32b253ef27 commit af5cdcd8b18c9a24cc317f1886dd3c32b253ef27 Author: Adrian Chadd AuthorDate: 2026-05-18 16:58:59 +0000 Commit: Adrian Chadd CommitDate: 2026-05-18 16:58:59 +0000 Revert "asmc: fix asmc_key_dump() page fault on T2 MMIO backend" This reverts commit 3abc07947c14f5c30e5328d56a2da8dbf8412ebf. I'm not sure how this built locally for me but obviously failed in CI; I'll go figure that out with the submitter and come back. --- sys/dev/asmc/asmc.c | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 30c5da698361..8cd7842d03fd 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -1091,27 +1090,6 @@ 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; @@ -1172,23 +1150,19 @@ out: maxlen = type[0]; type[0] = ' '; type[5] = '\0'; - maxlen = MIN(maxlen, sizeof(v)); + if (maxlen > sizeof(v)) + maxlen = sizeof(v); memset(v, 0, sizeof(v)); error = asmc_key_read(dev, key, v, maxlen); if (error) return (error); - 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", + device_printf(dev, "key %d: %s, type%s (len %d), data", number, key, type, maxlen); for (i = 0; i < maxlen; i++) - sbuf_printf(&sb, " %02x", v[i]); - sbuf_finish(&sb); - device_printf(dev, "%s\n", sbuf_data(&sb)); - sbuf_delete(&sb); + printf(" %02x", v[i]); + printf("\n"); return (0); }