[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Mon Apr 30 12:28:17 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/836e04b655a0
changeset: 477:836e04b655a0
user: Aleksandr Rybalko <ray at ddteam.net>
date: Mon Apr 30 15:27:19 2012 +0300
description:
Driver still not work, but for unbreak ZRouter build.
diffstat:
head/sys/dev/ral/if_ral_nexus.c | 228 +
head/sys/dev/ral/if_ral_pci.c | 4 +-
head/sys/dev/ral/rt2860.c | 4644 ++++++++++++++++----------------------
head/sys/dev/ral/rt2860reg.h | 1259 +++++++--
head/sys/dev/ral/rt2860var.h | 318 +--
5 files changed, 3085 insertions(+), 3368 deletions(-)
diffs (10467 lines):
diff -r 7d0c8bc7dd1c -r 836e04b655a0 head/sys/dev/ral/if_ral_nexus.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/dev/ral/if_ral_nexus.c Mon Apr 30 15:27:19 2012 +0300
@@ -0,0 +1,228 @@
+/* $FreeBSD$ */
+
+/*-
+ * Copyright (c) 2005, 2006
+ * Damien Bergamini <damien.bergamini at free.fr>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Memory attachment for the Ralink RT2xxx wireless driver.
+ */
+
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_amrr.h>
+
+#include <dev/ral/rt2560var.h>
+#include <dev/ral/rt2661var.h>
+#include <dev/ral/rt2860var.h>
+
+MODULE_DEPEND(ral, firmware, 1, 1, 1); /* XXX ??? */
+MODULE_DEPEND(ral, wlan, 1, 1, 1);
+MODULE_DEPEND(ral, wlan_amrr, 1, 1, 1);
+
+static struct ral_opns {
+ int (*attach)(device_t, int);
+ int (*detach)(void *);
+ void (*shutdown)(void *);
+ void (*suspend)(void *);
+ void (*resume)(void *);
+ void (*intr)(void *);
+} ral_rt2860_opns = {
+ rt2860_attach,
+ rt2860_detach,
+ rt2860_shutdown,
+ rt2860_suspend,
+ rt2860_resume,
+ rt2860_intr
+};
+
+struct ral_nexus_softc {
+ union {
+ struct rt2560_softc sc_rt2560;
+ struct rt2661_softc sc_rt2661;
+ struct rt2860_softc sc_rt2860;
+ } u;
+
+ struct ral_opns *sc_opns;
+ int irq_rid;
+ int mem_rid;
+ struct resource *irq;
+ struct resource *mem;
+ void *sc_ih;
+};
+
+static int ral_nexus_probe(device_t);
+static int ral_nexus_attach(device_t);
+static int ral_nexus_detach(device_t);
+static int ral_nexus_shutdown(device_t);
+static int ral_nexus_suspend(device_t);
+static int ral_nexus_resume(device_t);
+
+static device_method_t ral_nexus_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, ral_nexus_probe),
+ DEVMETHOD(device_attach, ral_nexus_attach),
+ DEVMETHOD(device_detach, ral_nexus_detach),
+ DEVMETHOD(device_shutdown, ral_nexus_shutdown),
+ DEVMETHOD(device_suspend, ral_nexus_suspend),
+ DEVMETHOD(device_resume, ral_nexus_resume),
+
+ { 0, 0 }
+};
+
+static driver_t ral_nexus_driver = {
+ "ral",
+ ral_nexus_methods,
+ sizeof (struct ral_nexus_softc)
+};
+
+static devclass_t ral_devclass;
+
+DRIVER_MODULE(ral, nexus, ral_nexus_driver, ral_devclass, 0, 0);
+
+static int
+ral_nexus_probe(device_t dev)
+{
+
+ device_set_desc(dev, "Ralink RT2860 802.11n MAC/BPP");
+ return (0);
+}
+
+static int
+ral_nexus_attach(device_t dev)
+{
+ struct ral_nexus_softc *psc = device_get_softc(dev);
+ struct rt2560_softc *sc = &psc->u.sc_rt2560;
+ int error;
+
+ /* Default to rt2860 driver */
+ psc->sc_opns = &ral_rt2860_opns;
+
+ psc->mem_rid = 0;
+ psc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &psc->mem_rid,
+ RF_ACTIVE);
+ if (psc->mem == NULL) {
+ device_printf(dev, "could not allocate memory resource\n");
+ return ENXIO;
+ }
+
+ sc->sc_st = rman_get_bustag(psc->mem);
+ sc->sc_sh = rman_get_bushandle(psc->mem);
+ sc->sc_invalid = 1;
+
+ psc->irq_rid = 0;
+ psc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &psc->irq_rid,
+ RF_ACTIVE | RF_SHAREABLE);
+ if (psc->irq == NULL) {
+ device_printf(dev, "could not allocate interrupt resource\n");
+ return ENXIO;
+ }
+
+ /* Emulate rt2860 */
+ error = (*psc->sc_opns->attach)(dev, 0x0601);
+ if (error != 0)
+ return error;
+
+ /*
+ * Hook our interrupt after all initialization is complete.
+ */
+ error = bus_setup_intr(dev, psc->irq, INTR_TYPE_NET | INTR_MPSAFE,
+ NULL, psc->sc_opns->intr, psc, &psc->sc_ih);
+ if (error != 0) {
+ device_printf(dev, "could not set up interrupt\n");
+ return error;
+ }
+ sc->sc_invalid = 0;
+
+ return 0;
+}
+
+static int
+ral_nexus_detach(device_t dev)
+{
+ struct ral_nexus_softc *psc = device_get_softc(dev);
+ struct rt2560_softc *sc = &psc->u.sc_rt2560;
+
+ /* check if device was removed */
+ sc->sc_invalid = !bus_child_present(dev);
+
+ (*psc->sc_opns->detach)(psc);
+
+ bus_generic_detach(dev);
+ bus_teardown_intr(dev, psc->irq, psc->sc_ih);
+ bus_release_resource(dev, SYS_RES_IRQ, psc->irq_rid, psc->irq);
+
+ bus_release_resource(dev, SYS_RES_MEMORY, psc->mem_rid, psc->mem);
+
+ return 0;
+}
+
+static int
+ral_nexus_shutdown(device_t dev)
+{
+ struct ral_nexus_softc *psc = device_get_softc(dev);
+
+ (*psc->sc_opns->shutdown)(psc);
+
+ return 0;
+}
+
+static int
+ral_nexus_suspend(device_t dev)
+{
+ struct ral_nexus_softc *psc = device_get_softc(dev);
+
+ (*psc->sc_opns->suspend)(psc);
+
+ return 0;
+}
+
+static int
+ral_nexus_resume(device_t dev)
+{
+ struct ral_nexus_softc *psc = device_get_softc(dev);
+
+ (*psc->sc_opns->resume)(psc);
+
+ return 0;
+}
diff -r 7d0c8bc7dd1c -r 836e04b655a0 head/sys/dev/ral/if_ral_pci.c
--- a/head/sys/dev/ral/if_ral_pci.c Sun Apr 29 20:53:21 2012 +0300
+++ b/head/sys/dev/ral/if_ral_pci.c Mon Apr 30 15:27:19 2012 +0300
@@ -79,6 +79,7 @@
{ 0x1814, 0x0681, "Ralink Technology RT2860 PCIe" },
{ 0x1814, 0x0701, "Ralink Technology RT2870 PCI" },
{ 0x1814, 0x0781, "Ralink Technology RT2870 PCIe" },
+ { 0x1814, 0x3060, "Ralink Technology RT3060 PCI" },
{ 0x1814, 0x3090, "Ralink Technology RT3090 PCIe" },
{ 0, 0, NULL }
@@ -194,8 +195,6 @@
/* enable bus-mastering */
pci_enable_busmaster(dev);
- psc->sc_opns = (pci_get_device(dev) == 0x0201) ? &ral_rt2560_opns :
- &ral_rt2661_opns;
switch (pci_get_device(dev)) {
case 0x0201:
psc->sc_opns = &ral_rt2560_opns;
@@ -209,6 +208,7 @@
case 0x0681:
case 0x0701:
case 0x0781:
+ case 0x3060:
case 0x3090:
psc->sc_opns = &ral_rt2860_opns;
break;
diff -r 7d0c8bc7dd1c -r 836e04b655a0 head/sys/dev/ral/rt2860.c
--- a/head/sys/dev/ral/rt2860.c Sun Apr 29 20:53:21 2012 +0300
+++ b/head/sys/dev/ral/rt2860.c Mon Apr 30 15:27:19 2012 +0300
@@ -15,21 +15,51 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/taskqueue.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+#include <sys/firmware.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_input.h>
+#include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_regdomain.h>
+
+#include <dev/ral/rt2860reg.h>
#include <dev/ral/rt2860var.h>
-#include <dev/ral/rt2860reg.h>
-#include <dev/ral/rt2860ucode.h>
/*
* Defines and macros
*/
#define RT2860_MAX_AGG_SIZE 3840
-#define RT2860_TX_DATA_SEG0_SIZE \
+#define RT2860_TX_DATA_SEG0_SIZE \
(sizeof(struct rt2860_txwi) + sizeof(struct ieee80211_qosframe_addr4))
#define RT2860_NOISE_FLOOR -95
-#define IEEE80211_HAS_ADDR4(wh) \
+#define IEEE80211_HAS_ADDR4(wh) \
(((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
#define RT2860_MS(_v, _f) (((_v) & _f) >> _f##_S)
@@ -41,6 +71,15 @@
#define RT2860_WCID_RESERVED 0xff
#define RT2860_WCID_MCAST 0xf7
+#define RT2860_AMRR_IS_SUCCESS(amrr_node) \
+ ((amrr_node)->retrycnt < (amrr_node)->txcnt / 10)
+
+#define RT2860_AMRR_IS_FAILURE(amrr_node) \
+ ((amrr_node)->retrycnt > (amrr_node)->txcnt / 3)
+
+#define RT2860_AMRR_IS_ENOUGH(amrr_node) \
+ ((amrr_node)->txcnt > 10)
+
#define LED_CFG_LED_POLARITY (1<<30)
#define LED_CFG_Y_LED_MODE_ONTX (1<<28)
#define LED_CFG_G_LED_MODE_ONTX (1<<26)
@@ -49,573 +88,204 @@
#define LED_CFG_LED_OFF_TIME (0x1e<<8) /* msec */
#define LED_CFG_LED_ON_TIME (0x46) /* msec */
-static void rt2872_rf_set_chan(struct rt2860_softc *sc,
- struct ieee80211_channel *c);
+static void rt2860_init_channels(struct rt2860_softc *sc);
+static void rt2860_init_locked(void *priv);
+static void rt2860_init(void *priv);
+static int rt2860_init_bbp(struct rt2860_softc *sc);
+static void rt2860_stop_locked(void *priv);
+static void rt2860_stop(void *priv);
+static void rt2860_start(struct ifnet *ifp);
+static int rt2860_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
+static struct ieee80211vap *rt2860_vap_create(struct ieee80211com *ic,
+ const char name[IFNAMSIZ], int unit, enum ieee80211_opmode, int flags,
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
+static void rt2860_vap_delete(struct ieee80211vap *vap);
+static int rt2860_vap_reset(struct ieee80211vap *vap, u_long cmd);
+static int rt2860_vap_newstate(struct ieee80211vap *vap,
+ enum ieee80211_state nstate, int arg);
+#ifndef RT2860_NO_HW_CRYPTO
+static void rt2860_vap_key_update_begin(struct ieee80211vap *vap);
+static void rt2860_vap_key_update_end(struct ieee80211vap *vap);
+static int rt2860_vap_key_set(struct ieee80211vap *vap,
+ const struct ieee80211_key *k, const uint8_t mac[IEEE80211_ADDR_LEN]);
+static int rt2860_vap_key_delete(struct ieee80211vap *vap,
+ const struct ieee80211_key *k);
+#endif
+static void rt2860_vap_update_beacon(struct ieee80211vap *vap, int what);
+static int rt2860_media_change(struct ifnet *ifp);
+static struct ieee80211_node *rt2860_node_alloc(struct ieee80211vap *vap,
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
+static void rt2860_node_cleanup(struct ieee80211_node *ni);
+static void rt2860_node_getmimoinfo(const struct ieee80211_node *ni,
+ struct ieee80211_mimo_info *mi);
+static int rt2860_setregdomain(struct ieee80211com *ic,
+ struct ieee80211_regdomain *reg, int nchans,
+ struct ieee80211_channel chans[]);
+static void rt2860_getradiocaps(struct ieee80211com *ic, int maxchans,
+ int *nchans, struct ieee80211_channel chans[]);
+static void rt2860_scan_start(struct ieee80211com *ic);
+static void rt2860_scan_end(struct ieee80211com *ic);
+static void rt2860_set_channel(struct ieee80211com *ic);
+static void rt2860_newassoc(struct ieee80211_node *ni, int isnew);
+static void rt2860_updateslot(struct ifnet *ifp);
+static void rt2860_update_promisc(struct ifnet *ifp);
+static void rt2860_update_mcast(struct ifnet *ifp);
+static int rt2860_wme_update(struct ieee80211com *ic);
+static int rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
+ const struct ieee80211_bpf_params *params);
+static int rt2860_recv_action(struct ieee80211_node *ni,
+ const struct ieee80211_frame *wh, const uint8_t *frm,
+ const uint8_t *efrm);
+static int rt2860_send_action(struct ieee80211_node *ni, int cat,
+ int act, void *sa);
+static int rt2860_addba_response(struct ieee80211_node *ni,
+ struct ieee80211_tx_ampdu *tap, int status, int baparamset,
+ int batimeout);
+static void rt2860_addba_stop(struct ieee80211_node *ni,
+ struct ieee80211_tx_ampdu *tap);
+static int rt2860_ampdu_rx_start(struct ieee80211_node *ni,
+ struct ieee80211_rx_ampdu *rap, int baparamset, int batimeout,
+ int baseqctl);
+static void rt2860_ampdu_rx_stop(struct ieee80211_node *ni,
+ struct ieee80211_rx_ampdu *rap);
+#ifdef RT2860_SEND_BAR_WORKAROUND
+static int rt2860_send_bar(struct ieee80211_node *ni,
+ struct ieee80211_tx_ampdu *tap, ieee80211_seq seqno);
+#endif
+static void rt2860_amrr_update_iter_func(void *arg,
+ struct ieee80211_node *ni);
+static void rt2860_periodic(void *arg);
+static void rt2860_tx_watchdog(void *arg);
+static int rt2860_staid_alloc(struct rt2860_softc *sc, int aid);
+static void rt2860_staid_delete(struct rt2860_softc *sc, int staid);
+static void rt2860_amrr_init(struct rt2860_amrr *amrr,
+ struct ieee80211vap *vap, int ntxpath, int min_success_threshold,
+ int max_success_threshold, int msecs);
+static void rt2860_amrr_cleanup(struct rt2860_amrr *amrr);
+static void rt2860_amrr_node_init(struct rt2860_amrr *amrr,
+ struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni);
+static int rt2860_amrr_choose(struct ieee80211_node *ni,
+ struct rt2860_amrr_node *amrr_node);
+static int rt2860_amrr_update(struct rt2860_amrr *amrr,
+ struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni);
+static __inline void rt2860_amrr_tx_complete(
+ struct rt2860_amrr_node *amrr_node, int ok, int retries);
+static __inline void rt2860_amrr_tx_update(
+ struct rt2860_amrr_node *amrr_node, int txcnt, int success, int retrycnt);
+static void rt2860_asic_set_bssid(struct rt2860_softc *sc,
+ const uint8_t *bssid);
+static void rt2860_asic_set_macaddr(struct rt2860_softc *sc,
+ const uint8_t *addr);
+static void rt2860_asic_enable_tsf_sync(struct rt2860_softc *sc);
+static void rt2860_asic_disable_tsf_sync(struct rt2860_softc *sc);
+static void rt2860_asic_enable_mrr(struct rt2860_softc *sc);
+static void rt2860_asic_set_txpreamble(struct rt2860_softc *sc);
+static void rt2860_asic_set_basicrates(struct rt2860_softc *sc);
+static void rt2860_asic_update_rtsthreshold(struct rt2860_softc *sc);
+static void rt2860_asic_update_txpower(struct rt2860_softc *sc);
+static void rt2860_asic_update_promisc(struct rt2860_softc *sc);
+static void rt2860_asic_updateprot(struct rt2860_softc *sc);
+static void rt2860_asic_updateslot(struct rt2860_softc *sc);
+static void rt2860_asic_wme_update(struct rt2860_softc *sc);
+static void rt2860_asic_update_beacon(struct rt2860_softc *sc,
+ struct ieee80211vap *, struct rt2860_txwi *);
+static void rt2860_asic_clear_keytables(struct rt2860_softc *sc);
+static void rt2860_asic_add_ba_session(struct rt2860_softc *sc,
+ uint8_t wcid, int tid);
+static void rt2860_asic_del_ba_session(struct rt2860_softc *sc,
+ uint8_t wcid, int tid);
+/*
+static void rt2860_led_brightness(struct rt2860_softc *sc,
+ uint8_t brightness);
+*/
+static void rt2860_led_cmd(struct rt2860_softc *sc, uint8_t cmd);
+static const char *rt2860_rf_name(int rf_rev);
+static void rt2860_rf_select_chan_group(struct rt2860_softc *sc,
+ struct ieee80211_channel *c);
+static void rt2860_rf_set_chan(struct rt2860_softc *sc,
+ struct ieee80211_channel *c);
+static uint8_t rt3090_rf_read(struct rt2860_softc *sc, uint8_t reg);
+static void rt3090_rf_write(struct rt2860_softc *sc, uint8_t reg,
+ uint8_t val);
+static void rt2872_rf_set_chan(struct rt2860_softc *sc,
+ struct ieee80211_channel *c);
+static void rt3090_set_chan(struct rt2860_softc *sc, u_int chan);
+static int rt3090_rf_init(struct rt2860_softc *sc);
+static void rt3090_set_rx_antenna(struct rt2860_softc *, int);
+static void rt3090_rf_wakeup(struct rt2860_softc *sc);
+static int rt3090_filter_calib(struct rt2860_softc *sc, uint8_t init,
+ uint8_t target, uint8_t *val);
+static void rt3090_rf_setup(struct rt2860_softc *sc);
+static void rt2860_read_eeprom(struct rt2860_softc *sc);
+static uint32_t rt2860_read_eeprom_txpow_rate_add_delta(uint32_t txpow_rate,
+ int8_t delta);
+static void rt2860_io_rf_load_defaults(struct rt2860_softc *sc);
+static uint16_t rt2860_io_eeprom_read(struct rt2860_softc *sc, uint16_t addr);
+static uint8_t rt2860_io_bbp_read(struct rt2860_softc *sc, uint8_t reg);
+static void rt2860_io_bbp_write(struct rt2860_softc *sc, uint8_t reg,
+ uint8_t val);
+static void rt2860_io_rf_write(struct rt2860_softc *sc, uint8_t reg,
+ uint32_t val);
+static int32_t rt2860_io_rf_read(struct rt2860_softc *sc, uint8_t reg);
+static void rt2860_io_mcu_cmd(struct rt2860_softc *sc, uint8_t cmd,
+ uint8_t token, uint16_t arg);
+static int rt2860_io_mcu_cmd_check(struct rt2860_softc *sc, uint8_t cid);
+static int rt2860_load_microcode(struct rt2860_softc *sc);
+static int rt2860_beacon_alloc(struct rt2860_softc *sc,
+ struct ieee80211vap *vap);
+static uint8_t rt2860_rxrate(struct rt2860_rxwi *rxwi);
+static uint8_t rt2860_maxrssi_rxpath(struct rt2860_softc *sc,
+ const struct rt2860_rxwi *rxwi);
+static int8_t rt2860_rssi2dbm(struct rt2860_softc *sc, uint8_t rssi,
+ uint8_t rxpath);
+static uint8_t rt2860_rate2mcs(uint8_t rate);
+static int rt2860_tx_mgmt(struct rt2860_softc *sc,
+ struct mbuf *m, struct ieee80211_node *ni, int qid);
+static int rt2860_tx_data(struct rt2860_softc *sc,
+ struct mbuf *m, struct ieee80211_node *ni, int qid);
+static void rt2860_reset_dma(struct rt2860_softc *sc);
+static void rt2860_fifo_stat_full_intr(struct rt2860_softc *sc);
+static void rt2860_rx_intr(struct rt2860_softc *sc);
+static void rt2860_tx_intr(struct rt2860_softc *sc, int qid);
+static void rt2860_rx_done_task(void *context, int pending);
+static void rt2860_tx_done_task(void *context, int pending);
+static void rt2860_fifo_stat_full_task(void *context, int pending);
+static void rt2860_periodic_task(void *context, int pending);
+static int rt2860_rx_eof(struct rt2860_softc *sc, int limit);
+static void rt2860_tx_eof(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring);
+static void rt2860_update_stats(struct rt2860_softc *sc);
+static void rt2860_bbp_tuning(struct rt2860_softc *sc);
+static void rt2860_watchdog(struct rt2860_softc *sc);
+static void rt2860_drain_fifo_stats(struct rt2860_softc *sc);
+static void rt2860_update_raw_counters(struct rt2860_softc *sc);
+static void rt2860_intr_enable(struct rt2860_softc *sc,
+ uint32_t intr_mask);
+static void rt2860_intr_disable(struct rt2860_softc *sc,
+ uint32_t intr_mask);
+static int rt2860_txrx_enable(struct rt2860_softc *sc);
+static int rt2860_alloc_rx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_rx_ring *ring);
+static void rt2860_reset_rx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_rx_ring *ring);
+static void rt2860_free_rx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_rx_ring *ring);
+static int rt2860_alloc_tx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring, int qid);
+static void rt2860_reset_tx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring);
+static void rt2860_free_tx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring);
+static void rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs,
+ int nseg, int error);
+static void rt2860_sysctl_attach(struct rt2860_softc *sc);
/*
* Static variables
*/
-static const struct rt2860_rf_prog
-{
- uint8_t chan;
- uint32_t r1, r2, r3, r4;
-} rt2860_rf_2850[] =
-{
- { 1, 0x98402ecc, 0x984c0786, 0x9816b455, 0x9800510b },
- { 2, 0x98402ecc, 0x984c0786, 0x98168a55, 0x9800519f },
- { 3, 0x98402ecc, 0x984c078a, 0x98168a55, 0x9800518b },
- { 4, 0x98402ecc, 0x984c078a, 0x98168a55, 0x9800519f },
- { 5, 0x98402ecc, 0x984c078e, 0x98168a55, 0x9800518b },
- { 6, 0x98402ecc, 0x984c078e, 0x98168a55, 0x9800519f },
- { 7, 0x98402ecc, 0x984c0792, 0x98168a55, 0x9800518b },
- { 8, 0x98402ecc, 0x984c0792, 0x98168a55, 0x9800519f },
- { 9, 0x98402ecc, 0x984c0796, 0x98168a55, 0x9800518b },
- { 10, 0x98402ecc, 0x984c0796, 0x98168a55, 0x9800519f },
- { 11, 0x98402ecc, 0x984c079a, 0x98168a55, 0x9800518b },
- { 12, 0x98402ecc, 0x984c079a, 0x98168a55, 0x9800519f },
- { 13, 0x98402ecc, 0x984c079e, 0x98168a55, 0x9800518b },
- { 14, 0x98402ecc, 0x984c07a2, 0x98168a55, 0x98005193 },
- { 36, 0x98402ecc, 0x984c099a, 0x98158a55, 0x980ed1a3 },
- { 38, 0x98402ecc, 0x984c099e, 0x98158a55, 0x980ed193 },
- { 40, 0x98402ec8, 0x984c0682, 0x98158a55, 0x980ed183 },
- { 44, 0x98402ec8, 0x984c0682, 0x98158a55, 0x980ed1a3 },
- { 46, 0x98402ec8, 0x984c0686, 0x98158a55, 0x980ed18b },
- { 48, 0x98402ec8, 0x984c0686, 0x98158a55, 0x980ed19b },
- { 52, 0x98402ec8, 0x984c068a, 0x98158a55, 0x980ed193 },
- { 54, 0x98402ec8, 0x984c068a, 0x98158a55, 0x980ed1a3 },
- { 56, 0x98402ec8, 0x984c068e, 0x98158a55, 0x980ed18b },
- { 60, 0x98402ec8, 0x984c0692, 0x98158a55, 0x980ed183 },
- { 62, 0x98402ec8, 0x984c0692, 0x98158a55, 0x980ed193 },
- { 64, 0x98402ec8, 0x984c0692, 0x98158a55, 0x980ed1a3 },
- { 100, 0x98402ec8, 0x984c06b2, 0x98178a55, 0x980ed783 },
- { 102, 0x98402ec8, 0x985c06b2, 0x98578a55, 0x980ed793 },
- { 104, 0x98402ec8, 0x985c06b2, 0x98578a55, 0x980ed1a3 },
- { 108, 0x98402ecc, 0x985c0a32, 0x98578a55, 0x980ed193 },
- { 110, 0x98402ecc, 0x984c0a36, 0x98178a55, 0x980ed183 },
- { 112, 0x98402ecc, 0x984c0a36, 0x98178a55, 0x980ed19b },
- { 116, 0x98402ecc, 0x984c0a3a, 0x98178a55, 0x980ed1a3 },
- { 118, 0x98402ecc, 0x984c0a3e, 0x98178a55, 0x980ed193 },
- { 120, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed183 },
- { 124, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed193 },
- { 126, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed15b },
- { 128, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed1a3 },
- { 132, 0x98402ec4, 0x984c0386, 0x98178a55, 0x980ed18b },
- { 134, 0x98402ec4, 0x984c0386, 0x98178a55, 0x980ed193 },
- { 136, 0x98402ec4, 0x984c0386, 0x98178a55, 0x980ed19b },
- { 140, 0x98402ec4, 0x984c038a, 0x98178a55, 0x980ed183 },
- { 149, 0x98402ec4, 0x984c038a, 0x98178a55, 0x980ed1a7 },
- { 151, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed187 },
- { 153, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed18f },
- { 157, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed19f },
- { 159, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed1a7 },
- { 161, 0x98402ec4, 0x984c0392, 0x98178a55, 0x980ed187 },
- { 165, 0x98402ec4, 0x984c0392, 0x98178a55, 0x980ed197 },
- { 184, 0x95002ccc, 0x9500491e, 0x9509be55, 0x950c0a0b },
- { 188, 0x95002ccc, 0x95004922, 0x9509be55, 0x950c0a13 },
- { 192, 0x95002ccc, 0x95004926, 0x9509be55, 0x950c0a1b },
- { 196, 0x95002ccc, 0x9500492a, 0x9509be55, 0x950c0a23 },
- { 208, 0x95002ccc, 0x9500493a, 0x9509be55, 0x950c0a13 },
- { 212, 0x95002ccc, 0x9500493e, 0x9509be55, 0x950c0a1b },
- { 216, 0x95002ccc, 0x95004982, 0x9509be55, 0x950c0a23 },
-};
-
-static const struct rfprog {
- uint8_t chan;
- uint32_t r1, r2, r3, r4;
-} rt2860_rf2850[] = {
- { 1, 0x100bb3, 0x1301e1, 0x05a014, 0x001402 },
- { 2, 0x100bb3, 0x1301e1, 0x05a014, 0x001407 },
- { 3, 0x100bb3, 0x1301e2, 0x05a014, 0x001402 },
- { 4, 0x100bb3, 0x1301e2, 0x05a014, 0x001407 },
- { 5, 0x100bb3, 0x1301e3, 0x05a014, 0x001402 },
- { 6, 0x100bb3, 0x1301e3, 0x05a014, 0x001407 },
- { 7, 0x100bb3, 0x1301e4, 0x05a014, 0x001402 },
- { 8, 0x100bb3, 0x1301e4, 0x05a014, 0x001407 },
- { 9, 0x100bb3, 0x1301e5, 0x05a014, 0x001402 },
- { 10, 0x100bb3, 0x1301e5, 0x05a014, 0x001407 },
- { 11, 0x100bb3, 0x1301e6, 0x05a014, 0x001402 },
- { 12, 0x100bb3, 0x1301e6, 0x05a014, 0x001407 },
- { 13, 0x100bb3, 0x1301e7, 0x05a014, 0x001402 },
- { 14, 0x100bb3, 0x1301e8, 0x05a014, 0x001404 },
- { 36, 0x100bb3, 0x130266, 0x056014, 0x001408 },
- { 38, 0x100bb3, 0x130267, 0x056014, 0x001404 },
- { 40, 0x100bb2, 0x1301a0, 0x056014, 0x001400 },
- { 44, 0x100bb2, 0x1301a0, 0x056014, 0x001408 },
- { 46, 0x100bb2, 0x1301a1, 0x056014, 0x001402 },
- { 48, 0x100bb2, 0x1301a1, 0x056014, 0x001406 },
- { 52, 0x100bb2, 0x1301a2, 0x056014, 0x001404 },
- { 54, 0x100bb2, 0x1301a2, 0x056014, 0x001408 },
- { 56, 0x100bb2, 0x1301a3, 0x056014, 0x001402 },
- { 60, 0x100bb2, 0x1301a4, 0x056014, 0x001400 },
- { 62, 0x100bb2, 0x1301a4, 0x056014, 0x001404 },
- { 64, 0x100bb2, 0x1301a4, 0x056014, 0x001408 },
- { 100, 0x100bb2, 0x1301ac, 0x05e014, 0x001400 },
- { 102, 0x100bb2, 0x1701ac, 0x15e014, 0x001404 },
- { 104, 0x100bb2, 0x1701ac, 0x15e014, 0x001408 },
- { 108, 0x100bb3, 0x17028c, 0x15e014, 0x001404 },
- { 110, 0x100bb3, 0x13028d, 0x05e014, 0x001400 },
- { 112, 0x100bb3, 0x13028d, 0x05e014, 0x001406 },
- { 116, 0x100bb3, 0x13028e, 0x05e014, 0x001408 },
- { 118, 0x100bb3, 0x13028f, 0x05e014, 0x001404 },
- { 120, 0x100bb1, 0x1300e0, 0x05e014, 0x001400 },
- { 124, 0x100bb1, 0x1300e0, 0x05e014, 0x001404 },
- { 126, 0x100bb1, 0x1300e0, 0x05e014, 0x001406 },
- { 128, 0x100bb1, 0x1300e0, 0x05e014, 0x001408 },
- { 132, 0x100bb1, 0x1300e1, 0x05e014, 0x001402 },
- { 134, 0x100bb1, 0x1300e1, 0x05e014, 0x001404 },
- { 136, 0x100bb1, 0x1300e1, 0x05e014, 0x001406 },
- { 140, 0x100bb1, 0x1300e2, 0x05e014, 0x001400 },
- { 149, 0x100bb1, 0x1300e2, 0x05e014, 0x001409 },
- { 151, 0x100bb1, 0x1300e3, 0x05e014, 0x001401 },
- { 153, 0x100bb1, 0x1300e3, 0x05e014, 0x001403 },
- { 157, 0x100bb1, 0x1300e3, 0x05e014, 0x001407 },
- { 159, 0x100bb1, 0x1300e3, 0x05e014, 0x001409 },
- { 161, 0x100bb1, 0x1300e4, 0x05e014, 0x001401 },
- { 165, 0x100bb1, 0x1300e4, 0x05e014, 0x001405 },
- { 167, 0x100bb1, 0x1300f4, 0x05e014, 0x001407 },
- { 169, 0x100bb1, 0x1300f4, 0x05e014, 0x001409 },
- { 171, 0x100bb1, 0x1300f5, 0x05e014, 0x001401 },
- { 173, 0x100bb1, 0x1300f5, 0x05e014, 0x001403 }
-};
-
-static const struct rt2860_rf_fi3020
-{
- uint8_t channel, n, r, k;
-} rt2860_rf_fi3020[] =
-{
- /* 802.11g */
- {1, 241, 2, 2},
- {2, 241, 2, 7},
- {3, 242, 2, 2},
- {4, 242, 2, 7},
- {5, 243, 2, 2},
- {6, 243, 2, 7},
- {7, 244, 2, 2},
- {8, 244, 2, 7},
- {9, 245, 2, 2},
- {10, 245, 2, 7},
- {11, 246, 2, 2},
- {12, 246, 2, 7},
- {13, 247, 2, 2},
- {14, 248, 2, 4},
-
- /* 802.11 UNI / HyperLan 2 */
- {36, 0x56, 0, 4},
- {38, 0x56, 0, 6},
- {40, 0x56, 0, 8},
- {44, 0x57, 0, 0},
- {46, 0x57, 0, 2},
- {48, 0x57, 0, 4},
- {52, 0x57, 0, 8},
- {54, 0x57, 0, 10},
- {56, 0x58, 0, 0},
- {60, 0x58, 0, 4},
- {62, 0x58, 0, 6},
- {64, 0x58, 0, 8},
-
- /* 802.11 HyperLan 2 */
- {100, 0x5b, 0, 8},
- {102, 0x5b, 0, 10},
- {104, 0x5c, 0, 0},
- {108, 0x5c, 0, 4},
- {110, 0x5c, 0, 6},
- {112, 0x5c, 0, 8},
- {116, 0x5d, 0, 0},
- {118, 0x5d, 0, 2},
- {120, 0x5d, 0, 4},
- {124, 0x5d, 0, 8},
- {126, 0x5d, 0, 10},
- {128, 0x5e, 0, 0},
- {132, 0x5e, 0, 4},
- {134, 0x5e, 0, 6},
- {136, 0x5e, 0, 8},
- {140, 0x5f, 0, 0},
-
- /* 802.11 UNII */
- {149, 0x5f, 0, 9},
- {151, 0x5f, 0, 11},
- {153, 0x60, 0, 1},
- {157, 0x60, 0, 5},
- {159, 0x60, 0, 7},
- {161, 0x60, 0, 9},
- {165, 0x61, 0, 1},
- {167, 0x61, 0, 3},
- {169, 0x61, 0, 5},
- {171, 0x61, 0, 7},
- {173, 0x61, 0, 9},
-};
-
-static const struct {
- uint8_t reg;
- uint8_t val;
-} rt3090_def_rf[] = {
- { 4, 0x40 },
- { 5, 0x03 },
- { 6, 0x02 },
- { 7, 0x70 },
- { 9, 0x0f },
- { 10, 0x41 },
- { 11, 0x21 },
- { 12, 0x7b },
- { 14, 0x90 },
- { 15, 0x58 },
- { 16, 0xb3 },
- { 17, 0x92 },
- { 18, 0x2c },
- { 19, 0x02 },
- { 20, 0xba },
- { 21, 0xdb },
- { 24, 0x16 },
- { 25, 0x01 },
- { 29, 0x1f }
-};
-
-struct {
- uint8_t n, r, k;
-} rt3090_freqs[] = {
- { 0xf1, 2, 2 },
- { 0xf1, 2, 7 },
- { 0xf2, 2, 2 },
- { 0xf2, 2, 7 },
- { 0xf3, 2, 2 },
- { 0xf3, 2, 7 },
- { 0xf4, 2, 2 },
- { 0xf4, 2, 7 },
- { 0xf5, 2, 2 },
- { 0xf5, 2, 7 },
- { 0xf6, 2, 2 },
- { 0xf6, 2, 7 },
- { 0xf7, 2, 2 },
- { 0xf8, 2, 4 },
- { 0x56, 0, 4 },
- { 0x56, 0, 6 },
- { 0x56, 0, 8 },
- { 0x57, 0, 0 },
- { 0x57, 0, 2 },
- { 0x57, 0, 4 },
- { 0x57, 0, 8 },
- { 0x57, 0, 10 },
- { 0x58, 0, 0 },
- { 0x58, 0, 4 },
- { 0x58, 0, 6 },
- { 0x58, 0, 8 },
- { 0x5b, 0, 8 },
- { 0x5b, 0, 10 },
- { 0x5c, 0, 0 },
- { 0x5c, 0, 4 },
- { 0x5c, 0, 6 },
- { 0x5c, 0, 8 },
- { 0x5d, 0, 0 },
- { 0x5d, 0, 2 },
- { 0x5d, 0, 4 },
- { 0x5d, 0, 8 },
- { 0x5d, 0, 10 },
- { 0x5e, 0, 0 },
- { 0x5e, 0, 4 },
- { 0x5e, 0, 6 },
- { 0x5e, 0, 8 },
- { 0x5f, 0, 0 },
- { 0x5f, 0, 9 },
- { 0x5f, 0, 11 },
- { 0x60, 0, 1 },
- { 0x60, 0, 5 },
- { 0x60, 0, 7 },
- { 0x60, 0, 9 },
- { 0x61, 0, 1 },
- { 0x61, 0, 3 },
- { 0x61, 0, 5 },
- { 0x61, 0, 7 },
- { 0x61, 0, 9 }
-};
-
-static const struct {
- uint32_t reg;
- uint32_t val;
-} rt2860_def_mac[] = {
- { RT2860_REG_PBF_BCN_OFFSET0, 0xf8f0e8e0 },
- { RT2860_REG_PBF_BCN_OFFSET1, 0x6f77d0c8 },
- { RT2860_REG_LEGACY_BASIC_RATE, 0x0000013f },
- { RT2860_REG_HT_BASIC_RATE, 0x00008003 },
- { RT2860_REG_SYS_CTRL, 0x00000000 },
- { RT2860_REG_RX_FILTER_CFG, 0x00017f97 },
- { RT2860_REG_BKOFF_SLOT_CFG, 0x00000209 },
- { RT2860_REG_TX_SW_CFG0, 0x00000000 },
- { RT2860_REG_TX_SW_CFG1, 0x00080606 },
- { RT2860_REG_TX_LINK_CFG, 0x00001020 },
- { RT2860_REG_TX_TIMEOUT_CFG, 0x000a2090 },
- { RT2860_REG_MAX_LEN_CFG, (1 << 12) | RT2860_MAX_AGG_SIZE },
- { RT2860_REG_LED_CFG, 0x7f031e46 },
- { RT2860_REG_PBF_MAX_PCNT, 0x1f3fbf9f },
- { RT2860_REG_TX_RTY_CFG, 0x47d01f0f },
- { RT2860_REG_AUTO_RSP_CFG, 0x00000013 },
- { RT2860_REG_TX_CCK_PROT_CFG, 0x05740003 },
- { RT2860_REG_TX_OFDM_PROT_CFG, 0x05740003 },
- { RT2860_REG_TX_GF20_PROT_CFG, 0x01744004 },
- { RT2860_REG_TX_GF40_PROT_CFG, 0x03f44084 },
- { RT2860_REG_TX_MM20_PROT_CFG, 0x01744004 },
- { RT2860_REG_TX_MM40_PROT_CFG, 0x03f54084 },
- { RT2860_REG_TX_TXOP_CTRL_CFG, 0x0000583f },
- { RT2860_REG_TX_RTS_CFG, 0x00092b20 },
- { RT2860_REG_TX_EXP_ACK_TIME, 0x002400ca },
- { RT2860_REG_HCCAPSMP_TXOP_HLDR_ET, 0x00000002 },
- { RT2860_REG_XIFS_TIME_CFG, 0x33a41010 },
- { RT2860_REG_PWR_PIN_CFG, 0x00000003 },
- { RT2860_REG_SCHDMA_WMM_AIFSN_CFG, 0x00002273 },
- { RT2860_REG_SCHDMA_WMM_CWMIN_CFG, 0x00002344 },
- { RT2860_REG_SCHDMA_WMM_CWMAX_CFG, 0x000034aa },
-};
-
-#define RT2860_DEF_MAC_SIZE \
- (sizeof(rt2860_def_mac) / sizeof(rt2860_def_mac[0]))
-
-static const struct {
- uint8_t reg;
- uint8_t val;
-} rt2860_def_bbp[] = {
- { 65, 0x2c },
- { 66, 0x38 },
- { 69, 0x12 },
- { 70, 0x0a },
- { 73, 0x10 },
- { 81, 0x37 },
- { 82, 0x62 },
- { 83, 0x6a },
- { 84, 0x99 },
- { 86, 0x00 },
- { 91, 0x04 },
- { 92, 0x00 },
- { 103, 0x00 },
- { 105, 0x05 },
- { 106, 0x35 },
-};
-
-#define RT2860_DEF_BBP_SIZE \
- (sizeof(rt2860_def_bbp) / sizeof(rt2860_def_bbp[0]))
-
-/*
- * Static function prototypes
- */
-static void rt2860_init_channels(struct rt2860_softc *sc);
-static void rt2860_init_channels_ht40(struct rt2860_softc *sc);
-static void rt2860_init_locked(void *priv);
-static void rt2860_init(void *priv);
-static int rt2860_init_bbp(struct rt2860_softc *sc);
-static void rt2860_stop_locked(void *priv);
-static void rt2860_stop(void *priv);
-static void rt2860_start(struct ifnet *ifp);
-static int rt2860_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
-static struct ieee80211vap *rt2860_vap_create(struct ieee80211com *ic,
- const char name[IFNAMSIZ], int unit, enum ieee80211_opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN],
- const uint8_t mac[IEEE80211_ADDR_LEN]);
-static void rt2860_vap_delete(struct ieee80211vap *vap);
-static int rt2860_vap_reset(struct ieee80211vap *vap, u_long cmd);
-static int rt2860_vap_newstate(struct ieee80211vap *vap,
- enum ieee80211_state nstate, int arg);
-
-#ifndef RT2860_NO_HW_CRYPTO
-static void rt2860_vap_key_update_begin(struct ieee80211vap *vap);
-static void rt2860_vap_key_update_end(struct ieee80211vap *vap);
-static int rt2860_vap_key_set(struct ieee80211vap *vap,
- const struct ieee80211_key *k, const uint8_t mac[IEEE80211_ADDR_LEN]);
-static int rt2860_vap_key_delete(struct ieee80211vap *vap,
- const struct ieee80211_key *k);
-#endif
-
-static void rt2860_vap_update_beacon(struct ieee80211vap *vap, int what);
-static int rt2860_media_change(struct ifnet *ifp);
-static struct ieee80211_node *rt2860_node_alloc(struct ieee80211vap *vap,
- const uint8_t mac[IEEE80211_ADDR_LEN]);
-static void rt2860_node_cleanup(struct ieee80211_node *ni);
-static void rt2860_node_getmimoinfo(const struct ieee80211_node *ni,
- struct ieee80211_mimo_info *mi);
-static int rt2860_setregdomain(struct ieee80211com *ic,
- struct ieee80211_regdomain *reg,
- int nchans, struct ieee80211_channel chans[]);
-static void rt2860_getradiocaps(struct ieee80211com *ic,
- int maxchans, int *nchans, struct ieee80211_channel chans[]);
-static void rt2860_scan_start(struct ieee80211com *ic);
-static void rt2860_scan_end(struct ieee80211com *ic);
-static void rt2860_set_channel(struct ieee80211com *ic);
-static void rt2860_newassoc(struct ieee80211_node *ni, int isnew);
-static void rt2860_updateslot(struct ifnet *ifp);
-static void rt2860_update_promisc(struct ifnet *ifp);
-static void rt2860_update_mcast(struct ifnet *ifp);
-static int rt2860_wme_update(struct ieee80211com *ic);
-static int rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
- const struct ieee80211_bpf_params *params);
-static int rt2860_recv_action(struct ieee80211_node *ni,
- const struct ieee80211_frame *wh,
- const uint8_t *frm, const uint8_t *efrm);
-static int rt2860_send_action(struct ieee80211_node *ni,
- int cat, int act, void *sa);
-static int rt2860_addba_response(struct ieee80211_node *ni,
- struct ieee80211_tx_ampdu *tap,
- int status, int baparamset, int batimeout);
-static void rt2860_addba_stop(struct ieee80211_node *ni,
- struct ieee80211_tx_ampdu *tap);
-static int rt2860_ampdu_rx_start(struct ieee80211_node *ni,
- struct ieee80211_rx_ampdu *rap,
- int baparamset, int batimeout, int baseqctl);
-static void rt2860_ampdu_rx_stop(struct ieee80211_node *ni,
- struct ieee80211_rx_ampdu *rap);
-static int rt2860_send_bar(struct ieee80211_node *ni,
- struct ieee80211_tx_ampdu *tap, ieee80211_seq seqno);
-static void rt2860_amrr_update_iter_func(void *arg, struct ieee80211_node *ni);
-static void rt2860_periodic(void *arg);
-static void rt2860_tx_watchdog(void *arg);
-static int rt2860_staid_alloc(struct rt2860_softc *sc, int aid);
-static void rt2860_staid_delete(struct rt2860_softc *sc, int staid);
-void rt2860_amrr_init(struct rt2860_amrr *amrr, struct ieee80211vap *vap,
- int ntxpath, int min_success_threshold,
- int max_success_threshold, int msecs);
-void rt2860_amrr_cleanup(struct rt2860_amrr *amrr);
-void rt2860_amrr_node_init(struct rt2860_amrr *amrr,
- struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni);
-int rt2860_amrr_choose(struct ieee80211_node *ni,
- struct rt2860_amrr_node *amrr_node);
-
-static __inline void
-rt2860_amrr_tx_complete(struct rt2860_amrr_node *amrr_node, int ok, int retries)
-{
-
- amrr_node->txcnt++;
-
- if (ok)
- amrr_node->success++;
-
- amrr_node->retrycnt += retries;
-}
-
-static __inline void
-rt2860_amrr_tx_update(struct rt2860_amrr_node *amrr_node, int txcnt,
- int success, int retrycnt)
-{
-
- amrr_node->txcnt = txcnt;
- amrr_node->success = success;
- amrr_node->retrycnt = retrycnt;
-}
-
-static void rt2860_asic_set_bssid(struct rt2860_softc *sc,
- const uint8_t *bssid);
-static void rt2860_asic_set_macaddr(struct rt2860_softc *sc,
- const uint8_t *addr);
-static void rt2860_asic_enable_tsf_sync(struct rt2860_softc *sc);
-static void rt2860_asic_disable_tsf_sync(struct rt2860_softc *sc);
-static void rt2860_asic_enable_mrr(struct rt2860_softc *sc);
-static void rt2860_asic_set_txpreamble(struct rt2860_softc *sc);
-static void rt2860_asic_set_basicrates(struct rt2860_softc *sc);
-static void rt2860_asic_update_rtsthreshold(struct rt2860_softc *sc);
-static void rt2860_asic_update_txpower(struct rt2860_softc *sc);
-static void rt2860_asic_update_promisc(struct rt2860_softc *sc);
-static void rt2860_asic_updateprot(struct rt2860_softc *sc);
-static void rt2860_asic_updateslot(struct rt2860_softc *sc);
-static void rt2860_asic_wme_update(struct rt2860_softc *sc);
-static void rt2860_asic_update_beacon(struct rt2860_softc *sc,
- struct ieee80211vap *vap);
-static void rt2860_asic_clear_keytables(struct rt2860_softc *sc);
-static void rt2860_asic_add_ba_session(struct rt2860_softc *sc,
- uint8_t wcid, int tid);
-static void rt2860_asic_del_ba_session(struct rt2860_softc *sc,
- uint8_t wcid, int tid);
-void rt2860_led_brightness(struct rt2860_softc *sc, uint8_t brightness);
-void rt2860_led_cmd(struct rt2860_softc *sc, uint8_t cmd);
-const char *rt2860_rf_name(int rf_rev);
-void rt2860_rf_select_chan_group(struct rt2860_softc *sc,
- struct ieee80211_channel *c);
-void rt2860_rf_set_chan(struct rt2860_softc *sc,
- struct ieee80211_channel *c);
-uint8_t rt3090_rf_read(struct rt2860_softc *sc, uint8_t reg);
-void rt3090_rf_write(struct rt2860_softc *sc, uint8_t reg, uint8_t val);
-void rt3090_set_chan(struct rt2860_softc *sc, u_int chan);
-int rt3090_rf_init(struct rt2860_softc *sc);
-void rt3090_set_rx_antenna(struct rt2860_softc *, int);
-void rt3090_rf_wakeup(struct rt2860_softc *sc);
-int rt3090_filter_calib(struct rt2860_softc *sc, uint8_t init, uint8_t target,
- uint8_t *val);
-void rt3090_rf_setup(struct rt2860_softc *sc);
-void rt2860_read_eeprom(struct rt2860_softc *sc);
-uint32_t rt2860_read_eeprom_txpow_rate_add_delta(uint32_t txpow_rate,
- int8_t delta);
-void rt2860_io_rf_load_defaults(struct rt2860_softc *sc);
-uint32_t rt2860_io_mac_read(struct rt2860_softc *sc, uint16_t reg);
-void rt2860_io_mac_read_multi(struct rt2860_softc *sc,
- uint16_t reg, void *buf, size_t len);
-void rt2860_io_mac_write(struct rt2860_softc *sc,
- uint16_t reg, uint32_t val);
-void rt2860_io_mac_write_multi(struct rt2860_softc *sc,
- uint16_t reg, const void *buf, size_t len);
-void rt2860_io_mac_set_region_4(struct rt2860_softc *sc,
- uint16_t reg, uint32_t val, size_t len);
-uint16_t rt2860_io_eeprom_read(struct rt2860_softc *sc, uint16_t addr);
-void rt2860_io_eeprom_read_multi(struct rt2860_softc *sc,
- uint16_t addr, void *buf, size_t len);
-uint8_t rt2860_io_bbp_read(struct rt2860_softc *sc, uint8_t reg);
-void rt2860_io_bbp_write(struct rt2860_softc *sc, uint8_t reg, uint8_t val);
-void rt2860_io_rf_write(struct rt2860_softc *sc, uint8_t reg, uint32_t val);
-int32_t rt2860_io_rf_read(struct rt2860_softc *sc, uint8_t reg);
-void rt2860_io_mcu_cmd(struct rt2860_softc *sc, uint8_t cmd,
- uint8_t token, uint16_t arg);
-int rt2860_io_mcu_cmd_check(struct rt2860_softc *sc, uint8_t cid);
-int rt2860_io_mcu_load_ucode(struct rt2860_softc *sc,
- const uint8_t *ucode, size_t len);
-static int rt2860_beacon_alloc(struct rt2860_softc *sc,
- struct ieee80211vap *vap);
-static uint8_t rt2860_rxrate(struct rt2860_rxwi *rxwi);
-static uint8_t rt2860_maxrssi_rxpath(struct rt2860_softc *sc,
- const struct rt2860_rxwi *rxwi);
-static int8_t rt2860_rssi2dbm(struct rt2860_softc *sc,
- uint8_t rssi, uint8_t rxpath);
-static uint8_t rt2860_rate2mcs(uint8_t rate);
-static int rt2860_tx_mgmt(struct rt2860_softc *sc,
- struct mbuf *m, struct ieee80211_node *ni, int qid);
-static int rt2860_tx_data(struct rt2860_softc *sc,
- struct mbuf *m, struct ieee80211_node *ni, int qid);
-
-static void rt2860_tx_coherent_intr(struct rt2860_softc *sc);
-static void rt2860_rx_coherent_intr(struct rt2860_softc *sc);
-static void rt2860_txrx_coherent_intr(struct rt2860_softc *sc);
-static void rt2860_fifo_sta_full_intr(struct rt2860_softc *sc);
-static void rt2860_rx_intr(struct rt2860_softc *sc);
-static void rt2860_tx_intr(struct rt2860_softc *sc, int qid);
-static void rt2860_rx_done_task(void *context, int pending);
-static void rt2860_tx_done_task(void *context, int pending);
-static void rt2860_fifo_sta_full_task(void *context, int pending);
-static void rt2860_periodic_task(void *context, int pending);
-static int rt2860_rx_eof(struct rt2860_softc *sc, int limit);
-static void rt2860_tx_eof(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring);
-static void rt2860_update_stats(struct rt2860_softc *sc);
-static void rt2860_bbp_tuning(struct rt2860_softc *sc);
-static void rt2860_watchdog(struct rt2860_softc *sc);
-static void rt2860_drain_fifo_stats(struct rt2860_softc *sc);
-static void rt2860_update_raw_counters(struct rt2860_softc *sc);
-static void rt2860_intr_enable(struct rt2860_softc *sc, uint32_t intr_mask);
-static void rt2860_intr_disable(struct rt2860_softc *sc, uint32_t intr_mask);
-static int rt2860_txrx_enable(struct rt2860_softc *sc);
-static int rt2860_alloc_rx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_rx_ring *ring);
-static void rt2860_reset_rx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_rx_ring *ring);
-static void rt2860_free_rx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_rx_ring *ring);
-static int rt2860_alloc_tx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring, int qid);
-static void rt2860_reset_tx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring);
-static void rt2860_free_tx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring);
-static void rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs,
- int nseg, int error);
-static void rt2860_sysctl_attach(struct rt2860_softc *sc);
-
-/*
- * Static variables
- */
-
-SYSCTL_NODE(_hw, OID_AUTO, rt2860, CTLFLAG_RD, 0, "RT2860 driver parameters");
+SYSCTL_NODE(_hw, OID_AUTO, ral, CTLFLAG_RD, 0, "RT2860 driver parameters");
static int rt2860_tx_stbc = 1;
SYSCTL_INT(_hw_ral, OID_AUTO, tx_stbc, CTLFLAG_RW, &rt2860_tx_stbc, 0,
@@ -629,10 +299,45 @@
TUNABLE_INT("hw.ral.debug", &rt2860_debug);
#endif
+static const struct {
+ uint32_t reg;
+ uint32_t val;
+} rt2860_def_mac[] = {
+ RT2860_DEF_MAC
+};
+
+static const struct {
+ uint8_t reg;
+ uint8_t val;
+} rt2860_def_bbp[] = {
+ RT2860_DEF_BBP
+};
+
+static const struct rfprog {
+ uint8_t chan;
+ uint32_t r1, r2, r3, r4;
+} rt2860_rf2850[] = {
+ RT2860_RF2850
+};
+
+struct {
+ uint8_t n, r, k;
+} rt3090_freqs[] = {
+ RT3070_RF3052
+};
+
+static const struct {
+ uint8_t reg;
+ uint8_t val;
+} rt3090_def_rf[] = {
+ RT3070_DEF_RF
+};
+
/*
* rt2860_attach
*/
-int rt2860_attach(device_t dev, int id)
+int
+rt2860_attach(device_t dev, int id)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -657,13 +362,11 @@
"debug", CTLFLAG_RW, &sc->debug, 0, "rt2860 debug level");
#endif
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: attaching\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "attaching\n");
/* wait for NIC to initialize */
for (ntries = 0; ntries < 100; ntries++) {
- sc->mac_rev = rt2860_io_mac_read(sc, RT2860_REG_MAC_CSR0);
+ sc->mac_rev = RAL_READ(sc, RT2860_REG_MAC_CSR0);
if (sc->mac_rev != 0x00000000 && sc->mac_rev != 0xffffffff)
break;
@@ -732,7 +435,7 @@
ic->ic_ifp = ifp;
- ic->ic_phytype = IEEE80211_T_HT;
+ ic->ic_phytype = IEEE80211_T_OFDM; /* IEEE80211_T_HT */
ic->ic_opmode = IEEE80211_M_STA;
ic->ic_caps = IEEE80211_C_MONITOR |
@@ -787,7 +490,6 @@
ic->ic_nchans = 0;
rt2860_init_channels(sc);
- rt2860_init_channels_ht40(sc);
ieee80211_ifattach(ic, sc->mac_addr);
@@ -842,7 +544,7 @@
/* init task queue */
TASK_INIT(&sc->rx_done_task, 0, rt2860_rx_done_task, sc);
TASK_INIT(&sc->tx_done_task, 0, rt2860_tx_done_task, sc);
- TASK_INIT(&sc->fifo_sta_full_task, 0, rt2860_fifo_sta_full_task, sc);
+ TASK_INIT(&sc->fifo_stat_full_task, 0, rt2860_fifo_stat_full_task, sc);
TASK_INIT(&sc->periodic_task, 0, rt2860_periodic_task, sc);
sc->rx_process_limit = 100;
@@ -858,7 +560,7 @@
if (bootverbose)
ieee80211_announce(ic);
- return 0;
+ return (0);
fail:
@@ -876,13 +578,14 @@
if (sc->irq != NULL)
bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq);
- return error;
+ return (error);
}
/*
* rt2860_detach
*/
-int rt2860_detach(void *xsc)
+int
+rt2860_detach(void *xsc)
{
struct rt2860_softc *sc = xsc;
struct ifnet *ifp;
@@ -892,9 +595,7 @@
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: detaching\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "detaching\n");
RT2860_SOFTC_LOCK(sc);
@@ -903,10 +604,13 @@
callout_stop(&sc->periodic_ch);
callout_stop(&sc->tx_watchdog_ch);
+ /* Unlock to drain taskqueue */
+ RT2860_SOFTC_UNLOCK(sc);
taskqueue_drain(sc->taskqueue, &sc->rx_done_task);
taskqueue_drain(sc->taskqueue, &sc->tx_done_task);
- taskqueue_drain(sc->taskqueue, &sc->fifo_sta_full_task);
+ taskqueue_drain(sc->taskqueue, &sc->fifo_stat_full_task);
taskqueue_drain(sc->taskqueue, &sc->periodic_task);
+ RT2860_SOFTC_LOCK(sc);
/* free Tx and Rx rings */
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
@@ -924,7 +628,7 @@
mtx_destroy(&sc->sc_mtx);
- return 0;
+ return (0);
}
/*
@@ -935,9 +639,7 @@
{
struct rt2860_softc *sc = xsc;
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: shutting down\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "shutting down\n");
rt2860_stop(sc);
@@ -954,9 +656,7 @@
{
struct rt2860_softc *sc = xsc;
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: suspending\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "suspending\n");
rt2860_stop(sc);
@@ -976,9 +676,7 @@
ifp = sc->sc_ifp;
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: resuming\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "resuming\n");
if (ifp->if_flags & IFF_UP)
rt2860_init(sc);
@@ -992,311 +690,70 @@
static void
rt2860_init_channels(struct rt2860_softc *sc)
{
+ struct ieee80211com *ic;
struct ifnet *ifp;
- struct ieee80211com *ic;
- struct ieee80211_channel *c;
- int i, flags;
+ uint8_t bands;
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- /* set supported channels for 2GHz band */
- for (i = 1; i <= 14; i++) {
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_B;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
-
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_B | IEEE80211_CHAN_HT20;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
-
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_G;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
-
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_G | IEEE80211_CHAN_HT20;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
- }
-
- /* set supported channels for 5GHz band */
- if (sc->rf_rev == RT2860_EEPROM_RF_2850 ||
- sc->rf_rev == RT2860_EEPROM_RF_2750 ||
- sc->rf_rev == RT2860_EEPROM_RF_3052) {
- for (i = 36; i <= 64; i += 4) {
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_A;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
-
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_A | IEEE80211_CHAN_HT20;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
- }
-
- for (i = 100; i <= 140; i += 4) {
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_A;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
-
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_A | IEEE80211_CHAN_HT20;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
- }
-
- for (i = 149; i <= 165; i += 4) {
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_A;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
-
- c = &ic->ic_channels[ic->ic_nchans++];
- flags = IEEE80211_CHAN_A | IEEE80211_CHAN_HT20;
-
- c->ic_freq = ieee80211_ieee2mhz(i, flags);
- c->ic_ieee = i;
- c->ic_flags = flags;
- }
- }
-}
-
-/*
- * rt2860_init_channels_ht40
- */
-static void rt2860_init_channels_ht40(struct rt2860_softc *sc)
-{
- struct ifnet *ifp;
- struct ieee80211com *ic;
- struct ieee80211_channel *c, *cent, *ext;
- int i, flags;
-
- ifp = sc->sc_ifp;
- ic = ifp->if_l2com;
-
- /* set supported channels for 2GHz band */
- for (i = 1; i <= 14; i++) {
- flags = IEEE80211_CHAN_G | IEEE80211_CHAN_HT40;
-
- /* find the center channel */
- cent = ieee80211_find_channel_byieee(ic, i,
- flags & ~IEEE80211_CHAN_HT);
- if (cent == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find center channel\n", i);
- continue;
- }
-
- /* find the extension channel */
- ext = ieee80211_find_channel(ic, cent->ic_freq + 20,
- flags & ~IEEE80211_CHAN_HT);
- if (ext == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find extension channel\n", i);
- continue;
- }
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *cent;
- c->ic_extieee = ext->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40U;
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *ext;
- c->ic_extieee = cent->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40D;
- }
-
- /* set supported channels for 5GHz band */
- if (sc->rf_rev == RT2860_EEPROM_RF_2850 ||
- sc->rf_rev == RT2860_EEPROM_RF_2750 ||
- sc->rf_rev == RT2860_EEPROM_RF_3052) {
- for (i = 36; i <= 64; i += 4) {
- flags = IEEE80211_CHAN_A | IEEE80211_CHAN_HT40;
-
- /* find the center channel */
- cent = ieee80211_find_channel_byieee(ic, i,
- flags & ~IEEE80211_CHAN_HT);
- if (cent == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find center channel\n", i);
- continue;
- }
-
- /* find the extension channel */
-
- ext = ieee80211_find_channel(ic, cent->ic_freq + 20,
- flags & ~IEEE80211_CHAN_HT);
- if (ext == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find extension channel\n", i);
- continue;
- }
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *cent;
- c->ic_extieee = ext->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40U;
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *ext;
- c->ic_extieee = cent->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40D;
- }
-
- for (i = 100; i <= 140; i += 4) {
- flags = IEEE80211_CHAN_A | IEEE80211_CHAN_HT40;
-
- /* find the center channel */
- cent = ieee80211_find_channel_byieee(ic, i,
- flags & ~IEEE80211_CHAN_HT);
- if (cent == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find center channel\n", i);
- continue;
- }
-
- /* find the extension channel */
- ext = ieee80211_find_channel(ic, cent->ic_freq + 20,
- flags & ~IEEE80211_CHAN_HT);
- if (ext == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find extension channel\n", i);
- continue;
- }
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *cent;
- c->ic_extieee = ext->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40U;
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *ext;
- c->ic_extieee = cent->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40D;
- }
-
- for (i = 149; i <= 165; i += 4) {
- flags = IEEE80211_CHAN_A | IEEE80211_CHAN_HT40;
-
- /* find the center channel */
-
- cent = ieee80211_find_channel_byieee(ic, i,
- flags & ~IEEE80211_CHAN_HT);
- if (cent == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find center channel\n", i);
- continue;
- }
-
- /* find the extension channel */
-
- ext = ieee80211_find_channel(ic, cent->ic_freq + 20,
- flags & ~IEEE80211_CHAN_HT);
- if (ext == NULL) {
- device_printf(sc->sc_dev, "skip channel %d, "
- "could not find extension channel\n", i);
- continue;
- }
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *cent;
- c->ic_extieee = ext->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40U;
-
- c = &ic->ic_channels[ic->ic_nchans++];
-
- *c = *ext;
- c->ic_extieee = cent->ic_ieee;
- c->ic_flags &= ~IEEE80211_CHAN_HT;
- c->ic_flags |= IEEE80211_CHAN_HT40D;
- }
- }
+ bands = 0;
+ switch (sc->rf_rev) {
+ case RT2860_RF_2850:
+ case RT2860_RF_2750:
+ case RT3070_RF_3052:
+ setbit(&bands, IEEE80211_MODE_11A);
+ setbit(&bands, IEEE80211_MODE_11NA);
+ default:
+ setbit(&bands, IEEE80211_MODE_11B);
+ setbit(&bands, IEEE80211_MODE_11G);
+ setbit(&bands, IEEE80211_MODE_11NG);
+ }
+ ieee80211_init_channels(ic, NULL, &bands);
}
/*
* rt2860_init_locked
*/
-static void rt2860_init_locked(void *priv)
-{
+static void
+rt2860_init_locked(void *priv)
+{
+#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
struct rt2860_softc *sc;
struct ifnet *ifp;
struct ieee80211com *ic;
int error, i, ntries;
- uint32_t tmp, stacnt[6];
+ uint32_t tmp;
+#if 0
+ uint32_t stacnt[6];
+#endif
sc = priv;
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: initializing\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "initializing\n");
RT2860_SOFTC_ASSERT_LOCKED(sc);
+ /* XXX: correct place? */
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_US_CYC_CNT, 0x80);
+
if (sc->mac_rev != 0x28720200) {
if (!(sc->flags & RT2860_SOFTC_FLAGS_UCODE_LOADED)) {
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: loading 8051 microcode\n",
- device_get_nameunit(sc->sc_dev));
-
- error = rt2860_io_mcu_load_ucode(sc, rt2860_ucode, sizeof(rt2860_ucode));
+ error = rt2860_load_microcode(sc);
if (error != 0) {
device_printf(sc->sc_dev,
"could not load 8051 microcode\n");
goto fail;
}
-
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: 8051 microcode was successfully loaded\n",
- device_get_nameunit(sc->sc_dev));
-
sc->flags |= RT2860_SOFTC_FLAGS_UCODE_LOADED;
}
} else {
sc->flags |= RT2860_SOFTC_FLAGS_UCODE_LOADED;
/* Blink every TX */
- rt2860_io_mac_write(sc, RT2860_REG_LED_CFG,
+ RAL_WRITE(sc, RT2860_LED_CFG,
LED_CFG_LED_POLARITY |
LED_CFG_Y_LED_MODE_ONTX |
LED_CFG_G_LED_MODE_ONTX |
@@ -1306,28 +763,28 @@
LED_CFG_LED_ON_TIME);
}
- rt2860_io_mac_write(sc, RT2860_REG_PWR_PIN_CFG, 0x2);
+ RAL_WRITE(sc, RT2860_PWR_PIN_CFG, 0x2);
/* disable DMA engine */
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
tmp &= 0xff0;
tmp |= RT2860_REG_TX_WB_DDONE;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_RST_IDX, 0xffffffff);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
+
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_RST_IDX, 0xffffffff);
/* PBF hardware reset */
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, 0xe1f);
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, 0xe00);
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, 0xe1f);
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, 0xe00);
/* wait while DMA engine is busy */
for (ntries = 0; ntries < 100; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
if (!(tmp & (RT2860_REG_TX_DMA_BUSY | RT2860_REG_RX_DMA_BUSY)))
break;
@@ -1342,7 +799,7 @@
tmp &= 0xff0;
tmp |= RT2860_REG_TX_WB_DDONE;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
/* reset Rx and Tx rings */
@@ -1354,37 +811,35 @@
RT2860_REG_RST_IDX_TX_AC1 |
RT2860_REG_RST_IDX_TX_AC0;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_RST_IDX, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_RST_IDX, tmp);
/* PBF hardware reset */
-
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, 0xe1f);
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, 0xe00);
-
- rt2860_io_mac_write(sc, RT2860_REG_PWR_PIN_CFG, 0x3);
-
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL,
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, 0xe1f);
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, 0xe00);
+ RAL_WRITE(sc, RT2860_PWR_PIN_CFG, 0x3);
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL,
RT2860_REG_MAC_SRST | RT2860_REG_BBP_HRST);
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL, 0);
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL, 0);
+
+ /* XXX: correct place? */
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_US_CYC_CNT, 0x80);
/* init Tx power per rate */
-
for (i = 0; i < RT2860_SOFTC_TXPOW_RATE_COUNT; i++) {
if (sc->txpow_rate_20mhz[i] == 0xffffffff)
continue;
- rt2860_io_mac_write(sc, RT2860_REG_TX_PWR_CFG(i),
+ RAL_WRITE(sc, RT2860_REG_TX_PWR_CFG(i),
sc->txpow_rate_20mhz[i]);
}
- for (i = 0; i < RT2860_DEF_MAC_SIZE; i++)
- rt2860_io_mac_write(sc, rt2860_def_mac[i].reg,
- rt2860_def_mac[i].val);
+ for (i = 0; i < nitems(rt2860_def_mac); i++)
+ RAL_WRITE(sc, rt2860_def_mac[i].reg, rt2860_def_mac[i].val);
/* wait while MAC is busy */
for (ntries = 0; ntries < 100; ntries++) {
- if (!(rt2860_io_mac_read(sc, RT2860_REG_STATUS_CFG) &
+ if (!(RAL_READ(sc, RT2860_REG_STATUS_CFG) &
(RT2860_REG_STATUS_TX_BUSY | RT2860_REG_STATUS_RX_BUSY)))
break;
@@ -1395,14 +850,13 @@
device_printf(sc->sc_dev, "timeout waiting for MAC\n");
goto fail;
}
-
/* clear Host to MCU mailbox */
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, 0);
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX, 0);
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, 0);
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX, 0);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_BOOT,
- RT2860_REG_H2M_TOKEN_NO_INTR, 0);
+ RT2860_TOKEN_NO_INTR, 0);
DELAY(1000);
@@ -1414,26 +868,26 @@
tmp = (1 << 12) | RT2860_MAX_AGG_SIZE;
- rt2860_io_mac_write(sc, RT2860_REG_MAX_LEN_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_MAX_LEN_CFG, tmp);
if (sc->mac_rev == 0x28720200) {
/* set max. PSDU length from 16K to 32K bytes */
- tmp = rt2860_io_mac_read(sc, RT2860_REG_MAX_LEN_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_MAX_LEN_CFG);
tmp &= ~(3 << 12);
tmp |= (2 << 12);
- rt2860_io_mac_write(sc, RT2860_REG_MAX_LEN_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_MAX_LEN_CFG, tmp);
}
if (sc->mac_rev >= 0x28720200 && sc->mac_rev < 0x30700200) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_MAX_LEN_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_MAX_LEN_CFG);
tmp &= 0xfff;
tmp |= 0x2000;
- rt2860_io_mac_write(sc, RT2860_REG_MAX_LEN_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_MAX_LEN_CFG, tmp);
}
/* set mac address */
@@ -1441,9 +895,8 @@
rt2860_asic_set_macaddr(sc, IF_LLADDR(ifp));
/* clear statistic registers */
-
- rt2860_io_mac_read_multi(sc, RT2860_REG_RX_STA_CNT0,
- stacnt, sizeof(stacnt));
+ for (i = 0; i < (sizeof(uint32_t) * 6); i += sizeof(uint32_t))
+ RAL_READ(sc, RT2860_REG_RX_STAT_CNT0 + i);
/* set RTS threshold */
@@ -1461,7 +914,7 @@
/* clear beacon frame space (entries = 8, entry size = 512) */
- rt2860_io_mac_set_region_4(sc, RT2860_REG_BEACON_BASE(0), 0, 1024);
+ RAL_SET_REGION_4(sc, RT2860_REG_BEACON_BASE(0), 0, 1024);
taskqueue_unblock(sc->taskqueue);
@@ -1471,28 +924,28 @@
rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
sc->tx_ring[i].desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
RT2860_SOFTC_TX_RING_DESC_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(i), 0);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(i), 0);
}
/* init Rx ring */
rt2860_reset_rx_ring(sc, &sc->rx_ring);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_BASE_PTR,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_BASE_PTR,
sc->rx_ring.desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_MAX_CNT,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_MAX_CNT,
RT2860_SOFTC_RX_RING_DATA_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
RT2860_SOFTC_RX_RING_DATA_COUNT - 1);
/* wait while DMA engine is busy */
for (ntries = 0; ntries < 100; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
if (!(tmp & (RT2860_REG_TX_DMA_BUSY | RT2860_REG_RX_DMA_BUSY)))
break;
@@ -1507,25 +960,25 @@
tmp &= 0xff0;
tmp |= RT2860_REG_TX_WB_DDONE;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
/* disable interrupts mitigation */
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_DELAY_INT_CFG, 0);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_DELAY_INT_CFG, 0);
/* select Main antenna for 1T1R devices */
- if (sc->rf_rev == RT2860_EEPROM_RF_2020 ||
- sc->rf_rev == RT2860_EEPROM_RF_3020 ||
- sc->rf_rev == RT2860_EEPROM_RF_3320)
+ if (sc->rf_rev == RT3070_RF_2020 ||
+ sc->rf_rev == RT3070_RF_3020 ||
+ sc->rf_rev == RT3070_RF_3320)
rt3090_set_rx_antenna(sc, 0);
/* send LEDs operating mode to microcontroller */
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_LED1,
- RT2860_REG_H2M_TOKEN_NO_INTR, sc->led_off[0]);
+ RT2860_TOKEN_NO_INTR, sc->led_off[0]);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_LED2,
- RT2860_REG_H2M_TOKEN_NO_INTR, sc->led_off[1]);
+ RT2860_TOKEN_NO_INTR, sc->led_off[1]);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_LED3,
- RT2860_REG_H2M_TOKEN_NO_INTR, sc->led_off[2]);
+ RT2860_TOKEN_NO_INTR, sc->led_off[2]);
/* turn radio LED on */
@@ -1546,15 +999,15 @@
if (sc->mac_rev != 0x28720200) {
/* 0x28720200 don`t have RT2860_REG_SCHDMA_GPIO_CTRL_CFG */
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG);
if (tmp & (1 << 2)) {
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_SLEEP,
- RT2860_REG_H2M_TOKEN_RADIOOFF, 0x02ff);
- rt2860_io_mcu_cmd_check(sc, RT2860_REG_H2M_TOKEN_RADIOOFF);
+ RT2860_TOKEN_RADIOOFF, 0x02ff);
+ rt2860_io_mcu_cmd_check(sc, RT2860_TOKEN_RADIOOFF);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_WAKEUP,
- RT2860_REG_H2M_TOKEN_WAKEUP, 0);
- rt2860_io_mcu_cmd_check(sc, RT2860_REG_H2M_TOKEN_WAKEUP);
+ RT2860_TOKEN_WAKEUP, 0);
+ rt2860_io_mcu_cmd_check(sc, RT2860_TOKEN_WAKEUP);
}
}
@@ -1588,7 +1041,7 @@
if ((sc->mac_rev & 0xffff0000) >= 0x30710000)
rt3090_rf_setup(sc);
- if (sc->rf_rev == RT2860_EEPROM_RF_3022) {
+ if (sc->rf_rev == RT3070_RF_3022) {
/* calibrate RF */
tmp = rt2860_io_rf_read(sc, 30);
tmp |= 0x80;
@@ -1604,22 +1057,20 @@
/* set current channel */
rt2860_rf_set_chan(sc, ic->ic_curchan);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_TXOP0_CFG, 0);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_TXOP1_CFG,
+ RAL_WRITE(sc, RT2860_WMM_TXOP0_CFG, 0);
+ RAL_WRITE(sc, RT2860_WMM_TXOP1_CFG,
(48 << 16) | 96);
if ((sc->mac_rev & 0xffff) != 0x0101)
- rt2860_io_mac_write(sc, RT2860_REG_TX_TXOP_CTRL_CFG, 0x583f);
+ RAL_WRITE(sc, RT2860_TXOP_CTRL_CFG, 0x583f);
/* clear pending interrupts */
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_INT_STATUS, 0xffffffff);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_INT_STATUS, 0xffffffff);
/* enable interrupts */
-
tmp = RT2860_REG_INT_TX_COHERENT |
RT2860_REG_INT_RX_COHERENT |
- RT2860_REG_INT_FIFO_STA_FULL |
+ RT2860_REG_INT_FIFO_STAT_FULL |
RT2860_REG_INT_TXRX_COHERENT |
RT2860_REG_INT_TX_MGMT_DONE |
RT2860_REG_INT_TX_HCCA_DONE |
@@ -1631,14 +1082,13 @@
sc->intr_enable_mask = tmp;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_INT_MASK, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_INT_MASK, tmp);
if (rt2860_txrx_enable(sc) != 0)
goto fail;
/* clear garbage interrupts */
-
- tmp = rt2860_io_mac_read(sc, 0x1300);
+ tmp = RAL_READ(sc, 0x1300);
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
ifp->if_drv_flags |= IFF_DRV_RUNNING;
@@ -1652,12 +1102,14 @@
fail:
rt2860_stop_locked(sc);
+#undef nitems
}
/*
* rt2860_init
*/
-static void rt2860_init(void *priv)
+static void
+rt2860_init(void *priv)
{
struct rt2860_softc *sc;
@@ -1673,8 +1125,10 @@
/*
* rt2860_init_bbp
*/
-static int rt2860_init_bbp(struct rt2860_softc *sc)
-{
+static int
+rt2860_init_bbp(struct rt2860_softc *sc)
+{
+#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
int ntries, i;
uint8_t tmp;
@@ -1687,12 +1141,13 @@
if (tmp == 0x00 || tmp == 0xff) {
device_printf(sc->sc_dev,
"timeout waiting for BBP to wakeup\n");
- return ETIMEDOUT;
- }
-
- for (i = 0; i < RT2860_DEF_BBP_SIZE; i++)
+ return (ETIMEDOUT);
+ }
+
+ for (i = 0; i < nitems(rt2860_def_bbp); i++) {
rt2860_io_bbp_write(sc, rt2860_def_bbp[i].reg,
rt2860_def_bbp[i].val);
+ }
if ((sc->mac_rev & 0xffff) != 0x0101)
rt2860_io_bbp_write(sc, 84, 0x19);
@@ -1702,13 +1157,15 @@
rt2860_io_bbp_write(sc, 73, 0x12);
}
- return 0;
+ return (0);
+#undef nitems
}
/*
* rt2860_stop_locked
*/
-static void rt2860_stop_locked(void *priv)
+static void
+rt2860_stop_locked(void *priv)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -1719,9 +1176,7 @@
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- RT2860_DPRINTF(sc, RT2860_DEBUG_ANY,
- "%s: stopping\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_ANY, "stopping\n");
RT2860_SOFTC_ASSERT_LOCKED(sc);
@@ -1741,7 +1196,7 @@
taskqueue_drain(sc->taskqueue, &sc->rx_done_task);
taskqueue_drain(sc->taskqueue, &sc->tx_done_task);
- taskqueue_drain(sc->taskqueue, &sc->fifo_sta_full_task);
+ taskqueue_drain(sc->taskqueue, &sc->fifo_stat_full_task);
taskqueue_drain(sc->taskqueue, &sc->periodic_task);
RT2860_SOFTC_LOCK(sc);
@@ -1752,27 +1207,28 @@
/* disable interrupts */
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_INT_MASK, 0);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_INT_MASK, 0);
/* disable Tx/Rx */
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SYS_CTRL);
+ tmp = RAL_READ(sc, RT2860_MAC_SYS_CTRL);
tmp &= ~(RT2860_REG_RX_ENABLE | RT2860_REG_TX_ENABLE);
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL, tmp);
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL, tmp);
/* reset adapter */
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL,
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL,
RT2860_REG_MAC_SRST | RT2860_REG_BBP_HRST);
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL, 0);
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL, 0);
}
/*
* rt2860_stop
*/
-static void rt2860_stop(void *priv)
+static void
+rt2860_stop(void *priv)
{
struct rt2860_softc *sc;
@@ -1788,12 +1244,15 @@
/*
* rt2860_start
*/
-static void rt2860_start(struct ifnet *ifp)
+static void
+rt2860_start(struct ifnet *ifp)
{
struct rt2860_softc *sc;
+#ifdef RT2860_NO_HW_CRYPTO
struct ieee80211_frame *wh;
+ struct ieee80211_key *k;
+#endif
struct ieee80211_node *ni;
- struct ieee80211_key *k;
struct mbuf *m;
int qid;
@@ -1811,6 +1270,7 @@
ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
+#ifdef RT2860_NO_HW_CRYPTO
KASSERT(ni != NULL, ("%s:%d: fail", __func__, __LINE__));
wh = mtod(m, struct ieee80211_frame *);
if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
@@ -1823,6 +1283,7 @@
}
}
wh = NULL; /* Catch any invalid use */
+#endif
m->m_pkthdr.rcvif = NULL;
@@ -1830,12 +1291,12 @@
RT2860_SOFTC_TX_RING_LOCK(&sc->tx_ring[qid]);
- if (sc->tx_ring[qid].data_queued >= RT2860_SOFTC_TX_RING_DATA_COUNT) {
+ if (sc->tx_ring[qid].data_queued >=
+ RT2860_SOFTC_TX_RING_DATA_COUNT) {
RT2860_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[qid]);
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: if_start: Tx ring with qid=%d is full\n",
- device_get_nameunit(sc->sc_dev), qid);
+ "if_start: Tx ring with qid=%d is full\n", qid);
m_freem(m);
ieee80211_free_node(ni);
@@ -1852,6 +1313,7 @@
RT2860_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[qid]);
ieee80211_free_node(ni);
+ m_freem(m);
ifp->if_oerrors++;
@@ -1862,6 +1324,7 @@
rt2860_drain_fifo_stats(sc);
+ printf("dtx 5 sc=%p\n", sc);
sc->tx_timer = RT2860_TX_WATCHDOG_TIMEOUT;
callout_reset(&sc->tx_watchdog_ch, hz, rt2860_tx_watchdog, sc);
@@ -1873,7 +1336,8 @@
/*
* rt2860_ioctl
*/
-static int rt2860_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
+static int
+rt2860_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -1927,16 +1391,17 @@
break;
}
- return error;
+ return (error);
}
/*
* rt2860_vap_create
*/
-static struct ieee80211vap *rt2860_vap_create(struct ieee80211com *ic,
- const char name[IFNAMSIZ], int unit, enum ieee80211_opmode opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
- const uint8_t mac[IEEE80211_ADDR_LEN])
+static struct ieee80211vap *
+rt2860_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ],
+ int unit, enum ieee80211_opmode opmode, int flags,
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -1946,10 +1411,8 @@
ifp = ic->ic_ifp;
sc = ifp->if_softc;
- RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: VAP create: opmode=%s\n",
- device_get_nameunit(sc->sc_dev),
- ieee80211_opmode_name[opmode]);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_STATE, "VAP create: opmode=%s\n",
+ ieee80211_opmode_name[opmode]);
switch (opmode) {
case IEEE80211_M_IBSS:
@@ -1959,7 +1422,7 @@
case IEEE80211_M_MBSS:
if ((sc->napvaps + sc->nadhocvaps + sc->nstavaps) != 0) {
if_printf(ifp, "only 1 VAP supported\n");
- return NULL;
+ return (NULL);
}
if (opmode == IEEE80211_M_STA)
@@ -1969,7 +1432,7 @@
case IEEE80211_M_WDS:
if (sc->napvaps == 0) {
if_printf(ifp, "WDS only supported in AP mode\n");
- return NULL;
+ return (NULL);
}
break;
@@ -1978,13 +1441,13 @@
default:
if_printf(ifp, "unknown opmode %d\n", opmode);
- return NULL;
+ return (NULL);
}
rvap = (struct rt2860_softc_vap *) malloc(sizeof(struct rt2860_softc_vap),
M_80211_VAP, M_NOWAIT | M_ZERO);
if (rvap == NULL)
- return NULL;
+ return (NULL);
vap = &rvap->vap;
@@ -2052,13 +1515,14 @@
else
ic->ic_opmode = opmode;
- return vap;
+ return (vap);
}
/*
* rt2860_vap_delete
*/
-static void rt2860_vap_delete(struct ieee80211vap *vap)
+static void
+rt2860_vap_delete(struct ieee80211vap *vap)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2072,16 +1536,15 @@
rvap = (struct rt2860_softc_vap *) vap;
opmode = vap->iv_opmode;
- RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: VAP delete: opmode=%s\n",
- device_get_nameunit(sc->sc_dev), ieee80211_opmode_name[opmode]);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_STATE, "VAP delete: opmode=%s\n",
+ ieee80211_opmode_name[opmode]);
rt2860_amrr_cleanup(&rvap->amrr);
ieee80211_vap_detach(vap);
if (rvap->beacon_mbuf != NULL) {
- m_free(rvap->beacon_mbuf);
+ m_freem(rvap->beacon_mbuf);
rvap->beacon_mbuf = NULL;
}
@@ -2119,7 +1582,8 @@
/*
* rt2860_reset_vap
*/
-static int rt2860_vap_reset(struct ieee80211vap *vap, u_long cmd)
+static int
+rt2860_vap_reset(struct ieee80211vap *vap, u_long cmd)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2132,9 +1596,7 @@
sc = ifp->if_softc;
rvap = (struct rt2860_softc_vap *) vap;
- RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: VAP reset: cmd=%lu\n",
- device_get_nameunit(sc->sc_dev), cmd);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_STATE, "VAP reset: cmd=%lu\n", cmd);
error = 0;
@@ -2166,14 +1628,15 @@
RT2860_SOFTC_UNLOCK(sc);
- return error;
+ return (error);
}
/*
* rt2860_vap_newstate
*/
-static int rt2860_vap_newstate(struct ieee80211vap *vap,
- enum ieee80211_state nstate, int arg)
+static int
+rt2860_vap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate,
+ int arg)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2190,14 +1653,12 @@
ostate = vap->iv_state;
- RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: VAP newstate: %s -> %s\n",
- device_get_nameunit(sc->sc_dev),
- ieee80211_state_name[ostate], ieee80211_state_name[nstate]);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_STATE, "VAP newstate: %s -> %s\n",
+ ieee80211_state_name[ostate], ieee80211_state_name[nstate]);
error = rvap->newstate(vap, nstate, arg);
if (error != 0)
- return error;
+ return (error);
IEEE80211_UNLOCK(ic);
@@ -2231,8 +1692,6 @@
error = rt2860_beacon_alloc(sc, vap);
if (error != 0)
break;
-
- rt2860_asic_update_beacon(sc, vap);
}
if (vap->iv_opmode != IEEE80211_M_MONITOR)
@@ -2255,14 +1714,15 @@
IEEE80211_LOCK(ic);
- return error;
+ return (error);
}
#ifndef RT2860_NO_HW_CRYPTO
/*
* rt2860_vap_key_update_begin
*/
-static void rt2860_vap_key_update_begin(struct ieee80211vap *vap)
+static void
+rt2860_vap_key_update_begin(struct ieee80211vap *vap)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2272,9 +1732,7 @@
ifp = ic->ic_ifp;
sc = ifp->if_softc;
- RT2860_DPRINTF(sc, RT2860_DEBUG_KEY,
- "%s: VAP key update begin\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_KEY, "VAP key update begin\n");
taskqueue_block(sc->taskqueue);
@@ -2284,7 +1742,8 @@
/*
* rt2860_vap_key_update_end
*/
-static void rt2860_vap_key_update_end(struct ieee80211vap *vap)
+static void
+rt2860_vap_key_update_end(struct ieee80211vap *vap)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2294,9 +1753,7 @@
ifp = ic->ic_ifp;
sc = ifp->if_softc;
- RT2860_DPRINTF(sc, RT2860_DEBUG_KEY,
- "%s: VAP key update end\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_KEY, "VAP key update end\n");
IF_UNLOCK(&ifp->if_snd);
@@ -2306,8 +1763,9 @@
/*
* rt2860_vap_key_set
*/
-static int rt2860_vap_key_set(struct ieee80211vap *vap,
- const struct ieee80211_key *k, const uint8_t mac[IEEE80211_ADDR_LEN])
+static int
+rt2860_vap_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k,
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2321,19 +1779,19 @@
switch (k->wk_cipher->ic_cipher) {
case IEEE80211_CIPHER_WEP:
if(k->wk_keylen < 8)
- mode = RT2860_REG_CIPHER_MODE_WEP40;
+ mode = RT2860_MODE_WEP40;
else
- mode = RT2860_REG_CIPHER_MODE_WEP104;
+ mode = RT2860_MODE_WEP104;
break;
case IEEE80211_CIPHER_TKIP:
- mode = RT2860_REG_CIPHER_MODE_TKIP;
+ mode = RT2860_MODE_TKIP;
break;
case IEEE80211_CIPHER_AES_CCM:
- mode = RT2860_REG_CIPHER_MODE_AES_CCMP;
+ mode = RT2860_MODE_AES_CCMP;
break;
default:
printf("Wrong key CIPHER (%d)\n", k->wk_cipher->ic_cipher);
- return 0;
+ return (0);
}
ic = vap->iv_ic;
@@ -2341,9 +1799,9 @@
sc = ifp->if_softc;
RT2860_DPRINTF(sc, RT2860_DEBUG_KEY,
- "%s: VAP key set: keyix=%d, keylen=%d, macaddr=%s, mode=%d, group=%d\n",
- device_get_nameunit(sc->sc_dev), k->wk_keyix, k->wk_keylen, ether_sprintf(k->wk_macaddr),
- mode, (k->wk_flags & IEEE80211_KEY_GROUP) ? 1 : 0);
+ "VAP key set: keyix=%d, keylen=%d, macaddr=%s, mode=%d, group=%d\n",
+ k->wk_keyix, k->wk_keylen, ether_sprintf(k->wk_macaddr),
+ mode, (k->wk_flags & IEEE80211_KEY_GROUP) ? 1 : 0);
if (!(k->wk_flags & IEEE80211_KEY_GROUP)) {
/* install pairwise key */
@@ -2385,30 +1843,29 @@
iv[7] = (k->wk_keytsc >> 40);
RT2860_DPRINTF(sc, RT2860_DEBUG_KEY,
- "%s: VAP key set: iv=%02x %02x %02x %02x %02x %02x %02x %02x\n",
- device_get_nameunit(sc->sc_dev),
- iv[0], iv[1], iv[2], iv[3], iv[4], iv[5], iv[6], iv[7]);
+ "VAP key set: iv=%02x %02x %02x %02x %02x %02x %02x %02x\n",
+ iv[0], iv[1], iv[2], iv[3], iv[4], iv[5], iv[6], iv[7]);
}
- rt2860_io_mac_write_multi(sc, RT2860_REG_IVEIV(wcid), iv, 8);
+ RAL_WRITE_REGION_1(sc, RT2860_REG_IVEIV(wcid), iv, 8);
if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP) {
- rt2860_io_mac_write_multi(sc, key_base, k->wk_key, 16);
+ RAL_WRITE_REGION_1(sc, key_base, k->wk_key, 16);
if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
- rt2860_io_mac_write_multi(sc, key_base + 16, &k->wk_key[16], 8);
- rt2860_io_mac_write_multi(sc, key_base + 24, &k->wk_key[24], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 16, &k->wk_key[16], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 24, &k->wk_key[24], 8);
} else {
- rt2860_io_mac_write_multi(sc, key_base + 16, &k->wk_key[24], 8);
- rt2860_io_mac_write_multi(sc, key_base + 24, &k->wk_key[16], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 16, &k->wk_key[24], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 24, &k->wk_key[16], 8);
}
} else {
- rt2860_io_mac_write_multi(sc, key_base, k->wk_key, k->wk_keylen);
+ RAL_WRITE_REGION_1(sc, key_base, k->wk_key, k->wk_keylen);
}
- tmp = ((vapid & RT2860_REG_VAP_MASK) << RT2860_REG_VAP_SHIFT) |
- (mode << RT2860_REG_CIPHER_MODE_SHIFT) | RT2860_REG_PKEY_ENABLE;
-
- rt2860_io_mac_write(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
+ tmp = (vapid << RT2860_VAP_SHIFT) |
+ (mode << RT2860_MODE_SHIFT) | RT2860_RX_PKEY_EN;
+
+ RAL_WRITE(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
}
if ((k->wk_flags & IEEE80211_KEY_GROUP) ||
@@ -2421,25 +1878,29 @@
keymode_base = RT2860_REG_SKEY_MODE(vapid);
if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP) {
- rt2860_io_mac_write_multi(sc, key_base, k->wk_key, 16);
+ RAL_WRITE_REGION_1(sc, key_base, k->wk_key, 16);
if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
- rt2860_io_mac_write_multi(sc, key_base + 16, &k->wk_key[16], 8);
- rt2860_io_mac_write_multi(sc, key_base + 24, &k->wk_key[24], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 16,
+ &k->wk_key[16], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 24,
+ &k->wk_key[24], 8);
} else {
- rt2860_io_mac_write_multi(sc, key_base + 16, &k->wk_key[24], 8);
- rt2860_io_mac_write_multi(sc, key_base + 24, &k->wk_key[16], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 16,
+ &k->wk_key[24], 8);
+ RAL_WRITE_REGION_1(sc, key_base + 24,
+ &k->wk_key[16], 8);
}
} else {
- rt2860_io_mac_write_multi(sc, key_base, k->wk_key, k->wk_keylen);
+ RAL_WRITE_REGION_1(sc, key_base, k->wk_key, k->wk_keylen);
}
- tmp = rt2860_io_mac_read(sc, keymode_base);
+ tmp = RAL_READ(sc, keymode_base);
tmp &= ~(0xf << (k->wk_keyix * 4 + 16 * (vapid % 2)));
tmp |= (mode << (k->wk_keyix * 4 + 16 * (vapid % 2)));
- rt2860_io_mac_write(sc, keymode_base, tmp);
+ RAL_WRITE(sc, keymode_base, tmp);
if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_WEP) {
@@ -2447,7 +1908,8 @@
iv[3] = (k->wk_keyix << 6);
} else {
- if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP) {
+ if (k->wk_cipher->ic_cipher ==
+ IEEE80211_CIPHER_TKIP) {
iv[0] = (k->wk_keytsc >> 8);
iv[1] = ((iv[0] | 0x20) & 0x7f);
iv[2] = k->wk_keytsc;
@@ -2459,35 +1921,37 @@
iv[2] = 0;
}
- iv[3] = ((k->wk_keyix << 6) | IEEE80211_WEP_EXTIV);
+ iv[3] = ((k->wk_keyix << 6) |
+ IEEE80211_WEP_EXTIV);
iv[4] = (k->wk_keytsc >> 16);
iv[5] = (k->wk_keytsc >> 24);
iv[6] = (k->wk_keytsc >> 32);
iv[7] = (k->wk_keytsc >> 40);
RT2860_DPRINTF(sc, RT2860_DEBUG_KEY,
- "%s: VAP key set: iv=%02x %02x %02x %02x %02x %02x %02x %02x\n",
- device_get_nameunit(sc->sc_dev),
- iv[0], iv[1], iv[2], iv[3], iv[4], iv[5], iv[6], iv[7]);
+ "VAP key set: iv=%02x %02x %02x %02x "
+ "%02x %02x %02x %02x\n",
+ iv[0], iv[1], iv[2], iv[3],
+ iv[4], iv[5], iv[6], iv[7]);
}
- rt2860_io_mac_write_multi(sc, RT2860_REG_IVEIV(wcid), iv, 8);
-
- tmp = ((vapid & RT2860_REG_VAP_MASK) << RT2860_REG_VAP_SHIFT) |
- (mode << RT2860_REG_CIPHER_MODE_SHIFT);
-
- rt2860_io_mac_write(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
+ RAL_WRITE_REGION_1(sc, RT2860_REG_IVEIV(wcid), iv, 8);
+
+ tmp = (vapid << RT2860_VAP_SHIFT) |
+ (mode << RT2860_MODE_SHIFT);
+
+ RAL_WRITE(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
}
}
- return 1;
+ return (1);
}
/*
* rt2860_vap_key_delete
*/
-static int rt2860_vap_key_delete(struct ieee80211vap *vap,
- const struct ieee80211_key *k)
+static int
+rt2860_vap_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2500,8 +1964,8 @@
sc = ifp->if_softc;
RT2860_DPRINTF(sc, RT2860_DEBUG_KEY,
- "%s: VAP key delete: keyix=%d, keylen=%d, macaddr=%s, group=%d\n",
- device_get_nameunit(sc->sc_dev), k->wk_keyix, k->wk_keylen, ether_sprintf(k->wk_macaddr),
+ "VAP key delete: keyix=%d, keylen=%d, macaddr=%s, group=%d\n",
+ k->wk_keyix, k->wk_keylen, ether_sprintf(k->wk_macaddr),
(k->wk_flags & IEEE80211_KEY_GROUP) ? 1 : 0);
if (k->wk_flags & IEEE80211_KEY_GROUP) {
@@ -2510,29 +1974,30 @@
vapid = 0;
wcid = RT2860_WCID_MCAST;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SKEY_MODE(vapid));
+ tmp = RAL_READ(sc, RT2860_REG_SKEY_MODE(vapid));
tmp &= ~(0xf << (k->wk_keyix * 4 + 16 * (vapid % 2)));
- tmp |= (RT2860_REG_CIPHER_MODE_NONE << (k->wk_keyix * 4 + 16 * (vapid % 2)));
-
- rt2860_io_mac_write(sc, RT2860_REG_SKEY_MODE(vapid), tmp);
+ tmp |= (RT2860_MODE_NOSEC << (k->wk_keyix * 4 + 16 * (vapid % 2)));
+
+ RAL_WRITE(sc, RT2860_REG_SKEY_MODE(vapid), tmp);
if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
- tmp = ((vapid & RT2860_REG_VAP_MASK) << RT2860_REG_VAP_SHIFT) |
- (RT2860_REG_CIPHER_MODE_NONE << RT2860_REG_CIPHER_MODE_SHIFT) | RT2860_REG_PKEY_ENABLE;
-
- rt2860_io_mac_write(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
+ tmp = (vapid << RT2860_VAP_SHIFT) |
+ RT2860_RX_PKEY_EN;
+
+ RAL_WRITE(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
}
}
- return 1;
+ return (1);
}
#endif
/*
* rt2860_vap_update_beacon
*/
-static void rt2860_vap_update_beacon(struct ieee80211vap *vap, int what)
+static void
+rt2860_vap_update_beacon(struct ieee80211vap *vap, int what)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2550,8 +2015,7 @@
bo = &rvap->beacon_offsets;
RT2860_DPRINTF(sc, RT2860_DEBUG_BEACON,
- "%s: VAP update beacon: what=%d\n",
- device_get_nameunit(sc->sc_dev), what);
+ "VAP update beacon: what=%d\n", what);
setbit(bo->bo_flags, what);
@@ -2564,14 +2028,13 @@
}
ieee80211_beacon_update(vap->iv_bss, bo, m, 0);
-
- rt2860_asic_update_beacon(sc, vap);
}
/*
* rt2860_media_change
*/
-static int rt2860_media_change(struct ifnet *ifp)
+static int
+rt2860_media_change(struct ifnet *ifp)
{
int error;
@@ -2583,8 +2046,9 @@
/*
* rt2860_node_alloc
*/
-static struct ieee80211_node *rt2860_node_alloc(struct ieee80211vap *vap,
- const uint8_t mac[IEEE80211_ADDR_LEN])
+static struct ieee80211_node *
+rt2860_node_alloc(struct ieee80211vap *vap,
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
return malloc(sizeof(struct rt2860_softc_node),
M_80211_NODE, M_NOWAIT | M_ZERO);
@@ -2593,7 +2057,8 @@
/*
* rt2860_node_cleanup
*/
-static void rt2860_node_cleanup(struct ieee80211_node *ni)
+static void
+rt2860_node_cleanup(struct ieee80211_node *ni)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2608,21 +2073,20 @@
rni = (struct rt2860_softc_node *) ni;
RT2860_DPRINTF(sc, RT2860_DEBUG_NODE,
- "%s: node cleanup: macaddr=%s, associd=0x%04x, staid=0x%02x\n",
- device_get_nameunit(sc->sc_dev), ether_sprintf(ni->ni_macaddr),
- ni->ni_associd, rni->staid);
+ "node cleanup: macaddr=%s, associd=0x%04x, staid=0x%02x\n",
+ ether_sprintf(ni->ni_macaddr), ni->ni_associd, rni->staid);
if (rni->staid != 0) {
vapid = 0;
wcid = rni->staid;
- tmp = ((vapid & RT2860_REG_VAP_MASK) << RT2860_REG_VAP_SHIFT) |
- (RT2860_REG_CIPHER_MODE_NONE << RT2860_REG_CIPHER_MODE_SHIFT) | RT2860_REG_PKEY_ENABLE;
-
- rt2860_io_mac_write(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
-
- rt2860_io_mac_write(sc, RT2860_REG_WCID(wcid), 0x00000000);
- rt2860_io_mac_write(sc, RT2860_REG_WCID(wcid) + 4, 0x00000000);
+ tmp = (vapid << RT2860_VAP_SHIFT) |
+ RT2860_RX_PKEY_EN;
+
+ RAL_WRITE(sc, RT2860_REG_WCID_ATTR(wcid), tmp);
+
+ RAL_WRITE(sc, RT2860_REG_WCID(wcid), 0x00000000);
+ RAL_WRITE(sc, RT2860_REG_WCID(wcid) + 4, 0x00000000);
rt2860_staid_delete(sc, rni->staid);
@@ -2635,8 +2099,9 @@
/*
* rt2860_node_getmimoinfo
*/
-static void rt2860_node_getmimoinfo(const struct ieee80211_node *ni,
- struct ieee80211_mimo_info *mi)
+static void
+rt2860_node_getmimoinfo(const struct ieee80211_node *ni,
+ struct ieee80211_mimo_info *mi)
{
const struct rt2860_softc_node *rni;
int i;
@@ -2652,9 +2117,9 @@
/*
* rt2860_setregdomain
*/
-static int rt2860_setregdomain(struct ieee80211com *ic,
- struct ieee80211_regdomain *reg,
- int nchans, struct ieee80211_channel chans[])
+static int
+rt2860_setregdomain(struct ieee80211com *ic, struct ieee80211_regdomain *reg,
+ int nchans, struct ieee80211_channel chans[])
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -2663,18 +2128,19 @@
sc = ifp->if_softc;
RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: set regulatory domain: country=%d, country code string=%c%c, location=%c\n",
- device_get_nameunit(sc->sc_dev),
- reg->country, reg->isocc[0], reg->isocc[1], reg->location);
-
- return 0;
+ "set regulatory domain: country=%d, country code string=%c%c, "
+ "location=%c\n",
+ reg->country, reg->isocc[0], reg->isocc[1], reg->location);
+
+ return (0);
}
/*
* rt2860_getradiocaps
*/
-static void rt2860_getradiocaps(struct ieee80211com *ic,
- int maxchans, int *nchans, struct ieee80211_channel chans[])
+static void
+rt2860_getradiocaps(struct ieee80211com *ic, int maxchans, int *nchans,
+ struct ieee80211_channel chans[])
{
*nchans = (ic->ic_nchans >= maxchans) ? maxchans : ic->ic_nchans;
@@ -2684,7 +2150,8 @@
/*
* rt2860_scan_start
*/
-static void rt2860_scan_start(struct ieee80211com *ic)
+static void
+rt2860_scan_start(struct ieee80211com *ic)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -2693,34 +2160,36 @@
sc = ifp->if_softc;
RT2860_SOFTC_LOCK(sc);
-
rt2860_asic_disable_tsf_sync(sc);
-
+ rt2860_asic_set_bssid(sc, ifp->if_broadcastaddr);
RT2860_SOFTC_UNLOCK(sc);
}
/*
* rt2860_scan_end
*/
-static void rt2860_scan_end(struct ieee80211com *ic)
-{
+static void
+rt2860_scan_end(struct ieee80211com *ic)
+{
+ struct ieee80211vap *vap;
struct rt2860_softc *sc;
struct ifnet *ifp;
+ vap = TAILQ_FIRST(&ic->ic_vaps);
ifp = ic->ic_ifp;
sc = ifp->if_softc;
RT2860_SOFTC_LOCK(sc);
-
rt2860_asic_enable_tsf_sync(sc);
-
+ rt2860_asic_set_bssid(sc, vap->iv_bss->ni_bssid);
RT2860_SOFTC_UNLOCK(sc);
}
/*
* rt2860_set_channel
*/
-static void rt2860_set_channel(struct ieee80211com *ic)
+static void
+rt2860_set_channel(struct ieee80211com *ic)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -2729,25 +2198,24 @@
sc = ifp->if_softc;
RT2860_DPRINTF(sc, RT2860_DEBUG_CHAN,
- "%s: set channel: channel=%u, HT%s%s\n",
- device_get_nameunit(sc->sc_dev),
+ "set channel: channel=%u, HT%s%s\n",
ieee80211_chan2ieee(ic, ic->ic_curchan),
!IEEE80211_IS_CHAN_HT(ic->ic_curchan) ? " disabled" :
- IEEE80211_IS_CHAN_HT20(ic->ic_curchan) ? "20":
- IEEE80211_IS_CHAN_HT40U(ic->ic_curchan) ? "40U" : "40D",
+ IEEE80211_IS_CHAN_HT20(ic->ic_curchan) ? "20":
+ IEEE80211_IS_CHAN_HT40U(ic->ic_curchan) ?
+ "40U" : "40D",
(ic->ic_flags & IEEE80211_F_SCAN) ? ", scanning" : "");
RT2860_SOFTC_LOCK(sc);
-
rt2860_rf_set_chan(sc, ic->ic_curchan);
-
RT2860_SOFTC_UNLOCK(sc);
}
/*
* rt2860_newassoc
*/
-static void rt2860_newassoc(struct ieee80211_node *ni, int isnew)
+static void
+rt2860_newassoc(struct ieee80211_node *ni, int isnew)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2776,23 +2244,25 @@
(ni->ni_macaddr[1] << 8) |
ni->ni_macaddr[0];
- rt2860_io_mac_write(sc, RT2860_REG_WCID(wcid), tmp);
+ RAL_WRITE(sc, RT2860_REG_WCID(wcid), tmp);
tmp = (ni->ni_macaddr[5] << 8) |
ni->ni_macaddr[4];
- rt2860_io_mac_write(sc, RT2860_REG_WCID(wcid) + 4, tmp);
+ RAL_WRITE(sc, RT2860_REG_WCID(wcid) + 4, tmp);
rt2860_amrr_node_init(&rvap->amrr, &sc->amrr_node[wcid], ni);
RT2860_DPRINTF(sc, RT2860_DEBUG_RATE,
- "%s: initial%s node Tx rate: associd=0x%04x, rate=0x%02x, max rate=0x%02x\n",
- device_get_nameunit(sc->sc_dev),
- (ni->ni_flags & IEEE80211_NODE_HT) ? " HT" : "",
- ni->ni_associd, ni->ni_txrate,
- (ni->ni_flags & IEEE80211_NODE_HT) ?
- (ni->ni_htrates.rs_rates[ni->ni_htrates.rs_nrates - 1] | IEEE80211_RATE_MCS) :
- (ni->ni_rates.rs_rates[ni->ni_rates.rs_nrates - 1] & IEEE80211_RATE_VAL));
+ "initial%s node Tx rate: associd=0x%04x, rate=0x%02x, "
+ "max rate=0x%02x\n",
+ (ni->ni_flags & IEEE80211_NODE_HT) ? " HT" : "",
+ ni->ni_associd, ni->ni_txrate,
+ (ni->ni_flags & IEEE80211_NODE_HT) ?
+ (ni->ni_htrates.rs_rates[ni->ni_htrates.rs_nrates - 1] |
+ IEEE80211_RATE_MCS) :
+ (ni->ni_rates.rs_rates[ni->ni_rates.rs_nrates - 1] &
+ IEEE80211_RATE_VAL));
rt2860_asic_updateprot(sc);
rt2860_asic_updateslot(sc);
@@ -2800,18 +2270,20 @@
}
RT2860_DPRINTF(sc, RT2860_DEBUG_NODE,
- "%s: new association: isnew=%d, macaddr=%s, associd=0x%04x, staid=0x%02x, QoS %s, ERP %s, HT %s\n",
- device_get_nameunit(sc->sc_dev), isnew, ether_sprintf(ni->ni_macaddr),
- ni->ni_associd, rni->staid,
- (ni->ni_flags & IEEE80211_NODE_QOS) ? "enabled" : "disabled",
- (ni->ni_flags & IEEE80211_NODE_ERP) ? "enabled" : "disabled",
- (ni->ni_flags & IEEE80211_NODE_HT) ? "enabled" : "disabled");
+ "new association: isnew=%d, macaddr=%s, associd=0x%04x, "
+ "staid=0x%02x, QoS %s, ERP %s, HT %s\n",
+ isnew, ether_sprintf(ni->ni_macaddr),
+ ni->ni_associd, rni->staid,
+ (ni->ni_flags & IEEE80211_NODE_QOS) ? "enabled" : "disabled",
+ (ni->ni_flags & IEEE80211_NODE_ERP) ? "enabled" : "disabled",
+ (ni->ni_flags & IEEE80211_NODE_HT) ? "enabled" : "disabled");
}
/*
* rt2860_updateslot
*/
-static void rt2860_updateslot(struct ifnet *ifp)
+static void
+rt2860_updateslot(struct ifnet *ifp)
{
struct rt2860_softc *sc;
@@ -2823,7 +2295,8 @@
/*
* rt2860_update_promisc
*/
-static void rt2860_update_promisc(struct ifnet *ifp)
+static void
+rt2860_update_promisc(struct ifnet *ifp)
{
struct rt2860_softc *sc;
@@ -2837,7 +2310,8 @@
/*
* rt2860_update_mcast
*/
-static void rt2860_update_mcast(struct ifnet *ifp)
+static void
+rt2860_update_mcast(struct ifnet *ifp)
{
struct rt2860_softc *sc;
@@ -2847,7 +2321,8 @@
/*
* rt2860_wme_update
*/
-static int rt2860_wme_update(struct ieee80211com *ic)
+static int
+rt2860_wme_update(struct ieee80211com *ic)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -2857,39 +2332,43 @@
rt2860_asic_wme_update(sc);
- return 0;
+ return (0);
}
/*
* rt2860_raw_xmit
*/
-static int rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
- const struct ieee80211_bpf_params *params)
-{
- struct ieee80211_frame *wh;
+static int
+rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
+ const struct ieee80211_bpf_params *params)
+{
struct rt2860_softc *sc;
struct ieee80211com *ic;
struct ifnet *ifp;
+#ifdef notyet
+ struct ieee80211_frame *wh;
int ismcast;
+#endif
ic = ni->ni_ic;
ifp = ic->ic_ifp;
sc = ifp->if_softc;
-
+ /* XXX: check if MAC complete setup also */
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
m_freem(m);
ieee80211_free_node(ni);
- return ENETDOWN;
+ return (ENETDOWN);
}
RT2860_SOFTC_TX_RING_LOCK(&sc->tx_ring[sc->tx_ring_mgtqid]);
- if (sc->tx_ring[sc->tx_ring_mgtqid].data_queued >= RT2860_SOFTC_TX_RING_DATA_COUNT) {
+ if (sc->tx_ring[sc->tx_ring_mgtqid].data_queued >=
+ RT2860_SOFTC_TX_RING_DATA_COUNT) {
RT2860_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[sc->tx_ring_mgtqid]);
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: raw xmit: Tx ring with qid=%d is full\n",
- device_get_nameunit(sc->sc_dev), sc->tx_ring_mgtqid);
+ "raw xmit: Tx ring with qid=%d is full\n",
+ sc->tx_ring_mgtqid);
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
@@ -2898,7 +2377,14 @@
sc->tx_data_queue_full[sc->tx_ring_mgtqid]++;
- return ENOBUFS;
+ return (ENOBUFS);
+ }
+
+ if (m->m_pkthdr.len < IEEE80211_MIN_LEN) {
+ m_freem(m);
+ ieee80211_free_node(ni);
+ ifp->if_oerrors++;
+ return (ENXIO);
}
#ifdef notyet
@@ -2946,24 +2432,26 @@
ifp->if_oerrors++;
+ m_freem(m);
ieee80211_free_node(ni);
- return EIO;
+ return (EIO);
}
RT2860_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[sc->tx_ring_mgtqid]);
+ printf("rtx 5 sc=%p\n", sc);
sc->tx_timer = RT2860_TX_WATCHDOG_TIMEOUT;
- return 0;
+ return (0);
}
/*
* rt2860_recv_action
*/
-static int rt2860_recv_action(struct ieee80211_node *ni,
- const struct ieee80211_frame *wh,
- const uint8_t *frm, const uint8_t *efrm)
+static int
+rt2860_recv_action(struct ieee80211_node *ni,
+ const struct ieee80211_frame *wh, const uint8_t *frm, const uint8_t *efrm)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -2990,8 +2478,9 @@
wcid = rni->staid;
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: received DELBA request: associd=0x%04x, staid=0x%02x, tid=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, tid);
+ "received DELBA request: associd=0x%04x, "
+ "staid=0x%02x, tid=%d\n",
+ ni->ni_associd, rni->staid, tid);
if (rni->staid != 0) {
RT2860_SOFTC_LOCK(sc);
@@ -3004,14 +2493,14 @@
}
}
- return sc->recv_action(ni, wh, frm, efrm);
+ return (sc->recv_action(ni, wh, frm, efrm));
}
/*
* rt2860_send_action
*/
-static int rt2860_send_action(struct ieee80211_node *ni,
- int cat, int act, void *sa)
+static int
+rt2860_send_action(struct ieee80211_node *ni, int cat, int act, void *sa)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3031,55 +2520,60 @@
if (cat == IEEE80211_ACTION_CAT_BA) {
switch (act) {
- /* IEEE80211_ACTION_BA_ADDBA_RESPONSE */
- case IEEE80211_ACTION_BA_ADDBA_RESPONSE:
- status = args[1];
- baparamset = args[2];
- tid = RT2860_MS(baparamset, IEEE80211_BAPS_TID);
- bufsize = RT2860_MS(baparamset, IEEE80211_BAPS_BUFSIZ);
-
- RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: sending ADDBA response: associd=0x%04x, staid=0x%02x, status=%d, tid=%d, bufsize=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, status, tid, bufsize);
-
- if (status == IEEE80211_STATUS_SUCCESS) {
- RT2860_SOFTC_LOCK(sc);
-
- rt2860_asic_add_ba_session(sc, wcid, tid);
- RT2860_SOFTC_UNLOCK(sc);
-
- }
+ /* IEEE80211_ACTION_BA_ADDBA_RESPONSE */
+ case IEEE80211_ACTION_BA_ADDBA_RESPONSE:
+ status = args[1];
+ baparamset = args[2];
+ tid = RT2860_MS(baparamset, IEEE80211_BAPS_TID);
+ bufsize = RT2860_MS(baparamset, IEEE80211_BAPS_BUFSIZ);
+
+ RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
+ "sending ADDBA response: associd=0x%04x, "
+ "staid=0x%02x, status=%d, tid=%d, bufsize=%d\n",
+ ni->ni_associd,
+ rni->staid, status, tid, bufsize);
+
+ if (status == IEEE80211_STATUS_SUCCESS) {
+ RT2860_SOFTC_LOCK(sc);
+
+ rt2860_asic_add_ba_session(sc, wcid, tid);
+ RT2860_SOFTC_UNLOCK(sc);
+
+ }
break;
- /* IEEE80211_ACTION_BA_DELBA */
- case IEEE80211_ACTION_BA_DELBA:
- baparamset = RT2860_SM(args[0], IEEE80211_DELBAPS_TID) | args[1];
- tid = RT2860_MS(baparamset, IEEE80211_DELBAPS_TID);
-
- RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: sending DELBA request: associd=0x%04x, staid=0x%02x, tid=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, tid);
-
- if (RT2860_MS(baparamset, IEEE80211_DELBAPS_INIT) != IEEE80211_DELBAPS_INIT) {
- RT2860_SOFTC_LOCK(sc);
-
- rt2860_asic_del_ba_session(sc, wcid, tid);
- RT2860_SOFTC_UNLOCK(sc);
-
- }
+ /* IEEE80211_ACTION_BA_DELBA */
+ case IEEE80211_ACTION_BA_DELBA:
+ baparamset = RT2860_SM(args[0],
+ IEEE80211_DELBAPS_TID) | args[1];
+ tid = RT2860_MS(baparamset, IEEE80211_DELBAPS_TID);
+
+ RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
+ "sending DELBA request: associd=0x%04x, "
+ "staid=0x%02x, tid=%d\n",
+ ni->ni_associd, rni->staid, tid);
+
+ if (RT2860_MS(baparamset, IEEE80211_DELBAPS_INIT) !=
+ IEEE80211_DELBAPS_INIT) {
+ RT2860_SOFTC_LOCK(sc);
+
+ rt2860_asic_del_ba_session(sc, wcid, tid);
+ RT2860_SOFTC_UNLOCK(sc);
+
+ }
break;
}
}
- return sc->send_action(ni, cat, act, sa);
+ return (sc->send_action(ni, cat, act, sa));
}
/*
* rt2860_addba_response
*/
-static int rt2860_addba_response(struct ieee80211_node *ni,
- struct ieee80211_tx_ampdu *tap,
- int status, int baparamset, int batimeout)
+static int
+rt2860_addba_response(struct ieee80211_node *ni,
+ struct ieee80211_tx_ampdu *tap, int status, int baparamset, int batimeout)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3128,27 +2622,31 @@
}
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: received ADDBA response: associd=0x%04x, staid=0x%02x, status=%d, tid=%d, "
- "old bufsize=%d, new bufsize=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, status, tid,
- old_bufsize, new_bufsize);
+ "received ADDBA response: associd=0x%04x, staid=0x%02x, "
+ "status=%d, tid=%d, old bufsize=%d, new bufsize=%d\n",
+ ni->ni_associd, rni->staid,
+ status, tid, old_bufsize, new_bufsize);
ret = sc->addba_response(ni, tap, status, baparamset, batimeout);
if (status == IEEE80211_STATUS_SUCCESS) {
seqno = ni->ni_txseqs[tid];
+#ifdef RT2860_SEND_BAR_WORKAROUND
rt2860_send_bar(ni, tap, seqno);
- }
-
- return ret;
+#else
+ ieee80211_send_bar(ni, tap, seqno);
+#endif
+ }
+
+ return (ret);
}
/*
* rt2860_addba_stop
*/
-static void rt2860_addba_stop(struct ieee80211_node *ni,
- struct ieee80211_tx_ampdu *tap)
+static void
+rt2860_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3164,8 +2662,8 @@
tid = WME_AC_TO_TID(tap->txa_ac);
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: stopping A-MPDU Tx: associd=0x%04x, staid=0x%02x, tid=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, tid);
+ "stopping A-MPDU Tx: associd=0x%04x, staid=0x%02x, tid=%d\n",
+ ni->ni_associd, rni->staid, tid);
if (tap->txa_flags & IEEE80211_AGGR_RUNNING) {
if (sc->tx_ampdu_sessions > 0) {
@@ -3188,9 +2686,10 @@
/*
* rt2860_ampdu_rx_start
*/
-static int rt2860_ampdu_rx_start(struct ieee80211_node *ni,
- struct ieee80211_rx_ampdu *rap,
- int baparamset, int batimeout, int baseqctl)
+static int
+rt2860_ampdu_rx_start(struct ieee80211_node *ni,
+ struct ieee80211_rx_ampdu *rap, int baparamset, int batimeout,
+ int baseqctl)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3206,20 +2705,21 @@
tid = RT2860_MS(baparamset, IEEE80211_BAPS_TID);
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: starting A-MPDU Rx: associd=0x%04x, staid=0x%02x, tid=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, tid);
+ "starting A-MPDU Rx: associd=0x%04x, staid=0x%02x, tid=%d\n",
+ ni->ni_associd, rni->staid, tid);
if (!(rap->rxa_flags & IEEE80211_AGGR_RUNNING))
sc->rx_ampdu_sessions++;
- return sc->ampdu_rx_start(ni, rap, baparamset, batimeout, baseqctl);
+ return (sc->ampdu_rx_start(ni, rap, baparamset, batimeout, baseqctl));
}
/*
* rt2860_ampdu_rx_stop
*/
-static void rt2860_ampdu_rx_stop(struct ieee80211_node *ni,
- struct ieee80211_rx_ampdu *rap)
+static void
+rt2860_ampdu_rx_stop(struct ieee80211_node *ni,
+ struct ieee80211_rx_ampdu *rap)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3232,8 +2732,8 @@
rni = (struct rt2860_softc_node *) ni;
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: stopping A-MPDU Rx: associd=0x%04x, staid=0x%02x\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid);
+ "stopping A-MPDU Rx: associd=0x%04x, staid=0x%02x\n",
+ ni->ni_associd, rni->staid);
if (rap->rxa_flags & IEEE80211_AGGR_RUNNING) {
if (sc->rx_ampdu_sessions > 0)
@@ -3246,11 +2746,13 @@
sc->ampdu_rx_stop(ni, rap);
}
+#ifdef RT2860_SEND_BAR_WORKAROUND
/*
* rt2860_send_bar
*/
-static int rt2860_send_bar(struct ieee80211_node *ni,
- struct ieee80211_tx_ampdu *tap, ieee80211_seq seqno)
+static int
+rt2860_send_bar(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap,
+ ieee80211_seq seqno)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3270,11 +2772,11 @@
rni = (struct rt2860_softc_node *) ni;
if (!(tap->txa_flags & IEEE80211_AGGR_RUNNING))
- return EINVAL;
+ return (EINVAL);
m = ieee80211_getmgtframe(&frm, ic->ic_headroom, sizeof(struct ieee80211_frame_bar));
if (m == NULL)
- return ENOMEM;
+ return (ENOMEM);
bar = mtod(m, struct ieee80211_frame_bar *);
@@ -3301,20 +2803,24 @@
ieee80211_ref_node(ni);
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: sending BAR: associd=0x%04x, staid=0x%02x, tid=%d, seqno=%d\n",
- device_get_nameunit(sc->sc_dev), ni->ni_associd, rni->staid, tid, seqno);
+ "sending BAR: associd=0x%04x, staid=0x%02x, tid=%d, seqno=%d\n",
+ ni->ni_associd, rni->staid, tid, seqno);
ret = ic->ic_raw_xmit(ni, m, NULL);
- if (ret != 0)
+ if (ret != 0) {
+ m_freem(m);
ieee80211_free_node(ni);
-
- return ret;
-}
+ }
+
+ return (ret);
+}
+#endif
/*
* rt2860_amrr_update_iter_func
*/
-static void rt2860_amrr_update_iter_func(void *arg, struct ieee80211_node *ni)
+static void
+rt2860_amrr_update_iter_func(void *arg, struct ieee80211_node *ni)
{
struct rt2860_softc *sc;
struct ieee80211com *ic;
@@ -3337,16 +2843,14 @@
wcid = rni->staid;
RT2860_DPRINTF(sc, RT2860_DEBUG_RATE,
- "%s: AMRR node: staid=0x%02x, txcnt=%d, success=%d, retrycnt=%d\n",
- device_get_nameunit(sc->sc_dev),
+ "AMRR node: staid=0x%02x, txcnt=%d, success=%d, retrycnt=%d\n",
rni->staid, sc->amrr_node[wcid].txcnt, sc->amrr_node[wcid].success, sc->amrr_node[wcid].retrycnt);
rt2860_amrr_choose(ni, &sc->amrr_node[wcid]);
RT2860_DPRINTF(sc, RT2860_DEBUG_RATE,
- "%s:%s node Tx rate: associd=0x%04x, staid=0x%02x, rate=0x%02x, max rate=0x%02x\n",
- device_get_nameunit(sc->sc_dev),
- (ni->ni_flags & IEEE80211_NODE_HT) ? " HT" : "",
+ "%snode Tx rate: associd=0x%04x, staid=0x%02x, rate=0x%02x, max rate=0x%02x\n",
+ (ni->ni_flags & IEEE80211_NODE_HT) ? "HT " : "",
ni->ni_associd, rni->staid, ni->ni_txrate,
(ni->ni_flags & IEEE80211_NODE_HT) ?
(ni->ni_htrates.rs_rates[ni->ni_htrates.rs_nrates - 1] | IEEE80211_RATE_MCS) :
@@ -3357,15 +2861,14 @@
/*
* rt2860_periodic
*/
-static void rt2860_periodic(void *arg)
+static void
+rt2860_periodic(void *arg)
{
struct rt2860_softc *sc;
sc = arg;
- RT2860_DPRINTF(sc, RT2860_DEBUG_PERIODIC,
- "%s: periodic\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_PERIODIC, "periodic\n");
taskqueue_enqueue(sc->taskqueue, &sc->periodic_task);
}
@@ -3373,7 +2876,8 @@
/*
* rt2860_tx_watchdog
*/
-static void rt2860_tx_watchdog(void *arg)
+static void
+rt2860_tx_watchdog(void *arg)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -3381,8 +2885,8 @@
sc = arg;
ifp = sc->sc_ifp;
- if (sc->sc_invalid) /* card ejected */
- return;
+// if (sc->sc_invalid) /* card ejected */
+// return;
if (sc->tx_timer == 0)
return;
@@ -3404,7 +2908,8 @@
/*
* rt2860_staid_alloc
*/
-static int rt2860_staid_alloc(struct rt2860_softc *sc, int aid)
+static int
+rt2860_staid_alloc(struct rt2860_softc *sc, int aid)
{
int staid;
@@ -3419,13 +2924,14 @@
setbit(sc->staid_mask, staid);
- return staid;
+ return (staid);
}
/*
* rt2860_staid_delete
*/
-static void rt2860_staid_delete(struct rt2860_softc *sc, int staid)
+static void
+rt2860_staid_delete(struct rt2860_softc *sc, int staid)
{
clrbit(sc->staid_mask, staid);
@@ -3434,46 +2940,46 @@
/*
* rt2860_asic_set_bssid
*/
-static void rt2860_asic_set_bssid(struct rt2860_softc *sc,
- const uint8_t *bssid)
+static void
+rt2860_asic_set_bssid(struct rt2860_softc *sc, const uint8_t *bssid)
{
uint32_t tmp;
RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: set bssid: bssid=%s\n",
- device_get_nameunit(sc->sc_dev),
+ "set bssid: bssid=%s\n",
ether_sprintf(bssid));
tmp = bssid[0] | (bssid[1]) << 8 | (bssid[2] << 16) | (bssid[3] << 24);
- rt2860_io_mac_write(sc, RT2860_REG_BSSID_DW0, tmp);
+ RAL_WRITE(sc, RT2860_REG_BSSID_DW0, tmp);
tmp = bssid[4] | (bssid[5] << 8);
- rt2860_io_mac_write(sc, RT2860_REG_BSSID_DW1, tmp);
+ RAL_WRITE(sc, RT2860_REG_BSSID_DW1, tmp);
}
/*
* rt2860_asic_set_macaddr
*/
-static void rt2860_asic_set_macaddr(struct rt2860_softc *sc,
- const uint8_t *addr)
+static void
+rt2860_asic_set_macaddr(struct rt2860_softc *sc, const uint8_t *addr)
{
uint32_t tmp;
tmp = addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);
- rt2860_io_mac_write(sc, RT2860_REG_ADDR_DW0, tmp);
+ RAL_WRITE(sc, RT2860_REG_ADDR_DW0, tmp);
tmp = addr[4] | (addr[5] << 8) | (0xff << 16);
- rt2860_io_mac_write(sc, RT2860_REG_ADDR_DW1, tmp);
+ RAL_WRITE(sc, RT2860_REG_ADDR_DW1, tmp);
}
/*
* rt2860_asic_enable_tsf_sync
*/
-static void rt2860_asic_enable_tsf_sync(struct rt2860_softc *sc)
+static void
+rt2860_asic_enable_tsf_sync(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3484,11 +2990,9 @@
ic = ifp->if_l2com;
vap = TAILQ_FIRST(&ic->ic_vaps);
- RT2860_DPRINTF(sc, RT2860_DEBUG_BEACON,
- "%s: enabling TSF\n",
- device_get_nameunit(sc->sc_dev));
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_BCN_TIME_CFG);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_BEACON, "enabling TSF\n");
+
+ tmp = RAL_READ(sc, RT2860_REG_BCN_TIME_CFG);
tmp &= ~0x1fffff;
tmp |= vap->iv_bss->ni_intval * 16;
@@ -3504,21 +3008,20 @@
tmp |= (RT2860_REG_TSF_SYNC_MODE_HOSTAP << RT2860_REG_TSF_SYNC_MODE_SHIFT);
}
- rt2860_io_mac_write(sc, RT2860_REG_BCN_TIME_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_BCN_TIME_CFG, tmp);
}
/*
* rt2860_asic_disable_tsf_sync
*/
-static void rt2860_asic_disable_tsf_sync(struct rt2860_softc *sc)
+static void
+rt2860_asic_disable_tsf_sync(struct rt2860_softc *sc)
{
uint32_t tmp;
- RT2860_DPRINTF(sc, RT2860_DEBUG_BEACON,
- "%s: disabling TSF\n",
- device_get_nameunit(sc->sc_dev));
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_BCN_TIME_CFG);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_BEACON, "disabling TSF\n");
+
+ tmp = RAL_READ(sc, RT2860_REG_BCN_TIME_CFG);
tmp &= ~(RT2860_REG_BCN_TX_ENABLE |
RT2860_REG_TSF_TIMER_ENABLE |
@@ -3527,19 +3030,20 @@
tmp &= ~(RT2860_REG_TSF_SYNC_MODE_MASK << RT2860_REG_TSF_SYNC_MODE_SHIFT);
tmp |= (RT2860_REG_TSF_SYNC_MODE_DISABLE << RT2860_REG_TSF_SYNC_MODE_SHIFT);
- rt2860_io_mac_write(sc, RT2860_REG_BCN_TIME_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_BCN_TIME_CFG, tmp);
}
/*
* rt2860_asic_enable_mrr
*/
-static void rt2860_asic_enable_mrr(struct rt2860_softc *sc)
+static void
+rt2860_asic_enable_mrr(struct rt2860_softc *sc)
{
#define CCK(mcs) (mcs)
#define OFDM(mcs) ((1 << 3) | (mcs))
#define HT(mcs) (mcs)
- rt2860_io_mac_write(sc, RT2860_REG_TX_LG_FBK_CFG0,
+ RAL_WRITE(sc, RT2860_REG_TX_LG_FBK_CFG0,
(OFDM(6) << 28) | /* 54 -> 48 */
(OFDM(5) << 24) | /* 48 -> 36 */
(OFDM(4) << 20) | /* 36 -> 24 */
@@ -3549,13 +3053,13 @@
(OFDM(0) << 4) | /* 9 -> 6 */
OFDM(0)); /* 6 -> 6 */
- rt2860_io_mac_write(sc, RT2860_REG_TX_LG_FBK_CFG1,
+ RAL_WRITE(sc, RT2860_REG_TX_LG_FBK_CFG1,
(CCK(2) << 12) | /* 11 -> 5.5 */
(CCK(1) << 8) | /* 5.5 -> 2 */
(CCK(0) << 4) | /* 2 -> 1 */
CCK(0)); /* 1 -> 1 */
- rt2860_io_mac_write(sc, RT2860_REG_TX_HT_FBK_CFG0,
+ RAL_WRITE(sc, RT2860_REG_TX_HT_FBK_CFG0,
(HT(6) << 28) |
(HT(5) << 24) |
(HT(4) << 20) |
@@ -3565,7 +3069,7 @@
(HT(0) << 4) |
HT(0));
- rt2860_io_mac_write(sc, RT2860_REG_TX_HT_FBK_CFG1,
+ RAL_WRITE(sc, RT2860_REG_TX_HT_FBK_CFG1,
(HT(14) << 28) |
(HT(13) << 24) |
(HT(12) << 20) |
@@ -3583,7 +3087,8 @@
/*
* rt2860_asic_set_txpreamble
*/
-static void rt2860_asic_set_txpreamble(struct rt2860_softc *sc)
+static void
+rt2860_asic_set_txpreamble(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3593,24 +3098,24 @@
ic = ifp->if_l2com;
RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: %s short Tx preamble\n",
- device_get_nameunit(sc->sc_dev),
+ "%s short Tx preamble\n",
(ic->ic_flags & IEEE80211_F_SHPREAMBLE) ? "enabling" : "disabling");
- tmp = rt2860_io_mac_read(sc, RT2860_REG_AUTO_RSP_CFG);
-
- tmp &= ~RT2860_REG_CCK_SHORT_ENABLE;
+ tmp = RAL_READ(sc, RT2860_AUTO_RSP_CFG);
+
+ tmp &= ~RT2860_CCK_SHORT_EN;
if (ic->ic_flags & IEEE80211_F_SHPREAMBLE)
- tmp |= RT2860_REG_CCK_SHORT_ENABLE;
-
- rt2860_io_mac_write(sc, RT2860_REG_AUTO_RSP_CFG, tmp);
+ tmp |= RT2860_CCK_SHORT_EN;
+
+ RAL_WRITE(sc, RT2860_AUTO_RSP_CFG, tmp);
}
/*
* rt2860_asic_set_basicrates
*/
-static void rt2860_asic_set_basicrates(struct rt2860_softc *sc)
+static void
+rt2860_asic_set_basicrates(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3619,17 +3124,18 @@
ic = ifp->if_l2com;
if (ic->ic_curmode == IEEE80211_MODE_11B)
- rt2860_io_mac_write(sc, RT2860_REG_LEGACY_BASIC_RATE, 0xf);
+ RAL_WRITE(sc, RT2860_LEGACY_BASIC_RATE, 0xf);
else if (ic->ic_curmode == IEEE80211_MODE_11A)
- rt2860_io_mac_write(sc, RT2860_REG_LEGACY_BASIC_RATE, 0x150);
+ RAL_WRITE(sc, RT2860_LEGACY_BASIC_RATE, 0x150);
else
- rt2860_io_mac_write(sc, RT2860_REG_LEGACY_BASIC_RATE, 0x15f);
+ RAL_WRITE(sc, RT2860_LEGACY_BASIC_RATE, 0x15f);
}
/*
* rt2860_asic_update_rtsthreshold
*/
-static void rt2860_asic_update_rtsthreshold(struct rt2860_softc *sc)
+static void
+rt2860_asic_update_rtsthreshold(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3649,23 +3155,24 @@
threshold = vap->iv_rtsthreshold;
RT2860_DPRINTF(sc, RT2860_DEBUG_PROT,
- "%s: updating RTS threshold: %d\n",
- device_get_nameunit(sc->sc_dev), threshold);
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_RTS_CFG);
+ "updating RTS threshold: %d\n",
+ threshold);
+
+ tmp = RAL_READ(sc, RT2860_TX_RTS_CFG);
tmp &= ~(RT2860_REG_TX_RTS_THRESHOLD_MASK << RT2860_REG_TX_RTS_THRESHOLD_SHIFT);
tmp |= ((threshold & RT2860_REG_TX_RTS_THRESHOLD_MASK) <<
RT2860_REG_TX_RTS_THRESHOLD_SHIFT);
- rt2860_io_mac_write(sc, RT2860_REG_TX_RTS_CFG, tmp);
+ RAL_WRITE(sc, RT2860_TX_RTS_CFG, tmp);
}
/*
* rt2860_asic_update_txpower
*/
-static void rt2860_asic_update_txpower(struct rt2860_softc *sc)
+static void
+rt2860_asic_update_txpower(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3679,8 +3186,8 @@
ic = ifp->if_l2com;
RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: updating Tx power: %d\n",
- device_get_nameunit(sc->sc_dev), ic->ic_txpowlimit);
+ "updating Tx power: %d\n",
+ ic->ic_txpowlimit);
if (!IEEE80211_IS_CHAN_HT40(ic->ic_curchan)) {
txpow_rate = sc->txpow_rate_20mhz;
@@ -3717,14 +3224,15 @@
if (txpow_rate[i] == 0xffffffff)
continue;
tmp = rt2860_read_eeprom_txpow_rate_add_delta(txpow_rate[i], delta);
- rt2860_io_mac_write(sc, RT2860_REG_TX_PWR_CFG(i), tmp);
+ RAL_WRITE(sc, RT2860_REG_TX_PWR_CFG(i), tmp);
}
}
/*
* rt2860_asic_update_promisc
*/
-static void rt2860_asic_update_promisc(struct rt2860_softc *sc)
+static void
+rt2860_asic_update_promisc(struct rt2860_softc *sc)
{
struct ifnet *ifp;
uint32_t tmp;
@@ -3734,20 +3242,21 @@
device_printf(sc->sc_dev, "%s promiscuous mode\n",
(ifp->if_flags & IFF_PROMISC) ? "entering" : "leaving");
- tmp = rt2860_io_mac_read(sc, RT2860_REG_RX_FILTER_CFG);
-
- tmp &= ~RT2860_REG_RX_FILTER_DROP_UC_NOME;
+ tmp = RAL_READ(sc, RT2860_REG_RX_FILTER_CFG);
+
+ tmp &= ~RT2860_DROP_UC_NOME;
if (!(ifp->if_flags & IFF_PROMISC))
- tmp |= RT2860_REG_RX_FILTER_DROP_UC_NOME;
-
- rt2860_io_mac_write(sc, RT2860_REG_RX_FILTER_CFG, tmp);
+ tmp |= RT2860_DROP_UC_NOME;
+
+ RAL_WRITE(sc, RT2860_REG_RX_FILTER_CFG, tmp);
}
/*
* rt2860_asic_updateprot
*/
-static void rt2860_asic_updateprot(struct rt2860_softc *sc)
+static void
+rt2860_asic_updateprot(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3762,8 +3271,8 @@
/* CCK frame protection */
- cck_prot = RT2860_REG_RTSTH_ENABLE | RT2860_REG_PROT_NAV_SHORT |
- RT2860_REG_TXOP_ALLOW_ALL | RT2860_REG_PROT_CTRL_NONE;
+ cck_prot = RT2860_RTSTH_EN | RT2860_PROT_NAV_SHORT |
+ RT2860_TXOP_ALLOW_ALL;
/* set up protection frame phy mode and rate (MCS code) */
@@ -3774,35 +3283,30 @@
cck_prot |= ((RT2860_REG_PROT_PHYMODE_CCK << RT2860_REG_PROT_PHYMODE_SHIFT) |
(3 << RT2860_REG_PROT_MCS_SHIFT));
- rt2860_io_mac_write(sc, RT2860_REG_TX_CCK_PROT_CFG, cck_prot);
+ RAL_WRITE(sc, RT2860_CCK_PROT_CFG, cck_prot);
/* OFDM frame protection */
- ofdm_prot = RT2860_REG_RTSTH_ENABLE | RT2860_REG_PROT_NAV_SHORT |
- RT2860_REG_TXOP_ALLOW_ALL;
+ ofdm_prot = RT2860_REG_RTSTH_ENABLE | RT2860_PROT_NAV_SHORT |
+ RT2860_TXOP_ALLOW_ALL;
if (ic->ic_flags & IEEE80211_F_USEPROT) {
RT2860_DPRINTF(sc, RT2860_DEBUG_PROT,
- "%s: updating protection mode: b/g protection mode=%s\n",
- device_get_nameunit(sc->sc_dev),
+ "updating protection mode: b/g protection mode=%s\n",
(ic->ic_protmode == IEEE80211_PROT_RTSCTS) ? "RTS/CTS" :
((ic->ic_protmode == IEEE80211_PROT_CTSONLY) ? "CTS-to-self" : "none"));
if (ic->ic_protmode == IEEE80211_PROT_RTSCTS)
- ofdm_prot |= RT2860_REG_PROT_CTRL_RTS_CTS;
+ ofdm_prot |= RT2860_PROT_CTRL_RTS_CTS;
else if (ic->ic_protmode == IEEE80211_PROT_CTSONLY)
- ofdm_prot |= RT2860_REG_PROT_CTRL_CTS;
- else
- ofdm_prot |= RT2860_REG_PROT_CTRL_NONE;
+ ofdm_prot |= RT2860_PROT_CTRL_CTS;
} else {
RT2860_DPRINTF(sc, RT2860_DEBUG_PROT,
- "%s: updating protection mode: b/g protection mode=%s\n",
- device_get_nameunit(sc->sc_dev), "none");
-
- ofdm_prot |= RT2860_REG_PROT_CTRL_NONE;
- }
-
- rt2860_io_mac_write(sc, RT2860_REG_TX_OFDM_PROT_CFG, ofdm_prot);
+ "updating protection mode: b/g protection mode=%s\n",
+ "none");
+ }
+
+ RAL_WRITE(sc, RT2860_OFDM_PROT_CFG, ofdm_prot);
/* HT frame protection */
@@ -3816,17 +3320,15 @@
/* force HT mixed mode and RTS/CTS protection if A-MPDU Tx aggregation is enabled */
if (sc->tx_ampdu_sessions > 0) {
- RT2860_DPRINTF(sc, RT2860_DEBUG_PROT,
- "%s: updating protection mode: forcing HT mixed mode and RTS/CTS protection\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_PROT, "updating protection "
+ "mode: forcing HT mixed mode and RTS/CTS protection\n");
htopmode = IEEE80211_HTINFO_OPMODE_MIXED;
htprotmode = IEEE80211_PROT_RTSCTS;
}
RT2860_DPRINTF(sc, RT2860_DEBUG_PROT,
- "%s: updating protection mode: HT operation mode=0x%02x, protection mode=%s\n",
- device_get_nameunit(sc->sc_dev),
+ "updating protection mode: HT operation mode=0x%02x, protection mode=%s\n",
htopmode & IEEE80211_HTINFO_OPMODE,
(htprotmode == IEEE80211_PROT_RTSCTS) ? "RTS/CTS" :
((htprotmode == IEEE80211_PROT_CTSONLY) ? "CTS-to-self" : "none"));
@@ -3834,33 +3336,31 @@
switch (htopmode & IEEE80211_HTINFO_OPMODE) {
/* IEEE80211_HTINFO_OPMODE_HT20PR */
case IEEE80211_HTINFO_OPMODE_HT20PR:
- mm20_prot = RT2860_REG_PROT_NAV_SHORT | RT2860_REG_PROT_CTRL_NONE |
- RT2860_REG_TXOP_ALLOW_CCK | RT2860_REG_TXOP_ALLOW_OFDM |
- RT2860_REG_TXOP_ALLOW_MM20 | RT2860_REG_TXOP_ALLOW_GF20 |
+ mm20_prot = RT2860_PROT_NAV_SHORT |
+ RT2860_TXOP_ALLOW_CCK | RT2860_TXOP_ALLOW_OFDM |
+ RT2860_TXOP_ALLOW_MM20 | RT2860_TXOP_ALLOW_GF20 |
(RT2860_REG_PROT_PHYMODE_OFDM << RT2860_REG_PROT_PHYMODE_SHIFT) |
(4 << RT2860_REG_PROT_MCS_SHIFT);
gf20_prot = mm20_prot;
- mm40_prot = RT2860_REG_PROT_NAV_SHORT | RT2860_REG_TXOP_ALLOW_ALL |
+ mm40_prot = RT2860_PROT_NAV_SHORT | RT2860_TXOP_ALLOW_ALL |
(RT2860_REG_PROT_PHYMODE_OFDM << RT2860_REG_PROT_PHYMODE_SHIFT) |
(0x84 << RT2860_REG_PROT_MCS_SHIFT);
if (htprotmode == IEEE80211_PROT_RTSCTS)
- mm40_prot |= RT2860_REG_PROT_CTRL_RTS_CTS;
+ mm40_prot |= RT2860_PROT_CTRL_RTS_CTS;
else if (htprotmode == IEEE80211_PROT_CTSONLY)
- mm40_prot |= RT2860_REG_PROT_CTRL_CTS;
- else
- mm40_prot |= RT2860_REG_PROT_CTRL_NONE;
+ mm40_prot |= RT2860_PROT_CTRL_CTS;
gf40_prot = mm40_prot;
break;
/* IEEE80211_HTINFO_OPMODE_MIXED */
case IEEE80211_HTINFO_OPMODE_MIXED:
- mm20_prot = RT2860_REG_PROT_NAV_SHORT |
- RT2860_REG_TXOP_ALLOW_CCK | RT2860_REG_TXOP_ALLOW_OFDM |
- RT2860_REG_TXOP_ALLOW_MM20 | RT2860_REG_TXOP_ALLOW_GF20;
+ mm20_prot = RT2860_PROT_NAV_SHORT |
+ RT2860_TXOP_ALLOW_CCK | RT2860_TXOP_ALLOW_OFDM |
+ RT2860_TXOP_ALLOW_MM20 | RT2860_TXOP_ALLOW_GF20;
if (ic->ic_flags & IEEE80211_F_USEPROT)
mm20_prot |= (RT2860_REG_PROT_PHYMODE_CCK << RT2860_REG_PROT_PHYMODE_SHIFT) |
@@ -3870,15 +3370,13 @@
(4 << RT2860_REG_PROT_MCS_SHIFT);
if (htprotmode == IEEE80211_PROT_RTSCTS)
- mm20_prot |= RT2860_REG_PROT_CTRL_RTS_CTS;
+ mm20_prot |= RT2860_PROT_CTRL_RTS_CTS;
else if (htprotmode == IEEE80211_PROT_CTSONLY)
- mm20_prot |= RT2860_REG_PROT_CTRL_CTS;
- else
- mm20_prot |= RT2860_REG_PROT_CTRL_NONE;
+ mm20_prot |= RT2860_PROT_CTRL_CTS;
gf20_prot = mm20_prot;
- mm40_prot = RT2860_REG_PROT_NAV_SHORT | RT2860_REG_TXOP_ALLOW_ALL;
+ mm40_prot = RT2860_PROT_NAV_SHORT | RT2860_TXOP_ALLOW_ALL;
if (ic->ic_flags & IEEE80211_F_USEPROT)
mm40_prot |= (RT2860_REG_PROT_PHYMODE_CCK << RT2860_REG_PROT_PHYMODE_SHIFT) |
@@ -3888,11 +3386,9 @@
(0x84 << RT2860_REG_PROT_MCS_SHIFT);
if (htprotmode == IEEE80211_PROT_RTSCTS)
- mm40_prot |= RT2860_REG_PROT_CTRL_RTS_CTS;
+ mm40_prot |= RT2860_PROT_CTRL_RTS_CTS;
else if (htprotmode == IEEE80211_PROT_CTSONLY)
- mm40_prot |= RT2860_REG_PROT_CTRL_CTS;
- else
- mm40_prot |= RT2860_REG_PROT_CTRL_NONE;
+ mm40_prot |= RT2860_PROT_CTRL_CTS;
gf40_prot = mm40_prot;
break;
@@ -3904,16 +3400,16 @@
case IEEE80211_HTINFO_OPMODE_PURE:
case IEEE80211_HTINFO_OPMODE_PROTOPT:
default:
- mm20_prot = RT2860_REG_PROT_NAV_SHORT | RT2860_REG_PROT_CTRL_NONE |
- RT2860_REG_TXOP_ALLOW_CCK | RT2860_REG_TXOP_ALLOW_OFDM |
- RT2860_REG_TXOP_ALLOW_MM20 | RT2860_REG_TXOP_ALLOW_GF20 |
+ mm20_prot = RT2860_PROT_NAV_SHORT |
+ RT2860_TXOP_ALLOW_CCK | RT2860_TXOP_ALLOW_OFDM |
+ RT2860_TXOP_ALLOW_MM20 | RT2860_TXOP_ALLOW_GF20 |
(RT2860_REG_PROT_PHYMODE_OFDM << RT2860_REG_PROT_PHYMODE_SHIFT) |
(4 << RT2860_REG_PROT_MCS_SHIFT);
gf20_prot = mm20_prot;
- mm40_prot = RT2860_REG_PROT_NAV_SHORT | RT2860_REG_PROT_CTRL_NONE |
- RT2860_REG_TXOP_ALLOW_ALL |
+ mm40_prot = RT2860_PROT_NAV_SHORT |
+ RT2860_TXOP_ALLOW_ALL |
(RT2860_REG_PROT_PHYMODE_OFDM << RT2860_REG_PROT_PHYMODE_SHIFT) |
(0x84 << RT2860_REG_PROT_MCS_SHIFT);
@@ -3921,16 +3417,17 @@
break;
}
- rt2860_io_mac_write(sc, RT2860_REG_TX_MM20_PROT_CFG, mm20_prot);
- rt2860_io_mac_write(sc, RT2860_REG_TX_MM40_PROT_CFG, mm40_prot);
- rt2860_io_mac_write(sc, RT2860_REG_TX_GF20_PROT_CFG, gf20_prot);
- rt2860_io_mac_write(sc, RT2860_REG_TX_GF40_PROT_CFG, gf40_prot);
+ RAL_WRITE(sc, RT2860_MM20_PROT_CFG, mm20_prot);
+ RAL_WRITE(sc, RT2860_MM40_PROT_CFG, mm40_prot);
+ RAL_WRITE(sc, RT2860_GF20_PROT_CFG, gf20_prot);
+ RAL_WRITE(sc, RT2860_GF40_PROT_CFG, gf40_prot);
}
/*
* rt2860_asic_updateslot
*/
-static void rt2860_asic_updateslot(struct rt2860_softc *sc)
+static void
+rt2860_asic_updateslot(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3942,12 +3439,11 @@
vap = TAILQ_FIRST(&ic->ic_vaps);
RT2860_DPRINTF(sc, RT2860_DEBUG_STATE,
- "%s: %s short slot time\n",
- device_get_nameunit(sc->sc_dev),
+ "%s short slot time\n",
((ic->ic_flags & IEEE80211_F_SHSLOT) ||
((vap != NULL) && (vap->iv_flags & IEEE80211_F_BURST))) ? "enabling" : "disabling");
- tmp = rt2860_io_mac_read(sc, RT2860_REG_BKOFF_SLOT_CFG);
+ tmp = RAL_READ(sc, RT2860_BKOFF_SLOT_CFG);
tmp &= ~0xff;
@@ -3957,13 +3453,14 @@
else
tmp |= IEEE80211_DUR_SLOT;
- rt2860_io_mac_write(sc, RT2860_REG_BKOFF_SLOT_CFG, tmp);
+ RAL_WRITE(sc, RT2860_BKOFF_SLOT_CFG, tmp);
}
/*
* rt2860_asic_wme_update
*/
-static void rt2860_asic_wme_update(struct rt2860_softc *sc)
+static void
+rt2860_asic_wme_update(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -3977,9 +3474,8 @@
wmep = wme->wme_chanParams.cap_wmeParams;
RT2860_DPRINTF(sc, RT2860_DEBUG_WME,
- "%s: wme update: WME_AC_VO=%d/%d/%d/%d, WME_AC_VI=%d/%d/%d/%d, "
+ "wme update: WME_AC_VO=%d/%d/%d/%d, WME_AC_VI=%d/%d/%d/%d, "
"WME_AC_BK=%d/%d/%d/%d, WME_AC_BE=%d/%d/%d/%d\n",
- device_get_nameunit(sc->sc_dev),
wmep[WME_AC_VO].wmep_aifsn,
wmep[WME_AC_VO].wmep_logcwmin, wmep[WME_AC_VO].wmep_logcwmax,
wmep[WME_AC_VO].wmep_txopLimit,
@@ -3994,152 +3490,144 @@
wmep[WME_AC_BE].wmep_txopLimit);
for (i = 0; i < WME_NUM_AC; i++)
- rt2860_io_mac_write(sc, RT2860_REG_TX_EDCA_AC_CFG(i),
+ RAL_WRITE(sc, RT2860_REG_TX_EDCA_AC_CFG(i),
(wmep[i].wmep_logcwmax << 16) | (wmep[i].wmep_logcwmin << 12) |
(wmep[i].wmep_aifsn << 8) | wmep[i].wmep_txopLimit);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_AIFSN_CFG,
+ RAL_WRITE(sc, RT2860_WMM_AIFSN_CFG,
(wmep[WME_AC_VO].wmep_aifsn << 12) | (wmep[WME_AC_VI].wmep_aifsn << 8) |
(wmep[WME_AC_BK].wmep_aifsn << 4) | wmep[WME_AC_BE].wmep_aifsn);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_CWMIN_CFG,
+ RAL_WRITE(sc, RT2860_WMM_CWMIN_CFG,
(wmep[WME_AC_VO].wmep_logcwmin << 12) | (wmep[WME_AC_VI].wmep_logcwmin << 8) |
(wmep[WME_AC_BK].wmep_logcwmin << 4) | wmep[WME_AC_BE].wmep_logcwmin);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_CWMAX_CFG,
+ RAL_WRITE(sc, RT2860_WMM_CWMAX_CFG,
(wmep[WME_AC_VO].wmep_logcwmax << 12) | (wmep[WME_AC_VI].wmep_logcwmax << 8) |
(wmep[WME_AC_BK].wmep_logcwmax << 4) | wmep[WME_AC_BE].wmep_logcwmax);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_TXOP0_CFG,
+ RAL_WRITE(sc, RT2860_WMM_TXOP0_CFG,
(wmep[WME_AC_BK].wmep_txopLimit << 16) | wmep[WME_AC_BE].wmep_txopLimit);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WMM_TXOP1_CFG,
+ RAL_WRITE(sc, RT2860_WMM_TXOP1_CFG,
(wmep[WME_AC_VO].wmep_txopLimit << 16) | wmep[WME_AC_VI].wmep_txopLimit);
}
/*
* rt2860_asic_update_beacon
*/
-static void rt2860_asic_update_beacon(struct rt2860_softc *sc,
- struct ieee80211vap *vap)
+static void
+rt2860_asic_update_beacon(struct rt2860_softc *sc, struct ieee80211vap *vap,
+ struct rt2860_txwi *txwi)
{
struct rt2860_softc_vap *rvap;
struct mbuf *m;
- struct rt2860_txwi *txwi;
uint32_t tmp;
rvap = (struct rt2860_softc_vap *) vap;
m = rvap->beacon_mbuf;
- txwi = &rvap->beacon_txwi;
/* disable temporarily TSF sync */
- tmp = rt2860_io_mac_read(sc, RT2860_REG_BCN_TIME_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_BCN_TIME_CFG);
tmp &= ~(RT2860_REG_BCN_TX_ENABLE |
RT2860_REG_TSF_TIMER_ENABLE |
RT2860_REG_TBTT_TIMER_ENABLE);
- rt2860_io_mac_write(sc, RT2860_REG_BCN_TIME_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_BCN_TIME_CFG, tmp);
/* write Tx wireless info and beacon frame to on-chip memory */
- rt2860_io_mac_write_multi(sc, RT2860_REG_BEACON_BASE(0),
- txwi, sizeof(struct rt2860_txwi));
-
- rt2860_io_mac_write_multi(sc, RT2860_REG_BEACON_BASE(0) + sizeof(struct rt2860_txwi),
+ RAL_WRITE_REGION_1(sc, RT2860_REG_BEACON_BASE(0),
+ (uint8_t *)txwi, sizeof(struct rt2860_txwi));
+
+ RAL_WRITE_REGION_1(sc, RT2860_REG_BEACON_BASE(0) + sizeof(struct rt2860_txwi),
mtod(m, uint8_t *), m->m_pkthdr.len);
/* enable again TSF sync */
- tmp = rt2860_io_mac_read(sc, RT2860_REG_BCN_TIME_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_BCN_TIME_CFG);
tmp |= (RT2860_REG_BCN_TX_ENABLE |
RT2860_REG_TSF_TIMER_ENABLE |
RT2860_REG_TBTT_TIMER_ENABLE);
- rt2860_io_mac_write(sc, RT2860_REG_BCN_TIME_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_BCN_TIME_CFG, tmp);
}
/*
* rt2860_asic_clear_keytables
*/
-static void rt2860_asic_clear_keytables(struct rt2860_softc *sc)
+static void
+rt2860_asic_clear_keytables(struct rt2860_softc *sc)
{
int i;
/* clear Rx WCID search table (entries = 256, entry size = 8) */
-
for (i = 0; i < 256; i++) {
- rt2860_io_mac_write(sc, RT2860_REG_WCID(i), 0xffffffff);
- rt2860_io_mac_write(sc, RT2860_REG_WCID(i) + 4, 0x0000ffff);
+ RAL_WRITE(sc, RT2860_REG_WCID(i), 0xffffffff);
+ RAL_WRITE(sc, RT2860_REG_WCID(i) + 4, 0x0000ffff);
}
/* clear WCID attribute table (entries = 256, entry size = 4) */
-
- rt2860_io_mac_set_region_4(sc, RT2860_REG_WCID_ATTR(0), RT2860_REG_PKEY_ENABLE, 256);
+ RAL_SET_REGION_4(sc, RT2860_REG_WCID_ATTR(0), RT2860_RX_PKEY_EN, 256);
/* clear IV/EIV table (entries = 256, entry size = 8) */
-
- rt2860_io_mac_set_region_4(sc, RT2860_REG_IVEIV(0), 0, 2 * 256);
+ RAL_SET_REGION_4(sc, RT2860_REG_IVEIV(0), 0, 2 * 256);
/* clear pairwise key table (entries = 64, entry size = 32) */
-
- rt2860_io_mac_set_region_4(sc, RT2860_REG_PKEY(0), 0, 8 * 64);
+ RAL_SET_REGION_4(sc, RT2860_REG_PKEY(0), 0, 8 * 64);
/* clear shared key table (entries = 32, entry size = 32) */
-
- rt2860_io_mac_set_region_4(sc, RT2860_REG_SKEY(0, 0), 0, 8 * 32);
+ RAL_SET_REGION_4(sc, RT2860_REG_SKEY(0, 0), 0, 8 * 32);
/* clear shared key mode (entries = 32, entry size = 2) */
-
- rt2860_io_mac_set_region_4(sc, RT2860_REG_SKEY_MODE(0), 0, 16);
+ RAL_SET_REGION_4(sc, RT2860_REG_SKEY_MODE(0), 0, 16);
}
/*
* rt2860_asic_add_ba_session
*/
-static void rt2860_asic_add_ba_session(struct rt2860_softc *sc,
- uint8_t wcid, int tid)
+static void
+rt2860_asic_add_ba_session(struct rt2860_softc *sc, uint8_t wcid, int tid)
{
uint32_t tmp;
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: adding BA session: wcid=0x%02x, tid=%d\n",
- device_get_nameunit(sc->sc_dev), wcid, tid);
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_WCID(wcid) + 4);
-
+ "adding BA session: wcid=0x%02x, tid=%d\n",
+ wcid, tid);
+
+ tmp = RAL_READ(sc, RT2860_REG_WCID(wcid) + 4);
tmp |= (0x10000 << tid);
-
- rt2860_io_mac_write(sc, RT2860_REG_WCID(wcid) + 4, tmp);
+ RAL_WRITE(sc, RT2860_REG_WCID(wcid) + 4, tmp);
}
/*
* rt2860_asic_del_ba_session
*/
-static void rt2860_asic_del_ba_session(struct rt2860_softc *sc,
- uint8_t wcid, int tid)
+static void
+rt2860_asic_del_ba_session(struct rt2860_softc *sc, uint8_t wcid, int tid)
{
uint32_t tmp;
RT2860_DPRINTF(sc, RT2860_DEBUG_BA,
- "%s: deleting BA session: wcid=0x%02x, tid=%d\n",
- device_get_nameunit(sc->sc_dev), wcid, tid);
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_WCID(wcid) + 4);
+ "deleting BA session: wcid=0x%02x, tid=%d\n",
+ wcid, tid);
+
+ tmp = RAL_READ(sc, RT2860_REG_WCID(wcid) + 4);
tmp &= ~(0x10000 << tid);
- rt2860_io_mac_write(sc, RT2860_REG_WCID(wcid) + 4, tmp);
+ RAL_WRITE(sc, RT2860_REG_WCID(wcid) + 4, tmp);
}
/*
* rt2860_beacon_alloc
*/
-static int rt2860_beacon_alloc(struct rt2860_softc *sc,
- struct ieee80211vap *vap)
+static int
+rt2860_beacon_alloc(struct rt2860_softc *sc, struct ieee80211vap *vap)
{
struct ieee80211com *ic;
struct rt2860_softc_vap *rvap;
@@ -4152,39 +3640,33 @@
m = ieee80211_beacon_alloc(vap->iv_bss, &rvap->beacon_offsets);
if (m == NULL)
- return ENOMEM;
+ return (ENOMEM);
rate = IEEE80211_IS_CHAN_5GHZ(vap->iv_bss->ni_chan) ? 12 : 2;
mcs = rt2860_rate2mcs(rate);
RT2860_DPRINTF(sc, RT2860_DEBUG_BEACON,
- "%s: beacon allocate: mcs=0x%02x\n",
- device_get_nameunit(sc->sc_dev), mcs);
+ "beacon allocate: mcs=0x%02x\n",
+ mcs);
memset(&txwi, 0, sizeof(struct rt2860_txwi));
txwi.wcid = RT2860_WCID_RESERVED;
- txwi.pid_mpdu_len = ((htole16(m->m_pkthdr.len) & RT2860_TXWI_MPDU_LEN_MASK) <<
- RT2860_TXWI_MPDU_LEN_SHIFT);
- txwi.txop = (RT2860_TXWI_TXOP_HT << RT2860_TXWI_TXOP_SHIFT);
- txwi.mpdu_density_flags |=
- (RT2860_TXWI_FLAGS_TS << RT2860_TXWI_FLAGS_SHIFT);
- txwi.bawin_size_xflags |=
- (RT2860_TXWI_XFLAGS_NSEQ << RT2860_TXWI_XFLAGS_SHIFT);
+ txwi.len = htole16(m->m_pkthdr.len);
+ txwi.txop = RT2860_TX_TXOP_HT;
+ txwi.flags |= RT2860_TX_TS;
+ txwi.xflags |= RT2860_TX_NSEQ;
if (rate == 2) {
- txwi.phymode_ifs_stbc_shortgi =
- (RT2860_TXWI_PHYMODE_CCK << RT2860_TXWI_PHYMODE_SHIFT);
+ txwi.phy = RT2860_PHY_CCK;
if (rate != 2 && (ic->ic_flags & IEEE80211_F_SHPREAMBLE))
- mcs |= RT2860_TXWI_MCS_SHOTPRE;
+ mcs |= RT2860_PHY_SHPRE;
} else {
- txwi.phymode_ifs_stbc_shortgi =
- (RT2860_TXWI_PHYMODE_OFDM << RT2860_TXWI_PHYMODE_SHIFT);
- }
-
- txwi.bw_mcs = (RT2860_TXWI_BW_20 << RT2860_TXWI_BW_SHIFT) |
- ((mcs & RT2860_TXWI_MCS_MASK) << RT2860_TXWI_MCS_SHIFT);
+ txwi.phy = RT2860_PHY_OFDM;
+ }
+
+ txwi.phy |= (mcs & RT2860_PHY_MCS);
if (rvap->beacon_mbuf != NULL) {
m_free(rvap->beacon_mbuf);
@@ -4192,15 +3674,17 @@
}
rvap->beacon_mbuf = m;
- rvap->beacon_txwi = txwi;
-
- return 0;
+
+ rt2860_asic_update_beacon(sc, vap, &txwi);
+
+ return (0);
}
/*
* rt2860_rxrate
*/
-static uint8_t rt2860_rxrate(struct rt2860_rxwi *rxwi)
+static uint8_t
+rt2860_rxrate(struct rt2860_rxwi *rxwi)
{
uint8_t mcs, phymode;
uint8_t rate;
@@ -4239,14 +3723,14 @@
break;
}
- return rate;
+ return (rate);
}
/*
* rt2860_maxrssi_rxpath
*/
-static uint8_t rt2860_maxrssi_rxpath(struct rt2860_softc *sc,
- const struct rt2860_rxwi *rxwi)
+static uint8_t
+rt2860_maxrssi_rxpath(struct rt2860_softc *sc, const struct rt2860_rxwi *rxwi)
{
uint8_t rxpath;
@@ -4260,14 +3744,14 @@
if (rxwi->rssi[2] > rxwi->rssi[rxpath])
rxpath = 2;
- return rxpath;
+ return (rxpath);
}
/*
* rt2860_rssi2dbm
*/
-static int8_t rt2860_rssi2dbm(struct rt2860_softc *sc,
- uint8_t rssi, uint8_t rxpath)
+static int8_t
+rt2860_rssi2dbm(struct rt2860_softc *sc, uint8_t rssi, uint8_t rxpath)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -4276,7 +3760,7 @@
int8_t rssi_off, lna_gain;
if (rssi == 0)
- return -99;
+ return (-99);
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
@@ -4303,34 +3787,36 @@
/*
* rt2860_rate2mcs
*/
-static uint8_t rt2860_rate2mcs(uint8_t rate)
+static uint8_t
+rt2860_rate2mcs(uint8_t rate)
{
switch (rate) {
/* CCK rates */
- case 2: return 0;
- case 4: return 1;
- case 11: return 2;
- case 22: return 3;
+ case 2: return (0);
+ case 4: return (1);
+ case 11: return (2);
+ case 22: return (3);
/* OFDM rates */
- case 12: return 0;
- case 18: return 1;
- case 24: return 2;
- case 36: return 3;
- case 48: return 4;
- case 72: return 5;
- case 96: return 6;
- case 108: return 7;
- }
-
- return 0;
+ case 12: return (0);
+ case 18: return (1);
+ case 24: return (2);
+ case 36: return (3);
+ case 48: return (4);
+ case 72: return (5);
+ case 96: return (6);
+ case 108: return (7);
+ }
+
+ return (0);
}
/*
* rt2860_tx_mgmt
*/
-static int rt2860_tx_mgmt(struct rt2860_softc *sc,
- struct mbuf *m, struct ieee80211_node *ni, int qid)
+static int
+rt2860_tx_mgmt(struct rt2860_softc *sc, struct mbuf *m,
+ struct ieee80211_node *ni, int qid)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -4339,12 +3825,11 @@
struct rt2860_softc_node *rni;
struct rt2860_softc_tx_ring *ring;
struct rt2860_softc_tx_data *data;
- struct rt2860_txdesc *desc;
+ struct rt2860_txd *desc;
struct rt2860_txwi *txwi;
struct ieee80211_frame *wh;
struct rt2860_softc_tx_radiotap_header *tap;
bus_dma_segment_t dma_seg[RT2860_SOFTC_MAX_SCATTER];
- struct mbuf *m_d;
u_int hdrsize, hdrspace;
uint8_t rate, mcs, pid, qsel;
uint16_t len, dmalen, mpdu_len, dur;
@@ -4370,9 +3855,8 @@
wh = mtod(m, struct ieee80211_frame *);
rate = tp->mgmtrate & IEEE80211_RATE_VAL;
- /* XXX */
- if (!rate)
- return EFBIG;
+ KASSERT(rate != 0, ("%s: Tx MGMT: invalid rate=%d\n",
+ device_get_nameunit(sc->sc_dev), rate));
/* fill Tx wireless info */
if (ni->ni_flags & IEEE80211_NODE_HT)
@@ -4389,7 +3873,6 @@
memset(txwi, 0, sizeof(struct rt2860_txwi));
/* management frames do not need encryption */
-
txwi->wcid = RT2860_WCID_RESERVED;
/* MIMO power save */
@@ -4397,71 +3880,54 @@
if (mcs > 7) {
if (ni->ni_flags & IEEE80211_NODE_MIMO_RTS) {
/* dynamic MIMO power save */
- txwi->mpdu_density_flags |=
- (RT2860_TXWI_FLAGS_MIMOPS << RT2860_TXWI_FLAGS_SHIFT);
+ txwi->flags |= RT2860_TX_MMPS;
} else {
/* static MIMO power save */
-
mcs = 7;
}
}
-
mimops = 1;
} else {
mimops = 0;
}
- pid = (mcs < 0xf) ? (mcs + 1) : mcs;
-
- txwi->pid_mpdu_len = ((htole16(pid) & RT2860_TXWI_PID_MASK) <<
- RT2860_TXWI_PID_SHIFT) | ((htole16(mpdu_len) & RT2860_TXWI_MPDU_LEN_MASK) <<
- RT2860_TXWI_MPDU_LEN_SHIFT);
-
+ pid = ((mcs < 0xf) ? (mcs + 1) : mcs) & 0xf;
+
+ txwi->len = (htole16(pid) << RT2860_TX_PID_SHIFT) | htole16(mpdu_len);
if (ni->ni_flags & IEEE80211_NODE_HT) {
- txwi->phymode_ifs_stbc_shortgi |=
- (RT2860_TXWI_PHYMODE_HT_MIXED << RT2860_TXWI_PHYMODE_SHIFT);
+ txwi->phy |= RT2860_PHY_HT;
} else {
if (ieee80211_rate2phytype(ic->ic_rt, rate) != IEEE80211_T_OFDM) {
- txwi->phymode_ifs_stbc_shortgi |=
- (RT2860_TXWI_PHYMODE_CCK << RT2860_TXWI_PHYMODE_SHIFT);
+ txwi->phy |= RT2860_PHY_CCK;
if (rate != 2 && (ic->ic_flags & IEEE80211_F_SHPREAMBLE))
- mcs |= RT2860_TXWI_MCS_SHOTPRE;
+ mcs |= RT2860_PHY_SHPRE;
} else {
- txwi->phymode_ifs_stbc_shortgi |=
- (RT2860_TXWI_PHYMODE_OFDM << RT2860_TXWI_PHYMODE_SHIFT);
+ txwi->phy |= RT2860_PHY_OFDM;
}
}
- txwi->bw_mcs = (RT2860_TXWI_BW_20 << RT2860_TXWI_BW_SHIFT) |
- ((mcs & RT2860_TXWI_MCS_MASK) << RT2860_TXWI_MCS_SHIFT);
-
- txwi->txop = (RT2860_TXWI_TXOP_BACKOFF << RT2860_TXWI_TXOP_SHIFT);
+ txwi->phy |= (mcs & RT2860_PHY_MCS);
+ txwi->txop = RT2860_TX_TXOP_BACKOFF;
/* skip ACKs for multicast frames */
-
if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
- txwi->bawin_size_xflags |=
- (RT2860_TXWI_XFLAGS_ACK << RT2860_TXWI_XFLAGS_SHIFT);
+ txwi->xflags |= RT2860_TX_ACK;
if (ni->ni_flags & IEEE80211_NODE_HT) {
/* preamble + plcp + signal extension + SIFS */
-
dur = 16 + 4 + 6 + 10;
} else {
dur = ieee80211_ack_duration(ic->ic_rt, rate,
ic->ic_flags & IEEE80211_F_SHPREAMBLE);
}
-
*(uint16_t *) wh->i_dur = htole16(dur);
}
/* ask MAC to insert timestamp into probe responses */
-
if ((wh->i_fc[0] & (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) ==
(IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP))
- txwi->mpdu_density_flags |=
- (RT2860_TXWI_FLAGS_TS << RT2860_TXWI_FLAGS_SHIFT);
+ txwi->flags |= RT2860_TX_TS;
if (ieee80211_radiotap_active_vap(vap)) {
tap = &sc->txtap;
@@ -4477,7 +3943,7 @@
else
tap->rate = rate;
- if (mcs & RT2860_TXWI_MCS_SHOTPRE)
+ if (mcs & RT2860_PHY_SHPRE)
tap->flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
if (wh->i_fc[1] & IEEE80211_FC1_WEP)
@@ -4495,7 +3961,6 @@
}
/* copy and trim 802.11 header */
-
m_copydata(m, 0, hdrsize, (caddr_t) (txwi + 1));
m_adj(m, hdrspace);
@@ -4503,18 +3968,17 @@
dma_seg, &ndmasegs, BUS_DMA_NOWAIT);
if (error != 0) {
/* too many fragments, linearize */
-
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: could not load mbuf DMA map, trying to linearize mbuf: ndmasegs=%d, len=%d, error=%d\n",
- device_get_nameunit(sc->sc_dev), ndmasegs, m->m_pkthdr.len, error);
-
- m_d = m_collapse(m, M_DONTWAIT, 16);
- if (m_d == NULL) {
- m_freem(m);
- m = NULL;
+ "could not load mbuf DMA map, trying to linearize "
+ "mbuf: ndmasegs=%d, len=%d, error=%d\n",
+ ndmasegs, m->m_pkthdr.len, error);
+
+ m = m_collapse(m, M_DONTWAIT, 16);
+ if (m == NULL) {
+ RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
+ "m_collapse(m, M_DONTWAIT, 16) failed\n");
return (ENOMEM);
}
- m = m_d;
sc->tx_defrag_packets++;
@@ -4524,8 +3988,7 @@
device_printf(sc->sc_dev, "could not load mbuf DMA "
"map: ndmasegs=%d, len=%d, error=%d\n",
ndmasegs, m->m_pkthdr.len, error);
- m_freem(m);
- return error;
+ return (error);
}
}
@@ -4533,78 +3996,76 @@
ndmasegs = 0;
/* determine how many Tx descs are required */
-
ndescs = 1 + ndmasegs / 2;
- if ((ring->desc_queued + ndescs) > (RT2860_SOFTC_TX_RING_DESC_COUNT - 2)) {
+ if ((ring->desc_queued + ndescs) >
+ (RT2860_SOFTC_TX_RING_DESC_COUNT - 2)) {
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: there are not enough Tx descs\n",
- device_get_nameunit(sc->sc_dev));
+ "there are not enough Tx descs\n");
sc->no_tx_desc_avail++;
bus_dmamap_unload(ring->data_dma_tag, data->dma_map);
- m_freem(m);
- return EFBIG;
+ return (EFBIG);
}
data->m = m;
data->ni = ni;
/* set up Tx descs */
-
/* first segment is Tx wireless info and 802.11 header */
-
len = sizeof(struct rt2860_txwi) + hdrsize;
/* align end on a 4-bytes boundary */
-
dmalen = (len + 3) & ~ 3;
-
memset((caddr_t) txwi + len, 0, dmalen - len);
-
- qsel = RT2860_TXDESC_QSEL_EDCA;
-
- desc->sdp0 = htole32(ring->seg0_phys_addr + ring->data_cur * RT2860_TX_DATA_SEG0_SIZE);
+ qsel = RT2860_TX_QSEL_EDCA;
+
+ desc->sdp0 = htole32(ring->seg0_phys_addr +
+ ring->data_cur * RT2860_TX_DATA_SEG0_SIZE);
desc->sdl0 = htole16(dmalen);
- desc->qsel_flags = (qsel << RT2860_TXDESC_QSEL_SHIFT);
+ desc->flags = (qsel << RT2860_TX_QSEL_SHIFT);
/* set up payload segments */
-
for (i = ndmasegs, j = 0; i >= 2; i -= 2) {
desc->sdp1 = htole32(dma_seg[j].ds_addr);
- desc->sdl1 = htole16(dma_seg[j].ds_len);
+ desc->sdl1 = htole16((dma_seg[j].ds_len + 3) & ~3);
ring->desc_queued++;
- ring->desc_cur = (ring->desc_cur + 1) % RT2860_SOFTC_TX_RING_DESC_COUNT;
+ ring->desc_cur = (ring->desc_cur + 1) %
+ RT2860_SOFTC_TX_RING_DESC_COUNT;
j++;
desc = &ring->desc[ring->desc_cur];
desc->sdp0 = htole32(dma_seg[j].ds_addr);
- desc->sdl0 = htole16(dma_seg[j].ds_len);
- desc->qsel_flags = (qsel << RT2860_TXDESC_QSEL_SHIFT);
+ desc->sdl0 = htole16((dma_seg[j].ds_len + 3) & ~3);
+ desc->flags = (qsel << RT2860_TX_QSEL_SHIFT);
j++;
}
/* finalize last payload segment */
-
if (i > 0) {
desc->sdp1 = htole32(dma_seg[j].ds_addr);
- desc->sdl1 = htole16(dma_seg[j].ds_len | RT2860_TXDESC_SDL1_LASTSEG);
+ desc->sdl1 = htole16(((dma_seg[j].ds_len + 3) & ~3) |
+ RT2860_TX_LS1);
} else {
- desc->sdl0 |= htole16(RT2860_TXDESC_SDL0_LASTSEG);
+ desc->sdl0 |= htole16(RT2860_TX_LS0);
desc->sdl1 = 0;
}
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: sending MGMT frame: qid=%d, hdrsize=%d, hdrspace=%d, len=%d, "
- "mcs=%d, mimops=%d, DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n",
- device_get_nameunit(sc->sc_dev),
- qid, hdrsize, hdrspace, m->m_pkthdr.len + hdrsize,
- mcs, mimops, dmalen, ndmasegs,
- (int) dma_seg[0].ds_len, (int) dma_seg[1].ds_len, (int) dma_seg[2].ds_len, (int) dma_seg[3].ds_len, (int) dma_seg[4].ds_len);
+ "sending MGMT frame: qid=%d, hdrsize=%d, hdrspace=%d, len=%d, "
+ "mcs=%d, mimops=%d, DMA len=%d, ndmasegs=%d, "
+ "DMA ds_len=%d/%d/%d/%d/%d\n",
+ qid, hdrsize, hdrspace, m->m_pkthdr.len + hdrsize,
+ mcs, mimops, dmalen, ndmasegs,
+ (int) dma_seg[0].ds_len,
+ (int) (ndmasegs > 1) ? dma_seg[1].ds_len : 0,
+ (int) (ndmasegs > 2) ? dma_seg[2].ds_len : 0,
+ (int) (ndmasegs > 3) ? dma_seg[3].ds_len : 0,
+ (int) (ndmasegs > 4) ? dma_seg[4].ds_len : 0);
bus_dmamap_sync(ring->seg0_dma_tag, ring->seg0_dma_map,
BUS_DMASYNC_PREWRITE);
@@ -4614,23 +4075,25 @@
BUS_DMASYNC_PREWRITE);
ring->desc_queued++;
- ring->desc_cur = (ring->desc_cur + 1) % RT2860_SOFTC_TX_RING_DESC_COUNT;
+ ring->desc_cur = (ring->desc_cur + 1) %
+ RT2860_SOFTC_TX_RING_DESC_COUNT;
ring->data_queued++;
- ring->data_cur = (ring->data_cur + 1) % RT2860_SOFTC_TX_RING_DATA_COUNT;
+ ring->data_cur = (ring->data_cur + 1) %
+ RT2860_SOFTC_TX_RING_DATA_COUNT;
/* kick Tx */
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(qid), ring->desc_cur);
-
- return 0;
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(qid), ring->desc_cur);
+
+ return (0);
}
/*
* rt2860_tx_data
*/
-static int rt2860_tx_data(struct rt2860_softc *sc,
- struct mbuf *m, struct ieee80211_node *ni, int qid)
+static int
+rt2860_tx_data(struct rt2860_softc *sc, struct mbuf *m,
+ struct ieee80211_node *ni, int qid)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -4639,7 +4102,7 @@
struct rt2860_softc_node *rni;
struct rt2860_softc_tx_ring *ring;
struct rt2860_softc_tx_data *data;
- struct rt2860_txdesc *desc;
+ struct rt2860_txd *desc;
struct rt2860_txwi *txwi;
struct ieee80211_frame *wh;
struct ieee80211_tx_ampdu *tx_ampdu;
@@ -4647,7 +4110,7 @@
struct rt2860_softc_tx_radiotap_header *tap;
bus_dma_segment_t dma_seg[RT2860_SOFTC_MAX_SCATTER];
u_int hdrsize, hdrspace;
- uint8_t type, rate, bw, stbc, shortgi, mcs, pid, wcid, mpdu_density, bawin_size, qsel;
+ uint8_t type, rate, stbc, shortgi, mcs, pid, wcid, mpdu_density, bawin_size, qsel;
uint16_t qos, len, dmalen, mpdu_len, dur;
int error, hasqos, ac, tid, ampdu, mimops, ndmasegs, ndescs, i, j;
@@ -4694,12 +4157,10 @@
rate = ni->ni_txrate;
rate &= IEEE80211_RATE_VAL;
-/* XXX */
- if (!rate)
- return EFBIG;
+ KASSERT(rate != 0, ("%s: Tx data: invalid rate=%d\n",
+ device_get_nameunit(sc->sc_dev), rate));
/* fill Tx wireless info */
-
if (ni->ni_flags & IEEE80211_NODE_HT)
mcs = rate;
else
@@ -4721,73 +4182,64 @@
txwi->wcid = wcid;
/* MIMO power save */
-
- if ((ni->ni_flags & IEEE80211_NODE_HT) && (ni->ni_flags & IEEE80211_NODE_MIMO_PS)) {
+ if ((ni->ni_flags & IEEE80211_NODE_HT) &&
+ (ni->ni_flags & IEEE80211_NODE_MIMO_PS)) {
if (mcs > 7) {
if (ni->ni_flags & IEEE80211_NODE_MIMO_RTS) {
/* dynamic MIMO power save */
-
- txwi->mpdu_density_flags |=
- (RT2860_TXWI_FLAGS_MIMOPS << RT2860_TXWI_FLAGS_SHIFT);
+ txwi->flags |= RT2860_TX_MMPS;
} else {
/* static MIMO power save */
-
mcs = 7;
}
}
-
mimops = 1;
} else {
mimops = 0;
}
- pid = (mcs < 0xf) ? (mcs + 1) : mcs;
-
- txwi->pid_mpdu_len = ((htole16(pid) & RT2860_TXWI_PID_MASK) <<
- RT2860_TXWI_PID_SHIFT) | ((htole16(mpdu_len) & RT2860_TXWI_MPDU_LEN_MASK) <<
- RT2860_TXWI_MPDU_LEN_SHIFT);
-
- stbc = sc->tx_stbc && (mcs <= 7) && (vap->iv_htcaps & IEEE80211_HTCAP_TXSTBC) &&
- (ni->ni_flags & IEEE80211_NODE_HT) && (ni->ni_htcap & IEEE80211_HTCAP_RXSTBC);
-
- shortgi = ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20) && (ni->ni_flags & IEEE80211_NODE_SGI20) && (ni->ni_chw == 20)) ||
- ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40) && (ni->ni_flags & IEEE80211_NODE_SGI40) && (ni->ni_chw == 40));
-
- txwi->phymode_ifs_stbc_shortgi |=
- ((stbc & RT2860_TXWI_STBC_MASK) << RT2860_TXWI_STBC_SHIFT) |
- ((shortgi & RT2860_TXWI_SHORTGI_MASK) << RT2860_TXWI_SHORTGI_SHIFT);
+ pid = ((mcs < 0xf) ? (mcs + 1) : mcs) & 0xf;
+ txwi->len = (htole16(pid) << RT2860_TX_PID_SHIFT) | htole16(mpdu_len);
+
+ stbc = sc->tx_stbc && (mcs <= 7) &&
+ (vap->iv_htcaps & IEEE80211_HTCAP_TXSTBC) &&
+ (ni->ni_flags & IEEE80211_NODE_HT) &&
+ (ni->ni_htcap & IEEE80211_HTCAP_RXSTBC);
+
+ shortgi = ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20) &&
+ (ni->ni_flags & IEEE80211_NODE_SGI20) && (ni->ni_chw == 20)) ||
+ ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40) &&
+ (ni->ni_flags & IEEE80211_NODE_SGI40) && (ni->ni_chw == 40));
+
+ txwi->phy |= (stbc << RT2860_PHY_STBC);
+ if (shortgi)
+ txwi->phy |= RT2860_PHY_SGI;
if (ni->ni_flags & IEEE80211_NODE_HT) {
- txwi->phymode_ifs_stbc_shortgi |=
- (RT2860_TXWI_PHYMODE_HT_MIXED << RT2860_TXWI_PHYMODE_SHIFT);
+ txwi->phy |= RT2860_PHY_HT;
} else {
- if (ieee80211_rate2phytype(ic->ic_rt, rate) != IEEE80211_T_OFDM) {
- txwi->phymode_ifs_stbc_shortgi |=
- (RT2860_TXWI_PHYMODE_CCK << RT2860_TXWI_PHYMODE_SHIFT);
-
- if (rate != 2 && (ic->ic_flags & IEEE80211_F_SHPREAMBLE))
- mcs |= RT2860_TXWI_MCS_SHOTPRE;
+ if (ieee80211_rate2phytype(ic->ic_rt, rate) !=
+ IEEE80211_T_OFDM) {
+ txwi->phy |= RT2860_PHY_CCK;
+
+ if (rate != 2 && (ic->ic_flags &
+ IEEE80211_F_SHPREAMBLE))
+ mcs |= RT2860_PHY_SHPRE;
} else {
- txwi->phymode_ifs_stbc_shortgi |=
- (RT2860_TXWI_PHYMODE_OFDM << RT2860_TXWI_PHYMODE_SHIFT);
+ txwi->phy |= RT2860_PHY_OFDM;
}
}
if ((ni->ni_flags & IEEE80211_NODE_HT) && (ni->ni_chw == 40))
- bw = RT2860_TXWI_BW_40;
- else
- bw = RT2860_TXWI_BW_20;
-
- txwi->bw_mcs = ((bw & RT2860_TXWI_BW_MASK) << RT2860_TXWI_BW_SHIFT) |
- ((mcs & RT2860_TXWI_MCS_MASK) << RT2860_TXWI_MCS_SHIFT);
-
- txwi->txop = (RT2860_TXWI_TXOP_HT << RT2860_TXWI_TXOP_SHIFT);
+ txwi->phy |= RT2860_PHY_BW40;
+ txwi->phy |= (mcs & RT2860_PHY_MCS);
+
+ txwi->txop = RT2860_TX_TXOP_HT;
if (!IEEE80211_IS_MULTICAST(wh->i_addr1) &&
(!hasqos || (qos & IEEE80211_QOS_ACKPOLICY) !=
IEEE80211_QOS_ACKPOLICY_NOACK)) {
- txwi->bawin_size_xflags |=
- (RT2860_TXWI_XFLAGS_ACK << RT2860_TXWI_XFLAGS_SHIFT);
+ txwi->xflags |= RT2860_TX_ACK;
if (ni->ni_flags & IEEE80211_NODE_HT) {
/* preamble + plcp + signal extension + SIFS */
@@ -4806,19 +4258,21 @@
tid = WME_AC_TO_TID(ac);
tx_ampdu = &ni->ni_tx_ampdu[ac];
- mpdu_density = RT2860_MS(ni->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY);
+ mpdu_density = RT2860_MS(ni->ni_htparam,
+ IEEE80211_HTCAP_MPDUDENSITY);
bawin_size = tx_ampdu->txa_wnd;
- txwi->mpdu_density_flags |=
- ((mpdu_density & RT2860_TXWI_MPDU_DENSITY_MASK) << RT2860_TXWI_MPDU_DENSITY_SHIFT) |
- (RT2860_TXWI_FLAGS_AMPDU << RT2860_TXWI_FLAGS_SHIFT);
-
- txwi->bawin_size_xflags |=
- ((bawin_size & RT2860_TXWI_BAWIN_SIZE_MASK) << RT2860_TXWI_BAWIN_SIZE_SHIFT);
+ txwi->flags |=
+ (mpdu_density << RT2860_TX_MPDU_DSITY_SHIFT) |
+ RT2860_TX_AMPDU;
+
+ txwi->xflags |=
+ (bawin_size << RT2860_TX_BAWINSIZE_SHIFT);
seqno = ni->ni_txseqs[tid]++;
- *(uint16_t *) &wh->i_seq[0] = htole16(seqno << IEEE80211_SEQ_SEQ_SHIFT);
+ *(uint16_t *) &wh->i_seq[0] =
+ htole16(seqno << IEEE80211_SEQ_SEQ_SHIFT);
ampdu = 1;
} else {
@@ -4828,11 +4282,10 @@
}
/* ask MAC to insert timestamp into probe responses */
-
- if ((wh->i_fc[0] & (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) ==
- (IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP))
- txwi->mpdu_density_flags |=
- (RT2860_TXWI_FLAGS_TS << RT2860_TXWI_FLAGS_SHIFT);
+ if ((wh->i_fc[0] &
+ (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) ==
+ (IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP))
+ txwi->flags |= RT2860_TX_TS;
if (ieee80211_radiotap_active_vap(vap)) {
tap = &sc->txtap;
@@ -4848,7 +4301,7 @@
else
tap->rate = rate;
- if (mcs & RT2860_TXWI_MCS_SHOTPRE)
+ if (mcs & RT2860_PHY_SHPRE)
tap->flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
if (shortgi)
@@ -4858,7 +4311,6 @@
tap->flags |= IEEE80211_RADIOTAP_F_WEP;
/* XXX use temporarily radiotap CFP flag as A-MPDU flag */
-
if (ampdu)
tap->flags |= IEEE80211_RADIOTAP_F_CFP;
@@ -4874,7 +4326,6 @@
}
/* copy and trim 802.11 header */
-
m_copydata(m, 0, hdrsize, (caddr_t) (txwi + 1));
m_adj(m, hdrspace);
@@ -4884,14 +4335,17 @@
/* too many fragments, linearize */
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: could not load mbuf DMA map, trying to linearize "
+ "could not load mbuf DMA map, trying to linearize "
"mbuf: ndmasegs=%d, len=%d, error=%d\n",
- device_get_nameunit(sc->sc_dev), ndmasegs,
+ ndmasegs,
m->m_pkthdr.len, error);
m = m_defrag(m, M_DONTWAIT);
- if (m == NULL)
- return ENOMEM;
+ if (m == NULL) {
+ RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
+ "Tx data: m_defrag failed\n");
+ return (ENOMEM);
+ }
sc->tx_defrag_packets++;
@@ -4901,8 +4355,7 @@
device_printf(sc->sc_dev, "could not load mbuf DMA "
"map: ndmasegs=%d, len=%d, error=%d\n",
ndmasegs, m->m_pkthdr.len, error);
- m_freem(m);
- return error;
+ return (error);
}
}
@@ -4912,46 +4365,38 @@
/* determine how many Tx descs are required */
ndescs = 1 + ndmasegs / 2;
- if ((ring->desc_queued + ndescs) >
+ if ((ring->desc_queued + ndescs) >
(RT2860_SOFTC_TX_RING_DESC_COUNT - 2)) {
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: there are not enough Tx descs\n",
- device_get_nameunit(sc->sc_dev));
+ "there are not enough Tx descs\n");
sc->no_tx_desc_avail++;
bus_dmamap_unload(ring->data_dma_tag, data->dma_map);
- m_freem(m);
- return EFBIG;
+ return (EFBIG);
}
data->m = m;
data->ni = ni;
/* set up Tx descs */
-
/* first segment is Tx wireless info and 802.11 header */
-
len = sizeof(struct rt2860_txwi) + hdrsize;
/* align end on a 4-bytes boundary */
-
dmalen = (len + 3) & ~ 3;
-
memset((caddr_t) txwi + len, 0, dmalen - len);
-
- qsel = RT2860_TXDESC_QSEL_EDCA;
+ qsel = RT2860_TX_QSEL_EDCA;
desc->sdp0 = htole32(ring->seg0_phys_addr + ring->data_cur *
RT2860_TX_DATA_SEG0_SIZE);
desc->sdl0 = htole16(dmalen);
- desc->qsel_flags = (qsel << RT2860_TXDESC_QSEL_SHIFT);
+ desc->flags = (qsel << RT2860_TX_QSEL_SHIFT);
/* set up payload segments */
-
for (i = ndmasegs, j = 0; i >= 2; i -= 2) {
desc->sdp1 = htole32(dma_seg[j].ds_addr);
- desc->sdl1 = htole16(dma_seg[j].ds_len);
+ desc->sdl1 = htole16((dma_seg[j].ds_len + 3) & ~3);
ring->desc_queued++;
ring->desc_cur = (ring->desc_cur + 1) %
@@ -4962,31 +4407,35 @@
desc = &ring->desc[ring->desc_cur];
desc->sdp0 = htole32(dma_seg[j].ds_addr);
- desc->sdl0 = htole16(dma_seg[j].ds_len);
- desc->qsel_flags = (qsel << RT2860_TXDESC_QSEL_SHIFT);
+ desc->sdl0 = htole16((dma_seg[j].ds_len + 3) & ~3);
+ desc->flags = (qsel << RT2860_TX_QSEL_SHIFT);
j++;
}
/* finalize last payload segment */
-
if (i > 0) {
desc->sdp1 = htole32(dma_seg[j].ds_addr);
- desc->sdl1 = htole16(dma_seg[j].ds_len |
- RT2860_TXDESC_SDL1_LASTSEG);
+ desc->sdl1 = htole16(((dma_seg[j].ds_len + 3) & ~3) |
+ RT2860_TX_LS1);
} else {
- desc->sdl0 |= htole16(RT2860_TXDESC_SDL0_LASTSEG);
+ desc->sdl0 |= htole16(RT2860_TX_LS0);
desc->sdl1 = 0;
}
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: sending data: qid=%d, hdrsize=%d, hdrspace=%d, len=%d, "
- "bw=%d, stbc=%d, shortgi=%d, mcs=%d, wcid=0x%02x, "
- "ampdu=%d (density=%d, winsize=%d), mimops=%d, DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n",
- device_get_nameunit(sc->sc_dev),
- qid, hdrsize, hdrspace, m->m_pkthdr.len + hdrsize,
- bw, stbc, shortgi, mcs, wcid, ampdu, mpdu_density, bawin_size, mimops, dmalen, ndmasegs,
- (int) dma_seg[0].ds_len, (int) dma_seg[1].ds_len, (int) dma_seg[2].ds_len, (int) dma_seg[3].ds_len, (int) dma_seg[4].ds_len);
+ "sending data: qid=%d, hdrsize=%d, hdrspace=%d, len=%d, "
+ "bw=%d, stbc=%d, shortgi=%d, mcs=%d, wcid=0x%02x, "
+ "ampdu=%d (density=%d, winsize=%d), mimops=%d, "
+ "DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n",
+ qid, hdrsize, hdrspace, m->m_pkthdr.len + hdrsize,
+ ni->ni_chw, stbc, shortgi, mcs, wcid, ampdu, mpdu_density,
+ bawin_size, mimops, dmalen, ndmasegs,
+ (int) dma_seg[0].ds_len,
+ (int) (ndmasegs > 1) ? dma_seg[1].ds_len : 0,
+ (int) (ndmasegs > 2) ? dma_seg[2].ds_len : 0,
+ (int) (ndmasegs > 3) ? dma_seg[3].ds_len : 0,
+ (int) (ndmasegs > 4) ? dma_seg[4].ds_len : 0);
bus_dmamap_sync(ring->seg0_dma_tag, ring->seg0_dma_map,
BUS_DMASYNC_PREWRITE);
@@ -4996,29 +4445,29 @@
BUS_DMASYNC_PREWRITE);
ring->desc_queued++;
- ring->desc_cur = (ring->desc_cur + 1) % RT2860_SOFTC_TX_RING_DESC_COUNT;
+ ring->desc_cur = (ring->desc_cur + 1) %
+ RT2860_SOFTC_TX_RING_DESC_COUNT;
ring->data_queued++;
- ring->data_cur = (ring->data_cur + 1) % RT2860_SOFTC_TX_RING_DATA_COUNT;
+ ring->data_cur = (ring->data_cur + 1) %
+ RT2860_SOFTC_TX_RING_DATA_COUNT;
/* kick Tx */
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(qid), ring->desc_cur);
-
- return 0;
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(qid), ring->desc_cur);
+
+ return (0);
}
/*
* rt2860_tx_raw
-static int rt2860_tx_raw(struct rt2860_softc *sc,
- struct mbuf *m, struct ieee80211_node *ni,
- const struct ieee80211_bpf_params *params)
-{
- RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: Tx raw\n",
- device_get_nameunit(sc->sc_dev));
-
- return 0;
+static int
+rt2860_tx_raw(struct rt2860_softc *sc, struct mbuf *m,
+ struct ieee80211_node *ni,
+ const struct ieee80211_bpf_params *params)
+{
+ RT2860_DPRINTF(sc, RT2860_DEBUG_TX, "Tx raw\n");
+
+ return (0);
}
*/
@@ -5036,13 +4485,12 @@
ifp = sc->sc_ifp;
/* acknowledge interrupts */
-
- status = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_INT_STATUS);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_INT_STATUS, status);
+ status = RAL_READ(sc, RT2860_REG_SCHDMA_INT_STATUS);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_INT_STATUS, status);
RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: interrupt: status = 0x%08x\n",
- device_get_nameunit(sc->sc_dev), status);
+ "interrupt: status = 0x%08x\n",
+ status);
if (status == 0xffffffff || /* device likely went away */
status == 0) /* not for us */
@@ -5053,17 +4501,29 @@
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
- if (status & RT2860_REG_INT_TX_COHERENT)
- rt2860_tx_coherent_intr(sc);
-
- if (status & RT2860_REG_INT_RX_COHERENT)
- rt2860_rx_coherent_intr(sc);
-
- if (status & RT2860_REG_INT_TXRX_COHERENT)
- rt2860_txrx_coherent_intr(sc);
-
- if (status & RT2860_REG_INT_FIFO_STA_FULL)
- rt2860_fifo_sta_full_intr(sc);
+ if (status & RT2860_REG_INT_TX_COHERENT) {
+ RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
+ "Tx coherent interrupt\n");
+ sc->tx_coherent_interrupts++;
+ rt2860_reset_dma(sc);
+ }
+
+ if (status & RT2860_REG_INT_RX_COHERENT) {
+ RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
+ "Rx coherent interrupt\n");
+ sc->rx_coherent_interrupts++;
+ rt2860_reset_dma(sc);
+ }
+
+ if (status & RT2860_REG_INT_TXRX_COHERENT) {
+ RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
+ "Tx/Rx coherent interrupt\n");
+ sc->txrx_coherent_interrupts++;
+ rt2860_reset_dma(sc);
+ }
+
+ if (status & RT2860_REG_INT_FIFO_STAT_FULL)
+ rt2860_fifo_stat_full_intr(sc);
if (status & RT2860_REG_INT_TX_MGMT_DONE)
rt2860_tx_intr(sc, 5);
@@ -5088,178 +4548,70 @@
}
/*
- * rt2860_tx_coherent_intr
- */
-static void rt2860_tx_coherent_intr(struct rt2860_softc *sc)
+ * rt2860_reset_dma
+ */
+static void
+rt2860_reset_dma(struct rt2860_softc *sc)
{
uint32_t tmp;
int i;
- RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: Tx coherent interrupt\n",
- device_get_nameunit(sc->sc_dev));
-
- sc->tx_coherent_interrupts++;
+ RT2860_DPRINTF(sc, RT2860_DEBUG_INTR, "Reseting DMA\n");
+ RT2860_SOFTC_ASSERT_LOCKED(sc);
/* restart DMA engine */
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
-
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
tmp &= ~(RT2860_REG_TX_WB_DDONE |
RT2860_REG_RX_DMA_ENABLE |
RT2860_REG_TX_DMA_ENABLE);
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
/* init Tx rings (4 EDCAs + HCCA + MGMT) */
-
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
sc->tx_ring[i].desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
RT2860_SOFTC_TX_RING_DESC_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(i), 0);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(i), 0);
}
/* init Rx ring */
-
rt2860_reset_rx_ring(sc, &sc->rx_ring);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_BASE_PTR,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_BASE_PTR,
sc->rx_ring.desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_MAX_CNT,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_MAX_CNT,
RT2860_SOFTC_RX_RING_DATA_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
RT2860_SOFTC_RX_RING_DATA_COUNT - 1);
rt2860_txrx_enable(sc);
}
/*
- * rt2860_rx_coherent_intr
- */
-static void rt2860_rx_coherent_intr(struct rt2860_softc *sc)
-{
- uint32_t tmp;
- int i;
+ * rt2860_fifo_stat_full_intr
+ */
+static void
+rt2860_fifo_stat_full_intr(struct rt2860_softc *sc)
+{
RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: Rx coherent interrupt\n",
- device_get_nameunit(sc->sc_dev));
-
- sc->rx_coherent_interrupts++;
-
- /* restart DMA engine */
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
-
- tmp &= ~(RT2860_REG_TX_WB_DDONE |
- RT2860_REG_RX_DMA_ENABLE |
- RT2860_REG_TX_DMA_ENABLE);
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
-
- /* init Tx rings (4 EDCAs + HCCA + MGMT) */
-
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
- rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
-
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
- sc->tx_ring[i].desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
- RT2860_SOFTC_TX_RING_DESC_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(i), 0);
- }
-
- /* init Rx ring */
-
- rt2860_reset_rx_ring(sc, &sc->rx_ring);
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_BASE_PTR,
- sc->rx_ring.desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_MAX_CNT,
- RT2860_SOFTC_RX_RING_DATA_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
- RT2860_SOFTC_RX_RING_DATA_COUNT - 1);
-
- rt2860_txrx_enable(sc);
-}
-
-/*
- * rt2860_txrx_coherent_intr
- */
-static void rt2860_txrx_coherent_intr(struct rt2860_softc *sc)
-{
- uint32_t tmp;
- int i;
-
- RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: Tx/Rx coherent interrupt\n",
- device_get_nameunit(sc->sc_dev));
-
- sc->txrx_coherent_interrupts++;
-
- /* restart DMA engine */
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
-
- tmp &= ~(RT2860_REG_TX_WB_DDONE |
- RT2860_REG_RX_DMA_ENABLE |
- RT2860_REG_TX_DMA_ENABLE);
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
-
- /* init Tx rings (4 EDCAs + HCCA + MGMT) */
-
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++)
- rt2860_reset_tx_ring(sc, &sc->tx_ring[i]);
-
- for (i = 0; i < RT2860_SOFTC_TX_RING_COUNT; i++) {
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_BASE_PTR(i),
- sc->tx_ring[i].desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_MAX_CNT(i),
- RT2860_SOFTC_TX_RING_DESC_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_TX_CTX_IDX(i), 0);
- }
-
- /* init Rx ring */
-
- rt2860_reset_rx_ring(sc, &sc->rx_ring);
-
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_BASE_PTR,
- sc->rx_ring.desc_phys_addr);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_MAX_CNT,
- RT2860_SOFTC_RX_RING_DATA_COUNT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
- RT2860_SOFTC_RX_RING_DATA_COUNT - 1);
-
- rt2860_txrx_enable(sc);
-}
-
-/*
- * rt2860_fifo_sta_full_intr
- */
-static void rt2860_fifo_sta_full_intr(struct rt2860_softc *sc)
-{
- RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: FIFO statistic full interrupt\n",
- device_get_nameunit(sc->sc_dev));
-
- sc->fifo_sta_full_interrupts++;
+ "FIFO statistic full interrupt\n");
+
+ sc->fifo_stat_full_interrupts++;
RT2860_SOFTC_LOCK(sc);
- if (!(sc->intr_disable_mask & RT2860_REG_INT_FIFO_STA_FULL)) {
- rt2860_intr_disable(sc, RT2860_REG_INT_FIFO_STA_FULL);
-
- taskqueue_enqueue(sc->taskqueue, &sc->fifo_sta_full_task);
- }
-
- sc->intr_pending_mask |= RT2860_REG_INT_FIFO_STA_FULL;
+ if (!(sc->intr_disable_mask & RT2860_REG_INT_FIFO_STAT_FULL)) {
+ rt2860_intr_disable(sc, RT2860_REG_INT_FIFO_STAT_FULL);
+
+ taskqueue_enqueue(sc->taskqueue, &sc->fifo_stat_full_task);
+ }
+
+ sc->intr_pending_mask |= RT2860_REG_INT_FIFO_STAT_FULL;
RT2860_SOFTC_UNLOCK(sc);
}
@@ -5267,11 +4619,10 @@
/*
* rt2860_rx_intr
*/
-static void rt2860_rx_intr(struct rt2860_softc *sc)
-{
- RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: Rx interrupt\n",
- device_get_nameunit(sc->sc_dev));
+static void
+rt2860_rx_intr(struct rt2860_softc *sc)
+{
+ RT2860_DPRINTF(sc, RT2860_DEBUG_INTR, "Rx interrupt\n");
sc->rx_interrupts++;
@@ -5291,15 +4642,16 @@
/*
* rt2860_tx_intr
*/
-static void rt2860_tx_intr(struct rt2860_softc *sc, int qid)
+static void
+rt2860_tx_intr(struct rt2860_softc *sc, int qid)
{
KASSERT(qid >= 0 && qid < RT2860_SOFTC_TX_RING_COUNT,
("%s: Tx interrupt: invalid qid=%d\n",
device_get_nameunit(sc->sc_dev), qid));
RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
- "%s: Tx interrupt: qid=%d\n",
- device_get_nameunit(sc->sc_dev), qid);
+ "Tx interrupt: qid=%d\n",
+ qid);
sc->tx_interrupts[qid]++;
@@ -5319,7 +4671,8 @@
/*
* rt2860_rx_done_task
*/
-static void rt2860_rx_done_task(void *context, int pending)
+static void
+rt2860_rx_done_task(void *context, int pending)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -5328,9 +4681,7 @@
sc = context;
ifp = sc->sc_ifp;
- RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: Rx done task\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_RX, "Rx done task\n");
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
@@ -5343,8 +4694,7 @@
if ((sc->intr_pending_mask & RT2860_REG_INT_RX_DONE) || again) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: Rx done task: scheduling again\n",
- device_get_nameunit(sc->sc_dev));
+ "Rx done task: scheduling again\n");
taskqueue_enqueue(sc->taskqueue, &sc->rx_done_task);
} else {
@@ -5357,7 +4707,8 @@
/*
* rt2860_tx_done_task
*/
-static void rt2860_tx_done_task(void *context, int pending)
+static void
+rt2860_tx_done_task(void *context, int pending)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -5367,9 +4718,7 @@
sc = context;
ifp = sc->sc_ifp;
- RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: Tx done task\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_TX, "Tx done task\n");
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
@@ -5402,8 +4751,7 @@
if (sc->intr_pending_mask & intr_mask) {
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: Tx done task: scheduling again\n",
- device_get_nameunit(sc->sc_dev));
+ "Tx done task: scheduling again\n");
taskqueue_enqueue(sc->taskqueue, &sc->tx_done_task);
}
@@ -5415,9 +4763,10 @@
}
/*
- * rt2860_fifo_sta_full_task
- */
-static void rt2860_fifo_sta_full_task(void *context, int pending)
+ * rt2860_fifo_stat_full_task
+ */
+static void
+rt2860_fifo_stat_full_task(void *context, int pending)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -5425,27 +4774,24 @@
sc = context;
ifp = sc->sc_ifp;
- RT2860_DPRINTF(sc, RT2860_DEBUG_STATS,
- "%s: FIFO statistic full task\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_STATS, "FIFO statistic full task\n");
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
- sc->intr_pending_mask &= ~RT2860_REG_INT_FIFO_STA_FULL;
+ sc->intr_pending_mask &= ~RT2860_REG_INT_FIFO_STAT_FULL;
rt2860_drain_fifo_stats(sc);
RT2860_SOFTC_LOCK(sc);
- if (sc->intr_pending_mask & RT2860_REG_INT_FIFO_STA_FULL) {
+ if (sc->intr_pending_mask & RT2860_REG_INT_FIFO_STAT_FULL) {
RT2860_DPRINTF(sc, RT2860_DEBUG_STATS,
- "%s: FIFO statistic full task: scheduling again\n",
- device_get_nameunit(sc->sc_dev));
-
- taskqueue_enqueue(sc->taskqueue, &sc->fifo_sta_full_task);
+ "FIFO statistic full task: scheduling again\n");
+
+ taskqueue_enqueue(sc->taskqueue, &sc->fifo_stat_full_task);
} else {
- rt2860_intr_enable(sc, RT2860_REG_INT_FIFO_STA_FULL);
+ rt2860_intr_enable(sc, RT2860_REG_INT_FIFO_STAT_FULL);
}
RT2860_SOFTC_UNLOCK(sc);
@@ -5457,7 +4803,8 @@
/*
* rt2860_periodic_task
*/
-static void rt2860_periodic_task(void *context, int pending)
+static void
+rt2860_periodic_task(void *context, int pending)
{
struct rt2860_softc *sc;
struct ifnet *ifp;
@@ -5470,8 +4817,8 @@
vap = TAILQ_FIRST(&ic->ic_vaps);
RT2860_DPRINTF(sc, RT2860_DEBUG_PERIODIC,
- "%s: periodic task: round=%lu\n",
- device_get_nameunit(sc->sc_dev), sc->periodic_round);
+ "periodic task: round=%lu\n",
+ sc->periodic_round);
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
@@ -5508,7 +4855,8 @@
/*
* rt2860_rx_eof
*/
-static int rt2860_rx_eof(struct rt2860_softc *sc, int limit)
+static int
+rt2860_rx_eof(struct rt2860_softc *sc, int limit)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -5517,7 +4865,7 @@
struct rt2860_softc_node *rni;
struct rt2860_softc_rx_radiotap_header *tap;
struct rt2860_softc_rx_ring *ring;
- struct rt2860_rxdesc *desc;
+ struct rt2860_rxd *desc;
struct rt2860_softc_rx_data *data;
struct rt2860_rxwi *rxwi;
struct mbuf *m, *mnew;
@@ -5539,7 +4887,7 @@
nframes = 0;
while (limit != 0) {
- index = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_RX_DRX_IDX);
+ index = RAL_READ(sc, RT2860_REG_SCHDMA_RX_DRX_IDX);
if (ring->cur == index)
break;
@@ -5549,7 +4897,7 @@
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
#ifdef XXX_TESTED_AND_WORKED
- if (!(desc->sdl0 & htole16(RT2860_RXDESC_SDL0_DDONE)))
+ if (!(desc->sdl0 & htole16(RT2860_RX_DDONE)))
break;
#endif
@@ -5564,12 +4912,12 @@
mnew->m_len = mnew->m_pkthdr.len = MJUMPAGESIZE;
- error = bus_dmamap_load_mbuf_sg(ring->data_dma_tag, ring->spare_dma_map,
- mnew, segs, &nsegs, BUS_DMA_NOWAIT);
+ error = bus_dmamap_load_mbuf_sg(ring->data_dma_tag,
+ ring->spare_dma_map, mnew, segs, &nsegs, BUS_DMA_NOWAIT);
if (error != 0) {
- RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: could not load Rx mbuf DMA map: error=%d, nsegs=%d\n",
- device_get_nameunit(sc->sc_dev), error, nsegs);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_RX, "could not load"
+ " Rx mbuf DMA map: error=%d, nsegs=%d\n",
+ error, nsegs);
m_freem(mnew);
@@ -5596,26 +4944,28 @@
m = data->m;
data->m = mnew;
+ uint32_t *tmp = (uint32_t *)desc;
+ RT2860_DPRINTF(sc, RT2860_DEBUG_RX, "rxdesc 0x%08x 0x%08x 0x%08x 0x%08x\n", tmp[0], tmp[1], tmp[2], tmp[3]);
desc->sdp0 = htole32(segs[0].ds_addr);
desc_flags = le32toh(desc->flags);
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: Rx frame: rxdesc flags=0x%08x\n",
- device_get_nameunit(sc->sc_dev), desc_flags);
+ "Rx frame: rxdesc flags=0x%08x\n",
+ desc_flags);
/* get Rx wireless info */
-
rxwi = mtod(m, struct rt2860_rxwi *);
- len = (le16toh(rxwi->tid_size) >> RT2860_RXWI_SIZE_SHIFT) &
+ tmp = (uint32_t *)rxwi;
+ RT2860_DPRINTF(sc, RT2860_DEBUG_RX, "rxdesc 0x%08x 0x%08x 0x%08x 0x%08x\n", tmp[0], tmp[1], tmp[2], tmp[3]);
+ len = (le16toh(rxwi->len) >> RT2860_RXWI_SIZE_SHIFT) &
RT2860_RXWI_SIZE_MASK;
/* check for L2 padding between IEEE 802.11 frame header and body */
-
- if (desc_flags & RT2860_RXDESC_FLAGS_L2PAD) {
+ if (desc_flags & RT2860_RX_L2PAD) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: L2 padding: len=%d\n",
- device_get_nameunit(sc->sc_dev), len);
+ "L2 padding: len=%d\n",
+ len);
len += 2;
}
@@ -5626,10 +4976,9 @@
/* check for crc errors */
- if (desc_flags & RT2860_RXDESC_FLAGS_CRC_ERR) {
+ if (desc_flags & RT2860_RX_CRCERR) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: rxdesc: crc error\n",
- device_get_nameunit(sc->sc_dev));
+ "rxdesc: crc error\n");
ifp->if_ierrors++;
@@ -5643,12 +4992,12 @@
/* check for cipher errors */
#ifndef RT2860_NO_HW_CRYPTO
- if (desc_flags & RT2860_RXDESC_FLAGS_DECRYPTED) {
+ if (desc_flags & RT2860_RX_DEC) {
cipher_err = ((desc_flags >>
- RT2860_RXDESC_FLAGS_CIPHER_ERR_SHIFT) &
- RT2860_RXDESC_FLAGS_CIPHER_ERR_MASK);
+ RT2860_RX_CIPHER_ERR_SHIFT) &
+ RT2860_RX_CIPHER_ERR_MASK);
if (cipher_err ==
- RT2860_RXDESC_FLAGS_CIPHER_ERR_NONE) {
+ RT2860_RX_CIPHER_ERR_NONE) {
if (wh->i_fc[1] & IEEE80211_FC1_WEP)
wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
@@ -5657,30 +5006,29 @@
sc->rx_cipher_no_errors++;
} else {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX_CRYPT,
- "%s: rxdesc: cipher error=0x%02x "
+ "rxdesc: cipher error=0x%02x "
"keyidx=%d\n",
- device_get_nameunit(sc->sc_dev),
cipher_err,
- (rxwi->udf_bssidx_keyidx >>
+ (rxwi->keyidx >>
RT2860_RXWI_KEYIDX_SHIFT) &
RT2860_RXWI_KEYIDX_MASK);
if (cipher_err ==
- RT2860_RXDESC_FLAGS_CIPHER_ERR_ICV)
+ RT2860_RX_CIPHER_ERR_ICV)
sc->rx_cipher_icv_errors++;
else if (cipher_err ==
- RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC)
+ RT2860_RX_CIPHER_ERR_MIC)
sc->rx_cipher_mic_errors++;
else if (cipher_err ==
- RT2860_RXDESC_FLAGS_CIPHER_ERR_INVALID_KEY)
+ RT2860_RX_CIPHER_ERR_INVALID_KEY)
sc->rx_cipher_invalid_key_errors++;
/* XXX style(9) */
- if ((cipher_err == RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC) && (desc_flags & RT2860_RXDESC_FLAGS_MYBSS)) {
+ if ((cipher_err == RT2860_RX_CIPHER_ERR_MIC) && (desc_flags & RT2860_RX_MYBSS)) {
ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) wh);
if (ni != NULL)
{
- keyidx = (rxwi->udf_bssidx_keyidx >> RT2860_RXWI_KEYIDX_SHIFT) & RT2860_RXWI_KEYIDX_MASK;
+ keyidx = (rxwi->keyidx >> RT2860_RXWI_KEYIDX_SHIFT) & RT2860_RXWI_KEYIDX_MASK;
ieee80211_notify_michael_failure(ni->ni_vap, wh, keyidx);
@@ -5698,9 +5046,8 @@
} else {
if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: rxdesc: not decrypted but "
- "protected flag set\n",
- device_get_nameunit(sc->sc_dev));
+ "rxdesc: not decrypted but "
+ "protected flag set\n");
ifp->if_ierrors++;
@@ -5713,7 +5060,7 @@
#endif
/* check for A-MPDU */
- if (desc_flags & RT2860_RXDESC_FLAGS_BA) {
+ if (desc_flags & RT2860_RX_BA) {
m->m_flags |= M_AMPDU;
sc->rx_ampdu++;
@@ -5728,7 +5075,7 @@
/* check for A-MSDU */
- if (desc_flags & RT2860_RXDESC_FLAGS_AMSDU) {
+ if (desc_flags & RT2860_RX_AMSDU) {
sc->rx_amsdu++;
amsdu = 1;
@@ -5739,22 +5086,21 @@
ant = rt2860_maxrssi_rxpath(sc, rxwi);
rssi = rxwi->rssi[ant];
rssi_dbm = rt2860_rssi2dbm(sc, rssi, ant);
- phymode = ((rxwi->phymode_stbc_shortgi >> RT2860_RXWI_PHYMODE_SHIFT) &
- RT2860_RXWI_PHYMODE_MASK);
+ phymode = ((rxwi->phymode_stbc_shortgi >> RT2860_RXWI_PHYMODE_SHIFT) & RT2860_RXWI_PHYMODE_MASK);
bw = ((rxwi->bw_mcs >> RT2860_RXWI_BW_SHIFT) & RT2860_RXWI_BW_MASK);
shortgi = ((rxwi->phymode_stbc_shortgi >> RT2860_RXWI_SHORTGI_SHIFT) &
RT2860_RXWI_SHORTGI_MASK);
stbc = ((rxwi->phymode_stbc_shortgi >> RT2860_RXWI_STBC_SHIFT) &
RT2860_RXWI_STBC_MASK);
mcs = ((rxwi->bw_mcs >> RT2860_RXWI_MCS_SHIFT) & RT2860_RXWI_MCS_MASK);
- tid = ((rxwi->tid_size >> RT2860_RXWI_TID_SHIFT) & RT2860_RXWI_TID_MASK);
- seq = ((rxwi->seq_frag >> RT2860_RXWI_SEQ_SHIFT) & RT2860_RXWI_SEQ_MASK);
- frag = ((rxwi->seq_frag >> RT2860_RXWI_FRAG_SHIFT) & RT2860_RXWI_FRAG_MASK);
+ tid = ((rxwi->len >> RT2860_RX_TID_SHIFT) & RT2860_RXWI_TID_MASK);
+ seq = ((rxwi->seq >> RT2860_RXWI_SEQ_SHIFT) & RT2860_RXWI_SEQ_MASK);
+ frag = ((rxwi->seq >> RT2860_RXWI_FRAG_SHIFT) & RT2860_RXWI_FRAG_MASK);
if (ieee80211_radiotap_active(ic)) {
tap = &sc->rxtap;
- tap->flags = (desc_flags & RT2860_RXDESC_FLAGS_L2PAD) ? IEEE80211_RADIOTAP_F_DATAPAD : 0;
+ tap->flags = (desc_flags & RT2860_RX_L2PAD) ? IEEE80211_RADIOTAP_F_DATAPAD : 0;
tap->dbm_antsignal = rssi_dbm;
tap->dbm_antnoise = RT2860_NOISE_FLOOR;
tap->antenna = ant;
@@ -5764,21 +5110,21 @@
tap->chan_ieee = ic->ic_curchan->ic_ieee;
tap->chan_maxpow = 0;
- if (phymode == RT2860_TXWI_PHYMODE_HT_MIXED || phymode == RT2860_TXWI_PHYMODE_HT_GF)
+ if (phymode == RT2860_RXWI_PHYMODE_HT_MIXED || phymode == RT2860_RXWI_PHYMODE_HT_GF)
tap->rate = mcs | IEEE80211_RATE_MCS;
else
tap->rate = rt2860_rxrate(rxwi);
- if (desc_flags & RT2860_RXDESC_FLAGS_CRC_ERR)
+ if (desc_flags & RT2860_RX_CRCERR)
tap->flags |= IEEE80211_RADIOTAP_F_BADFCS;
- if (desc_flags & RT2860_RXDESC_FLAGS_FRAG)
+ if (desc_flags & RT2860_RX_FRAG)
tap->flags |= IEEE80211_RADIOTAP_F_FRAG;
if (rxwi->bw_mcs & RT2860_RXWI_MCS_SHOTPRE)
tap->flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
- if ((desc_flags & RT2860_RXDESC_FLAGS_DECRYPTED) ||
+ if ((desc_flags & RT2860_RX_DEC) ||
(wh->i_fc[1] & IEEE80211_FC1_WEP))
tap->flags |= IEEE80211_RADIOTAP_F_WEP;
@@ -5801,12 +5147,11 @@
rssi_dbm_rel = 127;
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: received frame: len=%d, phymode=%d, bw=%d, "
+ "received frame: len=%d, phymode=%d, bw=%d, "
"shortgi=%d, stbc=0x%02x, mcs=%d, "
"ant=%d, rssi=%d/%d/%d, snr=%d/%d, wcid=0x%02x, "
"ampdu=%d, amsdu=%d, tid=%d, seq=%d, frag=%d, "
"retry=%d, rssi_dbm=%d, rssi_dbm_rel=%d\n",
- device_get_nameunit(sc->sc_dev),
len, phymode, bw, shortgi, stbc, mcs,
ant, rxwi->rssi[0], rxwi->rssi[1], rxwi->rssi[2],
rxwi->snr[0], rxwi->snr[1],
@@ -5831,7 +5176,7 @@
skip:
- desc->sdl0 &= ~htole16(RT2860_RXDESC_SDL0_DDONE);
+ desc->sdl0 &= ~htole16(RT2860_RX_DDONE);
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
@@ -5842,15 +5187,15 @@
}
if (ring->cur == 0)
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
RT2860_SOFTC_RX_RING_DATA_COUNT - 1);
else
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_RX_CALC_IDX,
ring->cur - 1);
RT2860_DPRINTF(sc, RT2860_DEBUG_RX,
- "%s: Rx eof: nframes=%d\n",
- device_get_nameunit(sc->sc_dev), nframes);
+ "Rx eof: nframes=%d\n",
+ nframes);
sc->rx_packets += nframes;
@@ -5860,11 +5205,11 @@
/*
* rt2860_tx_eof
*/
-static void rt2860_tx_eof(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring)
+static void
+rt2860_tx_eof(struct rt2860_softc *sc, struct rt2860_softc_tx_ring *ring)
{
struct ifnet *ifp;
- struct rt2860_txdesc *desc;
+ struct rt2860_txd *desc;
struct rt2860_softc_tx_data *data;
uint32_t index;
int ndescs, nframes;
@@ -5875,7 +5220,7 @@
nframes = 0;
for (;;) {
- index = rt2860_io_mac_read(sc,
+ index = RAL_READ(sc,
RT2860_REG_SCHDMA_TX_DTX_IDX(ring->qid));
if (ring->desc_next == index)
break;
@@ -5889,21 +5234,21 @@
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
- if (desc->sdl0 & htole16(RT2860_TXDESC_SDL0_LASTSEG) ||
- desc->sdl1 & htole16(RT2860_TXDESC_SDL1_LASTSEG)) {
+ if (desc->sdl0 & htole16(RT2860_TX_LS0) ||
+ desc->sdl1 & htole16(RT2860_TX_LS1)) {
nframes++;
data = &ring->data[ring->data_next];
if (data->m->m_flags & M_TXCB)
- ieee80211_process_callback(data->ni, data->m, 0);
+ ieee80211_process_callback(data->ni, data->m,
+ 0);
bus_dmamap_sync(ring->data_dma_tag, data->dma_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(ring->data_dma_tag, data->dma_map);
m_freem(data->m);
-
ieee80211_free_node(data->ni);
data->m = NULL;
@@ -5914,12 +5259,13 @@
RT2860_SOFTC_TX_RING_LOCK(ring);
ring->data_queued--;
- ring->data_next = (ring->data_next + 1) % RT2860_SOFTC_TX_RING_DATA_COUNT;
+ ring->data_next = (ring->data_next + 1) %
+ RT2860_SOFTC_TX_RING_DATA_COUNT;
RT2860_SOFTC_TX_RING_UNLOCK(ring);
}
- desc->sdl0 &= ~htole16(RT2860_TXDESC_SDL0_DDONE);
+ desc->sdl0 &= ~htole16(RT2860_TX_DDONE);
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
@@ -5927,20 +5273,22 @@
RT2860_SOFTC_TX_RING_LOCK(ring);
ring->desc_queued--;
- ring->desc_next = (ring->desc_next + 1) % RT2860_SOFTC_TX_RING_DESC_COUNT;
+ ring->desc_next = (ring->desc_next + 1) %
+ RT2860_SOFTC_TX_RING_DESC_COUNT;
RT2860_SOFTC_TX_RING_UNLOCK(ring);
}
RT2860_DPRINTF(sc, RT2860_DEBUG_TX,
- "%s: Tx eof: qid=%d, ndescs=%d, nframes=%d\n",
- device_get_nameunit(sc->sc_dev), ring->qid, ndescs, nframes);
+ "Tx eof: qid=%d, ndescs=%d, nframes=%d\n",
+ ring->qid, ndescs, nframes);
}
/*
* rt2860_update_stats
*/
-static void rt2860_update_stats(struct rt2860_softc *sc)
+static void
+rt2860_update_stats(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -5950,20 +5298,14 @@
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- RT2860_DPRINTF(sc, RT2860_DEBUG_STATS,
- "%s: update statistic\n",
- device_get_nameunit(sc->sc_dev));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_STATS, "update statistic\n");
rt2860_drain_fifo_stats(sc);
/* read and clear Tx statistic registers */
-
- rt2860_io_mac_read_multi(sc, RT2860_REG_TX_STA_CNT0,
- stacnt, sizeof(stacnt));
-
- stacnt[0] = le32toh(stacnt[0]);
- stacnt[1] = le32toh(stacnt[1]);
- stacnt[2] = le32toh(stacnt[2]);
+ stacnt[0] = le32toh(RAL_READ(sc, RT2860_REG_TX_STAT_CNT0));
+ stacnt[1] = le32toh(RAL_READ(sc, RT2860_REG_TX_STAT_CNT1));
+ stacnt[2] = le32toh(RAL_READ(sc, RT2860_REG_TX_STAT_CNT2));
beacons = stacnt[0] >> 16;
noretryok = stacnt[1] & 0xffff;
@@ -5973,8 +5315,7 @@
zerolen = stacnt[2] & 0xffff;
RT2860_DPRINTF(sc, RT2860_DEBUG_STATS,
- "%s: update statistic: beacons=%d, noretryok=%d, retryok=%d, failed=%d, underflows=%d, zerolen=%d\n",
- device_get_nameunit(sc->sc_dev),
+ "update statistic: beacons=%d, noretryok=%d, retryok=%d, failed=%d, underflows=%d, zerolen=%d\n",
beacons, noretryok, retryok, failed, underflows, zerolen);
ifp->if_oerrors += failed;
@@ -5990,7 +5331,8 @@
/*
* rt2860_bbp_tuning
*/
-static void rt2860_bbp_tuning(struct rt2860_softc *sc)
+static void
+rt2860_bbp_tuning(struct rt2860_softc *sc)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -6050,25 +5392,26 @@
/*
* rt2860_watchdog
*/
-static void rt2860_watchdog(struct rt2860_softc *sc)
+static void
+rt2860_watchdog(struct rt2860_softc *sc)
{
uint32_t tmp;
int ntries;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_PBF_TXRXQ_PCNT);
+ tmp = RAL_READ(sc, RT2860_REG_PBF_TXRXQ_PCNT);
RT2860_DPRINTF(sc, RT2860_DEBUG_WATCHDOG,
- "%s: watchdog: TXRXQ_PCNT=0x%08x\n",
- device_get_nameunit(sc->sc_dev), tmp);
+ "watchdog: TXRXQ_PCNT=0x%08x\n",
+ tmp);
if (((tmp >> RT2860_REG_TX0Q_PCNT_SHIFT) &
RT2860_REG_TX0Q_PCNT_MASK) != 0) {
sc->tx_queue_not_empty[0]++;
- rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf40012);
+ RAL_WRITE(sc, RT2860_REG_PBF_CFG, 0xf40012);
for (ntries = 0; ntries < 10; ntries++) {
- tmp = rt2860_io_mac_read(sc,
+ tmp = RAL_READ(sc,
RT2860_REG_PBF_TXRXQ_PCNT);
if (((tmp >> RT2860_REG_TX0Q_PCNT_SHIFT) &
@@ -6078,17 +5421,17 @@
DELAY(1);
}
- rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf40006);
+ RAL_WRITE(sc, RT2860_REG_PBF_CFG, 0xf40006);
}
if (((tmp >> RT2860_REG_TX1Q_PCNT_SHIFT) &
RT2860_REG_TX1Q_PCNT_MASK) != 0) {
sc->tx_queue_not_empty[1]++;
- rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf4000a);
+ RAL_WRITE(sc, RT2860_REG_PBF_CFG, 0xf4000a);
for (ntries = 0; ntries < 10; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_PBF_TXRXQ_PCNT);
+ tmp = RAL_READ(sc, RT2860_REG_PBF_TXRXQ_PCNT);
if (((tmp >> RT2860_REG_TX1Q_PCNT_SHIFT) &
RT2860_REG_TX1Q_PCNT_MASK) == 0)
break;
@@ -6096,14 +5439,15 @@
DELAY(1);
}
- rt2860_io_mac_write(sc, RT2860_REG_PBF_CFG, 0xf40006);
+ RAL_WRITE(sc, RT2860_REG_PBF_CFG, 0xf40006);
}
}
/*
* rt2860_drain_fifo_stats
*/
-static void rt2860_drain_fifo_stats(struct rt2860_softc *sc)
+static void
+rt2860_drain_fifo_stats(struct rt2860_softc *sc)
{
struct ifnet *ifp;
uint32_t stats;
@@ -6114,30 +5458,25 @@
/* drain Tx status FIFO (maxsize = 16) */
- while ((stats = rt2860_io_mac_read(sc, RT2860_REG_TX_STA_FIFO)) &
- RT2860_REG_TX_STA_FIFO_VALID) {
-
- wcid = (stats >> RT2860_REG_TX_STA_FIFO_WCID_SHIFT) &
- RT2860_REG_TX_STA_FIFO_WCID_MASK;
+ while ((stats = RAL_READ(sc, RT2860_REG_TX_STAT_FIFO)) &
+ RT2860_TXQ_VLD) {
+
+ wcid = ((stats & RT2860_TXQ_WCID_MASK ) >> RT2860_TXQ_WCID_SHIFT);
/* if no ACK was requested, no feedback is available */
- if (!(stats & RT2860_REG_TX_STA_FIFO_ACK_REQ) || wcid == RT2860_WCID_RESERVED)
+ if (!(stats & RT2860_TXQ_ACKREQ) || wcid == RT2860_WCID_RESERVED)
continue;
/* update AMRR statistic */
-
- ok = (stats & RT2860_REG_TX_STA_FIFO_TX_OK) ? 1 : 0;
- agg = (stats & RT2860_REG_TX_STA_FIFO_AGG) ? 1 : 0;
- mcs = (stats >> RT2860_REG_TX_STA_FIFO_MCS_SHIFT) &
- RT2860_REG_TX_STA_FIFO_MCS_MASK;
- pid = (stats >> RT2860_REG_TX_STA_FIFO_PID_SHIFT) &
- RT2860_REG_TX_STA_FIFO_PID_MASK;
+ ok = (stats & RT2860_TXQ_OK) ? 1 : 0;
+ agg = (stats & RT2860_TXQ_AGG) ? 1 : 0;
+ mcs = (stats >> RT2860_TXQ_MCS_SHIFT);
+ pid = (stats >> RT2860_TXQ_PID_SHIFT);
retrycnt = (mcs < 0xf) ? (pid - mcs - 1) : 0;
RT2860_DPRINTF(sc, RT2860_DEBUG_STATS,
- "%s: FIFO statistic: wcid=0x%02x, ok=%d, agg=%d, mcs=0x%02x, pid=0x%02x, retrycnt=%d\n",
- device_get_nameunit(sc->sc_dev),
+ "FIFO statistic: wcid=0x%02x, ok=%d, agg=%d, mcs=0x%02x, pid=0x%02x, retrycnt=%d\n",
wcid, ok, agg, mcs, pid, retrycnt);
rt2860_amrr_tx_complete(&sc->amrr_node[wcid], ok, retrycnt);
@@ -6150,63 +5489,64 @@
/*
* rt2860_update_raw_counters
*/
-static void rt2860_update_raw_counters(struct rt2860_softc *sc)
+static void
+rt2860_update_raw_counters(struct rt2860_softc *sc)
{
uint32_t tmp;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT);
sc->tx_nonagg += tmp & 0xffff;
sc->tx_agg += tmp >> 16;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT0);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT0);
sc->tx_ampdu += (tmp & 0xffff) / 1 + (tmp >> 16) / 2;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT1);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT1);
sc->tx_ampdu += (tmp & 0xffff) / 3 + (tmp >> 16) / 4;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT2);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT2);
sc->tx_ampdu += (tmp & 0xffff) / 5 + (tmp >> 16) / 6;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT3);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT3);
sc->tx_ampdu += (tmp & 0xffff) / 7 + (tmp >> 16) / 8;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT4);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT4);
sc->tx_ampdu += (tmp & 0xffff) / 9 + (tmp >> 16) / 10;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT5);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT5);
sc->tx_ampdu += (tmp & 0xffff) / 11 + (tmp >> 16) / 12;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT6);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT6);
sc->tx_ampdu += (tmp & 0xffff) / 13 + (tmp >> 16) / 14;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_AGG_CNT7);
+ tmp = RAL_READ(sc, RT2860_REG_TX_AGG_CNT7);
sc->tx_ampdu += (tmp & 0xffff) / 15 + (tmp >> 16) / 16;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_RX_STA_CNT0);
+ tmp = RAL_READ(sc, RT2860_REG_RX_STAT_CNT0);
sc->rx_crc_errors += tmp & 0xffff;
sc->rx_phy_errors += tmp >> 16;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_RX_STA_CNT1);
+ tmp = RAL_READ(sc, RT2860_REG_RX_STAT_CNT1);
sc->rx_false_ccas += tmp & 0xffff;
sc->rx_plcp_errors += tmp >> 16;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_RX_STA_CNT2);
+ tmp = RAL_READ(sc, RT2860_REG_RX_STAT_CNT2);
sc->rx_dup_packets += tmp & 0xffff;
sc->rx_fifo_overflows += tmp >> 16;
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TXRX_MPDU_DEN_CNT);
+ tmp = RAL_READ(sc, RT2860_REG_TXRX_MPDU_DEN_CNT);
sc->tx_mpdu_zero_density += tmp & 0xffff;
sc->rx_mpdu_zero_density += tmp >> 16;
@@ -6215,7 +5555,8 @@
/*
* rt2860_intr_enable
*/
-static void rt2860_intr_enable(struct rt2860_softc *sc, uint32_t intr_mask)
+static void
+rt2860_intr_enable(struct rt2860_softc *sc, uint32_t intr_mask)
{
uint32_t tmp;
@@ -6223,13 +5564,14 @@
tmp = sc->intr_enable_mask & ~sc->intr_disable_mask;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_INT_MASK, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_INT_MASK, tmp);
}
/*
* rt2860_intr_disable
*/
-static void rt2860_intr_disable(struct rt2860_softc *sc, uint32_t intr_mask)
+static void
+rt2860_intr_disable(struct rt2860_softc *sc, uint32_t intr_mask)
{
uint32_t tmp;
@@ -6237,13 +5579,14 @@
tmp = sc->intr_enable_mask & ~sc->intr_disable_mask;
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_INT_MASK, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_INT_MASK, tmp);
}
/*
* rt2860_txrx_enable
*/
-static int rt2860_txrx_enable(struct rt2860_softc *sc)
+static int
+rt2860_txrx_enable(struct rt2860_softc *sc)
{
struct ieee80211com *ic;
struct ifnet *ifp;
@@ -6255,10 +5598,10 @@
/* enable Tx/Rx DMA engine */
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL, RT2860_REG_TX_ENABLE);
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL, RT2860_REG_TX_ENABLE);
for (ntries = 0; ntries < 200; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG);
if (!(tmp & (RT2860_REG_TX_DMA_BUSY | RT2860_REG_RX_DMA_BUSY)))
break;
@@ -6267,7 +5610,7 @@
if (ntries == 200) {
device_printf(sc->sc_dev, "timeout waiting for DMA engine\n");
- return -1;
+ return (-1);
}
DELAY(50);
@@ -6277,54 +5620,55 @@
RT2860_REG_TX_DMA_ENABLE |
(RT2860_REG_WPDMA_BT_SIZE64 << RT2860_REG_WPDMA_BT_SIZE_SHIFT);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_WPDMA_GLO_CFG, tmp);
/* set Rx filter */
- tmp = RT2860_REG_RX_FILTER_DROP_CRC_ERR |
- RT2860_REG_RX_FILTER_DROP_PHY_ERR;
+ tmp = RT2860_DROP_CRC_ERR |
+ RT2860_DROP_PHY_ERR;
if (ic->ic_opmode != IEEE80211_M_MONITOR) {
- tmp |= RT2860_REG_RX_FILTER_DROP_DUPL |
- RT2860_REG_RX_FILTER_DROP_CTS |
- RT2860_REG_RX_FILTER_DROP_BA |
- RT2860_REG_RX_FILTER_DROP_ACK |
- RT2860_REG_RX_FILTER_DROP_VER_ERR |
- RT2860_REG_RX_FILTER_DROP_CTRL_RSV |
- RT2860_REG_RX_FILTER_DROP_CFACK |
- RT2860_REG_RX_FILTER_DROP_CFEND;
+ tmp |= RT2860_DROP_DUPL |
+ RT2860_DROP_CTS |
+ RT2860_DROP_BA |
+ RT2860_DROP_ACK |
+ RT2860_DROP_VER_ERR |
+ RT2860_DROP_CTRL_RSV |
+ RT2860_DROP_CFACK |
+ RT2860_DROP_CFEND;
if (ic->ic_opmode == IEEE80211_M_STA)
- tmp |= RT2860_REG_RX_FILTER_DROP_RTS |
- RT2860_REG_RX_FILTER_DROP_PSPOLL;
+ tmp |= RT2860_DROP_RTS |
+ RT2860_DROP_PSPOLL;
if (!(ifp->if_flags & IFF_PROMISC))
- tmp |= RT2860_REG_RX_FILTER_DROP_UC_NOME;
- }
-
- rt2860_io_mac_write(sc, RT2860_REG_RX_FILTER_CFG, tmp);
-
- rt2860_io_mac_write(sc, RT2860_REG_SYS_CTRL,
+ tmp |= RT2860_DROP_UC_NOME;
+ }
+
+ RAL_WRITE(sc, RT2860_REG_RX_FILTER_CFG, tmp);
+
+ RAL_WRITE(sc, RT2860_MAC_SYS_CTRL,
RT2860_REG_RX_ENABLE | RT2860_REG_TX_ENABLE);
- return 0;
+ return (0);
}
/*
* rt2860_alloc_rx_ring
*/
-static int rt2860_alloc_rx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_rx_ring *ring)
-{
- struct rt2860_rxdesc *desc;
+static int
+rt2860_alloc_rx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_rx_ring *ring)
+{
+ struct rt2860_rxd *desc;
struct rt2860_softc_rx_data *data;
bus_dma_segment_t segs[1];
int i, nsegs, error;
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), PAGE_SIZE, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
- RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxdesc), 1,
- RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxdesc),
+ RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxd), 1,
+ RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxd),
0, NULL, NULL, &ring->desc_dma_tag);
if (error != 0) {
device_printf(sc->sc_dev,
@@ -6342,7 +5686,7 @@
error = bus_dmamap_load(ring->desc_dma_tag, ring->desc_dma_map,
ring->desc,
- RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxdesc),
+ RT2860_SOFTC_RX_RING_DATA_COUNT * sizeof(struct rt2860_rxd),
rt2860_dma_map_addr, &ring->desc_phys_addr, 0);
if (error != 0) {
device_printf(sc->sc_dev,
@@ -6350,7 +5694,7 @@
goto fail;
}
- error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), PAGE_SIZE, 0,
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), PAGE_SIZE, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL,
&ring->data_dma_tag);
@@ -6409,28 +5753,28 @@
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
- return 0;
+ return (0);
fail:
-
rt2860_free_rx_ring(sc, ring);
- return error;
+ return (error);
}
/*
* rt2860_reset_rx_ring
*/
-static void rt2860_reset_rx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_rx_ring *ring)
-{
- struct rt2860_rxdesc *desc;
+static void
+rt2860_reset_rx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_rx_ring *ring)
+{
+ struct rt2860_rxd *desc;
int i;
for (i = 0; i < RT2860_SOFTC_RX_RING_DATA_COUNT; i++) {
desc = &ring->desc[i];
- desc->sdl0 &= ~htole16(RT2860_RXDESC_SDL0_DDONE);
+ desc->sdl0 &= ~htole16(RT2860_RX_DDONE);
}
bus_dmamap_sync(ring->desc_dma_tag, ring->desc_dma_map,
@@ -6442,8 +5786,9 @@
/*
* rt2860_free_rx_ring
*/
-static void rt2860_free_rx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_rx_ring *ring)
+static void
+rt2860_free_rx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_rx_ring *ring)
{
struct rt2860_softc_rx_data *data;
int i;
@@ -6483,13 +5828,14 @@
/*
* rt2860_alloc_tx_ring
*/
-static int rt2860_alloc_tx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring, int qid)
+static int
+rt2860_alloc_tx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring, int qid)
{
struct rt2860_softc_tx_data *data;
int error, i, size;
- size = RT2860_SOFTC_TX_RING_DESC_COUNT * sizeof(struct rt2860_txdesc);
+ size = RT2860_SOFTC_TX_RING_DESC_COUNT * sizeof(struct rt2860_txd);
mtx_init(&ring->lock, device_get_nameunit(sc->sc_dev), NULL, MTX_DEF);
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), PAGE_SIZE, 0,
@@ -6574,23 +5920,23 @@
ring->qid = qid;
- return 0;
+ return (0);
fail:
-
rt2860_free_tx_ring(sc, ring);
- return error;
+ return (error);
}
/*
* rt2860_reset_tx_ring
*/
-static void rt2860_reset_tx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring)
+static void
+rt2860_reset_tx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring)
{
struct rt2860_softc_tx_data *data;
- struct rt2860_txdesc *desc;
+ struct rt2860_txd *desc;
int i;
for (i = 0; i < RT2860_SOFTC_TX_RING_DESC_COUNT; i++) {
@@ -6613,15 +5959,18 @@
for (i = 0; i < RT2860_SOFTC_TX_RING_DATA_COUNT; i++) {
data = &ring->data[i];
- if (data->m != NULL) {
+ /*
+ * XXX: not sure about it, but
+ * if both not NULL, because normal packet have mbuf and node
+ */
+ if ((data->m != NULL) && (data->ni != NULL)) {
bus_dmamap_sync(ring->data_dma_tag, data->dma_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(ring->data_dma_tag, data->dma_map);
+
m_freem(data->m);
data->m = NULL;
- }
-
- if (data->ni != NULL) {
+
ieee80211_free_node(data->ni);
data->ni = NULL;
}
@@ -6635,8 +5984,9 @@
/*
* rt2860_free_tx_ring
*/
-static void rt2860_free_tx_ring(struct rt2860_softc *sc,
- struct rt2860_softc_tx_ring *ring)
+static void
+rt2860_free_tx_ring(struct rt2860_softc *sc,
+ struct rt2860_softc_tx_ring *ring)
{
struct rt2860_softc_tx_data *data;
int i;
@@ -6689,8 +6039,8 @@
/*
* rt2860_dma_map_addr
*/
-static void rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs,
- int nseg, int error)
+static void
+rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
if (error != 0)
return;
@@ -6703,7 +6053,8 @@
/*
* rt2860_sysctl_attach
*/
-static void rt2860_sysctl_attach(struct rt2860_softc *sc)
+static void
+rt2860_sysctl_attach(struct rt2860_softc *sc)
{
struct sysctl_ctx_list *ctx;
struct sysctl_oid *tree;
@@ -6717,289 +6068,343 @@
"Tx STBC");
/* statistic counters */
-
stats = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"stats", CTLFLAG_RD, 0, "statistic");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "interrupts", CTLFLAG_RD, &sc->interrupts, 0,
+ "interrupts", CTLFLAG_RD,
+ &sc->interrupts, 0,
"all interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_coherent_interrupts", CTLFLAG_RD, &sc->tx_coherent_interrupts, 0,
+ "tx_coherent_interrupts", CTLFLAG_RD,
+ &sc->tx_coherent_interrupts, 0,
"Tx coherent interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_coherent_interrupts", CTLFLAG_RD, &sc->rx_coherent_interrupts, 0,
+ "rx_coherent_interrupts", CTLFLAG_RD,
+ &sc->rx_coherent_interrupts, 0,
"Rx coherent interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "txrx_coherent_interrupts", CTLFLAG_RD, &sc->txrx_coherent_interrupts, 0,
+ "txrx_coherent_interrupts", CTLFLAG_RD,
+ &sc->txrx_coherent_interrupts, 0,
"Tx/Rx coherent interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "fifo_sta_full_interrupts", CTLFLAG_RD, &sc->fifo_sta_full_interrupts, 0,
+ "fifo_stat_full_interrupts", CTLFLAG_RD,
+ &sc->fifo_stat_full_interrupts, 0,
"FIFO statistic full interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_interrupts", CTLFLAG_RD, &sc->rx_interrupts, 0,
+ "rx_interrupts", CTLFLAG_RD,
+ &sc->rx_interrupts, 0,
"Rx interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_mgmt_interrupts", CTLFLAG_RD, &sc->tx_interrupts[5], 0,
+ "tx_mgmt_interrupts", CTLFLAG_RD,
+ &sc->tx_interrupts[5], 0,
"Tx MGMT interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_hcca_interrupts", CTLFLAG_RD, &sc->tx_interrupts[4], 0,
+ "tx_hcca_interrupts", CTLFLAG_RD,
+ &sc->tx_interrupts[4], 0,
"Tx HCCA interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac3_interrupts", CTLFLAG_RD, &sc->tx_interrupts[3], 0,
+ "tx_ac3_interrupts", CTLFLAG_RD,
+ &sc->tx_interrupts[3], 0,
"Tx AC3 interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac2_interrupts", CTLFLAG_RD, &sc->tx_interrupts[2], 0,
+ "tx_ac2_interrupts", CTLFLAG_RD,
+ &sc->tx_interrupts[2], 0,
"Tx AC2 interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac1_interrupts", CTLFLAG_RD, &sc->tx_interrupts[1], 0,
+ "tx_ac1_interrupts", CTLFLAG_RD,
+ &sc->tx_interrupts[1], 0,
"Tx AC1 interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac0_interrupts", CTLFLAG_RD, &sc->tx_interrupts[0], 0,
+ "tx_ac0_interrupts", CTLFLAG_RD,
+ &sc->tx_interrupts[0], 0,
"Tx AC0 interrupts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_mgmt_desc_queued", CTLFLAG_RD, &sc->tx_ring[5].desc_queued, 0,
+ "tx_mgmt_desc_queued", CTLFLAG_RD,
+ &sc->tx_ring[5].desc_queued, 0,
"Tx MGMT descriptors queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_mgmt_data_queued", CTLFLAG_RD, &sc->tx_ring[5].data_queued, 0,
+ "tx_mgmt_data_queued", CTLFLAG_RD,
+ &sc->tx_ring[5].data_queued, 0,
"Tx MGMT data queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_hcca_desc_queued", CTLFLAG_RD, &sc->tx_ring[4].desc_queued, 0,
+ "tx_hcca_desc_queued", CTLFLAG_RD,
+ &sc->tx_ring[4].desc_queued, 0,
"Tx HCCA descriptors queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_hcca_data_queued", CTLFLAG_RD, &sc->tx_ring[4].data_queued, 0,
+ "tx_hcca_data_queued", CTLFLAG_RD,
+ &sc->tx_ring[4].data_queued, 0,
"Tx HCCA data queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac3_desc_queued", CTLFLAG_RD, &sc->tx_ring[3].desc_queued, 0,
+ "tx_ac3_desc_queued", CTLFLAG_RD,
+ &sc->tx_ring[3].desc_queued, 0,
"Tx AC3 descriptors queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac3_data_queued", CTLFLAG_RD, &sc->tx_ring[3].data_queued, 0,
+ "tx_ac3_data_queued", CTLFLAG_RD,
+ &sc->tx_ring[3].data_queued, 0,
"Tx AC3 data queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac2_desc_queued", CTLFLAG_RD, &sc->tx_ring[2].desc_queued, 0,
+ "tx_ac2_desc_queued", CTLFLAG_RD,
+ &sc->tx_ring[2].desc_queued, 0,
"Tx AC2 descriptors queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac2_data_queued", CTLFLAG_RD, &sc->tx_ring[2].data_queued, 0,
+ "tx_ac2_data_queued", CTLFLAG_RD,
+ &sc->tx_ring[2].data_queued, 0,
"Tx AC2 data queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac1_desc_queued", CTLFLAG_RD, &sc->tx_ring[1].desc_queued, 0,
+ "tx_ac1_desc_queued", CTLFLAG_RD,
+ &sc->tx_ring[1].desc_queued, 0,
"Tx AC1 descriptors queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac1_data_queued", CTLFLAG_RD, &sc->tx_ring[1].data_queued, 0,
+ "tx_ac1_data_queued", CTLFLAG_RD,
+ &sc->tx_ring[1].data_queued, 0,
"Tx AC1 data queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac0_desc_queued", CTLFLAG_RD, &sc->tx_ring[0].desc_queued, 0,
+ "tx_ac0_desc_queued", CTLFLAG_RD,
+ &sc->tx_ring[0].desc_queued, 0,
"Tx AC0 descriptors queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac0_data_queued", CTLFLAG_RD, &sc->tx_ring[0].data_queued, 0,
+ "tx_ac0_data_queued", CTLFLAG_RD,
+ &sc->tx_ring[0].data_queued, 0,
"Tx AC0 data queued");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_mgmt_data_queue_full", CTLFLAG_RD, &sc->tx_data_queue_full[5], 0,
+ "tx_mgmt_data_queue_full", CTLFLAG_RD,
+ &sc->tx_data_queue_full[5], 0,
"Tx MGMT data queue full");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_hcca_data_queue_full", CTLFLAG_RD, &sc->tx_data_queue_full[4], 0,
+ "tx_hcca_data_queue_full", CTLFLAG_RD,
+ &sc->tx_data_queue_full[4], 0,
"Tx HCCA data queue full");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac3_data_queue_full", CTLFLAG_RD, &sc->tx_data_queue_full[3], 0,
+ "tx_ac3_data_queue_full", CTLFLAG_RD,
+ &sc->tx_data_queue_full[3], 0,
"Tx AC3 data queue full");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac2_data_queue_full", CTLFLAG_RD, &sc->tx_data_queue_full[2], 0,
+ "tx_ac2_data_queue_full", CTLFLAG_RD,
+ &sc->tx_data_queue_full[2], 0,
"Tx AC2 data queue full");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac1_data_queue_full", CTLFLAG_RD, &sc->tx_data_queue_full[1], 0,
+ "tx_ac1_data_queue_full", CTLFLAG_RD,
+ &sc->tx_data_queue_full[1], 0,
"Tx AC1 data queue full");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ac0_data_queue_full", CTLFLAG_RD, &sc->tx_data_queue_full[0], 0,
+ "tx_ac0_data_queue_full", CTLFLAG_RD,
+ &sc->tx_data_queue_full[0], 0,
"Tx AC0 data queue full");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_watchdog_timeouts", CTLFLAG_RD, &sc->tx_watchdog_timeouts, 0,
+ "tx_watchdog_timeouts", CTLFLAG_RD,
+ &sc->tx_watchdog_timeouts, 0,
"Tx watchdog timeouts");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_defrag_packets", CTLFLAG_RD, &sc->tx_defrag_packets, 0,
+ "tx_defrag_packets", CTLFLAG_RD,
+ &sc->tx_defrag_packets, 0,
"Tx defragmented packets");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "no_tx_desc_avail", CTLFLAG_RD, &sc->no_tx_desc_avail, 0,
+ "no_tx_desc_avail", CTLFLAG_RD,
+ &sc->no_tx_desc_avail, 0,
"no Tx descriptors available");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_mbuf_alloc_errors", CTLFLAG_RD, &sc->rx_mbuf_alloc_errors, 0,
+ "rx_mbuf_alloc_errors", CTLFLAG_RD,
+ &sc->rx_mbuf_alloc_errors, 0,
"Rx mbuf allocation errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_mbuf_dmamap_errors", CTLFLAG_RD, &sc->rx_mbuf_dmamap_errors, 0,
+ "rx_mbuf_dmamap_errors", CTLFLAG_RD,
+ &sc->rx_mbuf_dmamap_errors, 0,
"Rx mbuf DMA mapping errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_queue_0_not_empty", CTLFLAG_RD, &sc->tx_queue_not_empty[0], 0,
+ "tx_queue_0_not_empty", CTLFLAG_RD,
+ &sc->tx_queue_not_empty[0], 0,
"Tx queue 0 not empty");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_queue_1_not_empty", CTLFLAG_RD, &sc->tx_queue_not_empty[1], 0,
+ "tx_queue_1_not_empty", CTLFLAG_RD,
+ &sc->tx_queue_not_empty[1], 0,
"Tx queue 1 not empty");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_beacons", CTLFLAG_RD, &sc->tx_beacons, 0,
+ "tx_beacons", CTLFLAG_RD,
+ &sc->tx_beacons, 0,
"Tx beacons");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_noretryok", CTLFLAG_RD, &sc->tx_noretryok, 0,
+ "tx_noretryok", CTLFLAG_RD,
+ &sc->tx_noretryok, 0,
"Tx successfull without retries");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_retryok", CTLFLAG_RD, &sc->tx_retryok, 0,
+ "tx_retryok", CTLFLAG_RD,
+ &sc->tx_retryok, 0,
"Tx successfull with retries");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_failed", CTLFLAG_RD, &sc->tx_failed, 0,
+ "tx_failed", CTLFLAG_RD,
+ &sc->tx_failed, 0,
"Tx failed");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_underflows", CTLFLAG_RD, &sc->tx_underflows, 0,
+ "tx_underflows", CTLFLAG_RD,
+ &sc->tx_underflows, 0,
"Tx underflows");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_zerolen", CTLFLAG_RD, &sc->tx_zerolen, 0,
+ "tx_zerolen", CTLFLAG_RD,
+ &sc->tx_zerolen, 0,
"Tx zero length");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_nonagg", CTLFLAG_RD, &sc->tx_nonagg, 0,
+ "tx_nonagg", CTLFLAG_RD,
+ &sc->tx_nonagg, 0,
"Tx non-aggregated");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_agg", CTLFLAG_RD, &sc->tx_agg, 0,
+ "tx_agg", CTLFLAG_RD,
+ &sc->tx_agg, 0,
"Tx aggregated");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ampdu", CTLFLAG_RD, &sc->tx_ampdu, 0,
+ "tx_ampdu", CTLFLAG_RD,
+ &sc->tx_ampdu, 0,
"Tx A-MPDU");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_mpdu_zero_density", CTLFLAG_RD, &sc->tx_mpdu_zero_density, 0,
+ "tx_mpdu_zero_density", CTLFLAG_RD,
+ &sc->tx_mpdu_zero_density, 0,
"Tx MPDU with zero density");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "tx_ampdu_sessions", CTLFLAG_RD, &sc->tx_ampdu_sessions, 0,
+ "tx_ampdu_sessions", CTLFLAG_RD,
+ &sc->tx_ampdu_sessions, 0,
"Tx A-MPDU sessions");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_packets", CTLFLAG_RD, &sc->rx_packets, 0,
+ "rx_packets", CTLFLAG_RD,
+ &sc->rx_packets, 0,
"Rx packets");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_ampdu", CTLFLAG_RD, &sc->rx_ampdu, 0,
+ "rx_ampdu", CTLFLAG_RD,
+ &sc->rx_ampdu, 0,
"Rx A-MPDU");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_ampdu_retries", CTLFLAG_RD, &sc->rx_ampdu_retries, 0,
+ "rx_ampdu_retries", CTLFLAG_RD,
+ &sc->rx_ampdu_retries, 0,
"Rx A-MPDU retries");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_mpdu_zero_density", CTLFLAG_RD, &sc->rx_mpdu_zero_density, 0,
+ "rx_mpdu_zero_density", CTLFLAG_RD,
+ &sc->rx_mpdu_zero_density, 0,
"Rx MPDU with zero density");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_ampdu_sessions", CTLFLAG_RD, &sc->rx_ampdu_sessions, 0,
+ "rx_ampdu_sessions", CTLFLAG_RD,
+ &sc->rx_ampdu_sessions, 0,
"Rx A-MPDU sessions");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_amsdu", CTLFLAG_RD, &sc->rx_amsdu, 0,
+ "rx_amsdu", CTLFLAG_RD,
+ &sc->rx_amsdu, 0,
"Rx A-MSDU");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_crc_errors", CTLFLAG_RD, &sc->rx_crc_errors, 0,
+ "rx_crc_errors", CTLFLAG_RD,
+ &sc->rx_crc_errors, 0,
"Rx CRC errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_phy_errors", CTLFLAG_RD, &sc->rx_phy_errors, 0,
+ "rx_phy_errors", CTLFLAG_RD,
+ &sc->rx_phy_errors, 0,
"Rx PHY errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_false_ccas", CTLFLAG_RD, &sc->rx_false_ccas, 0,
+ "rx_false_ccas", CTLFLAG_RD,
+ &sc->rx_false_ccas, 0,
"Rx false CCAs");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_plcp_errors", CTLFLAG_RD, &sc->rx_plcp_errors, 0,
+ "rx_plcp_errors", CTLFLAG_RD,
+ &sc->rx_plcp_errors, 0,
"Rx PLCP errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_dup_packets", CTLFLAG_RD, &sc->rx_dup_packets, 0,
+ "rx_dup_packets", CTLFLAG_RD,
+ &sc->rx_dup_packets, 0,
"Rx duplicate packets");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_fifo_overflows", CTLFLAG_RD, &sc->rx_fifo_overflows, 0,
+ "rx_fifo_overflows", CTLFLAG_RD,
+ &sc->rx_fifo_overflows, 0,
"Rx FIFO overflows");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_cipher_no_errors", CTLFLAG_RD, &sc->rx_cipher_no_errors, 0,
+ "rx_cipher_no_errors", CTLFLAG_RD,
+ &sc->rx_cipher_no_errors, 0,
"Rx cipher no errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_cipher_icv_errors", CTLFLAG_RD, &sc->rx_cipher_icv_errors, 0,
+ "rx_cipher_icv_errors", CTLFLAG_RD,
+ &sc->rx_cipher_icv_errors, 0,
"Rx cipher ICV errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_cipher_mic_errors", CTLFLAG_RD, &sc->rx_cipher_mic_errors, 0,
+ "rx_cipher_mic_errors", CTLFLAG_RD,
+ &sc->rx_cipher_mic_errors, 0,
"Rx cipher MIC errors");
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "rx_cipher_invalid_key_errors", CTLFLAG_RD, &sc->rx_cipher_invalid_key_errors, 0,
+ "rx_cipher_invalid_key_errors", CTLFLAG_RD,
+ &sc->rx_cipher_invalid_key_errors, 0,
"Rx cipher invalid key errors");
-}
-
-/*
- * Defines and macros
- */
-
-#define RT2860_AMRR_IS_SUCCESS(amrr_node) ((amrr_node)->retrycnt < (amrr_node)->txcnt / 10)
-
-#define RT2860_AMRR_IS_FAILURE(amrr_node) ((amrr_node)->retrycnt > (amrr_node)->txcnt / 3)
-
-#define RT2860_AMRR_IS_ENOUGH(amrr_node) ((amrr_node)->txcnt > 10)
-
-/*
- * Static function prototypes
- */
-
-static int rt2860_amrr_update(struct rt2860_amrr *amrr,
- struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni);
+#ifdef RT2860_DEBUG
+ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
+ "tx_timer", CTLFLAG_RD,
+ &sc->tx_timer, 0,
+ "tx_timer");
+#endif
+}
/*
* rt2860_amrr_init
*/
-void rt2860_amrr_init(struct rt2860_amrr *amrr, struct ieee80211vap *vap,
- int ntxpath, int min_success_threshold, int max_success_threshold, int msecs)
+static void
+rt2860_amrr_init(struct rt2860_amrr *amrr, struct ieee80211vap *vap,
+ int ntxpath, int min_success_threshold, int max_success_threshold,
+ int msecs)
{
int t;
@@ -7019,14 +6424,16 @@
/*
* rt2860_amrr_cleanup
*/
-void rt2860_amrr_cleanup(struct rt2860_amrr *amrr)
+static void
+rt2860_amrr_cleanup(struct rt2860_amrr *amrr)
{
}
/*
* rt2860_amrr_node_init
*/
-void rt2860_amrr_node_init(struct rt2860_amrr *amrr,
+static void
+rt2860_amrr_node_init(struct rt2860_amrr *amrr,
struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni)
{
const struct ieee80211_rateset *rs;
@@ -7042,18 +6449,24 @@
rs = (const struct ieee80211_rateset *) &ni->ni_htrates;
for (amrr_node->rate_index = rs->rs_nrates - 1;
- amrr_node->rate_index > 0 && (rs->rs_rates[amrr_node->rate_index] & IEEE80211_RATE_VAL) > 4;
+ amrr_node->rate_index > 0 &&
+ (rs->rs_rates[amrr_node->rate_index] &
+ IEEE80211_RATE_VAL) > 4;
amrr_node->rate_index--) ;
- ni->ni_txrate = rs->rs_rates[amrr_node->rate_index] | IEEE80211_RATE_MCS;
+ ni->ni_txrate = rs->rs_rates[amrr_node->rate_index] |
+ IEEE80211_RATE_MCS;
} else {
rs = &ni->ni_rates;
for (amrr_node->rate_index = rs->rs_nrates - 1;
- amrr_node->rate_index > 0 && (rs->rs_rates[amrr_node->rate_index] & IEEE80211_RATE_VAL) > 72;
+ amrr_node->rate_index > 0 &&
+ (rs->rs_rates[amrr_node->rate_index] &
+ IEEE80211_RATE_VAL) > 72;
amrr_node->rate_index--) ;
- ni->ni_txrate = rs->rs_rates[amrr_node->rate_index] & IEEE80211_RATE_VAL;
+ ni->ni_txrate = rs->rs_rates[amrr_node->rate_index] &
+ IEEE80211_RATE_VAL;
}
amrr_node->ticks = ticks;
@@ -7062,8 +6475,9 @@
/*
* rt2860_amrr_choose
*/
-int rt2860_amrr_choose(struct ieee80211_node *ni,
- struct rt2860_amrr_node *amrr_node)
+static int
+rt2860_amrr_choose(struct ieee80211_node *ni,
+ struct rt2860_amrr_node *amrr_node)
{
struct rt2860_amrr *amrr;
int rate_index;
@@ -7091,21 +6505,21 @@
rate_index = amrr_node->rate_index;
}
- return rate_index;
+ return (rate_index);
}
/*
* rt2860_amrr_update
*/
-static int rt2860_amrr_update(struct rt2860_amrr *amrr,
- struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni)
+static int
+rt2860_amrr_update(struct rt2860_amrr *amrr,
+ struct rt2860_amrr_node *amrr_node, struct ieee80211_node *ni)
{
const struct ieee80211_rateset *rs;
int rate_index;
KASSERT(RT2860_AMRR_IS_ENOUGH(amrr_node),
- ("not enough Tx count: txcnt=%d",
- amrr_node->txcnt));
+ ("not enough Tx count: txcnt=%d", amrr_node->txcnt));
if (ni->ni_flags & IEEE80211_NODE_HT)
rs = (const struct ieee80211_rateset *) &ni->ni_htrates;
@@ -7134,10 +6548,13 @@
if (rate_index > 0) {
if (amrr_node->recovery) {
amrr_node->success_threshold *= 2;
- if (amrr_node->success_threshold > amrr->max_success_threshold)
- amrr_node->success_threshold = amrr->max_success_threshold;
+ if (amrr_node->success_threshold >
+ amrr->max_success_threshold)
+ amrr_node->success_threshold =
+ amrr->max_success_threshold;
} else {
- amrr_node->success_threshold = amrr->min_success_threshold;
+ amrr_node->success_threshold =
+ amrr->min_success_threshold;
}
rate_index--;
@@ -7149,35 +6566,48 @@
amrr_node->txcnt = 0;
amrr_node->retrycnt = 0;
- return rate_index;
-}
-
-/*
- * Defines and macros
- */
-
-/*
- * RT2860_IO_EEPROM_RAISE_CLK
- */
+ return (rate_index);
+}
+
+static __inline void
+rt2860_amrr_tx_complete(struct rt2860_amrr_node *amrr_node, int ok,
+ int retries)
+{
+
+ amrr_node->txcnt++;
+
+ if (ok)
+ amrr_node->success++;
+
+ amrr_node->retrycnt += retries;
+}
+
+static __inline void
+rt2860_amrr_tx_update(struct rt2860_amrr_node *amrr_node, int txcnt,
+ int success, int retrycnt)
+{
+
+ amrr_node->txcnt = txcnt;
+ amrr_node->success = success;
+ amrr_node->retrycnt = retrycnt;
+}
+
#define RT2860_IO_EEPROM_RAISE_CLK(sc, val) \
do \
{ \
(val) |= RT2860_REG_EESK; \
\
- rt2860_io_mac_write((sc), RT2860_REG_EEPROM_CSR, (val)); \
+ RAL_WRITE((sc), RT2860_PCI_EECTRL, (val)); \
\
DELAY(1); \
} while (0)
-/*
- * RT2860_IO_EEPROM_LOWER_CLK
- */
#define RT2860_IO_EEPROM_LOWER_CLK(sc, val) \
do \
{ \
(val) &= ~RT2860_REG_EESK; \
\
- rt2860_io_mac_write((sc), RT2860_REG_EEPROM_CSR, (val)); \
+ RAL_WRITE((sc), RT2860_PCI_EECTRL, (val)); \
\
DELAY(1); \
} while (0)
@@ -7186,19 +6616,8 @@
((uint16_t) (((crc) << 8) ^ \
rt2860_io_ccitt16[(((crc) >> 8) ^ (byte)) & 255]))
-/*
- * Static function prototypes
- */
-
-static void rt2860_io_eeprom_shiftout_bits(struct rt2860_softc *sc,
- uint16_t val, uint16_t count);
-
-static uint16_t rt2860_io_eeprom_shiftin_bits(struct rt2860_softc *sc);
-
-static uint8_t rt2860_io_byte_rev(uint8_t byte);
-
/* #ifdef RT305X_SOC */
-static const uint16_t rt3052_eeprom[] =
+static const uint16_t rt3052_eeprom[] =
{
0x3052, 0x0101, 0x0c00, 0x3043, 0x8852, 0xffff, 0xffff, 0xffff,
0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
@@ -7268,6 +6687,7 @@
0x00, /* 30 */
0x00,
};
+
/* #endif */
@@ -7311,65 +6731,6 @@
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
};
-/*
- * rt2860_io_mac_read
- */
-uint32_t rt2860_io_mac_read(struct rt2860_softc *sc, uint16_t reg)
-{
-
- return bus_space_read_4(sc->sc_st, sc->sc_sh, reg);
-}
-
-/*
- * rt2860_io_mac_read_multi
- */
-void rt2860_io_mac_read_multi(struct rt2860_softc *sc,
- uint16_t reg, void *buf, size_t len)
-{
-
- bus_space_read_region_1(sc->sc_st, sc->sc_sh, reg, buf, len);
-}
-
-/*
- * rt2860_io_mac_write
- */
-void rt2860_io_mac_write(struct rt2860_softc *sc,
- uint16_t reg, uint32_t val)
-{
-
- bus_space_write_4(sc->sc_st, sc->sc_sh, reg, val);
-}
-
-/*
- * rt2860_io_mac_write_multi
- */
-void rt2860_io_mac_write_multi(struct rt2860_softc *sc,
- uint16_t reg, const void *buf, size_t len)
-{
- int i;
- const uint8_t *p;
-
- p = buf;
- for (i = 0; i < len; i ++)
- bus_space_write_1(sc->sc_st, sc->sc_sh, reg + i, *(p+i));
-
-#ifdef notyet
- bus_space_write_region_1(sc->sc_st, sc->sc_sh, reg, buf, len);
-#endif
-}
-
-/*
- * rt2860_io_mac_set_region_4
- */
-void rt2860_io_mac_set_region_4(struct rt2860_softc *sc,
- uint16_t reg, uint32_t val, size_t len)
-{
- int i;
-
- for (i = 0; i < len; i += sizeof(uint32_t))
- rt2860_io_mac_write(sc, reg + i, val);
-}
-
/* Read 16-bit from eFUSE ROM (>=RT3071 only.) */
static uint16_t
rt3090_efuse_read_2(struct rt2860_softc *sc, uint16_t addr)
@@ -7378,7 +6739,6 @@
uint16_t reg;
int ntries;
- addr *= 2;
/*-
* Read one 16-byte block into registers EFUSE_DATA[0-3]:
* DATA0: F E D C
@@ -7386,113 +6746,110 @@
* DATA2: 7 6 5 4
* DATA3: 3 2 1 0
*/
- tmp = rt2860_io_mac_read(sc, RT3070_EFUSE_CTRL);
+ tmp = RAL_READ(sc, RT3070_EFUSE_CTRL);
tmp &= ~(RT3070_EFSROM_MODE_MASK | RT3070_EFSROM_AIN_MASK);
tmp |= (addr & ~0xf) << RT3070_EFSROM_AIN_SHIFT | RT3070_EFSROM_KICK;
- rt2860_io_mac_write(sc, RT3070_EFUSE_CTRL, tmp);
+ RAL_WRITE(sc, RT3070_EFUSE_CTRL, tmp);
+
for (ntries = 0; ntries < 500; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT3070_EFUSE_CTRL);
+ tmp = RAL_READ(sc, RT3070_EFUSE_CTRL);
if (!(tmp & RT3070_EFSROM_KICK))
break;
DELAY(2);
}
if (ntries == 500)
- return 0xffff;
+ return (0xffff);
if ((tmp & RT3070_EFUSE_AOUT_MASK) == RT3070_EFUSE_AOUT_MASK)
- return 0xffff; /* address not found */
+ return (0xffff); /* address not found */
/* determine to which 32-bit register our 16-bit word belongs */
reg = RT3070_EFUSE_DATA3 - (addr & 0xc);
- tmp = rt2860_io_mac_read(sc, reg);
-
- return (addr & 2) ? tmp >> 16 : tmp & 0xffff;
+ tmp = RAL_READ(sc, reg);
+
+ return ((addr & 2) ? tmp >> 16 : tmp & 0xffff);
}
/*
* rt2860_io_eeprom_read
- */
-uint16_t rt2860_io_eeprom_read(struct rt2860_softc *sc, uint16_t addr)
+ * addr is 16bit word address
+ */
+static uint16_t
+rt2860_io_eeprom_read(struct rt2860_softc *sc, uint16_t addr)
{
uint32_t tmp;
uint16_t val;
-
- addr = (addr >> 1);
+ int n;
if (sc->mac_rev == 0x28720200) {
- return (rt3052_eeprom[addr]);
+ /* SoC embedded version, don't have EEPROM */
+ /* index of 16bit words array */
+ return (rt3052_eeprom[addr >> 1]);
} else if ((sc->mac_rev & 0xffff0000) >= 0x30710000) {
- tmp = rt2860_io_mac_read(sc, RT3070_EFUSE_CTRL);
+ tmp = RAL_READ(sc, RT3070_EFUSE_CTRL);
if (tmp & RT3070_SEL_EFUSE)
return (rt3090_efuse_read_2(sc, addr));
}
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
-
- tmp &= ~(RT2860_REG_EEDI | RT2860_REG_EEDO | RT2860_REG_EESK);
- tmp |= RT2860_REG_EECS;
-
- rt2860_io_mac_write(sc, RT2860_REG_EEPROM_CSR, tmp);
-
- if (((sc->mac_rev & 0xffff0000) != 0x30710000) &&
- ((sc->mac_rev & 0xffff0000) != 0x30900000) &&
- ((sc->mac_rev & 0xffff0000) != 0x35720000) &&
- ((sc->mac_rev & 0xffff0000) != 0x33900000)) {
- RT2860_IO_EEPROM_RAISE_CLK(sc, tmp);
- RT2860_IO_EEPROM_LOWER_CLK(sc, tmp);
- }
-
- rt2860_io_eeprom_shiftout_bits(sc, RT2860_REG_EEOP_READ, 3);
- rt2860_io_eeprom_shiftout_bits(sc, addr, sc->eeprom_addr_num);
-
- val = rt2860_io_eeprom_shiftin_bits(sc);
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
-
- tmp &= ~(RT2860_REG_EECS | RT2860_REG_EEDI);
-
- rt2860_io_mac_write(sc, RT2860_REG_EEPROM_CSR, tmp);
-
- RT2860_IO_EEPROM_RAISE_CLK(sc, tmp);
- RT2860_IO_EEPROM_LOWER_CLK(sc, tmp);
-
- return val;
-}
-
-/*
- * rt2860_io_eeprom_read_multi
- */
-void rt2860_io_eeprom_read_multi(struct rt2860_softc *sc,
- uint16_t addr, void *buf, size_t len)
-{
- uint16_t *ptr;
- int i;
-
- len += len % sizeof(uint16_t);
- ptr = buf;
-
- i = 0;
-
- do {
- *ptr++ = rt2860_io_eeprom_read(sc, addr + i);
-
- i += sizeof(uint16_t);
- len -= sizeof(uint16_t);
- } while (len > 0);
+ /* clock C once before the first command */
+ RT2860_EEPROM_CTL(sc, 0);
+
+ RT2860_EEPROM_CTL(sc, RT2860_S);
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_C);
+ RT2860_EEPROM_CTL(sc, RT2860_S);
+
+ /* write start bit (1) */
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_D);
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_D | RT2860_C);
+
+ /* write READ opcode (10) */
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_D);
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_D | RT2860_C);
+ RT2860_EEPROM_CTL(sc, RT2860_S);
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_C);
+
+ /* write address (A5-A0 or A7-A0) */
+ n = ((RAL_READ(sc, RT2860_PCI_EECTRL) & 0x30) == 0) ? 5 : 7;
+ for (; n >= 0; n--) {
+ RT2860_EEPROM_CTL(sc, RT2860_S |
+ (((addr >> n) & 1) << RT2860_SHIFT_D));
+ RT2860_EEPROM_CTL(sc, RT2860_S |
+ (((addr >> n) & 1) << RT2860_SHIFT_D) | RT2860_C);
+ }
+
+ RT2860_EEPROM_CTL(sc, RT2860_S);
+
+ /* read data Q15-Q0 */
+ val = 0;
+ for (n = 15; n >= 0; n--) {
+ RT2860_EEPROM_CTL(sc, RT2860_S | RT2860_C);
+ tmp = RAL_READ(sc, RT2860_PCI_EECTRL);
+ val |= ((tmp & RT2860_Q) >> RT2860_SHIFT_Q) << n;
+ RT2860_EEPROM_CTL(sc, RT2860_S);
+ }
+ RT2860_EEPROM_CTL(sc, 0);
+
+ /* clear Chip Select and clock C */
+ RT2860_EEPROM_CTL(sc, RT2860_S);
+ RT2860_EEPROM_CTL(sc, 0);
+ RT2860_EEPROM_CTL(sc, RT2860_C);
+
+ return (val);
}
/*
* rt2860_io_bbp_read
*/
-uint8_t rt2860_io_bbp_read(struct rt2860_softc *sc, uint8_t reg)
+static uint8_t
+rt2860_io_bbp_read(struct rt2860_softc *sc, uint8_t reg)
{
int ntries;
uint32_t tmp;
if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2860_REG_BBP_CSR_CFG) &
+ if ( !(RAL_READ(sc, RT2860_REG_BBP_CSR_CFG) &
RT2860_REG_BBP_CSR_BUSY) )
break;
DELAY(1);
@@ -7502,15 +6859,15 @@
"BBP busy after 100 probes\n");
return (0);
}
- rt2860_io_mac_write(sc, RT2860_REG_BBP_CSR_CFG,
+ RAL_WRITE(sc, RT2860_REG_BBP_CSR_CFG,
RT2860_REG_BBP_CSR_READ |
RT2860_REG_BBP_CSR_KICK |
RT2860_REG_BBP_RW_MODE_PARALLEL |
(reg & RT2860_REG_BBP_REG_MASK) <<
RT2860_REG_BBP_REG_SHIFT);
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc,
- RT2860_REG_BBP_CSR_CFG) &
+ if ( !(RAL_READ(sc,
+ RT2860_REG_BBP_CSR_CFG) &
RT2860_REG_BBP_CSR_BUSY) )
break;
DELAY(1);
@@ -7520,16 +6877,16 @@
"BBP busy after 100 probes\n");
return (0);
} else {
- return ((rt2860_io_mac_read(sc,
+ return ((RAL_READ(sc,
RT2860_REG_BBP_CSR_CFG) >>
- RT2860_REG_BBP_VAL_SHIFT) &
+ RT2860_REG_BBP_VAL_SHIFT) &
RT2860_REG_BBP_VAL_MASK);
}
return (0);
}
for (ntries = 0; ntries < 100; ntries++) {
- if (!(rt2860_io_mac_read(sc,
+ if (!(RAL_READ(sc,
RT2860_REG_H2M_MAILBOX_BBP_AGENT) &
RT2860_REG_BBP_CSR_BUSY))
break;
@@ -7540,7 +6897,7 @@
if (ntries == 100) {
device_printf(sc->sc_dev,
"could not read from BBP through MCU: reg=0x%02x\n", reg);
- return 0;
+ return (0);
}
tmp = RT2860_REG_BBP_RW_MODE_PARALLEL |
@@ -7548,15 +6905,15 @@
RT2860_REG_BBP_CSR_READ |
((reg & RT2860_REG_BBP_REG_MASK) << RT2860_REG_BBP_REG_SHIFT);
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, tmp);
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, tmp);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_BBP,
- RT2860_REG_H2M_TOKEN_NO_INTR, 0);
+ RT2860_TOKEN_NO_INTR, 0);
DELAY(1000);
for (ntries = 0; ntries < 100; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT);
+ tmp = RAL_READ(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT);
if (!(tmp & RT2860_REG_BBP_CSR_BUSY))
return ((tmp >> RT2860_REG_BBP_VAL_SHIFT) &
RT2860_REG_BBP_VAL_MASK);
@@ -7567,20 +6924,21 @@
device_printf(sc->sc_dev, "could not read from BBP through MCU: "
"reg=0x%02x\n", reg);
- return 0;
+ return (0);
}
/*
* rt2860_io_bbp_write
*/
-void rt2860_io_bbp_write(struct rt2860_softc *sc, uint8_t reg, uint8_t val)
+static void
+rt2860_io_bbp_write(struct rt2860_softc *sc, uint8_t reg, uint8_t val)
{
int ntries;
uint32_t tmp;
if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2860_REG_BBP_CSR_CFG) &
+ if ( !(RAL_READ(sc, RT2860_REG_BBP_CSR_CFG) &
RT2860_REG_BBP_CSR_BUSY) )
break;
DELAY(1);
@@ -7590,16 +6948,16 @@
"BBP busy after 100 probes\n");
return;
}
- rt2860_io_mac_write(sc, RT2860_REG_BBP_CSR_CFG,
+ RAL_WRITE(sc, RT2860_REG_BBP_CSR_CFG,
RT2860_REG_BBP_CSR_KICK | RT2860_REG_BBP_RW_MODE_PARALLEL |
- (reg & RT2860_REG_BBP_REG_MASK) << RT2860_REG_BBP_REG_SHIFT |
+ (reg & RT2860_REG_BBP_REG_MASK) << RT2860_REG_BBP_REG_SHIFT |
(val & RT2860_REG_BBP_VAL_MASK) << RT2860_REG_BBP_VAL_SHIFT );
rt2860_io_bbp_read(sc, reg);
return;
}
for (ntries = 0; ntries < 100; ntries++) {
- if (!(rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT) &
+ if (!(RAL_READ(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT) &
RT2860_REG_BBP_CSR_BUSY))
break;
@@ -7617,10 +6975,10 @@
((reg & RT2860_REG_BBP_REG_MASK) << RT2860_REG_BBP_REG_SHIFT) |
((val & RT2860_REG_BBP_VAL_MASK) << RT2860_REG_BBP_VAL_SHIFT);
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, tmp);
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, tmp);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_BBP,
- RT2860_REG_H2M_TOKEN_NO_INTR, 0);
+ RT2860_TOKEN_NO_INTR, 0);
DELAY(1000);
}
@@ -7628,12 +6986,13 @@
/*
* rt2860_io_rf_write
*/
-void rt2860_io_rf_write(struct rt2860_softc *sc, uint8_t reg, uint32_t val)
+static void
+rt2860_io_rf_write(struct rt2860_softc *sc, uint8_t reg, uint32_t val)
{
int ntries;
if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) &
+ if ( !(RAL_READ(sc, RT2872_REG_RF_CSR_CFG) &
RT2872_REG_RF_CSR_BUSY) )
break;
DELAY(1);
@@ -7643,9 +7002,9 @@
"RF busy after 100 probes\n");
return;
}
- rt2860_io_mac_write(sc, RT2872_REG_RF_CSR_CFG,
+ RAL_WRITE(sc, RT2872_REG_RF_CSR_CFG,
RT2872_REG_RF_CSR_KICK | RT2872_REG_RF_CSR_WRITE |
- (reg & RT2872_REG_RF_ID_MASK) << RT2872_REG_RF_ID_SHIFT |
+ (reg & RT2872_REG_RF_ID_MASK) << RT2872_REG_RF_ID_SHIFT |
(val & RT2872_REG_RF_VAL_MASK) << RT2872_REG_RF_VAL_SHIFT );
rt2860_io_rf_read(sc, reg);
return;
@@ -7653,7 +7012,7 @@
for (ntries = 0; ntries < 100; ntries++)
- if (!(rt2860_io_mac_read(sc, RT2860_REG_RF_CSR_CFG0) &
+ if (!(RAL_READ(sc, RT2860_REG_RF_CSR_CFG0) &
RT2860_REG_RF_BUSY))
break;
@@ -7663,18 +7022,19 @@
return;
}
- rt2860_io_mac_write(sc, RT2860_REG_RF_CSR_CFG0, val);
+ RAL_WRITE(sc, RT2860_REG_RF_CSR_CFG0, val);
}
/*
* rt2860_io_rf_read
*/
-int32_t rt2860_io_rf_read(struct rt2860_softc *sc, uint8_t reg)
+static int32_t
+rt2860_io_rf_read(struct rt2860_softc *sc, uint8_t reg)
{
int ntries;
if (sc->mac_rev == 0x28720200) {
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) &
+ if ( !(RAL_READ(sc, RT2872_REG_RF_CSR_CFG) &
RT2872_REG_RF_CSR_BUSY) )
break;
DELAY(1);
@@ -7684,12 +7044,12 @@
"RF busy after 100 probes\n");
return (-1);
}
- rt2860_io_mac_write(sc, RT2872_REG_RF_CSR_CFG,
+ RAL_WRITE(sc, RT2872_REG_RF_CSR_CFG,
RT2872_REG_RF_CSR_KICK |
(reg & RT2872_REG_RF_ID_MASK) << RT2872_REG_RF_ID_SHIFT );
for (ntries = 0; ntries < 100; ntries ++) {
- if ( !(rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) &
+ if ( !(RAL_READ(sc, RT2872_REG_RF_CSR_CFG) &
RT2872_REG_RF_CSR_BUSY) )
break;
DELAY(1);
@@ -7699,7 +7059,7 @@
"RF busy after 100 probes\n");
}
- return (rt2860_io_mac_read(sc, RT2872_REG_RF_CSR_CFG) & RT2872_REG_RF_VAL_MASK);
+ return (RAL_READ(sc, RT2872_REG_RF_CSR_CFG) & RT2872_REG_RF_VAL_MASK);
}
return (-1);
}
@@ -7707,7 +7067,8 @@
/*
* rt2860_io_rf_load_defaults
*/
-void rt2860_io_rf_load_defaults(struct rt2860_softc *sc)
+static void
+rt2860_io_rf_load_defaults(struct rt2860_softc *sc)
{
int i;
@@ -7720,8 +7081,9 @@
/*
* rt2860_io_mcu_cmd
*/
-void rt2860_io_mcu_cmd(struct rt2860_softc *sc, uint8_t cmd,
- uint8_t token, uint16_t arg)
+static void
+rt2860_io_mcu_cmd(struct rt2860_softc *sc, uint8_t cmd, uint8_t token,
+ uint16_t arg)
{
uint32_t tmp;
int ntries;
@@ -7730,8 +7092,8 @@
return;
for (ntries = 0; ntries < 100; ntries++) {
- if (!(rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX) &
- RT2860_REG_H2M_BUSY))
+ if (!(RAL_READ(sc, RT2860_REG_H2M_MAILBOX) &
+ RT2860_H2M_BUSY))
break;
DELAY(2);
@@ -7743,16 +7105,17 @@
return;
}
- tmp = RT2860_REG_H2M_BUSY | (token << 16) | arg;
-
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX, tmp);
- rt2860_io_mac_write(sc, RT2860_REG_H2M_HOST_CMD, cmd);
+ tmp = RT2860_H2M_BUSY | (token << 16) | arg;
+
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX, tmp);
+ RAL_WRITE(sc, RT2860_REG_H2M_HOST_CMD, cmd);
}
/*
* rt2860_io_mcu_cmd_check
*/
-int rt2860_io_mcu_cmd_check(struct rt2860_softc *sc, uint8_t cid)
+static int
+rt2860_io_mcu_cmd_check(struct rt2860_softc *sc, uint8_t cid)
{
uint32_t tmp, mask, status;
int result, ntries;
@@ -7760,7 +7123,7 @@
result = -1;
for (ntries = 0; ntries < 200; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_CID);
+ tmp = RAL_READ(sc, RT2860_REG_H2M_MAILBOX_CID);
if (((cid >> RT2860_REG_H2M_CID0_SHIFT) &
RT2860_REG_H2M_CID_MASK) == cid) {
@@ -7787,7 +7150,7 @@
DELAY(100);
}
- status = rt2860_io_mac_read(sc, RT2860_REG_H2M_MAILBOX_STATUS);
+ status = RAL_READ(sc, RT2860_REG_H2M_MAILBOX_STATUS);
if (ntries < 200) {
status &= mask;
@@ -7799,166 +7162,63 @@
result = 0;
}
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX_STATUS, 0xffffffff);
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX_CID, 0xffffffff);
-
- return result;
-}
-
-/*
- * rt2860_io_mcu_load_ucode
- */
-int rt2860_io_mcu_load_ucode(struct rt2860_softc *sc,
- const uint8_t *ucode, size_t len)
-{
- int i, ntries;
- uint16_t crc;
-
- for (i = 0, crc = 0xffff; i < len - 2; i++)
- crc = RT2860_IO_BYTE_CRC16(rt2860_io_byte_rev(ucode[i]), crc);
-
- if (ucode[len - 2] != rt2860_io_byte_rev(crc >> 8) ||
- ucode[len - 1] != rt2860_io_byte_rev(crc)) {
- device_printf(sc->sc_dev, "wrong microcode crc\n");
- return EINVAL;
- }
-
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, RT2860_REG_HST_PM_SEL);
-
- for(i = 0; i < len; i += 4) {
- rt2860_io_mac_write(sc, RT2860_REG_MCU_UCODE_BASE + i,
- (ucode[i+3] << 24) | (ucode[i+2] << 16) |
- (ucode[i+1] << 8) | ucode[i]);
- }
-
- if (sc->mac_rev != 0x28720200)
- rt2860_io_mac_write_multi(sc, RT2860_REG_MCU_UCODE_BASE,
- ucode, len);
-
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL, 0);
-
- if (sc->mac_rev != 0x28720200)
- rt2860_io_mac_write(sc, RT2860_REG_PBF_SYS_CTRL,
- RT2860_REG_MCU_RESET);
-
- DELAY(10000);
-
- /* initialize BBP R/W access agent */
-
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, 0);
- rt2860_io_mac_write(sc, RT2860_REG_H2M_MAILBOX, 0);
-
- if (sc->mac_rev != 0x28720200) {
-
- for (ntries = 0; ntries < 1000; ntries++) {
- if (rt2860_io_mac_read(sc, RT2860_REG_PBF_SYS_CTRL) &
- RT2860_REG_MCU_READY)
- break;
-
- DELAY(1000);
- }
-
- if (ntries == 1000) {
- device_printf(sc->sc_dev,
- "timeout waiting for MCU to initialize\n");
- return ETIMEDOUT;
- }
- }
-
- return 0;
-}
-
-/*
- * rt2860_io_eeprom_shiftout_bits
- */
-static void rt2860_io_eeprom_shiftout_bits(struct rt2860_softc *sc,
- uint16_t val, uint16_t count)
-{
- uint32_t mask, tmp;
-
- mask = (1 << (count - 1));
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
-
- tmp &= ~(RT2860_REG_EEDO | RT2860_REG_EEDI);
-
- do {
- tmp &= ~RT2860_REG_EEDI;
-
- if(val & mask)
- tmp |= RT2860_REG_EEDI;
-
- rt2860_io_mac_write(sc, RT2860_REG_EEPROM_CSR, tmp);
-
- RT2860_IO_EEPROM_RAISE_CLK(sc, tmp);
- RT2860_IO_EEPROM_LOWER_CLK(sc, tmp);
-
- mask = (mask >> 1);
- } while (mask);
-
- tmp &= ~RT2860_REG_EEDI;
-
- rt2860_io_mac_write(sc, RT2860_REG_EEPROM_CSR, tmp);
-}
-
-/*
- * rt2860_io_eeprom_shiftin_bits
- */
-static uint16_t rt2860_io_eeprom_shiftin_bits(struct rt2860_softc *sc)
-{
- uint32_t tmp;
- uint16_t val;
- int i;
-
- val = 0;
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
-
- tmp &= ~(RT2860_REG_EEDO | RT2860_REG_EEDI);
-
- for(i = 0; i < 16; i++) {
- val = (val << 1);
-
- RT2860_IO_EEPROM_RAISE_CLK(sc, tmp);
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
-
- RT2860_IO_EEPROM_LOWER_CLK(sc, tmp);
-
- tmp &= ~RT2860_REG_EEDI;
- if(tmp & RT2860_REG_EEDO)
- val |= 1;
- }
-
- return val;
-}
-
-/*
- * rt2860_io_byte_rev
- */
-static uint8_t rt2860_io_byte_rev(uint8_t byte)
-{
- int i;
- uint8_t tmp;
-
- for(i = 0, tmp = 0; ; i++) {
- if(byte & 0x80)
- tmp |= 0x80;
-
- if(i == 7)
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX_STATUS, 0xffffffff);
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX_CID, 0xffffffff);
+
+ return (result);
+}
+
+int
+rt2860_load_microcode(struct rt2860_softc *sc)
+{
+ struct ifnet *ifp = sc->sc_ifp;
+ const struct firmware *fp;
+ int ntries, error = 0;
+
+ RT2860_SOFTC_UNLOCK(sc);
+ fp = firmware_get("rt2860fw");
+ RT2860_SOFTC_LOCK(sc);
+ if (fp == NULL) {
+ if_printf(ifp,
+ "%s: unable to retrieve firmware image rt2860fw\n",
+ __func__);
+ return (EINVAL);
+ }
+
+ /* set "host program ram write selection" bit */
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, RT2860_REG_HST_PM_SEL);
+ /* write microcode image */
+ RAL_WRITE_REGION_1(sc, RT2860_REG_MCU_UCODE_BASE, fp->data,
+ fp->datasize);
+ /* kick microcontroller unit */
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, 0);
+ RAL_BARRIER_WRITE(sc);
+ RAL_WRITE(sc, RT2860_REG_PBF_SYS_CTRL, RT2860_REG_MCU_RESET);
+
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX_BBP_AGENT, 0);
+ RAL_WRITE(sc, RT2860_REG_H2M_MAILBOX, 0);
+
+ /* wait until microcontroller is ready */
+ RAL_BARRIER_READ_WRITE(sc);
+ for (ntries = 0; ntries < 1000; ntries++) {
+ if (RAL_READ(sc, RT2860_REG_PBF_SYS_CTRL) &
+ RT2860_REG_MCU_READY)
break;
-
- byte <<= 1;
- tmp >>= 1;
- }
-
- return tmp;
+ DELAY(1000);
+ }
+ if (ntries == 1000) {
+ device_printf(sc->sc_dev,
+ "timeout waiting for MCU to initialize\n");
+ error = ETIMEDOUT;
+ }
+ firmware_put(fp, FIRMWARE_UNLOAD);
+ return (error);
}
/*
* rt2860_led_brightness
- */
-void rt2860_led_brightness(struct rt2860_softc *sc, uint8_t brightness)
+static void
+rt2860_led_brightness(struct rt2860_softc *sc, uint8_t brightness)
{
uint8_t polarity;
uint16_t tmp;
@@ -7968,35 +7228,36 @@
tmp = (polarity << 8) | brightness;
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_LED_BRIGHTNESS,
- RT2860_REG_H2M_TOKEN_NO_INTR, tmp);
-}
+ RT2860_TOKEN_NO_INTR, tmp);
+}
+ */
/*
* rt2860_led_cmd
*/
-void rt2860_led_cmd(struct rt2860_softc *sc, uint8_t cmd)
+static void
+rt2860_led_cmd(struct rt2860_softc *sc, uint8_t cmd)
{
uint16_t tmp;
tmp = (cmd << 8) | (sc->led_cntl & RT2860_EEPROM_LED_MODE_MASK);
rt2860_io_mcu_cmd(sc, RT2860_IO_MCU_CMD_LEDS,
- RT2860_REG_H2M_TOKEN_NO_INTR, tmp);
+ RT2860_TOKEN_NO_INTR, tmp);
}
/*
* rt2860_read_eeprom
*/
-void rt2860_read_eeprom(struct rt2860_softc *sc)
+static void
+rt2860_read_eeprom(struct rt2860_softc *sc)
{
uint32_t tmp;
uint16_t val;
int i;
/* read EEPROM address number */
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
-
+ tmp = RAL_READ(sc, RT2860_PCI_EECTRL);
if((tmp & 0x30) == 0)
sc->eeprom_addr_num = 6;
else if((tmp & 0x30) == 0x10)
@@ -8005,41 +7266,33 @@
sc->eeprom_addr_num = 8;
/* read EEPROM version */
-
sc->eeprom_rev = rt2860_io_eeprom_read(sc, RT2860_EEPROM_VERSION);
- RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM rev=0x%04x\n",
- device_get_nameunit(sc->sc_dev), sc->eeprom_rev);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM, "EEPROM rev=0x%04x\n",
+ sc->eeprom_rev);
/* read MAC address */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_ADDRESS01);
-
sc->mac_addr[0] = (val & 0xff);
sc->mac_addr[1] = (val >> 8);
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_ADDRESS23);
-
sc->mac_addr[2] = (val & 0xff);
sc->mac_addr[3] = (val >> 8);
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_ADDRESS45);
-
sc->mac_addr[4] = (val & 0xff);
sc->mac_addr[5] = (val >> 8);
- RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM mac address=%s\n",
- device_get_nameunit(sc->sc_dev), ether_sprintf(sc->mac_addr));
+ RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM, "EEPROM mac address=%s\n",
+ ether_sprintf(sc->mac_addr));
/* read RF information */
-
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_ANTENNA);
if (val == 0xffff) {
device_printf(sc->sc_dev, "invalid EEPROM antenna info\n");
-
- sc->rf_rev = RT2860_EEPROM_RF_2820;
+ sc->rf_rev = RT2860_RF_2820;
sc->ntxpath = 1;
sc->nrxpath = 2;
} else {
@@ -8050,13 +7303,12 @@
if ((sc->mac_rev != 0x28830300) && (sc->nrxpath > 2)) {
/* only 2 Rx streams for RT2860 series */
-
sc->nrxpath = 2;
}
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM RF rev=0x%04x, paths=%dT%dR\n",
- device_get_nameunit(sc->sc_dev), sc->rf_rev, sc->ntxpath, sc->nrxpath);
+ "EEPROM RF rev=0x%04x, paths=%dT%dR\n",
+ sc->rf_rev, sc->ntxpath, sc->nrxpath);
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_NIC_CONFIG);
if ((val & 0xff00) != 0xff00)
@@ -8068,46 +7320,39 @@
sc->ext_lna_5ghz = ((val & RT2860_EEPROM_EXT_LNA_5GHZ) ? 1 : 0);
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM NIC config: HW radio cntl=%d, Tx AGC cntl=%d, ext LNA gains=%d/%d\n",
- device_get_nameunit(sc->sc_dev),
- sc->hw_radio_cntl, sc->tx_agc_cntl, sc->ext_lna_2ghz, sc->ext_lna_5ghz);
+ "EEPROM NIC config: HW radio cntl=%d, Tx AGC cntl=%d, "
+ "ext LNA gains=%d/%d\n",
+ sc->hw_radio_cntl, sc->tx_agc_cntl, sc->ext_lna_2ghz,
+ sc->ext_lna_5ghz);
/* read country code */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_COUNTRY);
-
sc->country_2ghz = (val >> 8) & 0xff;
sc->country_5ghz = (val & 0xff);
- RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM country code=%d/%d\n",
- device_get_nameunit(sc->sc_dev), sc->country_2ghz, sc->country_5ghz);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM, "EEPROM country code=%d/%d\n",
+ sc->country_2ghz, sc->country_5ghz);
/* read RF frequency offset */
-
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_RF_FREQ_OFF);
if ((val & 0xff) != 0xff) {
sc->rf_freq_off = (val & 0xff);
} else {
device_printf(sc->sc_dev, "invalid EEPROM RF freq offset\n");
-
sc->rf_freq_off = 0;
}
- RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM freq offset=0x%02x\n",device_get_nameunit(sc->sc_dev), sc->rf_freq_off);
+ RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM, "EEPROM freq offset=0x%02x\n",
+ sc->rf_freq_off);
/* read LEDs operating mode */
-
if (((val >> 8) & 0xff) != 0xff) {
sc->led_cntl = ((val >> 8) & 0xff);
- sc->led_off[0] = rt2860_io_eeprom_read(sc,
- RT2860_EEPROM_LED1_OFF);
- sc->led_off[1] = rt2860_io_eeprom_read(sc,
- RT2860_EEPROM_LED2_OFF);
- sc->led_off[2] = rt2860_io_eeprom_read(sc,
- RT2860_EEPROM_LED3_OFF);
+ sc->led_off[0] = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LED1_OFF);
+ sc->led_off[1] = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LED2_OFF);
+ sc->led_off[2] = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LED3_OFF);
} else {
device_printf(sc->sc_dev, "invalid EEPROM LED settings\n");
@@ -8118,12 +7363,10 @@
}
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM LED cntl=0x%02x, LEDs=0x%04x/0x%04x/0x%04x\n",
- device_get_nameunit(sc->sc_dev), sc->led_cntl,
- sc->led_off[0], sc->led_off[1], sc->led_off[2]);
+ "EEPROM LED cntl=0x%02x, LEDs=0x%04x/0x%04x/0x%04x\n",
+ sc->led_cntl, sc->led_off[0], sc->led_off[1], sc->led_off[2]);
/* read RSSI offsets and LNA gains */
-
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_LNA_GAIN);
if ((sc->mac_rev & 0xffff0000) >= 0x30710000)
sc->lna_gain[0] = RT3090_DEF_LNA;
@@ -8133,12 +7376,10 @@
sc->lna_gain[1] = (val >> 8) & 0xff;
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_RSSI_OFF_2GHZ_BASE);
-
sc->rssi_off_2ghz[0] = (val & 0xff);
sc->rssi_off_2ghz[1] = (val >> 8) & 0xff;
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_RSSI_OFF_2GHZ_BASE + 2);
-
if ((sc->mac_rev & 0xffff0000) >= 0x30710000) {
/*
* On RT3090 chips (limited to 2 Rx chains), this ROM
@@ -8151,18 +7392,15 @@
sc->lna_gain[2] = (val >> 8) & 0xff;
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_RSSI_OFF_5GHZ_BASE);
-
sc->rssi_off_5ghz[0] = (val & 0xff);
sc->rssi_off_5ghz[1] = (val >> 8) & 0xff;
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_RSSI_OFF_5GHZ_BASE + 2);
-
sc->rssi_off_5ghz[2] = (val & 0xff);
sc->lna_gain[3] = (val >> 8) & 0xff;
for (i = 2; i < RT2860_SOFTC_LNA_GAIN_COUNT; i++) {
- if (sc->lna_gain[i] == 0x00 ||
- sc->lna_gain[i] == (int8_t) 0xff) {
+ if (sc->lna_gain[i] == 0x00 || sc->lna_gain[i] == (int8_t) 0xff) {
device_printf(sc->sc_dev,
"invalid EEPROM LNA gain #%d: 0x%02x\n",
i, sc->lna_gain[i]);
@@ -8172,14 +7410,14 @@
}
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM LNA gains=0x%02x/0x%02x/0x%02x/0x%02x\n",
- device_get_nameunit(sc->sc_dev),
- sc->lna_gain[0], sc->lna_gain[1], sc->lna_gain[2], sc->lna_gain[3]);
+ "EEPROM LNA gains=0x%02x/0x%02x/0x%02x/0x%02x\n",
+ sc->lna_gain[0], sc->lna_gain[1],
+ sc->lna_gain[2], sc->lna_gain[3]);
for (i = 0; i < RT2860_SOFTC_RSSI_OFF_COUNT; i++) {
if (sc->rssi_off_2ghz[i] < RT2860_EEPROM_RSSI_OFF_MIN ||
sc->rssi_off_2ghz[i] > RT2860_EEPROM_RSSI_OFF_MAX) {
- device_printf(sc->sc_dev,
+ device_printf(sc->sc_dev,
"invalid EEPROM RSSI offset #%d (2GHz): 0x%02x\n",
i, sc->rssi_off_2ghz[i]);
@@ -8197,19 +7435,14 @@
}
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM RSSI offsets 2GHz=%d/%d/%d\n",
- device_get_nameunit(sc->sc_dev),
- sc->rssi_off_2ghz[0], sc->rssi_off_2ghz[1],
- sc->rssi_off_2ghz[2]);
+ "EEPROM RSSI offsets 2GHz=%d/%d/%d\n",
+ sc->rssi_off_2ghz[0], sc->rssi_off_2ghz[1], sc->rssi_off_2ghz[2]);
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM RSSI offsets 5GHz=%d/%d/%d\n",
- device_get_nameunit(sc->sc_dev),
- sc->rssi_off_5ghz[0], sc->rssi_off_5ghz[1],
- sc->rssi_off_5ghz[2]);
+ "EEPROM RSSI offsets 5GHz=%d/%d/%d\n",
+ sc->rssi_off_5ghz[0], sc->rssi_off_5ghz[1], sc->rssi_off_5ghz[2]);
/* read Tx power settings for 2GHz channels */
-
for (i = 0; i < 14; i += 2) {
val = rt2860_io_eeprom_read(sc,
RT2860_EEPROM_TXPOW1_2GHZ_BASE + i / 2);
@@ -8225,9 +7458,7 @@
}
/* read Tx power settings for 5GHz channels */
-
- for (; i < RT2860_SOFTC_TXPOW_COUNT; i += 2)
- {
+ for (; i < RT2860_SOFTC_TXPOW_COUNT; i += 2) {
val = rt2860_io_eeprom_read(sc,
RT2860_EEPROM_TXPOW1_5GHZ_BASE + i / 2);
@@ -8242,7 +7473,6 @@
}
/* fix broken Tx power settings */
-
for (i = 0; i < 14; i++) {
if (sc->txpow1[i] < RT2860_EEPROM_TXPOW_2GHZ_MIN ||
sc->txpow1[i] > RT2860_EEPROM_TXPOW_2GHZ_MAX) {
@@ -8284,7 +7514,6 @@
}
/* read Tx power per rate deltas */
-
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TXPOW_RATE_DELTA);
sc->txpow_rate_delta_2ghz = 0;
@@ -8295,8 +7524,7 @@
sc->txpow_rate_delta_2ghz = (val & 0xf);
if (!(val & 0x40))
- sc->txpow_rate_delta_2ghz =
- -sc->txpow_rate_delta_2ghz;
+ sc->txpow_rate_delta_2ghz = -sc->txpow_rate_delta_2ghz;
}
val >>= 8;
@@ -8306,60 +7534,56 @@
sc->txpow_rate_delta_5ghz = (val & 0xf);
if (!(val & 0x40))
- sc->txpow_rate_delta_5ghz =
- -sc->txpow_rate_delta_5ghz;
+ sc->txpow_rate_delta_5ghz = -sc->txpow_rate_delta_5ghz;
}
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM Tx power per rate deltas=%d(2MHz), %d(5MHz)\n",
- device_get_nameunit(sc->sc_dev),
+ "EEPROM Tx power per rate deltas=%d(2MHz), %d(5MHz)\n",
sc->txpow_rate_delta_2ghz, sc->txpow_rate_delta_5ghz);
/* read Tx power per rate */
-
for (i = 0; i < RT2860_SOFTC_TXPOW_RATE_COUNT; i++) {
- rt2860_io_eeprom_read_multi(sc, RT2860_EEPROM_TXPOW_RATE_BASE + i * sizeof(uint32_t),
- &tmp, sizeof(uint32_t));
+ tmp = rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_TXPOW_RATE_BASE + i * 2);
+ tmp |= (rt2860_io_eeprom_read(sc,
+ RT2860_EEPROM_TXPOW_RATE_BASE + i * 2 + 1) << 16);
sc->txpow_rate_20mhz[i] = tmp;
sc->txpow_rate_40mhz_2ghz[i] =
- rt2860_read_eeprom_txpow_rate_add_delta(tmp, sc->txpow_rate_delta_2ghz);
+ rt2860_read_eeprom_txpow_rate_add_delta(tmp,
+ sc->txpow_rate_delta_2ghz);
sc->txpow_rate_40mhz_5ghz[i] =
- rt2860_read_eeprom_txpow_rate_add_delta(tmp, sc->txpow_rate_delta_5ghz);
+ rt2860_read_eeprom_txpow_rate_add_delta(tmp,
+ sc->txpow_rate_delta_5ghz);
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM Tx power per rate #%d=0x%08x(20MHz), 0x%08x(40MHz/2GHz), 0x%08x(40MHz/5GHz)\n",
- device_get_nameunit(sc->sc_dev), i,
- sc->txpow_rate_20mhz[i], sc->txpow_rate_40mhz_2ghz[i], sc->txpow_rate_40mhz_5ghz[i]);
+ "EEPROM Tx power per rate #%d=0x%08x(20MHz), "
+ "0x%08x(40MHz/2GHz), 0x%08x(40MHz/5GHz)\n",
+ i, sc->txpow_rate_20mhz[i], sc->txpow_rate_40mhz_2ghz[i],
+ sc->txpow_rate_40mhz_5ghz[i]);
}
if (sc->tx_agc_cntl)
sc->tx_agc_cntl_2ghz = sc->tx_agc_cntl_5ghz = 1;
/* read factory-calibrated samples for temperature compensation */
-
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_2GHZ_BASE);
-
sc->tssi_2ghz[0] = (val & 0xff); /* [-4] */
sc->tssi_2ghz[1] = (val >> 8); /* [-3] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_2GHZ_BASE + 2);
-
sc->tssi_2ghz[2] = (val & 0xff); /* [-2] */
sc->tssi_2ghz[3] = (val >> 8); /* [-1] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_2GHZ_BASE + 2 * 2);
-
sc->tssi_2ghz[4] = (val & 0xff); /* [0] */
sc->tssi_2ghz[5] = (val >> 8); /* [+1] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_2GHZ_BASE + 3 * 2);
-
sc->tssi_2ghz[6] = (val & 0xff); /* [+2] */
sc->tssi_2ghz[7] = (val >> 8); /* [+3] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_2GHZ_BASE + 4 * 2);
-
sc->tssi_2ghz[8] = (val & 0xff); /* [+4] */
sc->tssi_step_2ghz = (val >> 8);
@@ -8367,36 +7591,30 @@
sc->tx_agc_cntl_2ghz = 0;
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM TSSI 2GHz: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, "
- "0x%02x, 0x%02x, step=%d\n",
- device_get_nameunit(sc->sc_dev),
- sc->tssi_2ghz[0], sc->tssi_2ghz[1], sc->tssi_2ghz[2],
- sc->tssi_2ghz[3], sc->tssi_2ghz[4], sc->tssi_2ghz[5],
- sc->tssi_2ghz[6], sc->tssi_2ghz[7], sc->tssi_2ghz[8],
- sc->tssi_step_2ghz);
+ "EEPROM TSSI 2GHz: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, "
+ "0x%02x, 0x%02x, 0x%02x, 0x%02x, step=%d\n",
+ sc->tssi_2ghz[0], sc->tssi_2ghz[1], sc->tssi_2ghz[2],
+ sc->tssi_2ghz[3], sc->tssi_2ghz[4], sc->tssi_2ghz[5],
+ sc->tssi_2ghz[6], sc->tssi_2ghz[7], sc->tssi_2ghz[8],
+ sc->tssi_step_2ghz);
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_5GHZ_BASE);
-
sc->tssi_5ghz[0] = (val & 0xff); /* [-4] */
sc->tssi_5ghz[1] = (val >> 8); /* [-3] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_5GHZ_BASE + 2);
-
sc->tssi_5ghz[2] = (val & 0xff); /* [-2] */
sc->tssi_5ghz[3] = (val >> 8); /* [-1] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_5GHZ_BASE + 2 * 2);
-
sc->tssi_5ghz[4] = (val & 0xff); /* [0] */
sc->tssi_5ghz[5] = (val >> 8); /* [+1] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_5GHZ_BASE + 3 * 2);
-
sc->tssi_5ghz[6] = (val & 0xff); /* [+2] */
sc->tssi_5ghz[7] = (val >> 8); /* [+3] */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_TSSI_5GHZ_BASE + 4 * 2);
-
sc->tssi_5ghz[8] = (val & 0xff); /* [+4] */
sc->tssi_step_5ghz = (val >> 8);
@@ -8404,42 +7622,44 @@
sc->tx_agc_cntl_5ghz = 0;
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM TSSI 5GHz: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, "
- "0x%02x, 0x%02x, step=%d\n",
- device_get_nameunit(sc->sc_dev),
+ "EEPROM TSSI 5GHz: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, "
+ "0x%02x, 0x%02x, 0x%02x, 0x%02x, step=%d\n",
sc->tssi_5ghz[0], sc->tssi_5ghz[1], sc->tssi_5ghz[2],
sc->tssi_5ghz[3], sc->tssi_5ghz[4], sc->tssi_5ghz[5],
sc->tssi_5ghz[6], sc->tssi_5ghz[7], sc->tssi_5ghz[8],
sc->tssi_step_5ghz);
/* read default BBP settings */
-
- rt2860_io_eeprom_read_multi(sc, RT2860_EEPROM_BBP_BASE,
- sc->bbp_eeprom, RT2860_SOFTC_BBP_EEPROM_COUNT * 2);
+ for (i = 0; i < 8; i++) {
+ val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_BBP_BASE + i);
+ sc->bbp_eeprom[i].val = val & 0xff;
+ sc->bbp_eeprom[i].reg = val >> 8;
+ }
if ((sc->mac_rev & 0xffff0000) >= 0x30710000) {
/* read vendor RF settings */
- rt2860_io_eeprom_read_multi(sc, RT3071_EEPROM_RF_BASE, sc->rf, 10 * 2);
+ for (i = 0; i < 10; i++) {
+ val = rt2860_io_eeprom_read(sc, RT3071_EEPROM_RF_BASE + i);
+ sc->rf[i].val = val & 0xff;
+ sc->rf[i].reg = val >> 8;
+ }
}
/* read powersave level */
val = rt2860_io_eeprom_read(sc, RT2860_EEPROM_POWERSAVE_LEVEL);
-
sc->powersave_level = val & 0xff;
-
if ((sc->powersave_level & 0xff) == 0xff)
device_printf(sc->sc_dev, "invalid EEPROM powersave level\n");
RT2860_DPRINTF(sc, RT2860_DEBUG_EEPROM,
- "%s: EEPROM powersave level=0x%02x\n",
- device_get_nameunit(sc->sc_dev), sc->powersave_level);
+ "EEPROM powersave level=0x%02x\n", sc->powersave_level);
}
/*
* rt2860_read_eeprom_txpow_rate_add_delta
*/
-uint32_t rt2860_read_eeprom_txpow_rate_add_delta(uint32_t txpow_rate,
- int8_t delta)
+static uint32_t
+rt2860_read_eeprom_txpow_rate_add_delta(uint32_t txpow_rate, int8_t delta)
{
int8_t b4;
int i;
@@ -8456,49 +7676,49 @@
txpow_rate = (txpow_rate >> 4) | (b4 << 28);
}
- return txpow_rate;
-}
-
-
-uint8_t
+ return (txpow_rate);
+}
+
+
+static uint8_t
rt3090_rf_read(struct rt2860_softc *sc, uint8_t reg)
{
uint32_t tmp;
int ntries;
for (ntries = 0; ntries < 100; ntries++) {
- if (!(rt2860_io_mac_read(sc, RT3070_RF_CSR_CFG) & RT3070_RF_KICK))
+ if (!(RAL_READ(sc, RT3070_RF_CSR_CFG) & RT3070_RF_KICK))
break;
DELAY(1);
}
if (ntries == 100) {
device_printf(sc->sc_dev, "could not read RF register\n");
- return 0xff;
+ return (0xff);
}
tmp = RT3070_RF_KICK | reg << 8;
- rt2860_io_mac_write(sc, RT3070_RF_CSR_CFG, tmp);
+ RAL_WRITE(sc, RT3070_RF_CSR_CFG, tmp);
for (ntries = 0; ntries < 100; ntries++) {
- tmp = rt2860_io_mac_read(sc, RT3070_RF_CSR_CFG);
+ tmp = RAL_READ(sc, RT3070_RF_CSR_CFG);
if (!(tmp & RT3070_RF_KICK))
break;
DELAY(1);
}
if (ntries == 100) {
device_printf(sc->sc_dev, "could not read RF register\n");
- return 0xff;
- }
- return tmp & 0xff;
-}
-
-void
+ return (0xff);
+ }
+ return (tmp & 0xff);
+}
+
+static void
rt3090_rf_write(struct rt2860_softc *sc, uint8_t reg, uint8_t val)
{
uint32_t tmp;
int ntries;
for (ntries = 0; ntries < 10; ntries++) {
- if (!(rt2860_io_mac_read(sc, RT3070_RF_CSR_CFG) & RT3070_RF_KICK))
+ if (!(RAL_READ(sc, RT3070_RF_CSR_CFG) & RT3070_RF_KICK))
break;
DELAY(10);
}
@@ -8508,64 +7728,66 @@
}
tmp = RT3070_RF_WRITE | RT3070_RF_KICK | reg << 8 | val;
- rt2860_io_mac_write(sc, RT3070_RF_CSR_CFG, tmp);
+ RAL_WRITE(sc, RT3070_RF_CSR_CFG, tmp);
}
/*
* rt2860_rf_name
*/
-const char *rt2860_rf_name(int rf_rev)
+static const char *
+rt2860_rf_name(int rf_rev)
{
switch (rf_rev) {
- case RT2860_EEPROM_RF_2820:
- return "RT2820 2.4G 2T3R";
-
- case RT2860_EEPROM_RF_2850:
- return "RT2850 2.4G/5G 2T3R";
-
- case RT2860_EEPROM_RF_2720:
- return "RT2720 2.4G 1T2R";
-
- case RT2860_EEPROM_RF_2750:
- return "RT2750 2.4G/5G 1T2R";
-
- case RT2860_EEPROM_RF_3020:
- return "RT3020 2.4G 1T1R";
-
- case RT2860_EEPROM_RF_2020:
- return "RT2020 2.4G B/G";
-
- case RT2860_EEPROM_RF_3021:
- return "RT3021 2.4G 1T2R";
-
- case RT2860_EEPROM_RF_3022:
- return "RT3022 2.4G 2T2R";
-
- case RT2860_EEPROM_RF_3052:
- return "RT3052 2.4G/5G 2T2R";
-
- case RT2860_EEPROM_RF_2853:
- return "RT2853 2.4G.5G 3T3R";
-
- case RT2860_EEPROM_RF_3320:
- return "RT3320 2.4G 1T1R with PA";
-
- case RT2860_EEPROM_RF_3322:
- return "RT3322 2.4G 2T2R with PA";
-
- case RT2860_EEPROM_RF_3053:
- return "RT3053 2.4G/5G 3T3R";
+ case RT2860_RF_2820:
+ return ("RT2820 2.4G 2T3R");
+
+ case RT2860_RF_2850:
+ return ("RT2850 2.4G/5G 2T3R");
+
+ case RT2860_RF_2720:
+ return ("RT2720 2.4G 1T2R");
+
+ case RT2860_RF_2750:
+ return ("RT2750 2.4G/5G 1T2R");
+
+ case RT3070_RF_3020:
+ return ("RT3020 2.4G 1T1R");
+
+ case RT3070_RF_2020:
+ return ("RT2020 2.4G B/G");
+
+ case RT3070_RF_3021:
+ return ("RT3021 2.4G 1T2R");
+
+ case RT3070_RF_3022:
+ return ("RT3022 2.4G 2T2R");
+
+ case RT3070_RF_3052:
+ return ("RT3052 2.4G/5G 2T2R");
+
+ case RT2860_RF_2853:
+ return ("RT2853 2.4G.5G 3T3R");
+
+ case RT3070_RF_3320:
+ return ("RT3320 2.4G 1T1R with PA");
+
+ case RT3070_RF_3322:
+ return ("RT3322 2.4G 2T2R with PA");
+
+ case RT3070_RF_3053:
+ return ("RT3053 2.4G/5G 3T3R");
default:
- return "unknown";
+ return ("unknown");
}
}
/*
* rt2860_rf_select_chan_group
*/
-void rt2860_rf_select_chan_group(struct rt2860_softc *sc,
- struct ieee80211_channel *c)
+static void
+rt2860_rf_select_chan_group(struct rt2860_softc *sc,
+ struct ieee80211_channel *c)
{
struct ifnet *ifp;
struct ieee80211com *ic;
@@ -8642,9 +7864,9 @@
if (sc->nrxpath == 1)
tmp &= ~(RT2860_REG_LNA_PE_G1_ENABLE | RT2860_REG_LNA_PE_A1_ENABLE);
- rt2860_io_mac_write(sc, RT2860_REG_TX_PIN_CFG, tmp);
-
- tmp = rt2860_io_mac_read(sc, RT2860_REG_TX_BAND_CFG);
+ RAL_WRITE(sc, RT2860_REG_TX_PIN_CFG, tmp);
+
+ tmp = RAL_READ(sc, RT2860_REG_TX_BAND_CFG);
tmp &= ~(RT2860_REG_TX_BAND_BG | RT2860_REG_TX_BAND_A | RT2860_REG_TX_BAND_HT40_ABOVE);
@@ -8662,7 +7884,7 @@
else
tmp |= RT2860_REG_TX_BAND_HT40_BELOW;
- rt2860_io_mac_write(sc, RT2860_REG_TX_BAND_CFG, tmp);
+ RAL_WRITE(sc, RT2860_REG_TX_BAND_CFG, tmp);
/* set bandwidth (20MHz or 40MHz) */
@@ -8700,14 +7922,14 @@
}
-void
+static void
rt3090_set_chan(struct rt2860_softc *sc, u_int chan)
{
int8_t txpow1, txpow2;
uint8_t rf;
int i;
- KASSERT((chan >= 1 && chan <= 14), "RT3090 is 2GHz only"); /* RT3090 is 2GHz only */
+ KASSERT(chan >= 1 && chan <= 14, ("RT3090 is 2GHz only")); /* RT3090 is 2GHz only */
/* find the settings for this channel (we know it exists) */
for (i = 0; rt2860_rf2850[i].chan != chan; i++);
@@ -8764,7 +7986,7 @@
rt3090_rf_write(sc, 7, rf | RT3070_TUNE);
}
-int
+static int
rt3090_rf_init(struct rt2860_softc *sc)
{
uint32_t tmp;
@@ -8777,17 +7999,17 @@
DELAY(1000);
rt3090_rf_write(sc, 30, rf & ~0x80);
- tmp = rt2860_io_mac_read(sc, RT3070_LDO_CFG0);
+ tmp = RAL_READ(sc, RT3070_LDO_CFG0);
tmp &= ~0x1f000000;
if (sc->patch_dac && (sc->mac_rev & 0x0000ffff) < 0x0211)
tmp |= 0x0d000000; /* 1.35V */
else
tmp |= 0x01000000; /* 1.2V */
- rt2860_io_mac_write(sc, RT3070_LDO_CFG0, tmp);
+ RAL_WRITE(sc, RT3070_LDO_CFG0, tmp);
/* patch LNA_PE_G1 */
- tmp = rt2860_io_mac_read(sc, RT3070_GPIO_SWITCH);
- rt2860_io_mac_write(sc, RT3070_GPIO_SWITCH, tmp & ~0x20);
+ tmp = RAL_READ(sc, RT3070_GPIO_SWITCH);
+ RAL_WRITE(sc, RT3070_GPIO_SWITCH, tmp & ~0x20);
/* initialize RF registers to default value */
for (i = 0; i < (sizeof(rt3090_def_rf)/2); i++) {
@@ -8823,10 +8045,10 @@
if ((sc->mac_rev & 0x0000ffff) < 0x0211)
rt3090_rf_write(sc, 27, 0x03);
- tmp = rt2860_io_mac_read(sc, RT3070_OPT_14);
- rt2860_io_mac_write(sc, RT3070_OPT_14, tmp | 1);
-
- if (sc->rf_rev == RT2860_EEPROM_RF_3020)
+ tmp = RAL_READ(sc, RT3070_OPT_14);
+ RAL_WRITE(sc, RT3070_OPT_14, tmp | 1);
+
+ if (sc->rf_rev == RT3070_RF_3020)
rt3090_set_rx_antenna(sc, 0);
bbp = rt2860_io_bbp_read(sc, 138);
@@ -8869,28 +8091,28 @@
rf = rt3090_rf_read(sc, 21);
rt3090_rf_write(sc, 21, rf & ~RT3070_RX_LO2);
- return 0;
-}
-
-void
+ return (0);
+}
+
+static void
rt3090_set_rx_antenna(struct rt2860_softc *sc, int aux)
{
uint32_t tmp;
if (aux) {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
- rt2860_io_mac_write(sc, RT2860_REG_EEPROM_CSR, tmp & ~RT2860_REG_EESK);
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG, (tmp & ~0x0808) | 0x08);
+ tmp = RAL_READ(sc, RT2860_PCI_EECTRL);
+ RAL_WRITE(sc, RT2860_PCI_EECTRL, tmp & ~RT2860_C);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG, (tmp & ~0x0808) | 0x08);
} else {
- tmp = rt2860_io_mac_read(sc, RT2860_REG_EEPROM_CSR);
- rt2860_io_mac_write(sc, RT2860_REG_EEPROM_CSR, tmp | RT2860_REG_EESK);
- tmp = rt2860_io_mac_read(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG);
- rt2860_io_mac_write(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG, tmp & ~0x0808);
- }
-}
-
-void
+ tmp = RAL_READ(sc, RT2860_PCI_EECTRL);
+ RAL_WRITE(sc, RT2860_PCI_EECTRL, tmp | RT2860_C);
+ tmp = RAL_READ(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG);
+ RAL_WRITE(sc, RT2860_REG_SCHDMA_GPIO_CTRL_CFG, tmp & ~0x0808);
+ }
+}
+
+static void
rt3090_rf_wakeup(struct rt2860_softc *sc)
{
uint32_t tmp;
@@ -8950,13 +8172,13 @@
rt3090_rf_write(sc, 27, rf);
}
if (sc->patch_dac && (sc->mac_rev & 0x0000ffff) < 0x0211) {
- tmp = rt2860_io_mac_read(sc, RT3070_LDO_CFG0);
+ tmp = RAL_READ(sc, RT3070_LDO_CFG0);
tmp = (tmp & ~0x1f000000) | 0x0d000000;
- rt2860_io_mac_write(sc, RT3070_LDO_CFG0, tmp);
- }
-}
-
-int
+ RAL_WRITE(sc, RT3070_LDO_CFG0, tmp);
+ }
+}
+
+static int
rt3090_filter_calib(struct rt2860_softc *sc, uint8_t init, uint8_t target,
uint8_t *val)
{
@@ -8985,7 +8207,7 @@
break;
}
if (ntries == 100)
- return ETIMEDOUT;
+ return (ETIMEDOUT);
/* set power and frequency of stopband test tone */
rt2860_io_bbp_write(sc, 24, 0x06);
@@ -9018,10 +8240,10 @@
rf22 = rt3090_rf_read(sc, 22);
rt3090_rf_write(sc, 22, rf22 & ~RT3070_BB_LOOPBACK);
- return 0;
-}
-
-void
+ return (0);
+}
+
+static void
rt3090_rf_setup(struct rt2860_softc *sc)
{
uint8_t bbp;
@@ -9036,12 +8258,12 @@
rt2860_io_bbp_write(sc, 31, bbp & ~0x03);
}
- rt2860_io_mac_write(sc, RT2860_REG_TX_SW_CFG1, 0);
+ RAL_WRITE(sc, RT2860_TX_SW_CFG1, 0);
if ((sc->mac_rev & 0x0000ffff) < 0x0211) {
- rt2860_io_mac_write(sc, RT2860_REG_TX_SW_CFG2,
+ RAL_WRITE(sc, RT2860_TX_SW_CFG2,
sc->patch_dac ? 0x2c : 0x0f);
} else
- rt2860_io_mac_write(sc, RT2860_REG_TX_SW_CFG2, 0);
+ RAL_WRITE(sc, RT2860_TX_SW_CFG2, 0);
/* initialize RF registers from ROM */
for (i = 0; i < 10; i++) {
@@ -9051,16 +8273,14 @@
}
}
-
/*
* rt2860_rf_set_chan
*/
-void rt2860_rf_set_chan(struct rt2860_softc *sc,
- struct ieee80211_channel *c)
+static void
+rt2860_rf_set_chan(struct rt2860_softc *sc, struct ieee80211_channel *c)
{
struct ifnet *ifp;
struct ieee80211com *ic;
- const struct rt2860_rf_prog *prog;
uint32_t r1, r2, r3, r4;
int8_t txpow1, txpow2;
int i, chan;
@@ -9068,11 +8288,10 @@
if (sc->mac_rev == 0x28720200) {
rt2872_rf_set_chan(sc, c);
return;
- }
+ }
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- prog = rt2860_rf_2850;
/* get central channel position */
@@ -9089,8 +8308,7 @@
chan -= 2;
RT2860_DPRINTF(sc, RT2860_DEBUG_CHAN,
- "%s: RF set channel: channel=%u, HT%s%s\n",
- device_get_nameunit(sc->sc_dev),
+ "RF set channel: channel=%u, HT%s%s\n",
ieee80211_chan2ieee(ic, c),
!IEEE80211_IS_CHAN_HT(c) ? " disabled" :
IEEE80211_IS_CHAN_HT20(c) ? "20":
@@ -9100,12 +8318,12 @@
if (chan == 0 || chan == IEEE80211_CHAN_ANY)
return;
- for (i = 0; prog[i].chan != chan; i++);
-
- r1 = prog[i].r1;
- r2 = prog[i].r2;
- r3 = prog[i].r3;
- r4 = prog[i].r4;
+ for (i = 0; rt2860_rf2850[i].chan != chan; i++);
+
+ r1 = rt2860_rf2850[i].r1;
+ r2 = rt2860_rf2850[i].r2;
+ r3 = rt2860_rf2850[i].r3;
+ r4 = rt2860_rf2850[i].r4;
txpow1 = sc->txpow1[i];
txpow2 = sc->txpow2[i];
@@ -9183,13 +8401,11 @@
/*
* rt2872_rf_set_chan
*/
-static void
-rt2872_rf_set_chan(struct rt2860_softc *sc,
- struct ieee80211_channel *c)
+static void
+rt2872_rf_set_chan(struct rt2860_softc *sc, struct ieee80211_channel *c)
{
struct ifnet *ifp;
struct ieee80211com *ic;
- const struct rt2860_rf_prog *prog;
uint32_t r1, r2, r3, r4;
uint32_t r6, r7, r12, r13, r23, r24;
int8_t txpow1, txpow2;
@@ -9197,7 +8413,6 @@
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
- prog = rt2860_rf_2850;
/* get central channel position */
@@ -9209,8 +8424,7 @@
chan -= 2;
RT2860_DPRINTF(sc, RT2860_DEBUG_CHAN,
- "%s: RF set channel: channel=%u, HT%s%s\n",
- device_get_nameunit(sc->sc_dev),
+ "RF set channel: channel=%u, HT%s%s\n",
ieee80211_chan2ieee(ic, c),
!IEEE80211_IS_CHAN_HT(c) ? " disabled" :
IEEE80211_IS_CHAN_HT20(c) ? "20":
@@ -9220,25 +8434,23 @@
if (chan == 0 || chan == IEEE80211_CHAN_ANY)
return;
- for (i = 0; prog[i].chan != chan; i++);
-
- r1 = prog[i].r1;
- r2 = prog[i].r2;
- r3 = prog[i].r3;
- r4 = prog[i].r4;
+ for (i = 0; rt2860_rf2850[i].chan != chan; i++);
+
+ r1 = rt2860_rf2850[i].r1;
+ r2 = rt2860_rf2850[i].r2;
+ r3 = rt2860_rf2850[i].r3;
+ r4 = rt2860_rf2850[i].r4;
txpow1 = sc->txpow1[i];
txpow2 = sc->txpow2[i];
- for (i = 0; rt2860_rf_fi3020[i].channel != chan; i++);
-
/* Programm channel parameters */
- r2 = rt2860_rf_fi3020[i].n;
+ r2 = rt3090_freqs[i].n;
rt2860_io_rf_write(sc, 2 , r2 );
- r3 = rt2860_rf_fi3020[i].k;
+ r3 = rt3090_freqs[i].k;
rt2860_io_rf_write(sc, 3 , r3 );
- r6 = (rt3052_rf_default[6] & 0xFC) | (rt2860_rf_fi3020[i].r & 0x03);
+ r6 = (rt3052_rf_default[6] & 0xFC) | (rt3090_freqs[i].r & 0x03);
rt2860_io_rf_write(sc, 6 , r6 );
/* Set Tx Power */
diff -r 7d0c8bc7dd1c -r 836e04b655a0 head/sys/dev/ral/rt2860reg.h
--- a/head/sys/dev/ral/rt2860reg.h Sun Apr 29 20:53:21 2012 +0300
+++ b/head/sys/dev/ral/rt2860reg.h Mon Apr 30 15:27:19 2012 +0300
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 2009-2010 Alexander Egorenkov <egorenar at gmail.com>
* Copyright (c) 2009 Damien Bergamini <damien.bergamini at free.fr>
@@ -16,314 +15,245 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef _RT2860_REG_H_
-#define _RT2860_REG_H_
+#define RT2860_REG_PCI_CFG 0x0000
+#define RT2860_PCI_EECTRL 0x0004
+#define RT2860_REG_PCI_MCU_CSR 0x0008
+#define RT2860_REG_PCI_SYS_CSR 0x000c
+#define RT2860_REG_PCIE_JTAG 0x0010
-#define RT2860_REG_PCI_CFG 0x0000
-#define RT2860_REG_EEPROM_CSR 0x0004
-#define RT2860_REG_PCI_MCU_CSR 0x0008
-#define RT2860_REG_PCI_SYS_CSR 0x000c
-#define RT2860_REG_PCIE_JTAG 0x0010
+#define RT2860_REG_SCHDMA_INT_STATUS 0x0200
+#define RT2860_REG_SCHDMA_INT_MASK 0x0204
+#define RT2860_REG_SCHDMA_WPDMA_GLO_CFG 0x0208
+#define RT2860_REG_SCHDMA_WPDMA_RST_IDX 0x020c
+#define RT2860_REG_SCHDMA_DELAY_INT_CFG 0x0210
+#define RT2860_WMM_AIFSN_CFG 0x0214
+#define RT2860_WMM_CWMIN_CFG 0x0218
+#define RT2860_WMM_CWMAX_CFG 0x021c
+#define RT2860_WMM_TXOP0_CFG 0x0220
+#define RT2860_WMM_TXOP1_CFG 0x0224
+#define RT2860_REG_SCHDMA_GPIO_CTRL_CFG 0x0228
+#define RT2860_REG_SCHDMA_RX_BASE_PTR 0x0290
+#define RT2860_REG_SCHDMA_RX_MAX_CNT 0x0294
+#define RT2860_REG_SCHDMA_RX_CALC_IDX 0x0298
+#define RT2860_REG_SCHDMA_RX_DRX_IDX 0x029c
+#define RT2860_REG_SCHDMA_TX_BASE_PTR(qid) (0x0230 + (qid) * 16)
+#define RT2860_REG_SCHDMA_TX_MAX_CNT(qid) (0x0234 + (qid) * 16)
+#define RT2860_REG_SCHDMA_TX_CTX_IDX(qid) (0x0238 + (qid) * 16)
+#define RT2860_REG_SCHDMA_TX_DTX_IDX(qid) (0x023c + (qid) * 16)
+#define RT2860_REG_SCHDMA_US_CYC_CNT 0x02a4
-#define RT2860_REG_SCHDMA_INT_STATUS 0x0200
-#define RT2860_REG_SCHDMA_INT_MASK 0x0204
-#define RT2860_REG_SCHDMA_WPDMA_GLO_CFG 0x0208
-#define RT2860_REG_SCHDMA_WPDMA_RST_IDX 0x020c
-#define RT2860_REG_SCHDMA_DELAY_INT_CFG 0x0210
-#define RT2860_REG_SCHDMA_WMM_AIFSN_CFG 0x0214
-#define RT2860_REG_SCHDMA_WMM_CWMIN_CFG 0x0218
-#define RT2860_REG_SCHDMA_WMM_CWMAX_CFG 0x021c
-#define RT2860_REG_SCHDMA_WMM_TXOP0_CFG 0x0220
-#define RT2860_REG_SCHDMA_WMM_TXOP1_CFG 0x0224
-#define RT2860_REG_SCHDMA_GPIO_CTRL_CFG 0x0228
-#define RT2860_REG_SCHDMA_RX_BASE_PTR 0x0290
-#define RT2860_REG_SCHDMA_RX_MAX_CNT 0x0294
-#define RT2860_REG_SCHDMA_RX_CALC_IDX 0x0298
-#define RT2860_REG_SCHDMA_RX_DRX_IDX 0x029c
-#define RT2860_REG_SCHDMA_TX_BASE_PTR(qid) (0x0230 + (qid) * 16)
-#define RT2860_REG_SCHDMA_TX_MAX_CNT(qid) (0x0234 + (qid) * 16)
-#define RT2860_REG_SCHDMA_TX_CTX_IDX(qid) (0x0238 + (qid) * 16)
-#define RT2860_REG_SCHDMA_TX_DTX_IDX(qid) (0x023c + (qid) * 16)
-#define RT2860_REG_SCHDMA_US_CYC_CNT 0x02a4
+#define RT2860_REG_PBF_SYS_CTRL 0x0400
+#define RT2860_REG_PBF_HOST_CMD 0x0404
+#define RT2860_REG_PBF_CFG 0x0408
+#define RT2860_MAX_PCNT 0x040c
+#define RT2860_REG_PBF_BUF_CTRL 0x0410
+#define RT2860_REG_PBF_MCU_INT_STA 0x0414
+#define RT2860_REG_PBF_MCU_INT_ENA 0x0418
+#define RT2860_REG_PBF_TX0Q_IO 0x041c
+#define RT2860_REG_PBF_TX1Q_IO 0x0420
+#define RT2860_REG_PBF_TX2Q_IO 0x0424
+#define RT2860_REG_PBF_RX0Q_IO 0x0428
+#define RT2860_BCN_OFFSET0 0x042c
+#define RT2860_REG_PBF_BCN_OFFSET1 0x0430
+#define RT2860_REG_PBF_TXRXQ_STA 0x0434
+#define RT2860_REG_PBF_TXRXQ_PCNT 0x0438
+#define RT2860_REG_PBF_DBG 0x043c
+#define RT2860_REG_PBF_CAP_CTRL 0x0440
-#define RT2860_REG_PBF_SYS_CTRL 0x0400
-#define RT2860_REG_PBF_HOST_CMD 0x0404
-#define RT2860_REG_PBF_CFG 0x0408
-#define RT2860_REG_PBF_MAX_PCNT 0x040c
-#define RT2860_REG_PBF_BUF_CTRL 0x0410
-#define RT2860_REG_PBF_MCU_INT_STA 0x0414
-#define RT2860_REG_PBF_MCU_INT_ENA 0x0418
-#define RT2860_REG_PBF_TX0Q_IO 0x041c
-#define RT2860_REG_PBF_TX1Q_IO 0x0420
-#define RT2860_REG_PBF_TX2Q_IO 0x0424
-#define RT2860_REG_PBF_RX0Q_IO 0x0428
-#define RT2860_REG_PBF_BCN_OFFSET0 0x042c
-#define RT2860_REG_PBF_BCN_OFFSET1 0x0430
-#define RT2860_REG_PBF_TXRXQ_STA 0x0434
-#define RT2860_REG_PBF_TXRXQ_PCNT 0x0438
-#define RT2860_REG_PBF_DBG 0x043c
-#define RT2860_REG_PBF_CAP_CTRL 0x0440
+#define RT2872_REG_RF_CSR_CFG 0x500
+#define RT2872_REG_RF_SETTING 0x504
+#define RT2872_REG_RF_TEST_CONTROL 0x508
-#define RT2872_REG_RF_CSR_CFG 0x500
-#define RT2872_REG_RF_SETTING 0x504
-#define RT2872_REG_RF_TEST_CONTROL 0x508
+#define RT2860_REG_MAC_CSR0 0x1000
+#define RT2860_MAC_SYS_CTRL 0x1004
+#define RT2860_REG_ADDR_DW0 0x1008
+#define RT2860_REG_ADDR_DW1 0x100c
+#define RT2860_REG_BSSID_DW0 0x1010
+#define RT2860_REG_BSSID_DW1 0x1014
+#define RT2860_REG_MAX_LEN_CFG 0x1018
+#define RT2860_REG_BBP_CSR_CFG 0x101c
+#define RT2860_REG_RF_CSR_CFG0 0x1020
+#define RT2860_LED_CFG 0x102c
+#define RT2860_REG_AMPDU_MAX_LEN_20M1S 0x1030
+#define RT2860_REG_AMPDU_MAX_LEN_20M2S 0x1034
+#define RT2860_REG_AMPDU_MAX_LEN_40M1S 0x1038
+#define RT2860_REG_AMPDU_MAX_LEN_40M2S 0x103c
+#define RT2860_REG_AMPDU_BA_WINSIZE 0x1040
-#define RT2860_REG_MAC_CSR0 0x1000
-#define RT2860_REG_SYS_CTRL 0x1004
-#define RT2860_REG_ADDR_DW0 0x1008
-#define RT2860_REG_ADDR_DW1 0x100c
-#define RT2860_REG_BSSID_DW0 0x1010
-#define RT2860_REG_BSSID_DW1 0x1014
-#define RT2860_REG_MAX_LEN_CFG 0x1018
-#define RT2860_REG_BBP_CSR_CFG 0x101c
-#define RT2860_REG_RF_CSR_CFG0 0x1020
-#define RT2860_REG_LED_CFG 0x102c
-#define RT2860_REG_AMPDU_MAX_LEN_20M1S 0x1030
-#define RT2860_REG_AMPDU_MAX_LEN_20M2S 0x1034
-#define RT2860_REG_AMPDU_MAX_LEN_40M1S 0x1038
-#define RT2860_REG_AMPDU_MAX_LEN_40M2S 0x103c
-#define RT2860_REG_AMPDU_BA_WINSIZE 0x1040
+/* undocumented registers */
+#define RT2860_DEBUG 0x10f4
-#define RT2860_REG_XIFS_TIME_CFG 0x1100
-#define RT2860_REG_BKOFF_SLOT_CFG 0x1104
-#define RT2860_REG_NAV_TIME_CFG 0x1108
-#define RT2860_REG_CH_TIME_CFG 0x110c
-#define RT2860_REG_PBF_LIFE_TIMER 0x1110
-#define RT2860_REG_BCN_TIME_CFG 0x1114
-#define RT2860_REG_TBTT_SYNC_CFG 0x1118
-#define RT2860_REG_TSF_TIMER_DW0 0x111c
-#define RT2860_REG_TSF_TIMER_DW1 0x1120
-#define RT2860_REG_TBTT_TIMER 0x1124
-#define RT2860_REG_INT_TIMER 0x1128
-#define RT2860_REG_INT_TIMER_EN 0x112c
-#define RT2860_REG_CH_IDLE_STA 0x1130
+#define RT2860_XIFS_TIME_CFG 0x1100
+#define RT2860_BKOFF_SLOT_CFG 0x1104
+#define RT2860_REG_NAV_TIME_CFG 0x1108
+#define RT2860_REG_CH_TIME_CFG 0x110c
+#define RT2860_REG_PBF_LIFE_TIMER 0x1110
+#define RT2860_REG_BCN_TIME_CFG 0x1114
+#define RT2860_REG_TBTT_SYNC_CFG 0x1118
+#define RT2860_REG_TSF_TIMER_DW0 0x111c
+#define RT2860_REG_TSF_TIMER_DW1 0x1120
+#define RT2860_REG_TBTT_TIMER 0x1124
+#define RT2860_REG_INT_TIMER 0x1128
+#define RT2860_REG_INT_TIMER_EN 0x112c
+#define RT2860_REG_CH_IDLE_STA 0x1130
-#define RT2860_REG_STATUS_CFG 0x1200
-#define RT2860_REG_PWR_PIN_CFG 0x1204
-#define RT2860_REG_AUTO_WAKEUP_CFG 0x1208
+#define RT2860_REG_STATUS_CFG 0x1200
+#define RT2860_PWR_PIN_CFG 0x1204
+#define RT2860_REG_AUTO_WAKEUP_CFG 0x1208
-#define RT2860_REG_TX_EDCA_AC_CFG(aci) (0x1300 + (aci) * 4)
-#define RT2860_REG_TX_EDCA_TID_AC_MAP 0x1310
-#define RT2860_REG_TX_PWR_CFG(ridx) (0x1314 + (ridx) * 4)
-#define RT2860_REG_TX_PIN_CFG 0x1328
-#define RT2860_REG_TX_BAND_CFG 0x132c
-#define RT2860_REG_TX_SW_CFG0 0x1330
-#define RT2860_REG_TX_SW_CFG1 0x1334
-#define RT2860_REG_TX_SW_CFG2 0x1338
-#define RT2860_REG_TX_TXOP_THRES_CFG 0x133c
-#define RT2860_REG_TX_TXOP_CTRL_CFG 0x1340
-#define RT2860_REG_TX_RTS_CFG 0x1344
-#define RT2860_REG_TX_TIMEOUT_CFG 0x1348
-#define RT2860_REG_TX_RTY_CFG 0x134c
-#define RT2860_REG_TX_LINK_CFG 0x1350
-#define RT2860_REG_TX_HT_FBK_CFG0 0x1354
-#define RT2860_REG_TX_HT_FBK_CFG1 0x1358
-#define RT2860_REG_TX_LG_FBK_CFG0 0x135c
-#define RT2860_REG_TX_LG_FBK_CFG1 0x1360
-#define RT2860_REG_TX_CCK_PROT_CFG 0x1364
-#define RT2860_REG_TX_OFDM_PROT_CFG 0x1368
-#define RT2860_REG_TX_MM20_PROT_CFG 0x136c
-#define RT2860_REG_TX_MM40_PROT_CFG 0x1370
-#define RT2860_REG_TX_GF20_PROT_CFG 0x1374
-#define RT2860_REG_TX_GF40_PROT_CFG 0x1378
-#define RT2860_REG_TX_EXP_CTS_TIME 0x137c
-#define RT2860_REG_TX_EXP_ACK_TIME 0x1380
+#define RT2860_REG_TX_EDCA_AC_CFG(aci) (0x1300 + (aci) * 4)
+#define RT2860_REG_TX_EDCA_TID_AC_MAP 0x1310
+#define RT2860_REG_TX_PWR_CFG(ridx) (0x1314 + (ridx) * 4)
+#define RT2860_REG_TX_PIN_CFG 0x1328
+#define RT2860_REG_TX_BAND_CFG 0x132c
+#define RT2860_TX_SW_CFG0 0x1330
+#define RT2860_TX_SW_CFG1 0x1334
+#define RT2860_TX_SW_CFG2 0x1338
+#define RT2860_REG_TX_TXOP_THRES_CFG 0x133c
+#define RT2860_TXOP_CTRL_CFG 0x1340
+#define RT2860_TX_RTS_CFG 0x1344
+#define RT2860_TX_TIMEOUT_CFG 0x1348
+#define RT2860_TX_RTY_CFG 0x134c
+#define RT2860_TX_LINK_CFG 0x1350
+#define RT2860_REG_TX_HT_FBK_CFG0 0x1354
+#define RT2860_REG_TX_HT_FBK_CFG1 0x1358
+#define RT2860_REG_TX_LG_FBK_CFG0 0x135c
+#define RT2860_REG_TX_LG_FBK_CFG1 0x1360
+#define RT2860_CCK_PROT_CFG 0x1364
+#define RT2860_OFDM_PROT_CFG 0x1368
+#define RT2860_MM20_PROT_CFG 0x136c
+#define RT2860_MM40_PROT_CFG 0x1370
+#define RT2860_GF20_PROT_CFG 0x1374
+#define RT2860_GF40_PROT_CFG 0x1378
+#define RT2860_REG_TX_EXP_CTS_TIME 0x137c
+#define RT2860_EXP_ACK_TIME 0x1380
-#define RT2860_REG_RX_FILTER_CFG 0x1400
-#define RT2860_REG_AUTO_RSP_CFG 0x1404
-#define RT2860_REG_LEGACY_BASIC_RATE 0x1408
-#define RT2860_REG_HT_BASIC_RATE 0x140c
-#define RT2860_REG_HT_CTRL_CFG 0x1410
-#define RT2860_REG_SIFS_COST_CFG 0x1414
-#define RT2860_REG_RX_PARSER_CFG 0x1418
+#define RT2860_REG_RX_FILTER_CFG 0x1400
+#define RT2860_AUTO_RSP_CFG 0x1404
+#define RT2860_LEGACY_BASIC_RATE 0x1408
+#define RT2860_HT_BASIC_RATE 0x140c
+#define RT2860_REG_HT_CTRL_CFG 0x1410
+#define RT2860_REG_SIFS_COST_CFG 0x1414
+#define RT2860_REG_RX_PARSER_CFG 0x1418
-#define RT2860_REG_TX_SEC_CNT0 0x1500
-#define RT2860_REG_RX_SEC_CNT0 0x1504
-#define RT2860_REG_CCMP_FC_MUTE 0x1508
+#define RT2860_REG_TX_SEC_CNT0 0x1500
+#define RT2860_REG_RX_SEC_CNT0 0x1504
+#define RT2860_REG_CCMP_FC_MUTE 0x1508
-#define RT2860_REG_HCCAPSMP_TXOP_HLDR_ADDR0 0x1600
-#define RT2860_REG_HCCAPSMP_TXOP_HLDR_ADDR1 0x1604
-#define RT2860_REG_HCCAPSMP_TXOP_HLDR_ET 0x1608
-#define RT2860_REG_HCCAPSMP_QOS_CFPOLL_RA_DW0 0x160c
-#define RT2860_REG_HCCAPSMP_QOS_CFPOLL_A1_DW1 0x1610
-#define RT2860_REG_HCCAPSMP_QOS_CFPOLL_QC 0x1614
+#define RT2860_REG_HCCAPSMP_TXOP_HLDR_ADDR0 0x1600
+#define RT2860_REG_HCCAPSMP_TXOP_HLDR_ADDR1 0x1604
+#define RT2860_TXOP_HLDR_ET 0x1608
+#define RT2860_REG_HCCAPSMP_QOS_CFPOLL_RA_DW0 0x160c
+#define RT2860_REG_HCCAPSMP_QOS_CFPOLL_A1_DW1 0x1610
+#define RT2860_REG_HCCAPSMP_QOS_CFPOLL_QC 0x1614
-#define RT2860_REG_RX_STA_CNT0 0x1700
-#define RT2860_REG_RX_STA_CNT1 0x1704
-#define RT2860_REG_RX_STA_CNT2 0x1708
-#define RT2860_REG_TX_STA_CNT0 0x170c
-#define RT2860_REG_TX_STA_CNT1 0x1710
-#define RT2860_REG_TX_STA_CNT2 0x1714
-#define RT2860_REG_TX_STA_FIFO 0x1718
-#define RT2860_REG_TX_AGG_CNT 0x171c
-#define RT2860_REG_TX_AGG_CNT0 0x1720
-#define RT2860_REG_TX_AGG_CNT1 0x1724
-#define RT2860_REG_TX_AGG_CNT2 0x1728
-#define RT2860_REG_TX_AGG_CNT3 0x172c
-#define RT2860_REG_TX_AGG_CNT4 0x1730
-#define RT2860_REG_TX_AGG_CNT5 0x1734
-#define RT2860_REG_TX_AGG_CNT6 0x1738
-#define RT2860_REG_TX_AGG_CNT7 0x173c
-#define RT2860_REG_TXRX_MPDU_DEN_CNT 0x1740
+#define RT2860_REG_RX_STAT_CNT0 0x1700
+#define RT2860_REG_RX_STAT_CNT1 0x1704
+#define RT2860_REG_RX_STAT_CNT2 0x1708
+#define RT2860_REG_TX_STAT_CNT0 0x170c
+#define RT2860_REG_TX_STAT_CNT1 0x1710
+#define RT2860_REG_TX_STAT_CNT2 0x1714
+#define RT2860_REG_TX_STAT_FIFO 0x1718
+#define RT2860_REG_TX_AGG_CNT 0x171c
+#define RT2860_REG_TX_AGG_CNT0 0x1720
+#define RT2860_REG_TX_AGG_CNT1 0x1724
+#define RT2860_REG_TX_AGG_CNT2 0x1728
+#define RT2860_REG_TX_AGG_CNT3 0x172c
+#define RT2860_REG_TX_AGG_CNT4 0x1730
+#define RT2860_REG_TX_AGG_CNT5 0x1734
+#define RT2860_REG_TX_AGG_CNT6 0x1738
+#define RT2860_REG_TX_AGG_CNT7 0x173c
+#define RT2860_REG_TXRX_MPDU_DEN_CNT 0x1740
-#define RT2860_REG_WCID(wcid) (0x1800 + (wcid) * 8)
-#define RT2860_REG_PKEY(wcid) (0x4000 + (wcid) * 32)
-#define RT2860_REG_IVEIV(wcid) (0x6000 + (wcid) * 8)
-#define RT2860_REG_WCID_ATTR(wcid) (0x6800 + (wcid) * 4)
-#define RT2860_REG_SKEY(vap, kidx) (0x6c00 + ((vap) * 4 + (kidx)) * 32)
-#define RT2860_REG_SKEY_MODE(vap) (0x7000 + ((vap) / 2) * 4)
-#define RT2860_REG_SKEY_MODE_0_7 0x7000
+#define RT2860_REG_WCID(wcid) (0x1800 + (wcid) * 8)
+#define RT2860_REG_PKEY(wcid) (0x4000 + (wcid) * 32)
+#define RT2860_REG_IVEIV(wcid) (0x6000 + (wcid) * 8)
+#define RT2860_REG_WCID_ATTR(wcid) (0x6800 + (wcid) * 4)
+#define RT2860_REG_SKEY(vap, kidx) \
+ (0x6c00 + ((vap) * 4 + (kidx)) * 32)
+#define RT2860_REG_SKEY_MODE(vap) \
+ (0x7000 + ((vap) / 2) * 4)
+#define RT2860_REG_SKEY_MODE_0_7 0x7000
-#define RT2860_REG_MCU_UCODE_BASE 0x2000
+#define RT2860_REG_MCU_UCODE_BASE 0x2000
-#define RT2860_REG_H2M_HOST_CMD 0x0404
-#define RT2860_REG_H2M_MAILBOX 0x7010
-#define RT2860_REG_H2M_MAILBOX_CID 0x7014
-#define RT2860_REG_H2M_MAILBOX_STATUS 0x701c
-#define RT2860_REG_H2M_MAILBOX_BBP_AGENT 0x7028
+#define RT2860_REG_H2M_HOST_CMD 0x0404
+#define RT2860_REG_H2M_MAILBOX 0x7010
+#define RT2860_REG_H2M_MAILBOX_CID 0x7014
+#define RT2860_REG_H2M_MAILBOX_STATUS 0x701c
+#define RT2860_REG_H2M_MAILBOX_BBP_AGENT 0x7028
#define RT2860_REG_BEACON_BASE(vap) (0x7800 + (vap) * 512)
/* RT3070 registers */
-#define RT3070_RF_CSR_CFG 0x0500
-#define RT3070_EFUSE_CTRL 0x0580
-#define RT3070_EFUSE_DATA0 0x0590
-#define RT3070_EFUSE_DATA1 0x0594
-#define RT3070_EFUSE_DATA2 0x0598
-#define RT3070_EFUSE_DATA3 0x059c
-#define RT3090_OSC_CTRL 0x05a4
-#define RT3070_LDO_CFG0 0x05d4
-#define RT3070_GPIO_SWITCH 0x05dc
+#define RT3070_RF_CSR_CFG 0x0500
+#define RT3070_EFUSE_CTRL 0x0580
+#define RT3070_EFUSE_DATA0 0x0590
+#define RT3070_EFUSE_DATA1 0x0594
+#define RT3070_EFUSE_DATA2 0x0598
+#define RT3070_EFUSE_DATA3 0x059c
+#define RT3090_OSC_CTRL 0x05a4
+#define RT3070_LDO_CFG0 0x05d4
+#define RT3070_GPIO_SWITCH 0x05dc
-#define RT3090_AUX_CTRL 0x010c
-#define RT3070_OPT_14 0x0114
+#define RT3090_AUX_CTRL 0x010c
+#define RT3070_OPT_14 0x0114
/* possible flags for register RF_CSR_CFG */
-#define RT3070_RF_KICK (1 << 17)
-#define RT3070_RF_WRITE (1 << 16)
+#define RT3070_RF_KICK (1 << 17)
+#define RT3070_RF_WRITE (1 << 16)
/* possible flags for register EFUSE_CTRL */
-#define RT3070_SEL_EFUSE (1 << 31)
-#define RT3070_EFSROM_KICK (1 << 30)
-#define RT3070_EFSROM_AIN_MASK 0x03ff0000
-#define RT3070_EFSROM_AIN_SHIFT 16
-#define RT3070_EFSROM_MODE_MASK 0x000000c0
-#define RT3070_EFUSE_AOUT_MASK 0x0000003f
+#define RT3070_SEL_EFUSE (1 << 31)
+#define RT3070_EFSROM_KICK (1 << 30)
+#define RT3070_EFSROM_AIN_MASK 0x03ff0000
+#define RT3070_EFSROM_AIN_SHIFT 16
+#define RT3070_EFSROM_MODE_MASK 0x000000c0
+#define RT3070_EFUSE_AOUT_MASK 0x0000003f
-/* possible flags for RT3020 RF register 1 */
-#define RT3070_RF_BLOCK (1 << 0)
-#define RT3070_RX0_PD (1 << 2)
-#define RT3070_TX0_PD (1 << 3)
-#define RT3070_RX1_PD (1 << 4)
-#define RT3070_TX1_PD (1 << 5)
-#define RT3070_RX2_PD (1 << 6)
-#define RT3070_TX2_PD (1 << 7)
-
-/* possible flags for RT3020 RF register 1 */
-#define RT3070_RF_BLOCK (1 << 0)
-#define RT3070_RX0_PD (1 << 2)
-#define RT3070_TX0_PD (1 << 3)
-#define RT3070_RX1_PD (1 << 4)
-#define RT3070_TX1_PD (1 << 5)
-#define RT3070_RX2_PD (1 << 6)
-#define RT3070_TX2_PD (1 << 7)
-
-/* possible flags for RT3020 RF register 7 */
-#define RT3070_TUNE (1 << 0)
-
-/* possible flags for RT3020 RF register 15 */
-#define RT3070_TX_LO2 (1 << 3)
-
-/* possible flags for RT3020 RF register 17 */
-#define RT3070_TX_LO1 (1 << 3)
-
-/* possible flags for RT3020 RF register 20 */
-#define RT3070_RX_LO1 (1 << 3)
-
-/* possible flags for RT3020 RF register 21 */
-#define RT3070_RX_LO2 (1 << 3)
-#define RT3070_RX_CTB (1 << 7)
-
-/* possible flags for RT3020 RF register 22 */
-#define RT3070_BB_LOOPBACK (1 << 0)
-
-/* possible flags for RT3053 RF register 1 */
-#define RT3593_VCO (1 << 0)
-
-/* possible flags for RT3053 RF register 2 */
-#define RT3593_RESCAL (1 << 7)
-
-/* possible flags for RT3053 RF register 3 */
-#define RT3593_VCOCAL (1 << 7)
-
-/* possible flags for RT3053 RF register 6 */
-#define RT3593_VCO_IC (1 << 6)
-
-/* possible flags for RT3053 RF register 20 */
-#define RT3593_LDO_PLL_VC_MASK 0x0e
-#define RT3593_LDO_RF_VC_MASK 0xe0
-
-/* possible flags for RT3053 RF register 22 */
-#define RT3593_CP_IC_MASK 0xe0
-#define RT3593_CP_IC_SHIFT 5
-
-/* possible flags for RT3053 RF register 46 */
-#define RT3593_RX_CTB (1 << 5)
-
-#define RT3090_DEF_LNA 10
-
-
-#define RT2860_REG_RF_R1 0
-#define RT2860_REG_RF_R2 1
-#define RT2860_REG_RF_R3 2
-#define RT2860_REG_RF_R4 3
-
-/*
- * RT2860_REG_EEPROM_CSR flags
- */
-#define RT2860_REG_EERL (1 << 7)
-#define RT2860_REG_EEDO (1 << 3)
-#define RT2860_REG_EEDI (1 << 2)
-#define RT2860_REG_EECS (1 << 1)
-#define RT2860_REG_EESK (1 << 0)
-#define RT2860_REG_EEOP_READ 0x6
+#define RT2860_REG_RF_R1 0
+#define RT2860_REG_RF_R2 1
+#define RT2860_REG_RF_R3 2
+#define RT2860_REG_RF_R4 3
/*
* RT2860_REG_SCHDMA_INT_STATUS
* RT2860_REG_SCHDMA_INT_MASK flags
*/
-#define RT2860_REG_INT_TX_COHERENT (1 << 17)
-#define RT2860_REG_INT_RX_COHERENT (1 << 16)
-#define RT2860_REG_INT_GP_TIMER (1 << 15)
-#define RT2860_REG_INT_AUTO_WAKEUP (1 << 14)
-#define RT2860_REG_INT_FIFO_STA_FULL (1 << 13)
-#define RT2860_REG_INT_PRE_TBTT (1 << 12)
-#define RT2860_REG_INT_TBTT (1 << 11)
-#define RT2860_REG_INT_TXRX_COHERENT (1 << 10)
-#define RT2860_REG_INT_MCU_CMD (1 << 9)
-#define RT2860_REG_INT_TX_MGMT_DONE (1 << 8)
-#define RT2860_REG_INT_TX_HCCA_DONE (1 << 7)
-#define RT2860_REG_INT_TX_AC3_DONE (1 << 6)
-#define RT2860_REG_INT_TX_AC2_DONE (1 << 5)
-#define RT2860_REG_INT_TX_AC1_DONE (1 << 4)
-#define RT2860_REG_INT_TX_AC0_DONE (1 << 3)
-#define RT2860_REG_INT_RX_DONE (1 << 2)
-#define RT2860_REG_INT_TX_DELAY_DONE (1 << 1)
-#define RT2860_REG_INT_RX_DELAY_DONE (1 << 0)
+#define RT2860_REG_INT_RADAR (1 << 20)
+#define RT2860_REG_INT_TX_COHERENT (1 << 17)
+#define RT2860_REG_INT_RX_COHERENT (1 << 16)
+#define RT2860_REG_INT_GP_TIMER (1 << 15)
+#define RT2860_REG_INT_AUTO_WAKEUP (1 << 14)
+#define RT2860_REG_INT_FIFO_STAT_FULL (1 << 13)
+#define RT2860_REG_INT_PRE_TBTT (1 << 12)
+#define RT2860_REG_INT_TBTT (1 << 11)
+#define RT2860_REG_INT_TXRX_COHERENT (1 << 10)
+#define RT2860_REG_INT_MCU_CMD (1 << 9)
+#define RT2860_REG_INT_TX_MGMT_DONE (1 << 8)
+#define RT2860_REG_INT_TX_HCCA_DONE (1 << 7)
+#define RT2860_REG_INT_TX_AC3_DONE (1 << 6)
+#define RT2860_REG_INT_TX_AC2_DONE (1 << 5)
+#define RT2860_REG_INT_TX_AC1_DONE (1 << 4)
+#define RT2860_REG_INT_TX_AC0_DONE (1 << 3)
+#define RT2860_REG_INT_RX_DONE (1 << 2)
+#define RT2860_REG_INT_TX_DELAY_DONE (1 << 1)
+#define RT2860_REG_INT_RX_DELAY_DONE (1 << 0)
/*
* RT2860_REG_SCHDMA_WPDMA_GLO_CFG flags
*/
-#define RT2860_REG_TX_WB_DDONE (1 << 6)
-#define RT2860_REG_RX_DMA_BUSY (1 << 3)
-#define RT2860_REG_RX_DMA_ENABLE (1 << 2)
-#define RT2860_REG_TX_DMA_BUSY (1 << 1)
-#define RT2860_REG_TX_DMA_ENABLE (1 << 0)
-#define RT2860_REG_WPDMA_BT_SIZE_SHIFT 4
-#define RT2860_REG_WPDMA_BT_SIZE16 0
-#define RT2860_REG_WPDMA_BT_SIZE32 1
-#define RT2860_REG_WPDMA_BT_SIZE64 2
-#define RT2860_REG_WPDMA_BT_SIZE128 3
+#define RT2860_REG_TX_WB_DDONE (1 << 6)
+#define RT2860_REG_RX_DMA_BUSY (1 << 3)
+#define RT2860_REG_RX_DMA_ENABLE (1 << 2)
+#define RT2860_REG_TX_DMA_BUSY (1 << 1)
+#define RT2860_REG_TX_DMA_ENABLE (1 << 0)
+#define RT2860_REG_WPDMA_BT_SIZE_SHIFT 4
+#define RT2860_REG_WPDMA_BT_SIZE_MASK 0x000000f0
+#define RT2860_REG_WPDMA_BT_SIZE16 0
+#define RT2860_REG_WPDMA_BT_SIZE32 1
+#define RT2860_REG_WPDMA_BT_SIZE64 2
+#define RT2860_REG_WPDMA_BT_SIZE128 3
/*
* RT2860_REG_SCHDMA_WPDMA_RST_IDX flags
@@ -462,19 +392,6 @@
* RT2860_REG_TX_GF40_PROT_CFG flags
*/
#define RT2860_REG_RTSTH_ENABLE (1 << 26)
-#define RT2860_REG_TXOP_ALLOW_GF40 (1 << 25)
-#define RT2860_REG_TXOP_ALLOW_GF20 (1 << 24)
-#define RT2860_REG_TXOP_ALLOW_MM40 (1 << 23)
-#define RT2860_REG_TXOP_ALLOW_MM20 (1 << 22)
-#define RT2860_REG_TXOP_ALLOW_OFDM (1 << 21)
-#define RT2860_REG_TXOP_ALLOW_CCK (1 << 20)
-#define RT2860_REG_TXOP_ALLOW_ALL (0x3f << 20)
-#define RT2860_REG_PROT_NAV_NONE (0 << 18)
-#define RT2860_REG_PROT_NAV_SHORT (1 << 18)
-#define RT2860_REG_PROT_NAV_LONG (2 << 18)
-#define RT2860_REG_PROT_CTRL_NONE (0 << 16)
-#define RT2860_REG_PROT_CTRL_RTS_CTS (1 << 16)
-#define RT2860_REG_PROT_CTRL_CTS (2 << 16)
#define RT2860_REG_PROT_PHYMODE_SHIFT 14
#define RT2860_REG_PROT_PHYMODE_MASK 0x3
#define RT2860_REG_PROT_PHYMODE_CCK 0
@@ -482,71 +399,6 @@
#define RT2860_REG_PROT_MCS_SHIFT 0
#define RT2860_REG_PROT_MCS_MASK 0x7f
-/*
- * RT2860_REG_RX_FILTER_CFG flags
- */
-#define RT2860_REG_RX_FILTER_DROP_CTRL_RSV (1 << 16)
-#define RT2860_REG_RX_FILTER_DROP_BAR (1 << 15)
-#define RT2860_REG_RX_FILTER_DROP_BA (1 << 14)
-#define RT2860_REG_RX_FILTER_DROP_PSPOLL (1 << 13)
-#define RT2860_REG_RX_FILTER_DROP_RTS (1 << 12)
-#define RT2860_REG_RX_FILTER_DROP_CTS (1 << 11)
-#define RT2860_REG_RX_FILTER_DROP_ACK (1 << 10)
-#define RT2860_REG_RX_FILTER_DROP_CFEND (1 << 9)
-#define RT2860_REG_RX_FILTER_DROP_CFACK (1 << 8)
-#define RT2860_REG_RX_FILTER_DROP_DUPL (1 << 7)
-#define RT2860_REG_RX_FILTER_DROP_BCAST (1 << 6)
-#define RT2860_REG_RX_FILTER_DROP_MCAST (1 << 5)
-#define RT2860_REG_RX_FILTER_DROP_VER_ERR (1 << 4)
-#define RT2860_REG_RX_FILTER_DROP_NOT_MYBSS (1 << 3)
-#define RT2860_REG_RX_FILTER_DROP_UC_NOME (1 << 2)
-#define RT2860_REG_RX_FILTER_DROP_PHY_ERR (1 << 1)
-#define RT2860_REG_RX_FILTER_DROP_CRC_ERR (1 << 0)
-
-/*
- * RT2860_REG_AUTO_RSP_CFG flags
- */
-#define RT2860_REG_CCK_SHORT_ENABLE (1 << 4)
-
-/*
- * RT2860_REG_TX_STA_FIFO flags
- */
-#define RT2860_REG_TX_STA_FIFO_MCS_SHIFT 16
-#define RT2860_REG_TX_STA_FIFO_MCS_MASK 0x7f
-#define RT2860_REG_TX_STA_FIFO_WCID_SHIFT 8
-#define RT2860_REG_TX_STA_FIFO_WCID_MASK 0xff
-#define RT2860_REG_TX_STA_FIFO_PID_SHIFT 1
-#define RT2860_REG_TX_STA_FIFO_PID_MASK 0xf
-#define RT2860_REG_TX_STA_FIFO_ACK_REQ (1 << 7)
-#define RT2860_REG_TX_STA_FIFO_AGG (1 << 6)
-#define RT2860_REG_TX_STA_FIFO_TX_OK (1 << 5)
-#define RT2860_REG_TX_STA_FIFO_VALID (1 << 0)
-
-/*
- * RT2860_REG_WCID_ATTR flags
- */
-#define RT2860_REG_VAP_SHIFT 4
-#define RT2860_REG_VAP_MASK 0x7
-#define RT2860_REG_CIPHER_MODE_SHIFT 1
-#define RT2860_REG_CIPHER_MODE_MASK 0x7
-#define RT2860_REG_CIPHER_MODE_NONE 0
-#define RT2860_REG_CIPHER_MODE_WEP40 1
-#define RT2860_REG_CIPHER_MODE_WEP104 2
-#define RT2860_REG_CIPHER_MODE_TKIP 3
-#define RT2860_REG_CIPHER_MODE_AES_CCMP 4
-#define RT2860_REG_CIPHER_MODE_CKIP40 5
-#define RT2860_REG_CIPHER_MODE_CKIP104 6
-#define RT2860_REG_CIPHER_MODE_CKIP128 7
-#define RT2860_REG_PKEY_ENABLE (1 << 0)
-
-/*
- * RT2860_REG_H2M_MAILBOX flags
- */
-#define RT2860_REG_H2M_BUSY (1 << 24)
-#define RT2860_REG_H2M_TOKEN_POWERSAVE 1
-#define RT2860_REG_H2M_TOKEN_RADIOOFF 2
-#define RT2860_REG_H2M_TOKEN_WAKEUP 3
-#define RT2860_REG_H2M_TOKEN_NO_INTR 0xff
/*
* RT2860_REG_H2M_MAILBOX_CID flags
@@ -557,4 +409,703 @@
#define RT2860_REG_H2M_CID3_SHIFT 24
#define RT2860_REG_H2M_CID_MASK 0xff
-#endif /* #ifndef _RT2860_REG_H_ */
+/* possible flags for register RT2860_PCI_EECTRL */
+#define RT2860_C (1 << 0)
+#define RT2860_S (1 << 1)
+#define RT2860_D (1 << 2)
+#define RT2860_SHIFT_D 2
+#define RT2860_Q (1 << 3)
+#define RT2860_SHIFT_Q 3
+
+/* possible flags for registers *_PROT_CFG */
+#define RT2860_RTSTH_EN (1 << 26)
+#define RT2860_TXOP_ALLOW_GF40 (1 << 25)
+#define RT2860_TXOP_ALLOW_GF20 (1 << 24)
+#define RT2860_TXOP_ALLOW_MM40 (1 << 23)
+#define RT2860_TXOP_ALLOW_MM20 (1 << 22)
+#define RT2860_TXOP_ALLOW_OFDM (1 << 21)
+#define RT2860_TXOP_ALLOW_CCK (1 << 20)
+#define RT2860_TXOP_ALLOW_ALL (0x3f << 20)
+#define RT2860_PROT_NAV_SHORT (1 << 18)
+#define RT2860_PROT_NAV_LONG (2 << 18)
+#define RT2860_PROT_CTRL_RTS_CTS (1 << 16)
+#define RT2860_PROT_CTRL_CTS (2 << 16)
+
+/* possible flags for registers EXP_{CTS,ACK}_TIME */
+#define RT2860_EXP_OFDM_TIME_SHIFT 16
+#define RT2860_EXP_CCK_TIME_SHIFT 0
+
+/* possible flags for register RX_FILTR_CFG */
+#define RT2860_DROP_CTRL_RSV (1 << 16)
+#define RT2860_DROP_BAR (1 << 15)
+#define RT2860_DROP_BA (1 << 14)
+#define RT2860_DROP_PSPOLL (1 << 13)
+#define RT2860_DROP_RTS (1 << 12)
+#define RT2860_DROP_CTS (1 << 11)
+#define RT2860_DROP_ACK (1 << 10)
+#define RT2860_DROP_CFEND (1 << 9)
+#define RT2860_DROP_CFACK (1 << 8)
+#define RT2860_DROP_DUPL (1 << 7)
+#define RT2860_DROP_BC (1 << 6)
+#define RT2860_DROP_MC (1 << 5)
+#define RT2860_DROP_VER_ERR (1 << 4)
+#define RT2860_DROP_NOT_MYBSS (1 << 3)
+#define RT2860_DROP_UC_NOME (1 << 2)
+#define RT2860_DROP_PHY_ERR (1 << 1)
+#define RT2860_DROP_CRC_ERR (1 << 0)
+
+/* possible flags for register AUTO_RSP_CFG */
+#define RT2860_CTRL_PWR_BIT (1 << 7)
+#define RT2860_BAC_ACK_POLICY (1 << 6)
+#define RT2860_CCK_SHORT_EN (1 << 4)
+#define RT2860_CTS_40M_REF_EN (1 << 3)
+#define RT2860_CTS_40M_MODE_EN (1 << 2)
+#define RT2860_BAC_ACKPOLICY_EN (1 << 1)
+#define RT2860_AUTO_RSP_EN (1 << 0)
+
+/* possible flags for register SIFS_COST_CFG */
+#define RT2860_OFDM_SIFS_COST_SHIFT 8
+#define RT2860_CCK_SIFS_COST_SHIFT 0
+
+/* possible flags for register TXOP_HLDR_ET */
+#define RT2860_TXOP_ETM1_EN (1 << 25)
+#define RT2860_TXOP_ETM0_EN (1 << 24)
+#define RT2860_TXOP_ETM_THRES_SHIFT 16
+#define RT2860_TXOP_ETO_EN (1 << 8)
+#define RT2860_TXOP_ETO_THRES_SHIFT 1
+#define RT2860_PER_RX_RST_EN (1 << 0)
+
+/* possible flags for register TX_STAT_FIFO */
+#define RT2860_TXQ_MCS_SHIFT 16
+#define RT2860_TXQ_WCID_SHIFT 8
+#define RT2860_TXQ_WCID_MASK 0xff00
+#define RT2860_TXQ_ACKREQ (1 << 7)
+#define RT2860_TXQ_AGG (1 << 6)
+#define RT2860_TXQ_OK (1 << 5)
+#define RT2860_TXQ_PID_SHIFT 1
+#define RT2860_TXQ_VLD (1 << 0)
+
+/* possible flags for register WCID_ATTR */
+#define RT2860_VAP_SHIFT 4
+#define RT2860_MODE_SHIFT 1
+#define RT2860_MODE_NOSEC 0
+#define RT2860_MODE_WEP40 1
+#define RT2860_MODE_WEP104 2
+#define RT2860_MODE_TKIP 3
+#define RT2860_MODE_AES_CCMP 4
+#define RT2860_MODE_CKIP40 5
+#define RT2860_MODE_CKIP104 6
+#define RT2860_MODE_CKIP128 7
+#define RT2860_RX_PKEY_EN (1 << 0)
+
+/* possible flags for register H2M_MAILBOX */
+#define RT2860_H2M_BUSY (1 << 24)
+#define RT2860_TOKEN_POWERSAVE 1
+#define RT2860_TOKEN_RADIOOFF 2
+#define RT2860_TOKEN_WAKEUP 3
+#define RT2860_TOKEN_NO_INTR 0xff
+
+
+/* possible flags for MCU command RT2860_MCU_CMD_LEDS */
+#define RT2860_LED_RADIO (1 << 13)
+#define RT2860_LED_LINK_2GHZ (1 << 14)
+#define RT2860_LED_LINK_5GHZ (1 << 15)
+
+
+/* possible flags for RT3020 RF register 1 */
+#define RT3070_RF_BLOCK (1 << 0)
+#define RT3070_RX0_PD (1 << 2)
+#define RT3070_TX0_PD (1 << 3)
+#define RT3070_RX1_PD (1 << 4)
+#define RT3070_TX1_PD (1 << 5)
+#define RT3070_RX2_PD (1 << 6)
+#define RT3070_TX2_PD (1 << 7)
+
+/* possible flags for RT3020 RF register 7 */
+#define RT3070_TUNE (1 << 0)
+
+/* possible flags for RT3020 RF register 15 */
+#define RT3070_TX_LO2 (1 << 3)
+
+/* possible flags for RT3020 RF register 17 */
+#define RT3070_TX_LO1 (1 << 3)
+
+/* possible flags for RT3020 RF register 20 */
+#define RT3070_RX_LO1 (1 << 3)
+
+/* possible flags for RT3020 RF register 21 */
+#define RT3070_RX_LO2 (1 << 3)
+#define RT3070_RX_CTB (1 << 7)
+
+/* possible flags for RT3020 RF register 22 */
+#define RT3070_BB_LOOPBACK (1 << 0)
+
+/* possible flags for RT3053 RF register 1 */
+#define RT3593_VCO (1 << 0)
+
+/* possible flags for RT3053 RF register 2 */
+#define RT3593_RESCAL (1 << 7)
+
+/* possible flags for RT3053 RF register 3 */
+#define RT3593_VCOCAL (1 << 7)
+
+/* possible flags for RT3053 RF register 6 */
+#define RT3593_VCO_IC (1 << 6)
+
+/* possible flags for RT3053 RF register 20 */
+#define RT3593_LDO_PLL_VC_MASK 0x0e
+#define RT3593_LDO_RF_VC_MASK 0xe0
+
+/* possible flags for RT3053 RF register 22 */
+#define RT3593_CP_IC_MASK 0xe0
+#define RT3593_CP_IC_SHIFT 5
+
+/* possible flags for RT3053 RF register 46 */
+#define RT3593_RX_CTB (1 << 5)
+
+#define RT3090_DEF_LNA 10
+
+/* RT2860 TX descriptor */
+struct rt2860_txd {
+ uint32_t sdp0; /* Segment Data Pointer 0 */
+ uint16_t sdl1; /* Segment Data Length 1 */
+#define RT2860_TX_BURST (1 << 15)
+#define RT2860_TX_LS1 (1 << 14) /* SDP1 is the last segment */
+
+ uint16_t sdl0; /* Segment Data Length 0 */
+#define RT2860_TX_DDONE (1 << 15)
+#define RT2860_TX_LS0 (1 << 14) /* SDP0 is the last segment */
+
+ uint32_t sdp1; /* Segment Data Pointer 1 */
+ uint8_t reserved[3];
+ uint8_t flags;
+#define RT2860_TX_QSEL_SHIFT 1
+#define RT2860_TX_QSEL_MGMT (0 << 1)
+#define RT2860_TX_QSEL_HCCA (1 << 1)
+#define RT2860_TX_QSEL_EDCA (2 << 1)
+#define RT2860_TX_WIV (1 << 0)
+} __packed;
+
+/* TX Wireless Information */
+struct rt2860_txwi {
+ uint8_t flags;
+#define RT2860_TX_MPDU_DSITY_SHIFT 5
+#define RT2860_TX_AMPDU (1 << 4)
+#define RT2860_TX_TS (1 << 3)
+#define RT2860_TX_CFACK (1 << 2)
+#define RT2860_TX_MMPS (1 << 1)
+#define RT2860_TX_FRAG (1 << 0)
+
+ uint8_t txop;
+#define RT2860_TX_TXOP_HT 0
+#define RT2860_TX_TXOP_PIFS 1
+#define RT2860_TX_TXOP_SIFS 2
+#define RT2860_TX_TXOP_BACKOFF 3
+
+ uint16_t phy;
+#define RT2860_PHY_MODE 0xc000
+#define RT2860_PHY_CCK (0 << 14)
+#define RT2860_PHY_OFDM (1 << 14)
+#define RT2860_PHY_HT (2 << 14)
+#define RT2860_PHY_HT_GF (3 << 14)
+#define RT2860_PHY_STBC 9
+#define RT2860_PHY_SGI (1 << 8)
+#define RT2860_PHY_BW40 (1 << 7)
+#define RT2860_PHY_MCS 0x7f
+#define RT2860_PHY_SHPRE (1 << 3)
+
+ uint8_t xflags;
+#define RT2860_TX_BAWINSIZE_SHIFT 2
+#define RT2860_TX_NSEQ (1 << 1)
+#define RT2860_TX_ACK (1 << 0)
+
+ uint8_t wcid; /* Wireless Client ID */
+ uint16_t len;
+#define RT2860_TX_PID_SHIFT 12
+
+ uint32_t iv;
+ uint32_t eiv;
+} __packed;
+
+/* RT2860 RX descriptor */
+struct rt2860_rxd {
+ uint32_t sdp0;
+ uint16_t sdl1; /* unused */
+ uint16_t sdl0;
+#define RT2860_RX_DDONE (1 << 15)
+#define RT2860_RX_LS0 (1 << 14)
+
+ uint32_t sdp1; /* unused */
+ uint32_t flags;
+#define RT2860_RX_DEC (1 << 16)
+#define RT2860_RX_AMPDU (1 << 15)
+#define RT2860_RX_L2PAD (1 << 14)
+#define RT2860_RX_RSSI (1 << 13)
+#define RT2860_RX_HTC (1 << 12)
+#define RT2860_RX_AMSDU (1 << 11)
+#define RT2860_RX_MICERR (1 << 10)
+#define RT2860_RX_ICVERR (1 << 9)
+#define RT2860_RX_CRCERR (1 << 8)
+#define RT2860_RX_MYBSS (1 << 7)
+#define RT2860_RX_BC (1 << 6)
+#define RT2860_RX_MC (1 << 5)
+#define RT2860_RX_UC2ME (1 << 4)
+#define RT2860_RX_FRAG (1 << 3)
+#define RT2860_RX_NULL (1 << 2)
+#define RT2860_RX_DATA (1 << 1)
+#define RT2860_RX_BA (1 << 0)
+
+#define RT2860_RX_CIPHER_ERR_SHIFT 9
+#define RT2860_RX_CIPHER_ERR_MASK 0x3
+#define RT2860_RX_CIPHER_ERR_NONE 0
+#define RT2860_RX_CIPHER_ERR_ICV 1
+#define RT2860_RX_CIPHER_ERR_MIC 2
+#define RT2860_RX_CIPHER_ERR_INVALID_KEY 3
+
+#define RT2860_RX_PLCP_SIGNAL_SHIFT 20
+#define RT2860_RX_PLCP_SIGNAL_MASK 0xfff
+} __packed;
+
+/* RX Wireless Information */
+struct rt2860_rxwi {
+ uint8_t wcid;
+ uint8_t keyidx;
+#define RT2860_RX_UDF_SHIFT 5
+#define RT2860_RX_BSS_IDX_SHIFT 2
+#define RT2860_RXWI_KEYIDX_SHIFT 0
+#define RT2860_RXWI_KEYIDX_MASK 0x3
+
+ uint16_t len;
+#define RT2860_RX_TID_SHIFT 12
+#define RT2860_RXWI_TID_MASK 0xf
+#define RT2860_RXWI_SIZE_SHIFT 0
+#define RT2860_RXWI_SIZE_MASK 0xfff
+
+ uint16_t seq;
+#define RT2860_RXWI_FRAG_SHIFT 0
+#define RT2860_RXWI_FRAG_MASK 0xf
+#define RT2860_RXWI_SEQ_SHIFT 4
+#define RT2860_RXWI_SEQ_MASK 0xfff
+
+ uint8_t bw_mcs;
+#define RT2860_RXWI_MCS_SHIFT 0
+#define RT2860_RXWI_MCS_MASK 0x7f
+#define RT2860_RXWI_MCS_SHOTPRE (1 << 3)
+#define RT2860_RXWI_BW_SHIFT 7
+#define RT2860_RXWI_BW_MASK 0x1
+#define RT2860_RXWI_BW_20 0
+#define RT2860_RXWI_BW_40 1
+
+ uint8_t phymode_stbc_shortgi;
+#define RT2860_RXWI_SHORTGI_SHIFT 0
+#define RT2860_RXWI_SHORTGI_MASK 0x1
+#define RT2860_RXWI_STBC_SHIFT 1
+#define RT2860_RXWI_STBC_MASK 0x3
+#define RT2860_RXWI_PHYMODE_SHIFT 6
+#define RT2860_RXWI_PHYMODE_MASK 0x3
+#define RT2860_RXWI_PHYMODE_CCK 0
+#define RT2860_RXWI_PHYMODE_OFDM 1
+#define RT2860_RXWI_PHYMODE_HT_MIXED 2
+#define RT2860_RXWI_PHYMODE_HT_GF 3
+
+ uint8_t rssi[3];
+ uint8_t reserved1;
+ uint8_t snr[2];
+ uint16_t reserved2;
+} __packed;
+
+
+/* first DMA segment contains TXWI + 802.11 header + 32-bit padding */
+#define RT2860_TXWI_DMASZ \
+ (sizeof (struct rt2860_txwi) + \
+ sizeof (struct ieee80211_htframe) + \
+ sizeof (uint16_t))
+
+#define RT2860_RF1 0
+#define RT2860_RF2 2
+#define RT2860_RF3 1
+#define RT2860_RF4 3
+
+#define RT2860_RF_2820 1 /* 2T3R */
+#define RT2860_RF_2850 2 /* dual-band 2T3R */
+#define RT2860_RF_2720 3 /* 1T2R */
+#define RT2860_RF_2750 4 /* dual-band 1T2R */
+#define RT3070_RF_3020 5 /* 1T1R */
+#define RT3070_RF_2020 6 /* b/g */
+#define RT3070_RF_3021 7 /* 1T2R */
+#define RT3070_RF_3022 8 /* 2T2R */
+#define RT3070_RF_3052 9 /* dual-band 2T2R */
+#define RT2860_RF_2853 10 /* dual-band 3T3R */
+#define RT3070_RF_3320 11 /* 1T1R */
+#define RT3070_RF_3322 12 /* 2T2R */
+#define RT3070_RF_3053 13 /* dual-band 3T3R */
+
+/* USB commands for RT2870 only */
+#define RT2870_RESET 1
+#define RT2870_WRITE_2 2
+#define RT2870_WRITE_REGION_1 6
+#define RT2870_READ_REGION_1 7
+#define RT2870_EEPROM_READ 9
+
+#define RT2860_EEPROM_DELAY 1 /* minimum hold time (microsecond) */
+/*
+#define RT2860_EEPROM_VERSION 0x01
+#define RT2860_EEPROM_MAC01 0x02
+#define RT2860_EEPROM_MAC23 0x03
+#define RT2860_EEPROM_MAC45 0x04
+#define RT2860_EEPROM_PCIE_PSLEVEL 0x11
+#define RT2860_EEPROM_REV 0x12
+#define RT2860_EEPROM_ANTENNA 0x1a
+#define RT2860_EEPROM_CONFIG 0x1b
+#define RT2860_EEPROM_COUNTRY 0x1c
+#define RT2860_EEPROM_FREQ_LEDS 0x1d
+#define RT2860_EEPROM_LED1 0x1e
+#define RT2860_EEPROM_LED2 0x1f
+#define RT2860_EEPROM_LED3 0x20
+#define RT2860_EEPROM_LNA 0x22
+#define RT2860_EEPROM_RSSI1_2GHZ 0x23
+#define RT2860_EEPROM_RSSI2_2GHZ 0x24
+#define RT2860_EEPROM_RSSI1_5GHZ 0x25
+#define RT2860_EEPROM_RSSI2_5GHZ 0x26
+#define RT2860_EEPROM_MAX_TXPWR 0x27
+#define RT2860_EEPROM_DELTAPWR 0x28
+#define RT2860_EEPROM_PWR2GHZ_BASE1 0x29
+#define RT2860_EEPROM_PWR2GHZ_BASE2 0x30
+#define RT2860_EEPROM_TSSI1_2GHZ 0x37
+#define RT2860_EEPROM_TSSI2_2GHZ 0x38
+#define RT2860_EEPROM_TSSI3_2GHZ 0x39
+#define RT2860_EEPROM_TSSI4_2GHZ 0x3a
+#define RT2860_EEPROM_TSSI5_2GHZ 0x3b
+#define RT2860_EEPROM_PWR5GHZ_BASE1 0x3c
+#define RT2860_EEPROM_PWR5GHZ_BASE2 0x53
+#define RT2860_EEPROM_TSSI1_5GHZ 0x6a
+#define RT2860_EEPROM_TSSI2_5GHZ 0x6b
+#define RT2860_EEPROM_TSSI3_5GHZ 0x6c
+#define RT2860_EEPROM_TSSI4_5GHZ 0x6d
+#define RT2860_EEPROM_TSSI5_5GHZ 0x6e
+#define RT2860_EEPROM_RPWR 0x6f
+#define RT2860_EEPROM_TXPWR_2G_20 0x6f
+#define RT2860_EEPROM_TXPWR_2G_40 0x77
+#define RT2860_EEPROM_TXPWR_5G_20 0x7d
+#define RT2860_EEPROM_TXPWR_5G_40 0x85
+#define RT2860_EEPROM_BBP_BASE 0x78
+#define RT3071_EEPROM_RF_BASE 0x41
+*/
+#define RT2860_EEPROM_VERSION 0x0002
+#define RT2860_EEPROM_ADDRESS01 0x0004
+#define RT2860_EEPROM_ADDRESS23 0x0006
+#define RT2860_EEPROM_ADDRESS45 0x0008
+#define RT2860_EEPROM_POWERSAVE_LEVEL 0x0022
+#define RT2860_EEPROM_ANTENNA 0x0034
+#define RT2860_EEPROM_NIC_CONFIG 0x0036
+#define RT2860_EEPROM_COUNTRY 0x0038
+#define RT2860_EEPROM_RF_FREQ_OFF 0x003a
+#define RT2860_EEPROM_LED1_OFF 0x003c
+#define RT2860_EEPROM_LED2_OFF 0x003e
+#define RT2860_EEPROM_LED3_OFF 0x0040
+#define RT2860_EEPROM_LNA_GAIN 0x0044
+#define RT2860_EEPROM_RSSI_OFF_2GHZ_BASE 0x0046
+#define RT2860_EEPROM_RSSI2_OFF_2GHZ_BASE 0x0048
+#define RT2860_EEPROM_RSSI_OFF_5GHZ_BASE 0x004a
+#define RT2860_EEPROM_RSSI2_OFF_5GHZ_BASE 0x004c
+#define RT2860_EEPROM_TXPOW_RATE_DELTA 0x0050
+#define RT2860_EEPROM_TXPOW1_2GHZ_BASE 0x0052
+#define RT2860_EEPROM_TXPOW2_2GHZ_BASE 0x0060
+#define RT2860_EEPROM_TSSI_2GHZ_BASE 0x006e
+#define RT2860_EEPROM_TXPOW1_5GHZ_BASE 0x0078
+#define RT2860_EEPROM_TXPOW2_5GHZ_BASE 0x00a6
+#define RT2860_EEPROM_TSSI_5GHZ_BASE 0x00d4
+#define RT2860_EEPROM_TXPOW_RATE_BASE 0x00de
+#define RT2860_EEPROM_BBP_BASE 0x00f0
+#define RT3071_EEPROM_RF_BASE 0x0082
+
+/*
+ * Control and status registers access macros.
+ */
+#define RAL_READ(sc, reg) \
+ bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (reg))
+
+#define RAL_WRITE(sc, reg, val) \
+ bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val))
+
+#define RAL_BARRIER_WRITE(sc) \
+ bus_space_barrier((sc)->sc_st, (sc)->sc_sh, 0, 0x1800, \
+ BUS_SPACE_BARRIER_WRITE)
+
+#define RAL_BARRIER_READ_WRITE(sc) \
+ bus_space_barrier((sc)->sc_st, (sc)->sc_sh, 0, 0x1800, \
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE)
+
+#define RAL_WRITE_REGION_1(sc, offset, datap, count) \
+ bus_space_write_region_1((sc)->sc_st, (sc)->sc_sh, (offset), \
+ (datap), (count))
+
+#define RAL_SET_REGION_4(sc, offset, val, count) \
+ bus_space_set_region_4((sc)->sc_st, (sc)->sc_sh, (offset), \
+ (val), (count))
+
+/*
+ * EEPROM access macro.
+ */
+#define RT2860_EEPROM_CTL(sc, val) do { \
+ RAL_WRITE((sc), RT2860_PCI_EECTRL, (val)); \
+ RAL_BARRIER_READ_WRITE((sc)); \
+ DELAY(RT2860_EEPROM_DELAY); \
+} while (/* CONSTCOND */0)
+
+/*
+ * Default values for MAC registers; values taken from the reference driver.
+ */
+#define RT2860_DEF_MAC \
+ { RT2860_BCN_OFFSET0, 0xf8f0e8e0 }, \
+ { RT2860_LEGACY_BASIC_RATE, 0x0000013f }, \
+ { RT2860_HT_BASIC_RATE, 0x00008003 }, \
+ { RT2860_MAC_SYS_CTRL, 0x00000000 }, \
+ { RT2860_BKOFF_SLOT_CFG, 0x00000209 }, \
+ { RT2860_TX_SW_CFG0, 0x00000000 }, \
+ { RT2860_TX_SW_CFG1, 0x00080606 }, \
+ { RT2860_TX_LINK_CFG, 0x00001020 }, \
+ { RT2860_TX_TIMEOUT_CFG, 0x000a2090 }, \
+ { RT2860_LED_CFG, 0x7f031e46 }, \
+ { RT2860_WMM_AIFSN_CFG, 0x00002273 }, \
+ { RT2860_WMM_CWMIN_CFG, 0x00002344 }, \
+ { RT2860_WMM_CWMAX_CFG, 0x000034aa }, \
+ { RT2860_MAX_PCNT, 0x1f3fbf9f }, \
+ { RT2860_TX_RTY_CFG, 0x47d01f0f }, \
+ { RT2860_AUTO_RSP_CFG, 0x00000013 }, \
+ { RT2860_CCK_PROT_CFG, 0x05740003 }, \
+ { RT2860_OFDM_PROT_CFG, 0x05740003 }, \
+ { RT2860_GF20_PROT_CFG, 0x01744004 }, \
+ { RT2860_GF40_PROT_CFG, 0x03f44084 }, \
+ { RT2860_MM20_PROT_CFG, 0x01744004 }, \
+ { RT2860_MM40_PROT_CFG, 0x03f54084 }, \
+ { RT2860_TXOP_CTRL_CFG, 0x0000583f }, \
+ { RT2860_TXOP_HLDR_ET, 0x00000002 }, \
+ { RT2860_TX_RTS_CFG, 0x00092b20 }, \
+ { RT2860_EXP_ACK_TIME, 0x002400ca }, \
+ { RT2860_XIFS_TIME_CFG, 0x33a41010 }, \
+ { RT2860_PWR_PIN_CFG, 0x00000003 }
+
+// { RT2860_RX_FILTR_CFG, 0x000017f97},
+// { RT2860_REG_MAX_LEN_CFG, (1 << 12) | RT2860_MAX_AGG_SIZE },
+
+
+/* XXX only a few registers differ from above, try to merge? */
+#define RT2870_DEF_MAC \
+ { RT2860_BCN_OFFSET0, 0xf8f0e8e0 }, \
+ { RT2860_LEGACY_BASIC_RATE, 0x0000013f }, \
+ { RT2860_HT_BASIC_RATE, 0x00008003 }, \
+ { RT2860_MAC_SYS_CTRL, 0x00000000 }, \
+ { RT2860_BKOFF_SLOT_CFG, 0x00000209 }, \
+ { RT2860_TX_SW_CFG0, 0x00000000 }, \
+ { RT2860_TX_SW_CFG1, 0x00080606 }, \
+ { RT2860_TX_LINK_CFG, 0x00001020 }, \
+ { RT2860_TX_TIMEOUT_CFG, 0x000a2090 }, \
+ { RT2860_LED_CFG, 0x7f031e46 }, \
+ { RT2860_WMM_AIFSN_CFG, 0x00002273 }, \
+ { RT2860_WMM_CWMIN_CFG, 0x00002344 }, \
+ { RT2860_WMM_CWMAX_CFG, 0x000034aa }, \
+ { RT2860_MAX_PCNT, 0x1f3fbf9f }, \
+ { RT2860_TX_RTY_CFG, 0x47d01f0f }, \
+ { RT2860_AUTO_RSP_CFG, 0x00000013 }, \
+ { RT2860_CCK_PROT_CFG, 0x05740003 }, \
+ { RT2860_OFDM_PROT_CFG, 0x05740003 }, \
+ { RT2860_REG_PBF_CFG, 0x00f40006 }, \
+ { RT2860_REG_SCHDMA_WPDMA_GLO_CFG, 0x00000030 }, \
+ { RT2860_GF20_PROT_CFG, 0x01744004 }, \
+ { RT2860_GF40_PROT_CFG, 0x03f44084 }, \
+ { RT2860_MM20_PROT_CFG, 0x01744004 }, \
+ { RT2860_MM40_PROT_CFG, 0x03f44084 }, \
+ { RT2860_TXOP_CTRL_CFG, 0x0000583f }, \
+ { RT2860_TXOP_HLDR_ET, 0x00000002 }, \
+ { RT2860_TX_RTS_CFG, 0x00092b20 }, \
+ { RT2860_EXP_ACK_TIME, 0x002400ca }, \
+ { RT2860_XIFS_TIME_CFG, 0x33a41010 }, \
+ { RT2860_PWR_PIN_CFG, 0x00000003 }
+
+/*
+ * Default values for BBP registers; values taken from the reference driver.
+ */
+#define RT2860_DEF_BBP \
+ { 65, 0x2c }, \
+ { 66, 0x38 }, \
+ { 69, 0x12 }, \
+ { 70, 0x0a }, \
+ { 73, 0x10 }, \
+ { 81, 0x37 }, \
+ { 82, 0x62 }, \
+ { 83, 0x6a }, \
+ { 84, 0x99 }, \
+ { 86, 0x00 }, \
+ { 91, 0x04 }, \
+ { 92, 0x00 }, \
+ { 103, 0x00 }, \
+ { 105, 0x05 }, \
+ { 106, 0x35 }
+
+/*
+ * Default settings for RF registers; values derived from the reference driver.
+ */
+#define RT2860_RF2850 \
+ { 1, 0x100bb3, 0x1301e1, 0x05a014, 0x001402 }, \
+ { 2, 0x100bb3, 0x1301e1, 0x05a014, 0x001407 }, \
+ { 3, 0x100bb3, 0x1301e2, 0x05a014, 0x001402 }, \
+ { 4, 0x100bb3, 0x1301e2, 0x05a014, 0x001407 }, \
+ { 5, 0x100bb3, 0x1301e3, 0x05a014, 0x001402 }, \
+ { 6, 0x100bb3, 0x1301e3, 0x05a014, 0x001407 }, \
+ { 7, 0x100bb3, 0x1301e4, 0x05a014, 0x001402 }, \
+ { 8, 0x100bb3, 0x1301e4, 0x05a014, 0x001407 }, \
+ { 9, 0x100bb3, 0x1301e5, 0x05a014, 0x001402 }, \
+ { 10, 0x100bb3, 0x1301e5, 0x05a014, 0x001407 }, \
+ { 11, 0x100bb3, 0x1301e6, 0x05a014, 0x001402 }, \
+ { 12, 0x100bb3, 0x1301e6, 0x05a014, 0x001407 }, \
+ { 13, 0x100bb3, 0x1301e7, 0x05a014, 0x001402 }, \
+ { 14, 0x100bb3, 0x1301e8, 0x05a014, 0x001404 }, \
+ { 36, 0x100bb3, 0x130266, 0x056014, 0x001408 }, \
+ { 38, 0x100bb3, 0x130267, 0x056014, 0x001404 }, \
+ { 40, 0x100bb2, 0x1301a0, 0x056014, 0x001400 }, \
+ { 44, 0x100bb2, 0x1301a0, 0x056014, 0x001408 }, \
+ { 46, 0x100bb2, 0x1301a1, 0x056014, 0x001402 }, \
+ { 48, 0x100bb2, 0x1301a1, 0x056014, 0x001406 }, \
+ { 52, 0x100bb2, 0x1301a2, 0x056014, 0x001404 }, \
+ { 54, 0x100bb2, 0x1301a2, 0x056014, 0x001408 }, \
+ { 56, 0x100bb2, 0x1301a3, 0x056014, 0x001402 }, \
+ { 60, 0x100bb2, 0x1301a4, 0x056014, 0x001400 }, \
+ { 62, 0x100bb2, 0x1301a4, 0x056014, 0x001404 }, \
+ { 64, 0x100bb2, 0x1301a4, 0x056014, 0x001408 }, \
+ { 100, 0x100bb2, 0x1301ac, 0x05e014, 0x001400 }, \
+ { 102, 0x100bb2, 0x1701ac, 0x15e014, 0x001404 }, \
+ { 104, 0x100bb2, 0x1701ac, 0x15e014, 0x001408 }, \
+ { 108, 0x100bb3, 0x17028c, 0x15e014, 0x001404 }, \
+ { 110, 0x100bb3, 0x13028d, 0x05e014, 0x001400 }, \
+ { 112, 0x100bb3, 0x13028d, 0x05e014, 0x001406 }, \
+ { 116, 0x100bb3, 0x13028e, 0x05e014, 0x001408 }, \
+ { 118, 0x100bb3, 0x13028f, 0x05e014, 0x001404 }, \
+ { 120, 0x100bb1, 0x1300e0, 0x05e014, 0x001400 }, \
+ { 124, 0x100bb1, 0x1300e0, 0x05e014, 0x001404 }, \
+ { 126, 0x100bb1, 0x1300e0, 0x05e014, 0x001406 }, \
+ { 128, 0x100bb1, 0x1300e0, 0x05e014, 0x001408 }, \
+ { 132, 0x100bb1, 0x1300e1, 0x05e014, 0x001402 }, \
+ { 134, 0x100bb1, 0x1300e1, 0x05e014, 0x001404 }, \
+ { 136, 0x100bb1, 0x1300e1, 0x05e014, 0x001406 }, \
+ { 140, 0x100bb1, 0x1300e2, 0x05e014, 0x001400 }, \
+ { 149, 0x100bb1, 0x1300e2, 0x05e014, 0x001409 }, \
+ { 151, 0x100bb1, 0x1300e3, 0x05e014, 0x001401 }, \
+ { 153, 0x100bb1, 0x1300e3, 0x05e014, 0x001403 }, \
+ { 157, 0x100bb1, 0x1300e3, 0x05e014, 0x001407 }, \
+ { 159, 0x100bb1, 0x1300e3, 0x05e014, 0x001409 }, \
+ { 161, 0x100bb1, 0x1300e4, 0x05e014, 0x001401 }, \
+ { 165, 0x100bb1, 0x1300e4, 0x05e014, 0x001405 }, \
+ { 167, 0x100bb1, 0x1300f4, 0x05e014, 0x001407 }, \
+ { 169, 0x100bb1, 0x1300f4, 0x05e014, 0x001409 }, \
+ { 171, 0x100bb1, 0x1300f5, 0x05e014, 0x001401 }, \
+ { 173, 0x100bb1, 0x1300f5, 0x05e014, 0x001403 }
+
+#define RT3070_RF3052 \
+ { 0xf1, 2, 2 }, \
+ { 0xf1, 2, 7 }, \
+ { 0xf2, 2, 2 }, \
+ { 0xf2, 2, 7 }, \
+ { 0xf3, 2, 2 }, \
+ { 0xf3, 2, 7 }, \
+ { 0xf4, 2, 2 }, \
+ { 0xf4, 2, 7 }, \
+ { 0xf5, 2, 2 }, \
+ { 0xf5, 2, 7 }, \
+ { 0xf6, 2, 2 }, \
+ { 0xf6, 2, 7 }, \
+ { 0xf7, 2, 2 }, \
+ { 0xf8, 2, 4 }, \
+ { 0x56, 0, 4 }, \
+ { 0x56, 0, 6 }, \
+ { 0x56, 0, 8 }, \
+ { 0x57, 0, 0 }, \
+ { 0x57, 0, 2 }, \
+ { 0x57, 0, 4 }, \
+ { 0x57, 0, 8 }, \
+ { 0x57, 0, 10 }, \
+ { 0x58, 0, 0 }, \
+ { 0x58, 0, 4 }, \
+ { 0x58, 0, 6 }, \
+ { 0x58, 0, 8 }, \
+ { 0x5b, 0, 8 }, \
+ { 0x5b, 0, 10 }, \
+ { 0x5c, 0, 0 }, \
+ { 0x5c, 0, 4 }, \
+ { 0x5c, 0, 6 }, \
+ { 0x5c, 0, 8 }, \
+ { 0x5d, 0, 0 }, \
+ { 0x5d, 0, 2 }, \
+ { 0x5d, 0, 4 }, \
+ { 0x5d, 0, 8 }, \
+ { 0x5d, 0, 10 }, \
+ { 0x5e, 0, 0 }, \
+ { 0x5e, 0, 4 }, \
+ { 0x5e, 0, 6 }, \
+ { 0x5e, 0, 8 }, \
+ { 0x5f, 0, 0 }, \
+ { 0x5f, 0, 9 }, \
+ { 0x5f, 0, 11 }, \
+ { 0x60, 0, 1 }, \
+ { 0x60, 0, 5 }, \
+ { 0x60, 0, 7 }, \
+ { 0x60, 0, 9 }, \
+ { 0x61, 0, 1 }, \
+ { 0x61, 0, 3 }, \
+ { 0x61, 0, 5 }, \
+ { 0x61, 0, 7 }, \
+ { 0x61, 0, 9 }
+
+#define RT3070_DEF_RF \
+ { 4, 0x40 }, \
+ { 5, 0x03 }, \
+ { 6, 0x02 }, \
+ { 7, 0x70 }, \
+ { 9, 0x0f }, \
+ { 10, 0x41 }, \
+ { 11, 0x21 }, \
+ { 12, 0x7b }, \
+ { 14, 0x90 }, \
+ { 15, 0x58 }, \
+ { 16, 0xb3 }, \
+ { 17, 0x92 }, \
+ { 18, 0x2c }, \
+ { 19, 0x02 }, \
+ { 20, 0xba }, \
+ { 21, 0xdb }, \
+ { 24, 0x16 }, \
+ { 25, 0x01 }, \
+ { 29, 0x1f }
+
+#define RT3572_DEF_RF \
+ { 0, 0x70 }, \
+ { 1, 0x81 }, \
+ { 2, 0xf1 }, \
+ { 3, 0x02 }, \
+ { 4, 0x4c }, \
+ { 5, 0x05 }, \
+ { 6, 0x4a }, \
+ { 7, 0xd8 }, \
+ { 9, 0xc3 }, \
+ { 10, 0xf1 }, \
+ { 11, 0xb9 }, \
+ { 12, 0x70 }, \
+ { 13, 0x65 }, \
+ { 14, 0xa0 }, \
+ { 15, 0x53 }, \
+ { 16, 0x4c }, \
+ { 17, 0x23 }, \
+ { 18, 0xac }, \
+ { 19, 0x93 }, \
+ { 20, 0xb3 }, \
+ { 21, 0xd0 }, \
+ { 22, 0x00 }, \
+ { 23, 0x3c }, \
+ { 24, 0x16 }, \
+ { 25, 0x15 }, \
+ { 26, 0x85 }, \
+ { 27, 0x00 }, \
+ { 28, 0x00 }, \
+ { 29, 0x9b }, \
+ { 30, 0x09 }, \
+ { 31, 0x10 }
diff -r 7d0c8bc7dd1c -r 836e04b655a0 head/sys/dev/ral/rt2860var.h
--- a/head/sys/dev/ral/rt2860var.h Sun Apr 29 20:53:21 2012 +0300
+++ b/head/sys/dev/ral/rt2860var.h Mon Apr 30 15:27:19 2012 +0300
@@ -15,39 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef _RT2860VAR_H_
-#define _RT2860VAR_H_
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/taskqueue.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/endian.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_input.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <net80211/ieee80211_regdomain.h>
-
#ifdef RT2860_DEBUG
enum
@@ -73,210 +40,18 @@
RT2860_DEBUG_ANY = 0xffffffff
};
-#define RT2860_DPRINTF(sc, m, fmt, ...) \
- do { if ((sc)->debug & (m)) printf(fmt, __VA_ARGS__); } while (0)
+#define RT2860_DPRINTF(sc, m, ...) \
+ do { if ((sc)->debug & (m)) \
+ device_printf(sc->sc_dev, __VA_ARGS__); } while (0)
#else
-#define RT2860_DPRINTF(sc, m, fmt, ...)
+#define RT2860_DPRINTF(sc, m, ...)
#endif /* #ifdef RT2860_DEBUG */
-#define RT2860_RXDESC_SDL0_DDONE (1 << 15)
-
-#define RT2860_RXDESC_FLAGS_LAST_AMSDU (1 << 19)
-#define RT2860_RXDESC_FLAGS_CIPHER_ALG (1 << 18)
-#define RT2860_RXDESC_FLAGS_PLCP_RSSIL (1 << 17)
-#define RT2860_RXDESC_FLAGS_DECRYPTED (1 << 16)
-#define RT2860_RXDESC_FLAGS_AMPDU (1 << 15)
-#define RT2860_RXDESC_FLAGS_L2PAD (1 << 14)
-#define RT2860_RXDESC_FLAGS_RSSI (1 << 13)
-#define RT2860_RXDESC_FLAGS_HTC (1 << 12)
-#define RT2860_RXDESC_FLAGS_AMSDU (1 << 11)
-#define RT2860_RXDESC_FLAGS_CRC_ERR (1 << 8)
-#define RT2860_RXDESC_FLAGS_MYBSS (1 << 7)
-#define RT2860_RXDESC_FLAGS_BCAST (1 << 6)
-#define RT2860_RXDESC_FLAGS_MCAST (1 << 5)
-#define RT2860_RXDESC_FLAGS_U2M (1 << 4)
-#define RT2860_RXDESC_FLAGS_FRAG (1 << 3)
-#define RT2860_RXDESC_FLAGS_NULL_DATA (1 << 2)
-#define RT2860_RXDESC_FLAGS_DATA (1 << 1)
-#define RT2860_RXDESC_FLAGS_BA (1 << 0)
-
-#define RT2860_RXDESC_FLAGS_CIPHER_ERR_SHIFT 9
-#define RT2860_RXDESC_FLAGS_CIPHER_ERR_MASK 0x3
-#define RT2860_RXDESC_FLAGS_CIPHER_ERR_NONE 0
-#define RT2860_RXDESC_FLAGS_CIPHER_ERR_ICV 1
-#define RT2860_RXDESC_FLAGS_CIPHER_ERR_MIC 2
-#define RT2860_RXDESC_FLAGS_CIPHER_ERR_INVALID_KEY 3
-
-#define RT2860_RXDESC_FLAGS_PLCP_SIGNAL_SHIFT 20
-#define RT2860_RXDESC_FLAGS_PLCP_SIGNAL_MASK 0xfff
-
-struct rt2860_rxdesc
-{
- uint32_t sdp0;
- uint16_t sdl1;
- uint16_t sdl0;
- uint32_t sdp1;
- uint32_t flags;
-} __packed;
-
-#define RT2860_TXDESC_SDL1_BURST (1 << 15)
-#define RT2860_TXDESC_SDL1_LASTSEG (1 << 14)
-
-#define RT2860_TXDESC_SDL0_DDONE (1 << 15)
-#define RT2860_TXDESC_SDL0_LASTSEG (1 << 14)
-
-#define RT2860_TXDESC_FLAGS_SHIFT 0
-#define RT2860_TXDESC_FLAGS_MASK 0xf9
-#define RT2860_TXDESC_FLAGS_WI_VALID (1 << 0)
-
-#define RT2860_TXDESC_QSEL_SHIFT 1
-#define RT2860_TXDESC_QSEL_MASK 0x3
-#define RT2860_TXDESC_QSEL_MGMT 0
-#define RT2860_TXDESC_QSEL_HCCA 1
-#define RT2860_TXDESC_QSEL_EDCA 2
-
-struct rt2860_txdesc
-{
- uint32_t sdp0;
- uint16_t sdl1;
- uint16_t sdl0;
- uint32_t sdp1;
- uint8_t reserved[3];
- uint8_t qsel_flags;
-} __packed;
-
-#define RT2860_TXWI_FLAGS_SHIFT 0
-#define RT2860_TXWI_FLAGS_MASK 0x1f
-#define RT2860_TXWI_FLAGS_AMPDU (1 << 4)
-#define RT2860_TXWI_FLAGS_TS (1 << 3)
-#define RT2860_TXWI_FLAGS_CFACK (1 << 2)
-#define RT2860_TXWI_FLAGS_MIMOPS (1 << 1)
-#define RT2860_TXWI_FLAGS_FRAG (1 << 0)
-
-#define RT2860_TXWI_MPDU_DENSITY_SHIFT 5
-#define RT2860_TXWI_MPDU_DENSITY_MASK 0x7
-
-#define RT2860_TXWI_TXOP_SHIFT 0
-#define RT2860_TXWI_TXOP_MASK 0x3
-#define RT2860_TXWI_TXOP_HT 0
-#define RT2860_TXWI_TXOP_PIFS 1
-#define RT2860_TXWI_TXOP_SIFS 2
-#define RT2860_TXWI_TXOP_BACKOFF 3
-
-#define RT2860_TXWI_MCS_SHIFT 0
-#define RT2860_TXWI_MCS_MASK 0x7f
-#define RT2860_TXWI_MCS_SHOTPRE (1 << 3)
-
-#define RT2860_TXWI_BW_SHIFT 7
-#define RT2860_TXWI_BW_MASK 0x1
-#define RT2860_TXWI_BW_20 0
-#define RT2860_TXWI_BW_40 1
-
-#define RT2860_TXWI_SHORTGI_SHIFT 0
-#define RT2860_TXWI_SHORTGI_MASK 0x1
-
-#define RT2860_TXWI_STBC_SHIFT 1
-#define RT2860_TXWI_STBC_MASK 0x3
-
-#define RT2860_TXWI_IFS_SHIFT 3
-#define RT2860_TXWI_IFS_MASK 0x1
-
-#define RT2860_TXWI_PHYMODE_SHIFT 6
-#define RT2860_TXWI_PHYMODE_MASK 0x3
-#define RT2860_TXWI_PHYMODE_CCK 0
-#define RT2860_TXWI_PHYMODE_OFDM 1
-#define RT2860_TXWI_PHYMODE_HT_MIXED 2
-#define RT2860_TXWI_PHYMODE_HT_GF 3
-
-#define RT2860_TXWI_XFLAGS_SHIFT 0
-#define RT2860_TXWI_XFLAGS_MASK 0x3
-#define RT2860_TXWI_XFLAGS_NSEQ (1 << 1)
-#define RT2860_TXWI_XFLAGS_ACK (1 << 0)
-
-#define RT2860_TXWI_BAWIN_SIZE_SHIFT 2
-#define RT2860_TXWI_BAWIN_SIZE_MASK 0x3f
-
-#define RT2860_TXWI_MPDU_LEN_SHIFT 0
-#define RT2860_TXWI_MPDU_LEN_MASK 0xfff
-
-#define RT2860_TXWI_PID_SHIFT 12
-#define RT2860_TXWI_PID_MASK 0xf
-
-struct rt2860_txwi
-{
- uint8_t mpdu_density_flags;
- uint8_t txop;
- uint8_t bw_mcs;
- uint8_t phymode_ifs_stbc_shortgi;
- uint8_t bawin_size_xflags;
- uint8_t wcid;
- uint16_t pid_mpdu_len;
- uint32_t iv;
- uint32_t eiv;
-} __packed;
-
-#define RT2860_RXWI_KEYIDX_SHIFT 0
-#define RT2860_RXWI_KEYIDX_MASK 0x3
-
-#define RT2860_RXWI_BSSIDX_SHIFT 2
-#define RT2860_RXWI_BSSIDX_MASK 0x7
-
-#define RT2860_RXWI_UDF_SHIFT 5
-#define RT2860_RXWI_UDF_MASK 0x7
-
-#define RT2860_RXWI_SIZE_SHIFT 0
-#define RT2860_RXWI_SIZE_MASK 0xfff
-
-#define RT2860_RXWI_TID_SHIFT 12
-#define RT2860_RXWI_TID_MASK 0xf
-
-#define RT2860_RXWI_FRAG_SHIFT 0
-#define RT2860_RXWI_FRAG_MASK 0xf
-
-#define RT2860_RXWI_SEQ_SHIFT 4
-#define RT2860_RXWI_SEQ_MASK 0xfff
-
-#define RT2860_RXWI_MCS_SHIFT 0
-#define RT2860_RXWI_MCS_MASK 0x7f
-#define RT2860_RXWI_MCS_SHOTPRE (1 << 3)
-
-#define RT2860_RXWI_BW_SHIFT 7
-#define RT2860_RXWI_BW_MASK 0x1
-#define RT2860_RXWI_BW_20 0
-#define RT2860_RXWI_BW_40 1
-
-#define RT2860_RXWI_SHORTGI_SHIFT 0
-#define RT2860_RXWI_SHORTGI_MASK 0x1
-
-#define RT2860_RXWI_STBC_SHIFT 1
-#define RT2860_RXWI_STBC_MASK 0x3
-
-#define RT2860_RXWI_PHYMODE_SHIFT 6
-#define RT2860_RXWI_PHYMODE_MASK 0x3
-#define RT2860_RXWI_PHYMODE_CCK 0
-#define RT2860_RXWI_PHYMODE_OFDM 1
-#define RT2860_RXWI_PHYMODE_HT_MIXED 2
-#define RT2860_RXWI_PHYMODE_HT_GF 3
-
-struct rt2860_rxwi
-{
- uint8_t wcid;
- uint8_t udf_bssidx_keyidx;
- uint16_t tid_size;
- uint16_t seq_frag;
- uint8_t bw_mcs;
- uint8_t phymode_stbc_shortgi;
- uint8_t rssi[3];
- uint8_t reserved1;
- uint8_t snr[2];
- uint16_t reserved2;
-} __packed;
-
-#define RT2860_AMRR_MIN_SUCCESS_THRESHOLD 1
-#define RT2860_AMRR_MAX_SUCCESS_THRESHOLD 15
+#define RT2860_AMRR_MIN_SUCCESS_THRESHOLD 1
+#define RT2860_AMRR_MAX_SUCCESS_THRESHOLD 15
struct rt2860_amrr
{
@@ -357,7 +132,7 @@
bus_dma_tag_t desc_dma_tag;
bus_dmamap_t desc_dma_map;
bus_addr_t desc_phys_addr;
- struct rt2860_rxdesc *desc;
+ struct rt2860_rxd *desc;
bus_dma_tag_t data_dma_tag;
bus_dmamap_t spare_dma_map;
struct rt2860_softc_rx_data data[RT2860_SOFTC_RX_RING_DATA_COUNT];
@@ -377,7 +152,7 @@
bus_dma_tag_t desc_dma_tag;
bus_dmamap_t desc_dma_map;
bus_addr_t desc_phys_addr;
- struct rt2860_txdesc *desc;
+ struct rt2860_txd *desc;
int desc_queued;
int desc_cur;
int desc_next;
@@ -409,8 +184,6 @@
struct ieee80211_beacon_offsets beacon_offsets;
struct mbuf *beacon_mbuf;
- struct rt2860_txwi beacon_txwi;
-
struct rt2860_amrr amrr;
int (*newstate)(struct ieee80211vap *vap,
@@ -569,7 +342,7 @@
struct task tx_done_task;
- struct task fifo_sta_full_task;
+ struct task fifo_stat_full_task;
struct task periodic_task;
struct callout periodic_ch;
@@ -594,7 +367,7 @@
unsigned long tx_coherent_interrupts;
unsigned long rx_coherent_interrupts;
unsigned long txrx_coherent_interrupts;
- unsigned long fifo_sta_full_interrupts;
+ unsigned long fifo_stat_full_interrupts;
unsigned long rx_interrupts;
unsigned long tx_interrupts[RT2860_SOFTC_TX_RING_COUNT];
@@ -653,67 +426,24 @@
#endif
};
-#define RT2860_EEPROM_VERSION 0x0002
-#define RT2860_EEPROM_ADDRESS01 0x0004
-#define RT2860_EEPROM_ADDRESS23 0x0006
-#define RT2860_EEPROM_ADDRESS45 0x0008
-#define RT2860_EEPROM_POWERSAVE_LEVEL 0x0022
-#define RT2860_EEPROM_ANTENNA 0x0034
-#define RT2860_EEPROM_NIC_CONFIG 0x0036
-#define RT2860_EEPROM_COUNTRY 0x0038
-#define RT2860_EEPROM_RF_FREQ_OFF 0x003a
-#define RT2860_EEPROM_LED1_OFF 0x003c
-#define RT2860_EEPROM_LED2_OFF 0x003e
-#define RT2860_EEPROM_LED3_OFF 0x0040
-#define RT2860_EEPROM_LNA_GAIN 0x0044
-#define RT2860_EEPROM_RSSI_OFF_2GHZ_BASE 0x0046
-#define RT2860_EEPROM_RSSI2_OFF_2GHZ_BASE 0x0048
-#define RT2860_EEPROM_RSSI_OFF_5GHZ_BASE 0x004a
-#define RT2860_EEPROM_RSSI2_OFF_5GHZ_BASE 0x004c
-#define RT2860_EEPROM_TXPOW_RATE_DELTA 0x0050
-#define RT2860_EEPROM_TXPOW1_2GHZ_BASE 0x0052
-#define RT2860_EEPROM_TXPOW2_2GHZ_BASE 0x0060
-#define RT2860_EEPROM_TSSI_2GHZ_BASE 0x006e
-#define RT2860_EEPROM_TXPOW1_5GHZ_BASE 0x0078
-#define RT2860_EEPROM_TXPOW2_5GHZ_BASE 0x00a6
-#define RT2860_EEPROM_TSSI_5GHZ_BASE 0x00d4
-#define RT2860_EEPROM_TXPOW_RATE_BASE 0x00de
-#define RT2860_EEPROM_BBP_BASE 0x00f0
-#define RT3071_EEPROM_RF_BASE 0x0082
-
-#define RT2860_EEPROM_RF_2820 1 /* 2.4GHz 2T3R */
-#define RT2860_EEPROM_RF_2850 2 /* 2.4/5GHz 2T3R */
-#define RT2860_EEPROM_RF_2720 3 /* 2.4GHz 1T2R */
-#define RT2860_EEPROM_RF_2750 4 /* 2.4G/5GHz 1T2R */
-#define RT2860_EEPROM_RF_3020 5 /* 2.4G 1T1R */
-#define RT2860_EEPROM_RF_2020 6 /* 2.4G B/G */
-#define RT2860_EEPROM_RF_3021 7 /* 2.4G 1T2R */
-#define RT2860_EEPROM_RF_3022 8 /* 2.4G 2T2R */
-#define RT2860_EEPROM_RF_3052 9 /* 2.4G/5G 2T2R */
-#define RT2860_EEPROM_RF_2853 10 /* 2.4G.5G 3T3R */
-#define RT2860_EEPROM_RF_3320 11 /* 2.4G 1T1R with PA (RT3350/RT3370/RT3390) */
-#define RT2860_EEPROM_RF_3322 12 /* 2.4G 2T2R with PA (RT3352/RT3371/RT3372/RT3391/RT3392) */
-#define RT2860_EEPROM_RF_3053 13 /* 2.4G/5G 3T3R (RT3883/RT3563/RT3573/RT3593/RT3662) */
-#define RT2860_EEPROM_RF_3853 13 /* 2.4G/5G 3T3R (RT3883/RT3563/RT3573/RT3593/RT3662) */
-
/*
* RT2860_EEPROM_NIC_CONFIG flags
*/
-#define RT2860_EEPROM_EXT_LNA_5GHZ (1 << 3)
-#define RT2860_EEPROM_EXT_LNA_2GHZ (1 << 2)
-#define RT2860_EEPROM_TX_AGC_CNTL (1 << 1)
-#define RT2860_EEPROM_HW_RADIO_CNTL (1 << 0)
+#define RT2860_EEPROM_EXT_LNA_5GHZ (1 << 3)
+#define RT2860_EEPROM_EXT_LNA_2GHZ (1 << 2)
+#define RT2860_EEPROM_TX_AGC_CNTL (1 << 1)
+#define RT2860_EEPROM_HW_RADIO_CNTL (1 << 0)
-#define RT2860_EEPROM_LED_POLARITY (1 << 7)
-#define RT2860_EEPROM_LED_MODE_MASK 0x7f
+#define RT2860_EEPROM_LED_POLARITY (1 << 7)
+#define RT2860_EEPROM_LED_MODE_MASK 0x7f
#define RT2860_EEPROM_LED_CNTL_DEFAULT 0x01
#define RT2860_EEPROM_LED1_OFF_DEFAULT 0x5555
#define RT2860_EEPROM_LED2_OFF_DEFAULT 0x2221
#define RT2860_EEPROM_LED3_OFF_DEFAULT 0xa9f8
-#define RT2860_EEPROM_RSSI_OFF_MIN -10
-#define RT2860_EEPROM_RSSI_OFF_MAX 10
+#define RT2860_EEPROM_RSSI_OFF_MIN -10
+#define RT2860_EEPROM_RSSI_OFF_MAX 10
#define RT2860_EEPROM_TXPOW_2GHZ_MIN 0
#define RT2860_EEPROM_TXPOW_2GHZ_MAX 31
@@ -734,10 +464,10 @@
#define RT2860_IO_MCU_CMD_BBP 0x80
#define RT2860_IO_MCU_CMD_POWERSAVE_LEVEL 0x83
-#define RT2860_LED_CMD_RADIO_OFF 0
-#define RT2860_LED_CMD_RADIO_ON (1 << 5)
-#define RT2860_LED_CMD_LINK_2GHZ (1 << 6)
-#define RT2860_LED_CMD_LINK_5GHZ (1 << 7)
+#define RT2860_LED_CMD_RADIO_OFF 0
+#define RT2860_LED_CMD_RADIO_ON (1 << 5)
+#define RT2860_LED_CMD_LINK_2GHZ (1 << 6)
+#define RT2860_LED_CMD_LINK_5GHZ (1 << 7)
/*
* Global function prototypes, used in bus depended interfaces
@@ -749,7 +479,3 @@
void rt2860_suspend(void *);
void rt2860_resume(void *);
void rt2860_intr(void *arg);
-
-
-#endif /* #ifndef _RT2860VAR_H_ */
-
More information about the Zrouter-src-freebsd
mailing list