Page MenuHomeFreeBSD

D61928.1795473600.diff
No OneTemporary

Authored By
Unknown
Size
10 KB
Referenced Files
None
Subscribers
None

D61928.1795473600.diff

diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c
--- a/sys/dev/rtwn/if_rtwn.c
+++ b/sys/dev/rtwn/if_rtwn.c
@@ -1511,7 +1511,6 @@
if (res != 0) \
return (EIO); \
} while(0)
- uint16_t reg;
uint8_t tx_boundary;
int error;
@@ -1555,9 +1554,9 @@
/* Set queue to USB pipe mapping. */
/* Note: PCIe devices are using some magic number here. */
- reg = rtwn_get_qmap(sc);
- RTWN_CHK(rtwn_setbits_2(sc, R92C_TRXDMA_CTRL,
- R92C_TRXDMA_CTRL_QMAP_M, reg));
+ error = rtwn_set_qmap(sc);
+ if (error != 0)
+ return (error);
/* Configure Tx/Rx DMA (PCIe). */
rtwn_set_desc_addr(sc);
diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h
--- a/sys/dev/rtwn/if_rtwnvar.h
+++ b/sys/dev/rtwn/if_rtwnvar.h
@@ -279,7 +279,7 @@
void (*sc_abort_xfers)(struct rtwn_softc *);
int (*sc_fw_write_block)(struct rtwn_softc *,
const uint8_t *, uint16_t, int);
- uint16_t (*sc_get_qmap)(struct rtwn_softc *);
+ int (*sc_set_qmap)(struct rtwn_softc *);
void (*sc_set_desc_addr)(struct rtwn_softc *);
void (*sc_drop_incorrect_tx)(struct rtwn_softc *);
void (*sc_beacon_update_begin)(struct rtwn_softc *,
@@ -466,8 +466,8 @@
(((_sc)->sc_abort_xfers)((_sc)))
#define rtwn_fw_write_block(_sc, _buf, _reg, _len) \
(((_sc)->sc_fw_write_block)((_sc), (_buf), (_reg), (_len)))
-#define rtwn_get_qmap(_sc) \
- (((_sc)->sc_get_qmap)((_sc)))
+#define rtwn_set_qmap(_sc) \
+ (((_sc)->sc_set_qmap)((_sc)))
#define rtwn_set_desc_addr(_sc) \
(((_sc)->sc_set_desc_addr)((_sc)))
#define rtwn_drop_incorrect_tx(_sc) \
diff --git a/sys/dev/rtwn/pci/rtwn_pci_attach.c b/sys/dev/rtwn/pci/rtwn_pci_attach.c
--- a/sys/dev/rtwn/pci/rtwn_pci_attach.c
+++ b/sys/dev/rtwn/pci/rtwn_pci_attach.c
@@ -80,7 +80,6 @@
struct ieee80211vap *);
static int rtwn_pci_fw_write_block(struct rtwn_softc *,
const uint8_t *, uint16_t, int);
-static uint16_t rtwn_pci_get_qmap(struct rtwn_softc *);
static void rtwn_pci_set_desc_addr(struct rtwn_softc *);
static void rtwn_pci_beacon_update_begin(struct rtwn_softc *,
struct ieee80211vap *);
@@ -499,16 +498,6 @@
return (0);
}
-static uint16_t
-rtwn_pci_get_qmap(struct rtwn_softc *sc)
-{
- struct rtwn_pci_softc *pc = RTWN_PCI_SOFTC(sc);
-
- KASSERT(pc->pc_qmap != 0, ("%s: qmap is not set!\n", __func__));
-
- return (pc->pc_qmap);
-}
-
static void
rtwn_pci_set_desc_addr(struct rtwn_softc *sc)
{
@@ -584,7 +573,6 @@
sc->sc_reset_lists = rtwn_pci_reset_lists;
sc->sc_abort_xfers = rtwn_nop_softc;
sc->sc_fw_write_block = rtwn_pci_fw_write_block;
- sc->sc_get_qmap = rtwn_pci_get_qmap;
sc->sc_set_desc_addr = rtwn_pci_set_desc_addr;
sc->sc_drop_incorrect_tx = rtwn_nop_softc;
sc->sc_beacon_update_begin = rtwn_pci_beacon_update_begin;
diff --git a/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c b/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c
--- a/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c
+++ b/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c
@@ -194,6 +194,7 @@
sc->sc_init_rf = r92c_init_rf;
sc->sc_init_antsel = rtwn_nop_softc;
sc->sc_post_init = r88ee_post_init;
+ sc->sc_set_qmap = r92ce_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92c_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c b/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
--- a/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
+++ b/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
@@ -187,6 +187,7 @@
sc->sc_init_rf = r92c_init_rf;
sc->sc_init_antsel = rtwn_nop_softc;
sc->sc_post_init = r88eu_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92c_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8188f/usb/r88fu_attach.c b/sys/dev/rtwn/rtl8188f/usb/r88fu_attach.c
--- a/sys/dev/rtwn/rtl8188f/usb/r88fu_attach.c
+++ b/sys/dev/rtwn/rtl8188f/usb/r88fu_attach.c
@@ -208,6 +208,7 @@
sc->sc_init_rf = r88f_init_rf;
sc->sc_init_antsel = r23b_init_antsel;
sc->sc_post_init = r88fu_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92c_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce.h b/sys/dev/rtwn/rtl8192c/pci/r92ce.h
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce.h
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce.h
@@ -52,6 +52,7 @@
void r92ce_power_off(struct rtwn_softc *);
void r92ce_init_ampdu(struct rtwn_softc *);
void r92ce_post_init(struct rtwn_softc *);
+int r92ce_set_qmap(struct rtwn_softc *);
/* r92ce_led.c */
void r92ce_set_led(struct rtwn_softc *, int, int);
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c b/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
@@ -224,6 +224,7 @@
sc->sc_init_rf = r92c_init_rf;
sc->sc_init_antsel = rtwn_nop_softc;
sc->sc_post_init = r92ce_post_init;
+ sc->sc_set_qmap = r92ce_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92c_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c b/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
@@ -318,3 +318,13 @@
#endif
sc->sc_ratectl = RTWN_RATECTL_NONE;
}
+
+int
+r92ce_set_qmap(struct rtwn_softc *sc)
+{
+ struct rtwn_pci_softc *pc = RTWN_PCI_SOFTC(sc);
+
+ KASSERT(pc->pc_qmap != 0, ("%s: qmap is not set!\n", __func__));
+
+ return (rtwn_write_2(sc, R92C_TRXDMA_CTRL, pc->pc_qmap));
+}
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu.h b/sys/dev/rtwn/rtl8192c/usb/r92cu.h
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu.h
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu.h
@@ -39,6 +39,7 @@
void r92cu_init_tx_agg(struct rtwn_softc *);
void r92cu_init_rx_agg(struct rtwn_softc *);
void r92cu_post_init(struct rtwn_softc *);
+int r92cu_set_qmap(struct rtwn_softc *);
/* r92cu_led.c */
void r92cu_set_led(struct rtwn_softc *, int, int);
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c b/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
@@ -216,6 +216,7 @@
sc->sc_init_rf = r92c_init_rf;
sc->sc_init_antsel = r92c_init_antsel;
sc->sc_post_init = r92cu_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92c_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c b/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
@@ -382,3 +382,21 @@
#endif
sc->sc_ratectl = RTWN_RATECTL_NONE;
}
+
+int
+r92cu_set_qmap(struct rtwn_softc *sc)
+{
+ struct rtwn_usb_softc *uc = RTWN_USB_SOFTC(sc);
+
+ switch (uc->ntx) {
+ case 1:
+ return (rtwn_write_2(sc, R92C_TRXDMA_CTRL,
+ R92C_TRXDMA_CTRL_QMAP_HQ));
+ case 2:
+ return (rtwn_write_2(sc, R92C_TRXDMA_CTRL,
+ R92C_TRXDMA_CTRL_QMAP_HQ_NQ));
+ default:
+ return (rtwn_write_2(sc, R92C_TRXDMA_CTRL,
+ R92C_TRXDMA_CTRL_QMAP_3EP));
+ }
+}
diff --git a/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c b/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
--- a/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
+++ b/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
@@ -167,6 +167,7 @@
sc->sc_init_rf = r92e_init_rf;
sc->sc_init_antsel = rtwn_nop_softc;
sc->sc_post_init = r92eu_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92e_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8723b/usb/r23bu_attach.c b/sys/dev/rtwn/rtl8723b/usb/r23bu_attach.c
--- a/sys/dev/rtwn/rtl8723b/usb/r23bu_attach.c
+++ b/sys/dev/rtwn/rtl8723b/usb/r23bu_attach.c
@@ -152,6 +152,7 @@
sc->sc_init_rf = r23b_init_rf;
sc->sc_init_antsel = r23b_init_antsel;
sc->sc_post_init = r23b_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = r92e_set_tx_power;
diff --git a/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c b/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
--- a/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
+++ b/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
@@ -268,6 +268,7 @@
sc->sc_init_rf = r12a_init_rf;
sc->sc_init_antsel = r12a_init_antsel;
sc->sc_post_init = r12au_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = rtwn_nop_int_softc;
sc->sc_set_tx_power = rtwn_nop_int_softc_vap;
diff --git a/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c b/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
--- a/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
+++ b/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
@@ -55,6 +55,7 @@
#include <dev/rtwn/usb/rtwn_usb_var.h>
#include <dev/rtwn/rtl8192c/r92c.h>
+#include <dev/rtwn/rtl8192c/usb/r92cu.h>
#include <dev/rtwn/rtl8188e/r88e.h>
@@ -252,6 +253,7 @@
sc->sc_init_rf = r12a_init_rf;
sc->sc_init_antsel = r12a_init_antsel;
sc->sc_post_init = r12au_post_init;
+ sc->sc_set_qmap = r92cu_set_qmap;
sc->sc_init_bcnq1_boundary = r21a_init_bcnq1_boundary;
sc->sc_set_tx_power = rtwn_nop_int_softc_vap;
diff --git a/sys/dev/rtwn/usb/rtwn_usb_attach.c b/sys/dev/rtwn/usb/rtwn_usb_attach.c
--- a/sys/dev/rtwn/usb/rtwn_usb_attach.c
+++ b/sys/dev/rtwn/usb/rtwn_usb_attach.c
@@ -348,7 +348,6 @@
sc->sc_reset_lists = rtwn_usb_reset_lists;
sc->sc_abort_xfers = rtwn_usb_abort_xfers;
sc->sc_fw_write_block = rtwn_usb_fw_write_block;
- sc->sc_get_qmap = rtwn_usb_get_qmap;
sc->sc_set_desc_addr = rtwn_nop_softc;
sc->sc_drop_incorrect_tx = rtwn_usb_drop_incorrect_tx;
sc->sc_beacon_update_begin = rtwn_nop_softc_vap;
diff --git a/sys/dev/rtwn/usb/rtwn_usb_ep.h b/sys/dev/rtwn/usb/rtwn_usb_ep.h
--- a/sys/dev/rtwn/usb/rtwn_usb_ep.h
+++ b/sys/dev/rtwn/usb/rtwn_usb_ep.h
@@ -19,6 +19,5 @@
int rtwn_usb_setup_endpoints(struct rtwn_usb_softc *,
const uint8_t iface_index);
-uint16_t rtwn_usb_get_qmap(struct rtwn_softc *);
#endif /* IF_RTWN_EP_H */
diff --git a/sys/dev/rtwn/usb/rtwn_usb_ep.c b/sys/dev/rtwn/usb/rtwn_usb_ep.c
--- a/sys/dev/rtwn/usb/rtwn_usb_ep.c
+++ b/sys/dev/rtwn/usb/rtwn_usb_ep.c
@@ -250,18 +250,3 @@
return (0);
}
-
-uint16_t
-rtwn_usb_get_qmap(struct rtwn_softc *sc)
-{
- struct rtwn_usb_softc *uc = RTWN_USB_SOFTC(sc);
-
- switch (uc->ntx) {
- case 1:
- return (R92C_TRXDMA_CTRL_QMAP_HQ);
- case 2:
- return (R92C_TRXDMA_CTRL_QMAP_HQ_NQ);
- default:
- return (R92C_TRXDMA_CTRL_QMAP_3EP);
- }
-}

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 23, 10:40 PM (23 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41941510
Default Alt Text
D61928.1795473600.diff (10 KB)

Event Timeline