From b3dab377a93967715de129705da699dd54bd1ae7 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 20 Jun 2022 17:17:20 -0400 Subject: [PATCH] idualwifi7260 & iaxwifi200: Enable PCI busmastering. The FreeBSD KPIs that we emulate expect this to be done manually, so we have to do it before we begin doing PCI access. Fixes firmware load failures and device initialization problems since the introduction of the OpenBSD driver replacing the FreeBSD one. --- .../kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c | 1 + .../kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c index 4f93451fe3..1649a0857e 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c +++ b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c @@ -10648,6 +10648,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux) BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_dmat); + pci_enable_busmaster(sc->sc_dev); if_alloc_inplace(ifp, IFT_ETHER); #else diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c index 64a3769aac..3be034e659 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c @@ -11743,6 +11743,7 @@ iwm_attach(struct device *parent, struct device *self, void *aux) BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_dmat); + pci_enable_busmaster(sc->sc_dev); if_alloc_inplace(ifp, IFT_ETHER); #else