From nobody Mon Oct 12 02:51:34 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 4j326Z4z3vz6k5FX for ; Mon, 12 Oct 2026 02:51:34 +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 4j326Z1CzRz4V3V for ; Mon, 12 Oct 2026 02:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791773494; 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=8Ks8QEhEZndrWbw1W1mbdze10S2x8V0WRGLjxF6LUqY=; b=jzGq6BWQDTSXjoPOt4H9z1owRFSW5moxqbkBZWuoMFsmPjIk9qOafvobC6r3tJXzn5ap2T oFnLCWGzqmcUmmeiNNzCm0ZyXT++ioYQM8hfJluWsG82wTrjpGNXDJQDV8ZZVmYTzd9ibJ qd48BiVK2lEpV5uIxAtqi3QY4F6+mBt3Lwk0CR8h6IGWGLyriWQRhQgJjZbnc7wdSJaAg9 g20LTmg+DyfV967tg1mqBuSakZIVbyhQyeB9nemKhdsh1DncZa/Z9inqAe0HKdbMccoMOI T/mGM54zmzza7RnPZxxQlv1d4yzbNPMB1Ir2YgqZg9e1mdtPaVdiPeDTK+xMNw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791773494; b=r+qjDUwoSyzgUGj+xqLzjaEYKWwfLV0fLNtwuv2zGhpMsP5OMxb1KqntvKxWDlZfoaVEhF CaLTYX+FQ//VFsC4jfNpIfOncxay1CelN68QwXmb+vzIEq9SdY1n3Kf0d+nWA4jkCZM7C/ N4ZHVVtlyElg6Ikr609eVhfqn/L6ol0pJVdwOto6u5scjx9d4OcirJ0FF73+JQEJ7qm4UX Bm0F+OUDf3LtMcf56FtQj1+WLDCZtQFgx49vuxsEnfLU47+q7CvIrNrJ6BzjbvAAEs+O4C eJN+gTVa/aw6T/fPRR4kUzgeSgSZ+yqyYkvv77xz52OQfzOX5dhd/LykDaX6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791773494; 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=8Ks8QEhEZndrWbw1W1mbdze10S2x8V0WRGLjxF6LUqY=; b=t0E1eBCsrRklA/A7+rK2y80cp+W6ipQl9gN0wRRPSPpnlexVjMKOspBveZE+RdZswnwJTR KHUNWiDoxR9EAiNcbS2t0J/FFArv9KXSya+wDaPlAPEqgwgfpRTfppowUMmGLhHM3OPevW 40/6IHGtZ/C2LgP1kZ4xczDJkpgUqV5muDcOmuncKIvyZpSsygbo6uL8VI/Crr/YGHhgpf +EdXl2NYVeZo1a+h/yNqA0Am1QgMPkacQHtnnYvqV4ESNZqClv3QxnRLlFz1/XVoCj3v/3 /JaeqGP1LSWQY/xwcgURXdW6Ux6sual1vQs+Srx43VRgHvSEuTGvPVTMkwsULA== 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 4j326Z0C5Xz189S for ; Mon, 12 Oct 2026 02:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42d58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 02:51:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 65373e8d0239 - main - iwm: bring in the command table version code from openbsd 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: 65373e8d02391054eb867edaeb92348c6f2d4ff4 Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 02:51:34 +0000 Message-Id: <6acc4b36.42d58.7a2cb20@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=65373e8d02391054eb867edaeb92348c6f2d4ff4 commit 65373e8d02391054eb867edaeb92348c6f2d4ff4 Author: Adrian Chadd AuthorDate: 2026-10-12 02:41:24 +0000 Commit: Adrian Chadd CommitDate: 2026-10-12 02:41:24 +0000 iwm: bring in the command table version code from openbsd Parse the command table; same way as OpenBSD (ie, memcpy() and not anything endianness happy.) Nothing is using it yet. Obtained from: OpenBSD a6e25c727a2214219715b51ba6af2221d7e0d674 Differential Revision: https://reviews.freebsd.org/D60075 --- sys/dev/iwm/if_iwm.c | 31 +++++++++++++++++++++++++++++++ sys/dev/iwm/if_iwmvar.h | 4 ++++ 2 files changed, 35 insertions(+) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 32d6dbc864fc..642c8fbd44f2 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -562,6 +562,21 @@ iwm_fw_info_free(struct iwm_fw_info *fw) memset(fw->img, 0, sizeof(fw->img)); } +static uint8_t +iwm_lookup_cmd_ver(struct iwm_softc *sc, uint8_t grp, uint8_t cmd) +{ + const struct iwm_fw_cmd_version *entry; + int i; + + for (i = 0; i < sc->n_cmd_versions; i++) { + entry = &sc->cmd_versions[i]; + if (entry->group == grp && entry->cmd == cmd) + return entry->cmd_ver; + } + + return IWM_FW_CMD_VER_UNKNOWN; +} + static int iwm_read_firmware(struct iwm_softc *sc) { @@ -817,6 +832,22 @@ iwm_read_firmware(struct iwm_softc *sc) } case IWM_UCODE_TLV_CMD_VERSIONS: + if (tlv_len % sizeof(struct iwm_fw_cmd_version)) { + tlv_len /= sizeof(struct iwm_fw_cmd_version); + tlv_len *= sizeof(struct iwm_fw_cmd_version); + } + if (sc->n_cmd_versions != 0) { + error = EINVAL; + goto parse_out; + } + if (tlv_len > sizeof(sc->cmd_versions)) { + error = EINVAL; + goto parse_out; + } + memcpy(&sc->cmd_versions[0], tlv_data, tlv_len); + sc->n_cmd_versions = tlv_len / sizeof(struct iwm_fw_cmd_version); + break; + case IWM_UCODE_TLV_SDIO_ADMA_ADDR: case IWM_UCODE_TLV_FW_GSCAN_CAPA: /* ignore, not used by current driver */ diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h index 361c2d073520..424587ad88a2 100644 --- a/sys/dev/iwm/if_iwmvar.h +++ b/sys/dev/iwm/if_iwmvar.h @@ -489,6 +489,10 @@ struct iwm_softc { struct iwm_fw_info sc_fw; struct iwm_tlv_calib_ctrl sc_default_calib[IWM_UCODE_TYPE_MAX]; +#define IWM_MAX_FW_CMD_VERSIONS 64 + struct iwm_fw_cmd_version cmd_versions[IWM_MAX_FW_CMD_VERSIONS]; + int n_cmd_versions; + const struct iwm_cfg *cfg; struct iwm_nvm_data *nvm_data; struct iwm_phy_db *sc_phy_db;