From 12b86893abf64fd67349a55bf74af7c340b7a0e8 Mon Sep 17 00:00:00 2001
From: markj <markj@FreeBSD.org>
Date: Thu, 7 Nov 2019 23:34:28 +0000
Subject: [PATCH] iwm: Add a few _prph functions needed for 9000-series chips.

MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
---
 sys/dev/iwm/if_iwm_pcie_trans.c | 21 +++++++++++++++++++++
 sys/dev/iwm/if_iwm_pcie_trans.h |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/sys/dev/iwm/if_iwm_pcie_trans.c b/sys/dev/iwm/if_iwm_pcie_trans.c
index a50e47945812..a8c8ac9fa00a 100644
--- a/sys/dev/iwm/if_iwm_pcie_trans.c
+++ b/sys/dev/iwm/if_iwm_pcie_trans.c
@@ -185,6 +185,27 @@ iwm_write_prph(struct iwm_softc *sc, uint32_t addr, uint32_t val)
 	IWM_WRITE(sc, IWM_HBUS_TARG_PRPH_WDAT, val);
 }
 
+void
+iwm_write_prph64(struct iwm_softc *sc, uint64_t addr, uint64_t val)
+{
+	iwm_write_prph(sc, (uint32_t)addr, val & 0xffffffff);
+	iwm_write_prph(sc, (uint32_t)addr + 4, val >> 32);
+}
+
+int
+iwm_poll_prph(struct iwm_softc *sc, uint32_t addr, uint32_t bits, uint32_t mask,
+    int timeout)
+{
+	do {
+		if ((iwm_read_prph(sc, addr) & mask) == (bits & mask))
+			return (0);
+		DELAY(10);
+		timeout -= 10;
+	} while (timeout > 0);
+
+	return (ETIMEDOUT);
+}
+
 #ifdef IWM_DEBUG
 /* iwlwifi: pcie/trans.c */
 int
diff --git a/sys/dev/iwm/if_iwm_pcie_trans.h b/sys/dev/iwm/if_iwm_pcie_trans.h
index e04dd52f3fe3..bdbd85476af3 100644
--- a/sys/dev/iwm/if_iwm_pcie_trans.h
+++ b/sys/dev/iwm/if_iwm_pcie_trans.h
@@ -106,6 +106,10 @@
 
 extern	uint32_t iwm_read_prph(struct iwm_softc *sc, uint32_t addr);
 extern	void iwm_write_prph(struct iwm_softc *sc, uint32_t addr, uint32_t val);
+extern	void iwm_write_prph64(struct iwm_softc *sc, uint64_t addr,
+    uint64_t val);
+extern	int iwm_poll_prph(struct iwm_softc *sc, uint32_t addr, uint32_t bits,
+    uint32_t mask, int timeout);
 extern	int iwm_read_mem(struct iwm_softc *sc, uint32_t addr, void *buf, int dwords);
 extern	int iwm_write_mem(struct iwm_softc *sc, uint32_t addr, const void *buf,
 		int dwords);