From: stsp <stsp@openbsd.org>
Date: Fri, 3 Dec 2021 14:32:08 +0000 (+0000)
Subject: Switch iwx(4) to new -67 firmware images.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=21b08ad8aacee4a4884e4eab645adc12b3e5de75;p=openbsd

Switch iwx(4) to new -67 firmware images.

iwx-firmware-20211101 must be installed with fw_update(1) before
booting a new kernel. sysupgrade(8) will take care of this.

Intel has published a related security advisory:
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00509.html

iwx(4) devices which are using the iwx-Qu-c0-hr-b0-63 image did
not receive a firmware update. I have no idea why.

Tested:
ax200: jmc, stsp, Matthias Schmidt
ax201: fkr, stsp
---

diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index dd1f4d8d1e8..197efe2a823 100644
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwx.c,v 1.127 2021/12/03 13:17:32 stsp Exp $	*/
+/*	$OpenBSD: if_iwx.c,v 1.128 2021/12/03 14:32:08 stsp Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -9397,7 +9397,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
 
 	switch (PCI_PRODUCT(pa->pa_id)) {
 	case PCI_PRODUCT_INTEL_WL_22500_1:
-		sc->sc_fwname = "iwx-cc-a0-63";
+		sc->sc_fwname = "iwx-cc-a0-67";
 		sc->sc_device_family = IWX_DEVICE_FAMILY_22000;
 		sc->sc_integrated = 0;
 		sc->sc_ltr_delay = IWX_SOC_FLAGS_LTR_APPLY_DELAY_NONE;
@@ -9414,7 +9414,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
 			return;
 		}
 
-		sc->sc_fwname = "iwx-QuZ-a0-hr-b0-63";
+		sc->sc_fwname = "iwx-QuZ-a0-hr-b0-67";
 		sc->sc_device_family = IWX_DEVICE_FAMILY_22000;
 		sc->sc_integrated = 1;
 		sc->sc_ltr_delay = IWX_SOC_FLAGS_LTR_APPLY_DELAY_200;