From nobody Thu Jun 19 05:44:22 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 4bN8gV4X54z5PWrt; Thu, 19 Jun 2025 05:44:22 +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 4bN8gV37rQz4735; Thu, 19 Jun 2025 05:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750311862; 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=f/0aLC5MSSwY4Zgf/56A8aGS6LSwZ/epgb5M2ozrcII=; b=YD/zSZ4YcqAjCSMGTdizcCU7u82750zMNBLLwKuQdgX/GtgV6tcTSsSI6QrLz3bZztOEnO 3QC9cJAGqiK7NfG+0DIg+WoB+SkKkYPrCovadZHSYznMH5Pi37EoZgvPT6nY4pDX/HH6hv MX5gsYtOFOSFxrW0bfs8X7vdqpjKzEv4meRCaxsTMeDB9/BFIfL4vT3t0h3zzTCxj9cVCB TE/PA50pQGFJPK7ZeibAa1iz2V1CE2Yc7fj0Af5XKH/xDHbMl35H1gkY3pmG5JC4qaO8mi PZbrDfmol+8+ULWSsp+hDW49PYPWDVCtwtXqRhUt/jA8J7jFy7dDO/5JFr+5tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750311862; 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=f/0aLC5MSSwY4Zgf/56A8aGS6LSwZ/epgb5M2ozrcII=; b=EbDyOg2H+2XtqaBHGU7h7Y68SOKeEXj5nGygXWGcM61eIL+GVztbtaJAlaALOgaxry+C/N /QU01cKsrNEE+EN3+D/KyEMIL/pr0GqHMmHCK4yZfk7TELn5E/3zDj5kbTva8fpJWe7rAe MRJabdF1+aPTZ3BIbDaYOzgFbaubJADMec0n53IUnwgbaDkl09Vt8RerPu87Q581GYFkq1 vsHFQ+Xf3uEgPaz1lrm0ONeMYsQIyg/VE/2rIQq4UOrxY5TozPrxBPd1nhznh6C2uy2ADl sZYsjPiLsFCsoF5yq6hEi6GoQ7C+C48CzEoRAZ2otYBqufODmZFIYfGZ9Wj7Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750311862; a=rsa-sha256; cv=none; b=ia2yzAZbDf947UvUHqaUI9FkGfkL7mjmlxWwSBljc/XlN4jhWvIVOX1hQAJ3yGsKcS/pxx 8LI/CXYA7oKGYG1eUcd3zrqxZfRRDACw3zUAddgBzEqoArQDsL17yROtt1cvduLha390v8 mq2YjuSWkIXWKkHfcNLaM3kdSDJj+LzdG9yfd6cKFhBxNy9n2bNs2vg/Bsu3eoet8je/HO /gL5ki812taUeJ9HvsnYtspXXThDIWQ5GjxTnDdQru5pXHxyYpGtHovIK81NMrjsZRWUE7 PtjUhEpW1VnRWbW4EKczlWU07NO3IWQm+H/LOGbKwXoaxG5QNomqM6cVXA89Vw== 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 4bN8gV2Whgz12P4; Thu, 19 Jun 2025 05:44:22 +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 55J5iMvv024516; Thu, 19 Jun 2025 05:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55J5iMhf024513; Thu, 19 Jun 2025 05:44:22 GMT (envelope-from git) Date: Thu, 19 Jun 2025 05:44:22 GMT Message-Id: <202506190544.55J5iMhf024513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Lo Subject: git: 19d0dd87189e - main - mtw: fix display of the MAC revision 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: kevlo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19d0dd87189e7daf665be9eeafed93f0d1a3ed25 Auto-Submitted: auto-generated The branch main has been updated by kevlo: URL: https://cgit.FreeBSD.org/src/commit/?id=19d0dd87189e7daf665be9eeafed93f0d1a3ed25 commit 19d0dd87189e7daf665be9eeafed93f0d1a3ed25 Author: Kevin Lo AuthorDate: 2025-06-19 05:42:39 +0000 Commit: Kevin Lo CommitDate: 2025-06-19 05:42:39 +0000 mtw: fix display of the MAC revision Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50542 --- sys/dev/usb/wlan/if_mtw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/wlan/if_mtw.c b/sys/dev/usb/wlan/if_mtw.c index 1eb7869decfa..137590651948 100644 --- a/sys/dev/usb/wlan/if_mtw.c +++ b/sys/dev/usb/wlan/if_mtw.c @@ -516,7 +516,7 @@ mtw_attach(device_t self) struct ieee80211com *ic = &sc->sc_ic; uint32_t ver; int i, ret; - // uint32_t tmp; + uint32_t tmp; uint8_t iface_index; int ntries, error; @@ -579,6 +579,11 @@ mtw_attach(device_t self) goto detach; } + + if (mtw_read(sc, MTW_MAC_VER_ID, &tmp) != 0) + goto detach; + sc->mac_rev = tmp & 0xffff; + mtw_load_microcode(sc); ret = msleep(&sc->fwloading, &sc->sc_mtx, 0, "fwload", 3 * hz); if (ret == EWOULDBLOCK || sc->fwloading != 1) {