Attach 0x51f1 devices to iwx(4) and fix params used for 0x7a70 devices.

from reyk@

diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index 407a061..8fe16a7 100644 (file)
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_iwx.c,v 1.172 2023/06/21 23:24:10 mlarkin Exp $    */
+/*     $OpenBSD: if_iwx.c,v 1.173 2023/06/27 15:31:27 stsp Exp $       */
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -10430,6 +10430,7 @@ static const struct pci_matchid iwx_devices[] = {
        /* _14 is an MA device, not yet supported */
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_15,},
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_16,},
+       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_17,},
 };
 
 
@@ -10520,6 +10521,8 @@ static const struct iwx_dev_info iwx_dev_info_table[] = {
        IWX_DEV_INFO(0x2725, 0x1674, iwx_2ax_cfg_ty_gf_a0), /* killer_1675x */
        IWX_DEV_INFO(0x51f0, 0x1691, iwx_2ax_cfg_so_gf4_a0), /* killer_1690s */
        IWX_DEV_INFO(0x51f0, 0x1692, iwx_2ax_cfg_so_gf4_a0), /* killer_1690i */
+       IWX_DEV_INFO(0x51f1, 0x1691, iwx_2ax_cfg_so_gf4_a0),
+       IWX_DEV_INFO(0x51f1, 0x1692, iwx_2ax_cfg_so_gf4_a0),
        IWX_DEV_INFO(0x54f0, 0x1691, iwx_2ax_cfg_so_gf4_a0), /* killer_1690s */
        IWX_DEV_INFO(0x54f0, 0x1692, iwx_2ax_cfg_so_gf4_a0), /* killer_1690i */
        IWX_DEV_INFO(0x7a70, 0x0090, iwx_2ax_cfg_so_gf_a0_long),
@@ -11122,7 +11125,6 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
        case PCI_PRODUCT_INTEL_WL_22500_9:
        case PCI_PRODUCT_INTEL_WL_22500_10:
        case PCI_PRODUCT_INTEL_WL_22500_11:
-       case PCI_PRODUCT_INTEL_WL_22500_12:
        case PCI_PRODUCT_INTEL_WL_22500_13:
        /* _14 is an MA device, not yet supported */
        case PCI_PRODUCT_INTEL_WL_22500_15:
@@ -11137,6 +11139,19 @@ iwx_attach(struct device *parent, struct device *self, void *aux)
                sc->sc_tx_with_siso_diversity = 0;
                sc->sc_uhb_supported = 1;
                break;
+       case PCI_PRODUCT_INTEL_WL_22500_12:
+       case PCI_PRODUCT_INTEL_WL_22500_17:
+               sc->sc_fwname = IWX_SO_A_GF_A_FW;
+               sc->sc_pnvm_name = IWX_SO_A_GF_A_PNVM;
+               sc->sc_device_family = IWX_DEVICE_FAMILY_AX210;
+               sc->sc_integrated = 1;
+               sc->sc_ltr_delay = IWX_SOC_FLAGS_LTR_APPLY_DELAY_2500;
+               sc->sc_low_latency_xtal = 1;
+               sc->sc_xtal_latency = 12000;
+               sc->sc_tx_with_siso_diversity = 0;
+               sc->sc_uhb_supported = 0;
+               sc->sc_imr_enabled = 1;
+               break;
        default:
                printf("%s: unknown adapter type\n", DEVNAME(sc));
                return;