From nobody Sat Nov 07 22:15:01 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 4jMVj14gqnz6xthp for ; Sat, 07 Nov 2026 22:15:01 +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 4jMVj141GCz4MZ2 for ; Sat, 07 Nov 2026 22:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089701; 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=bpWw5UP+zsuR8IDKl6woIhMx7p4BdrNqqYloLyn77mM=; b=XOZ0RVTdIXvlMq2kmAOSeP+yzUKaZwD0cEhLWu+mTEp1Rp4gzTlsRALVe2tPUdBAjpYNKx mcNsbfZcETqbDekH2GDV+lHyszMloZu/LPf0wayhYPt0dVfruhOuapruNq8I2NbxzIQysh /spTajG7IhO3iscY7WpIPHaqI7NJ7xrJD8baVy/OsSTxsx4MgBnlZGflpaESkdeWrK0Axa HCs1jSg+Hk44P2uD/dR0C8LwnYJnspwhcrxZHKo9qq+RTJMRqNYyZ9jmO0t30H4ZGtgunS kVFmTZ+Lw0dT1ijBn9SEjtorOZR5jyY6qnRXivMrZgSaSd0rm8isgOV4KVDEcQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794089701; b=wzL8EgFNMjb4hVoMMfSp3RMLCiKQvrs2BBdp9/c9HPs+zU5d63WtHAGVJpDZuoLJYpOBb4 u3CPDljlXpwhT0ndCu35pOPPFEy0C4toEKTaVnwV73E5sc6DXyUylNKINW3Uhg2l2eUTyc bdmPIa8rrASqa3+odE4hVd/ecXXM51ujAjGK1Em0089+d94u7q/vEU2kDLD52mCzBzXWbT MU8TveVpnr3LVhivqJk3eATmEtwF9MxhrSrKd068DtuReoGtObiCe52uKfKu7e7s7+m/hw a4atpCd608DBoURItn6FpyWoSDftOUTprV11LFp6yCxv99sUny6yrEJ8YWuqFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089701; 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=bpWw5UP+zsuR8IDKl6woIhMx7p4BdrNqqYloLyn77mM=; b=oYVIniOtva9TNngHWfLOOdAaAX0OxHT2dmamloihjBMiTNh94ncfbsDacRgH5Zd0gJZovm Ux4ttzAVfojzKTQKCgguxoivAKlROQ+FD//WoMkYWrr38qVbJzcjK/5Bz2tesJ5mBhQyaM z+T1HypshUetUjYoNAM1XtfJULOA7RhBvfyMIAwUkJOAYnfoxIIp67PVNfAn3kxUATyjNp TkkmvNl0LjVE/R2NFY5V1Dkdb3XqWMdRyRyQZxmBtwC1TbzIsSi5c1QmzKJcw09Gnf1fSB PLnNFlRJrZhsbXZkazoNuXtbpBadS/P6l7bgpaIZCsN4XudAD/cP8EAgamMUbg== 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 4jMVj12kkszgdY for ; Sat, 07 Nov 2026 22:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eade by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 22:15:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: d8318a8ba673 - main - asmc: rebuild asmc_key_dump on the by-index helper List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8318a8ba673c691514749ee34c417f6606d5396 Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 22:15:01 +0000 Message-Id: <6aefa2e5.3eade.7213be29@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=d8318a8ba673c691514749ee34c417f6606d5396 commit d8318a8ba673c691514749ee34c417f6606d5396 Author: Abdelkader Boudih AuthorDate: 2026-11-07 20:26:18 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-07 20:26:18 +0000 asmc: rebuild asmc_key_dump on the by-index helper asmc_key_dump() branched on the backend, but asmc_key_dump_by_index() already dispatches on it, so the PIO arm open-coded a transaction it could have called. Keep one printer for both. Output is unchanged. The PIO arm checked asmc_key_read()'s return value instead of printing a zeroed buffer; the merged printer keeps that. Its retry exhaustion message is gone, which asmc_dumpall() cannot observe. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D61284 --- sys/dev/asmc/asmc.c | 93 +++++++---------------------------------------------- 1 file changed, 11 insertions(+), 82 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 9906f4acd28c..3fe647818e4e 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -1284,99 +1284,28 @@ out: static int asmc_key_dump(device_t dev, int number) { - struct asmc_softc *sc = device_get_softc(dev); char key[ASMC_KEYLEN + 1] = { 0 }; - char type[ASMC_KEYINFO_RESPLEN + 1] = { 0 }; - uint8_t index[4]; + char type[ASMC_TYPELEN + 1] = { 0 }; uint8_t v[ASMC_MAXVAL]; - 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; - index[1] = (number >> 16) & 0xff; - index[2] = (number >> 8) & 0xff; - index[3] = number & 0xff; - -begin: - if (asmc_command(dev, ASMC_CMDGETBYINDEX)) - goto out; - - if (asmc_pio_send(dev, index, ASMC_KEYLEN, ASMC_STATUS_AWAIT_DATA)) - goto out; - - ASMC_DATAPORT_WRITE(sc, ASMC_KEYLEN); - - if (asmc_pio_recv(dev, (uint8_t *)key, ASMC_KEYLEN, - ASMC_STATUS_DATA_READY)) - goto out; - - /* Get key info (length + type). */ - if (asmc_command(dev, ASMC_CMDGETINFO)) - goto out; - - if (asmc_pio_send(dev, (const uint8_t *)key, ASMC_KEYLEN, - ASMC_STATUS_AWAIT_DATA)) - goto out; - - ASMC_DATAPORT_WRITE(sc, ASMC_KEYINFO_RESPLEN); - - if (asmc_pio_recv(dev, (uint8_t *)type, ASMC_KEYINFO_RESPLEN, - ASMC_STATUS_DATA_READY)) - goto out; - - error = 0; -out: - if (error) { - if (++try < ASMC_MAXRETRIES) - goto begin; - device_printf(dev, - "%s for key %d failed %d times, giving up\n", - __func__, number, try); - } - mtx_unlock_spin(&sc->sc_mtx); + struct sbuf sb; + char buf[128]; + uint8_t len = 0; + int error; + error = asmc_key_dump_by_index(dev, number, key, type, &len); if (error) return (error); - maxlen = type[0]; - type[0] = ' '; - type[5] = '\0'; - maxlen = MIN(maxlen, sizeof(v)); - + len = MIN(len, sizeof(v)); memset(v, 0, sizeof(v)); - error = asmc_key_read(dev, key, v, maxlen); + error = asmc_key_read(dev, key, v, len); 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", - number, key, type, maxlen); - for (i = 0; i < maxlen; i++) + sbuf_printf(&sb, "key %d: %s, type %s (len %d), data", + number, key, type, len); + for (int i = 0; i < len; i++) sbuf_printf(&sb, " %02x", v[i]); sbuf_finish(&sb); device_printf(dev, "%s\n", sbuf_data(&sb));