Index: if_rsu.c =================================================================== --- if_rsu.c (revision 288049) +++ if_rsu.c (working copy) @@ -599,6 +599,7 @@ /* Scanning is done by the firmware. */ RSU_LOCK(sc); + /* XXX TODO: force awake if in in network-sleep? */ error = rsu_site_survey(sc, TAILQ_FIRST(&ic->ic_vaps)); RSU_UNLOCK(sc); if (error != 0) @@ -955,8 +956,12 @@ if (data == NULL) return (ENOMEM); + /* Blank the entire payload, just to be safe */ + memset(data->buf, '\0', RSU_TXBUFSZ); + /* Round-up command length to a multiple of 8 bytes. */ - cmdsz = (len + 7) & ~7; + //cmdsz = (len + 7) & ~7; + cmdsz = len; xferlen = sizeof(*txd) + sizeof(*cmd) + cmdsz; KASSERT(xferlen <= RSU_TXBUFSZ, ("%s: invalid length", __func__)); @@ -1022,7 +1027,67 @@ RSU_UNLOCK(sc); } +#define RSU_PWR_ACTIVE 0x1 +#define RSU_PWR_OFF 0x2 +#define RSU_PWR_SLEEP 0x3 + +/* + * Set the current power state. + * + * The rtlwifi code doesn't do this so aggressively; it + * waits for an idle period after association with + * no traffic before doing this. + * + * For now - it's on in all states except RUN, and + * in RUN it'll transition to allow sleep. + */ + +struct r92s_pwr_cmd { + uint8_t mode; + uint8_t smart_ps; + uint8_t bcn_pass_time; +}; + static int +rsu_set_fw_power_state(struct rsu_softc *sc, int state) +{ + struct r92s_set_pwr_mode cmd; + //struct r92s_pwr_cmd cmd; + int error; + + memset(&cmd, 0, sizeof(cmd)); + + /* XXX TODO: only change state if required */ + RSU_ASSERT_LOCKED(sc); + + switch (state) { + case RSU_PWR_ACTIVE: + /* Force the hardware awake */ + rsu_write_1(sc, R92S_USB_HRPWM, + R92S_USB_HRPWM_PS_ST_ACTIVE | R92S_USB_HRPWM_PS_ALL_ON); + cmd.mode = R92S_PS_MODE_ACTIVE; + break; + case RSU_PWR_SLEEP: + cmd.mode = R92S_PS_MODE_DTIM; /* XXX configurable? */ + cmd.smart_ps = 1; /* XXX 2 if doing p2p */ + cmd.bcn_pass_time = 5; /* in 100mS usb.c, linux/rtlwifi */ + break; + default: + device_printf(sc->sc_dev, "%s: unknown ps mode (%d)\n", + __func__, + state); + return (ENXIO); + } + + RSU_DPRINTF(sc, RSU_DEBUG_RESET, + "%s: setting ps mode to %d (mode %d)\n", + __func__, state, cmd.mode); + error = rsu_fw_cmd(sc, R92S_CMD_SET_PWR_MODE, &cmd, sizeof(cmd)); + + return (error); +} + +static int rsu_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct rsu_vap *uvp = RSU_VAP(vap); @@ -1053,9 +1118,11 @@ RSU_LOCK(sc); switch (nstate) { case IEEE80211_S_INIT: + (void) rsu_set_fw_power_state(sc, RSU_PWR_ACTIVE); break; case IEEE80211_S_AUTH: ni = ieee80211_ref_node(vap->iv_bss); + (void) rsu_set_fw_power_state(sc, RSU_PWR_ACTIVE); error = rsu_join_bss(sc, ni); ieee80211_free_node(ni); if (error != 0) { @@ -1068,6 +1135,7 @@ rs = &ni->ni_rates; /* Indicate highest supported rate. */ ni->ni_txrate = rs->rs_rates[rs->rs_nrates - 1]; + (void) rsu_set_fw_power_state(sc, RSU_PWR_SLEEP); ieee80211_free_node(ni); startcal = 1; break; @@ -1456,13 +1524,11 @@ buf[60] = '\0'; RSU_DPRINTF(sc, RSU_DEBUG_FWDBG, "FWDBG: %s\n", (char *)buf); break; - case R92S_EVT_ADDBA_REQ_REPORT: rsu_event_addba_req_report(sc, buf, len); break; default: - RSU_DPRINTF(sc, RSU_DEBUG_ANY, "%s: unhandled code (%d)\n", - __func__, code); + device_printf(sc->sc_dev, "%s: unhandled code (%d)\n", __func__, code); break; } } @@ -1508,6 +1574,7 @@ struct r92s_rx_cck *cck; uint8_t rpt; int8_t rssi; + int rs; if (rate <= 3) { cck = (struct r92s_rx_cck *)physt; @@ -1516,7 +1583,21 @@ rssi = cckoff[rpt] - rssi; } else { /* OFDM/HT. */ phy = (struct r92s_rx_phystat *)physt; - rssi = ((le32toh(phy->phydw1) >> 1) & 0x7f) - 106; + //rssi = ((le32toh(phy->phydw1) >> 1) & 0x7f) - 106; + rssi = ((le32toh(phy->phydw1)) & 0x3f) * 2 - 110; + rs = le32toh(phy->phydw1) & 0x3f; + device_printf(sc->sc_dev, "%s: rs=%d, rssi=%d, st=0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n", + __func__, + rs, + (int) rssi, + le32toh(phy->phydw0), + le32toh(phy->phydw1), + le32toh(phy->phydw2), + le32toh(phy->phydw3), + le32toh(phy->phydw4), + le32toh(phy->phydw5), + le32toh(phy->phydw6), + le32toh(phy->phydw7)); } return (rssi); } @@ -2335,7 +2416,7 @@ int ntries, error; if (rsu_read_1(sc, R92S_TCR) & R92S_TCR_FWRDY) { - RSU_DPRINTF(sc, RSU_DEBUG_FW | RSU_DEBUG_RESET, + RSU_DPRINTF(sc, RSU_DEBUG_ANY, "%s: Firmware already loaded\n", __func__); return (0); @@ -2459,6 +2540,7 @@ memset(dmem, 0, sizeof(*dmem)); dmem->hci_sel = R92S_HCI_SEL_USB | R92S_HCI_SEL_8172; dmem->nendpoints = sc->sc_nendpoints; + dmem->chip_version = sc->cut; /* XXX TODO: rf_config should come from ROM */ dmem->rf_config = 0x11; /* 1T1R */ dmem->vcs_type = R92S_VCS_TYPE_AUTO; @@ -2469,6 +2551,8 @@ dmem->ampdu_en = !! (sc->sc_ht); dmem->agg_offload = !! (sc->sc_ht); dmem->qos_en = 1; + dmem->ps_offload = 1; + dmem->lowpower_mode = 0; /* XXX TODO: configurable? */ /* Load DMEM section. */ error = rsu_fw_loadsection(sc, (uint8_t *)dmem, sizeof(*dmem)); if (error != 0) { @@ -2545,7 +2629,6 @@ struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); uint8_t macaddr[IEEE80211_ADDR_LEN]; - struct r92s_set_pwr_mode cmd; int error; int i; @@ -2554,6 +2637,9 @@ /* Init host async commands ring. */ sc->cmdq.cur = sc->cmdq.next = sc->cmdq.queued = 0; + /* Reset power management state. */ + rsu_write_1(sc, R92S_USB_HRPWM, 0); + /* Power on adapter. */ if (sc->cut == 1) rsu_power_on_acut(sc); @@ -2606,15 +2692,14 @@ goto fail; } +#if 0 rsu_write_1(sc, R92S_USB_HRPWM, R92S_USB_HRPWM_PS_ST_ACTIVE | R92S_USB_HRPWM_PS_ALL_ON); +#endif /* Set PS mode fully active */ - memset(&cmd, 0, sizeof(cmd)); - cmd.mode = R92S_PS_MODE_ACTIVE; - RSU_DPRINTF(sc, RSU_DEBUG_RESET, "%s: setting ps mode to %d\n", - __func__, cmd.mode); - error = rsu_fw_cmd(sc, R92S_CMD_SET_PWR_MODE, &cmd, sizeof(cmd)); + error = rsu_set_fw_power_state(sc, RSU_PWR_ACTIVE); + if (error != 0) { device_printf(sc->sc_dev, "could not set PS mode\n"); goto fail;