iwm(4): revert to use firmware v17 on Intel AC 7265.
authorlandry <landry@openbsd.org>
Tue, 12 Oct 2021 11:20:32 +0000 (11:20 +0000)
committerlandry <landry@openbsd.org>
Tue, 12 Oct 2021 11:20:32 +0000 (11:20 +0000)
fixes instability issues seen on X1 carbon gen3 (hw rev 0x210) by
anton@, mpi@ and myself.
diff from stsp@
ok mpi@ stsp@

sys/dev/pci/if_iwm.c

index ababbb0..92f7775 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_iwm.c,v 1.376 2021/10/11 09:03:22 stsp Exp $       */
+/*     $OpenBSD: if_iwm.c,v 1.377 2021/10/12 11:20:32 landry Exp $     */
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -11265,11 +11265,7 @@ iwm_attach(struct device *parent, struct device *self, void *aux)
                break;
        case PCI_PRODUCT_INTEL_WL_7265_1:
        case PCI_PRODUCT_INTEL_WL_7265_2:
-               if ((sc->sc_hw_rev & IWM_CSR_HW_REV_TYPE_MSK) ==
-                   IWM_CSR_HW_REV_TYPE_7265D)
-                       sc->sc_fwname = "iwm-7265D-29";
-               else
-                       sc->sc_fwname = "iwm-7265-17";
+               sc->sc_fwname = "iwm-7265-17";
                sc->host_interrupt_operation_mode = 0;
                sc->sc_device_family = IWM_DEVICE_FAMILY_7000;
                sc->sc_fwdmasegsz = IWM_FWDMASEGSZ;