From nobody Wed May 28 09:06:53 2025 X-Original-To: dev-commits-src-main@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 4b6kCK2khMz5xC3C; Wed, 28 May 2025 09:06:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6kCK1yfrz3vLH; Wed, 28 May 2025 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748423213; 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=l+pAWaD1KYInBA0d62fagqsHJvJS5xglX13Ck2aslxc=; b=x5++L0utES8jEhDKmftkUI+7s8yg98RDHu/Tu1zH2SXb025Ad1Cce3l3+PQnHDqbALTVQu vYAvcYBxdEcJm8Usb96So4kJsOpVvF4imxaV73mUMb1ZQwxC7Y3M7v8h5bzoEgUqVF4gfx gpIAJGGc+oq3WvAkFM8iJP4nCJjwqP951LEdd9MJB87Ox4UZ64Lw9AW3W/usrqfdAhg+s8 dKLYQROqT04+rDjM8bC/1HEt4FffzJpNgqyCNjv+KBDgAQTQ5eCdEIWu/2ecghLmtHbR8C hqnX7A5D88BbBr/kR06viSI173G2vkzmd9vcIjuUiZTE/s8AzhyUT8epAyg7Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748423213; a=rsa-sha256; cv=none; b=T8w+nbMbStsYIwaLVm7lfrtaBIu2juVuYy6k2cIDzJZ7IiDOv5JORWEMBSaErOBjQWqIHC iWj0dOMXg6sH/0QhE20PPaT+XR+JYTyqWdY9/V0fO8tQEG0ZpSuqHp8i9rKtVdUZJCkfat MH2GcNQdCFFT5I81yGo+N4T9cDcOubMw62F4s3kY1C0FTl9Bjv6RS1U/pR514LTn6fkxBa Ei6BIeE1t8r9hp1IpKOtVS+6/DfwPjRf8OfydHZVW9MW++elQ7VBOzmEcjY/fKRl36qV5h MQolvik6p2W5Yx/eEZ5aryeeuPOyayV+dryMeettiTrIQmGgGDTeRKN5SbnWAw== 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=1748423213; 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=l+pAWaD1KYInBA0d62fagqsHJvJS5xglX13Ck2aslxc=; b=aqDRDlk0REwH9Lm82z6xROiErgy+eeYxftS8Ufp6Nf2Cu0v7Bq3GSnkt4qjkleS2MTPWdg p0bhapowVQeWhAWyVNxPdPMxm0pSOJpyXoq0sNTq7kqeCoWT2UmtOvjY0FkE2yYcU2ikRV ALPVulxzJ8FYGAEvfJ5SqbPOomxn+ME7dRl/SkdMRfZRXY9G0j0LwkJB3mAbwgWvufuLkB 7HDTeBDwC3uZaxcmg4Xo2UrcokOxMTQL/hztMq96XInzTbFaClIXziS+AKUQITePNHcGqd LHjc/vJ09MlSoANYD7ctGlCigGocCIzKSXhdHndob/rkiETZJTRT0twEUidQyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6kCK1RLnzWtv; Wed, 28 May 2025 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S96rJV012060; Wed, 28 May 2025 09:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S96rNk012057; Wed, 28 May 2025 09:06:53 GMT (envelope-from git) Date: Wed, 28 May 2025 09:06:53 GMT Message-Id: <202505280906.54S96rNk012057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 28345b17efca - main - if_iwx: Make firmware load error messages clearer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28345b17efca045ba3a24cb05167bc03b6348faf Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=28345b17efca045ba3a24cb05167bc03b6348faf commit 28345b17efca045ba3a24cb05167bc03b6348faf Author: Tom Jones AuthorDate: 2025-05-28 08:49:48 +0000 Commit: Tom Jones 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,