From nobody Mon Oct 12 02:51:32 2026 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 4j326Y3QNMz6k5FW for ; Mon, 12 Oct 2026 02:51:33 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j326Y15N2z4Tvf for ; Mon, 12 Oct 2026 02:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791773493; 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=sMUgMi6tok2tLMRska5dymv2TVUtISfLOatt3xT3lJ8=; b=D7YGI55Qfls2Zmxgg8gTPsA89CfwUtE4vPADx11yGRIRrWszf24W0sEUWMPljiWBazVrsh t7MqzyLkXPptrpGcM01bfmSqnOMzcExYAcnTZF9uTbrKPPuZYUmXg4VRmSQmJ2znfmG25H tReDif5TkRpUkpaPr7m3J8ncdr3mqnADd4lkQx3BDcJYuaIL1Xtof8/YAYxgQWdOKFz/07 Rmzge97oty9v5IDQXbmXH8uv95ttdXcxVrNK1AAwHsUnYwTTuY+nYq7KJlZRljVEGHcppW pBqbYAE/nn5bXC6NqjVNOZPwmazqlguQgoP8q9FdDp/1uu5HjkJNgilbOP+9VQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791773493; b=m+3DIJtR2hllZgtq3xVLBd2ZewkEq80FfFs2nhrhCKMFYTfF/zOeptqKawziuce8jpk23y 1zC2DpCfKJOd7YZYgLwQ5IsDaxOev1iF4NZQJB/WY+WcuEpgc64Jb+A9FC9znB4jASYYz4 +CKA/D7IOQJh9tfOqOzeMNggZuiUN0lPV8A3X0MBhk9S+ZxL3yI5fxb/wS374iwP7fFF+Q twvpM6Xf9khkw2Fj5DVoM9qnbLb6bUDZuzijS2sFK7gDoxRbRZxvyxRoMRrggyTn0BdHPX 3JZWTeJukYC7ooB35G0e4RCLyJS7TmIjKHlNLGNhlUzDPQXGRKOqGLuEaJ6OyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791773493; 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=sMUgMi6tok2tLMRska5dymv2TVUtISfLOatt3xT3lJ8=; b=uaoQyXE3u59G9lojiKILaJjZ5ZhW+4OFTTsbGbKGlZBrqEANvhMnqel3UgrVJoPD9MgMmw 1KyiK4Vj1qnvrhcG84ez4OkAndxB+MsufCIoJ3YL6YeNMx3zvQmPryfGbEB0nu2XZpfiE7 9uj9w8wP7yZTn/0IpbpXmcb8u3PVqlxf9Ro6pSaBFJgM9sA5JxgZPAcioKTmWE7IwBDTfj J6YyQnQN8KHc3M+0NBXskMjzRIGqn1slcqDYrRYbuKGJ3xqOfaa1vzFkCT1RvA5nfH8EBe tBb5DOUrGaMuW6Eu8K0YHZbtyrc38QGhgDKhAc/OgjN+kmrUVeDs0H/BIcll2w== 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 4j326X6wcKz17RG for ; Mon, 12 Oct 2026 02:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42a6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 02:51:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: b00a90df99f7 - main - iwm: bring over placeholder calibration information List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b00a90df99f72c30bdeec17bb0fb0cd28342415d Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 02:51:32 +0000 Message-Id: <6acc4b34.42a6c.f97bb57@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=b00a90df99f72c30bdeec17bb0fb0cd28342415d commit b00a90df99f72c30bdeec17bb0fb0cd28342415d Author: Adrian Chadd AuthorDate: 2026-10-12 02:41:20 +0000 Commit: Adrian Chadd CommitDate: 2026-10-12 02:41:20 +0000 iwm: bring over placeholder calibration information Like openbsd at this commit, it's not being used anywhere yet. Obtained from: OpenBSD a6e25c727a2214219715b51ba6af2221d7e0d674 Differential Revision: https://reviews.freebsd.org/D60074 --- sys/dev/iwm/if_iwm.c | 6 ++++++ sys/dev/iwm/if_iwmvar.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index dcebda12e263..32d6dbc864fc 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -2247,6 +2247,12 @@ iwm_parse_nvm_data(struct iwm_softc *sc, data->n_hw_addrs = iwm_get_n_hw_addrs(sc, nvm_sw); + data->calib_version = 255; /* TODO: + this value will prevent some checks from + failing, we need to check if this + field is still needed, and if it does, + where is it in the NVM */ + if (sc->cfg->device_family >= IWM_DEVICE_FAMILY_8000) { /* TODO: use IWL_NVM_EXT */ uint16_t lar_offset = data->nvm_version < 0xE39 ? diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h index af1c484e9690..361c2d073520 100644 --- a/sys/dev/iwm/if_iwmvar.h +++ b/sys/dev/iwm/if_iwmvar.h @@ -195,6 +195,14 @@ struct iwm_nvm_data { int n_hw_addrs; uint8_t hw_addr[IEEE80211_ADDR_LEN]; + uint8_t calib_version; + uint16_t calib_voltage; + + uint16_t raw_temperature; + uint16_t kelvin_temperature; + uint16_t kelvin_voltage; + uint16_t xtal_calib[2]; + int sku_cap_band_24GHz_enable; int sku_cap_band_52GHz_enable; int sku_cap_11n_enable;