From: stsp <stsp@openbsd.org>
Date: Fri, 3 Sep 2021 11:55:31 +0000 (+0000)
Subject: Make iwm(4) and iwx(4) resume code path more similar to the attach code path.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e9ea0334d233379808f7e4bb5a6c49d321501ad6;p=openbsd

Make iwm(4) and iwx(4) resume code path more similar to the attach code path.

In particular, this makes suspend/resume work on systems using msix.
Resume is not 100% reliable yet, though, failing about 1 in 20 times
to bring the interface back up.
Recovery with ifconfig down/up should be possible when things go wrong.

With help from gnezdo@ in diagnosing the issue and testing changes.

Tests:
8265: stsp
9260: florian
9560: kevlo, Uwe Werler
ax200: kevlo, Mark Patruck, beck
ax201: gnezdo
---

diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index c66035ef2aa..be92ca7dabb 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.364 2021/09/03 11:41:41 stsp Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.365 2021/09/03 11:55:31 stsp Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -11445,13 +11445,19 @@ 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);
 
-	/* reconfigure the MSI-X mapping to get the correct IRQ for rfkill */
-	iwm_conf_msix_hw(sc, 0);
+	if (!sc->sc_msix) {
+		/* Hardware bug workaround. */
+		reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
+		    PCI_COMMAND_STATUS_REG);
+		if (reg & PCI_COMMAND_INTERRUPT_DISABLE)
+			reg &= ~PCI_COMMAND_INTERRUPT_DISABLE;
+		pci_conf_write(sc->sc_pct, sc->sc_pcitag,
+		    PCI_COMMAND_STATUS_REG, reg);
+	}
 
-	iwm_enable_rfkill_int(sc);
-	iwm_check_rfkill(sc);
+	iwm_disable_interrupts(sc);
 
-	return iwm_prepare_card_hw(sc);
+	return iwm_start_hw(sc);
 }
 
 int
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index 06f0b877872..428a299e7a2 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.102 2021/09/03 11:41:41 stsp Exp $	*/
+/*	$OpenBSD: if_iwx.c,v 1.103 2021/09/03 11:55:31 stsp Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -2328,7 +2328,6 @@ int
 iwx_start_hw(struct iwx_softc *sc)
 {
 	int err;
-	int t = 0;
 
 	err = iwx_prepare_card_hw(sc);
 	if (err)
@@ -2369,16 +2368,6 @@ iwx_start_hw(struct iwx_softc *sc)
 
 	iwx_init_msix_hw(sc);
 
-	while (t < 150000 && !iwx_set_hw_ready(sc)) {
-		DELAY(200);
-		t += 200;
-		if (iwx_set_hw_ready(sc)) {
-			break;
-		}
-	}
-	if (t >= 150000)
-		return ETIMEDOUT;
-
 	iwx_enable_rfkill_int(sc);
 	iwx_check_rfkill(sc);
 
@@ -9575,13 +9564,19 @@ iwx_resume(struct iwx_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);
 
-	/* reconfigure the MSI-X mapping to get the correct IRQ for rfkill */
-	iwx_conf_msix_hw(sc, 0);
+	if (!sc->sc_msix) {
+		/* Hardware bug workaround. */
+		reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
+		    PCI_COMMAND_STATUS_REG);
+		if (reg & PCI_COMMAND_INTERRUPT_DISABLE)
+			reg &= ~PCI_COMMAND_INTERRUPT_DISABLE;
+		pci_conf_write(sc->sc_pct, sc->sc_pcitag,
+		    PCI_COMMAND_STATUS_REG, reg);
+	}
 
-	iwx_enable_rfkill_int(sc);
-	iwx_check_rfkill(sc);
+	iwx_disable_interrupts(sc);
 
-	return iwx_prepare_card_hw(sc);
+	return iwx_start_hw(sc);
 }
 
 int