diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2021-08-20 00:22:55 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2021-08-20 00:22:55 +0000 |
| commit | 2a66b258490cd5ad15c20be9ae1d69cff27b3db1 (patch) | |
| tree | e6e1a868ee95ef2d25d0d37ab010a6c84b66936a /sys/dev/pci/if_iwm.c | |
| parent | 5ef560d6a5cc9e949fab5f6e6fe0c985e8e0e47b (diff) | |
Revert previous; Turns out the start_hw() functions don't always
work right during the resume path. To be revisited later.
Diffstat (limited to 'sys/dev/pci/if_iwm.c')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index cfa97343e2f..c1e641f4456 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.359 2021/08/19 18:45:11 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.360 2021/08/20 00:22:54 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -11425,7 +11425,13 @@ iwm_resume(struct iwm_softc *sc) reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag, 0x40); pci_conf_write(sc->sc_pct, sc->sc_pcitag, 0x40, reg & ~0xff00); - return iwm_start_hw(sc); + /* reconfigure the MSI-X mapping to get the correct IRQ for rfkill */ + iwm_conf_msix_hw(sc, 0); + + iwm_enable_rfkill_int(sc); + iwm_check_rfkill(sc); + + return iwm_prepare_card_hw(sc); } int |