git: d8318a8ba673 - main - asmc: rebuild asmc_key_dump on the by-index helper

From: Abdelkader Boudih <seuros_at_FreeBSD.org>
Date: Sat, 07 Nov 2026 22:15:01 UTC
The branch main has been updated by seuros:

URL: https://cgit.FreeBSD.org/src/commit/?id=d8318a8ba673c691514749ee34c417f6606d5396

commit d8318a8ba673c691514749ee34c417f6606d5396
Author:     Abdelkader Boudih <seuros@FreeBSD.org>
AuthorDate: 2026-11-07 20:26:18 +0000
Commit:     Abdelkader Boudih <seuros@FreeBSD.org>
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));