git: 28345b17efca - main - if_iwx: Make firmware load error messages clearer

The branch main has been updated by thj:

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

commit 28345b17efca045ba3a24cb05167bc03b6348faf
Author:     Tom Jones <thj@FreeBSD.org>
AuthorDate: 2025-05-28 08:49:48 +0000
Commit:     Tom Jones <thj@FreeBSD.org>
CommitDate: 2025-05-28 08:49:48 +0000

    if_iwx: Make firmware load error messages clearer
    
    Try to make it clearer where the errors are coming from in the iwx
    firmware load path. In particular make it clearer that transferring
    firmware to the card failed, not the loading of firmware.
    
    Hide the init firmware failed message behind a debug level, there are
    other errors which will show already in this path and for most people
    this doesn't add much.
    
    Reviewed by:    adrian
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D49826
---
 sys/dev/iwx/if_iwx.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c
index 03008e4fac93..029031802a26 100644
--- a/sys/dev/iwx/if_iwx.c
+++ b/sys/dev/iwx/if_iwx.c
@@ -2607,7 +2607,7 @@ iwx_apm_stop(struct iwx_softc *sc)
 	if (!iwx_poll_bit(sc, IWX_CSR_RESET,
 	    IWX_CSR_RESET_REG_FLAG_MASTER_DISABLED,
 	    IWX_CSR_RESET_REG_FLAG_MASTER_DISABLED, 100))
-		printf("%s: timeout waiting for master\n", DEVNAME(sc));
+		printf("%s: timeout waiting for bus master\n", DEVNAME(sc));
 
 	/*
 	 * Clear "initialization complete" bit to move adapter from
@@ -3697,7 +3697,7 @@ iwx_load_firmware(struct iwx_softc *sc)
 	/* wait for the firmware to load */
 	err = msleep(&sc->sc_uc, &sc->sc_mtx, 0, "iwxuc", hz);
 	if (err || !sc->sc_uc.uc_ok) {
-		printf("%s: could not load firmware, %d\n", DEVNAME(sc), err);
+		printf("%s: firmware upload failed, %d\n", DEVNAME(sc), err);
 		iwx_ctxt_info_free_paging(sc);
 	}
 
@@ -4050,7 +4050,8 @@ iwx_run_init_mvm_ucode(struct iwx_softc *sc, int readnvm)
 	sc->sc_init_complete = 0;
 	err = iwx_load_ucode_wait_alive(sc);
 	if (err) {
-		printf("%s: failed to load init firmware\n", DEVNAME(sc));
+		IWX_DPRINTF(sc, IWX_DEBUG_FIRMWARE_TLV,
+		    "%s: failed to load init firmware\n", DEVNAME(sc));
 		return err;
 	} else {
 		IWX_DPRINTF(sc, IWX_DEBUG_FIRMWARE_TLV,