diff options
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/r92creg.h | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rtwn.c | 21 |
2 files changed, 13 insertions, 14 deletions
diff --git a/sys/dev/ic/r92creg.h b/sys/dev/ic/r92creg.h index 780419047e6..24de14a28b4 100644 --- a/sys/dev/ic/r92creg.h +++ b/sys/dev/ic/r92creg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: r92creg.h,v 1.27 2022/08/13 14:16:59 kevlo Exp $ */ +/* $OpenBSD: r92creg.h,v 1.28 2022/08/21 07:56:31 kevlo Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -352,6 +352,10 @@ /* Bits for R88E_XCK_OUT_CTRL. */ #define R88E_XCK_OUT_CTRL_EN 1 +/* Bits for R92C_AFE_CTRL3. */ +#define R92C_AFE_CTRL3_ADDR_M 0x00fff000 +#define R92C_AFE_CTRL3_ADDR_S 12 + /* Bits for R92C_EFUSE_CTRL. */ #define R92C_EFUSE_CTRL_DATA_M 0x000000ff #define R92C_EFUSE_CTRL_DATA_S 0 diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c index 9bd35c90ba9..2d7551eaef3 100644 --- a/sys/dev/ic/rtwn.c +++ b/sys/dev/ic/rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwn.c,v 1.52 2022/01/09 05:42:39 jsg Exp $ */ +/* $OpenBSD: rtwn.c,v 1.53 2022/08/21 07:56:31 kevlo Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -212,12 +212,9 @@ rtwn_attach(struct device *pdev, struct rtwn_softc *sc) } /* Determine number of Tx/Rx chains. */ - if (sc->chip & RTWN_CHIP_92C) { + if (sc->chip & (RTWN_CHIP_92C | RTWN_CHIP_92E)) { sc->ntxchains = (sc->chip & RTWN_CHIP_92C_1T2R) ? 1 : 2; sc->nrxchains = 2; - } else if (sc->chip & RTWN_CHIP_92E) { - sc->ntxchains = 2; - sc->nrxchains = 2; } else { sc->ntxchains = 1; sc->nrxchains = 1; @@ -1761,7 +1758,10 @@ rtwn_load_firmware(struct rtwn_softc *sc) /* Disable FW download. */ rtwn_write_1(sc, R92C_MCUFWDL, rtwn_read_1(sc, R92C_MCUFWDL) & ~R92C_MCUFWDL_EN); - rtwn_write_1(sc, R92C_MCUFWDL + 1, 0); + + /* Reserved for fw extension. */ + if (!(sc->chip & RTWN_CHIP_92E)) + rtwn_write_1(sc, R92C_MCUFWDL + 1, 0); reg = rtwn_read_4(sc, R92C_MCUFWDL); reg = (reg & ~R92C_MCUFWDL_WINTINI_RDY) | R92C_MCUFWDL_RDY; @@ -2332,13 +2332,10 @@ rtwn_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c, rtwn_set_txpower(sc, c, extc); if (extc != NULL) { - uint32_t reg; - /* Is secondary channel below or above primary? */ int prichlo = c->ic_freq < extc->ic_freq; if (sc->chip & RTWN_CHIP_92E) { - uint16_t reg; reg = rtwn_read_2(sc, R92C_WMAC_TRXPTCL_CTL); reg &= ~R92C_WMAC_TRXPTCL_CTL_BW_MASK; reg |= R92C_WMAC_TRXPTCL_CTL_BW_40; @@ -2385,7 +2382,6 @@ rtwn_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c, } } else { if (sc->chip & RTWN_CHIP_92E) { - uint16_t reg; reg = rtwn_read_2(sc, R92C_WMAC_TRXPTCL_CTL); reg &= ~R92C_WMAC_TRXPTCL_CTL_BW_MASK; rtwn_write_2(sc, R92C_WMAC_TRXPTCL_CTL, reg); @@ -2953,6 +2949,8 @@ void rtwn_enable_intr(struct rtwn_softc *sc) { if (sc->chip & RTWN_CHIP_92E) { + rtwn_write_4(sc, R88E_HISR, 0xffffffff); + rtwn_write_4(sc, R88E_HISRE, 0xffffffff); rtwn_write_4(sc, R88E_HIMR, 0); rtwn_write_4(sc, R88E_HIMRE, 0); } else if (sc->chip & RTWN_CHIP_88E) { @@ -3166,9 +3164,6 @@ rtwn_init(struct ifnet *ifp) rtwn_write_1(sc, R92C_HWSEQ_CTRL, 0xff); if (sc->chip & RTWN_CHIP_92E) { - rtwn_write_4(sc, R92C_BAR_MODE_CTRL, 0x0201ffff); - rtwn_write_1(sc, R92C_NAV_UPPER, 0); - rtwn_write_1(sc, R92C_QUEUE_CTRL, rtwn_read_1(sc, R92C_QUEUE_CTRL) & ~0x08); } |