From nobody Mon Apr 14 08:17:16 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 4ZbgBP2zghz5sNB0; Mon, 14 Apr 2025 08:17:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZbgBP2P9hz3kP2; Mon, 14 Apr 2025 08:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744618637; 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=Qc++ZfXgDDCsb2p859AzABNCBuWohc6cPnFpVGvlH2g=; b=sX0PU2wMN/afjRK5LYO4vC8QwDXwsMVDXPDDa9rBKeGrayMw/I3fHtJuCb4K6Z8YJbwYbw eITIcIk0GLxmezGlh4BGSlYB9UcbTGYOKfHY0z2y+npHCw5em9ULJyZNLkYzM00fP7u6eA l76nKAtJucf6Ootf/UO6jqWW5LcwiNtMFU2vas1S4wuJR0TiX9WZ321LnlQ3LqvxtxnAFE EnWqZ4ZFgEv3PIxGeTRFOOaSaLwbLrQ1jGkUenjO6y2M1lzzsT5MQZXwtBObDbaKQ1tlDj riiDWXB3zinWuCk7zSPVceOik5MPvAnVQfRc5M5IScgBUk9PsZDKbeu0Ve42Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744618637; a=rsa-sha256; cv=none; b=D2lFGT0YyrJWyMv53yd9XvaWb4inq79uDK4OcmehdYEzX3B0nOzKr18Gm491hEzRNQaYG8 /tOeFLY61gxSc9fXsyxxjlQuG2AnqqMm2UUyMAq4Cit8vNi+TebADUNI8EFJcDEk4mB7OI /p1Z9/cf8qvSwZizoOuIhArk+6J+CvsPjVB583G5x4uiuGw6SObXgxKvSX3eNuABNpMKc4 fe8RtWSb/4pF4v9rTbicH//k0ns+Ab+oGY6aixIKj2DpivPneVsTuKxvllYr4YSFZEPah1 BpH8v8dTcaeGUESYkVDV/LAU6wyiAy+Kq2QTKzR35dgY/zxFMojmm2sNlG8f3g== 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=1744618637; 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=Qc++ZfXgDDCsb2p859AzABNCBuWohc6cPnFpVGvlH2g=; b=CkT6oszGt210q22WwNPeKxhIQQWszSEBMyj4yYFPdQDy/NNk0ZybI1YHlRsDLUSJDJx8/i BWtnJEuH2L91uWLj0XtmNFF9ylXQgMJ7X0nl4RAzahAc2LpZVxEg24GQbNm2zaCpPUy0H/ llzWNBxcauWrJkyv+sXAI6X5rOnfegDOvX3KeboPyh3bxzlZY0XE1vYIxvl+N8keUYK2gC NVp3YG8QcK9MxEHCv1P4+Fevc4dCE2dSPyYll2oxF74DDdR15gMdQWzBxxFQGIG7IWibnD eAe9Pb7BU6iXM29ZfBsMYkXEbVIUJhLyFEzLGfb5suMhVl2h7QGe2LL1H8BRzQ== 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 4ZbgBP1j35zh6v; Mon, 14 Apr 2025 08:17:17 +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 53E8HGeG076999; Mon, 14 Apr 2025 08:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53E8HGCO076996; Mon, 14 Apr 2025 08:17:16 GMT (envelope-from git) Date: Mon, 14 Apr 2025 08:17:16 GMT Message-Id: <202504140817.53E8HGCO076996@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: 1110ed3b46ea - main - iwx: Use subdevice for comparison 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: 1110ed3b46ea2765fd45ebfb4e0f0fd997ecb92e Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=1110ed3b46ea2765fd45ebfb4e0f0fd997ecb92e commit 1110ed3b46ea2765fd45ebfb4e0f0fd997ecb92e Author: Tom Jones AuthorDate: 2025-04-14 08:10:48 +0000 Commit: Tom Jones CommitDate: 2025-04-14 08:16:40 +0000 iwx: Use subdevice for comparison iwx goes through a couple of steps to match devices to firmware. There is a default match of pcie device and subdevices and then a secondary pass to find a template configuration struct. Previously we were looking up the device not the subdevice and that led to ax210 cards in some devices (Framework 13) from being matched to the correct firmware. PR: 285905 Reviewed by: bz, adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49759 --- sys/dev/iwx/if_iwx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 9e5d5a9569d5..6d3aa1b49c15 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -10022,12 +10022,11 @@ out: const struct iwx_device_cfg * iwx_find_device_cfg(struct iwx_softc *sc) { - uint16_t mac_type, rf_type; + uint16_t sdev_id, mac_type, rf_type; uint8_t mac_step, cdb, jacket, rf_id, no_160, cores; int i; - uint16_t sdev_id; - sdev_id = pci_get_device(sc->sc_dev); + sdev_id = pci_get_subdevice(sc->sc_dev); mac_type = IWX_CSR_HW_REV_TYPE(sc->sc_hw_rev); mac_step = IWX_CSR_HW_REV_STEP(sc->sc_hw_rev << 2); rf_type = IWX_CSR_HW_RFID_TYPE(sc->sc_hw_rf_id);