Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177869468
D61929.1795473904.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
9 KB
Referenced Files
None
Subscribers
None
D61929.1795473904.diff
View Options
diff --git a/sys/dev/rtwn/if_rtwn_fw.c b/sys/dev/rtwn/if_rtwn_fw.c
--- a/sys/dev/rtwn/if_rtwn_fw.c
+++ b/sys/dev/rtwn/if_rtwn_fw.c
@@ -65,7 +65,7 @@
rtwn_write_4(sc, R92C_MCUFWDL, reg);
error = 0;
- off = R92C_FW_START_ADDR;
+ off = sc->fw_start_addr;
while (len > 0) {
if (len > R92C_FW_MAX_BLOCK_SIZE)
mlen = R92C_FW_MAX_BLOCK_SIZE;
@@ -215,6 +215,10 @@
error = ETIMEDOUT;
goto fail;
}
+
+ error = rtwn_fw_write_finish(sc);
+ if (error)
+ goto fail;
fail:
firmware_put(fw, FIRMWARE_UNLOAD);
return (error);
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
@@ -253,6 +253,7 @@
uint16_t fwver;
uint16_t fwsig;
int fwcur;
+ uint16_t fw_start_addr;
void (*sc_node_free)(struct ieee80211_node *);
void (*sc_scan_curchan)(struct ieee80211_scan_state *,
@@ -306,7 +307,9 @@
#ifndef RTWN_WITHOUT_UCODE
void (*sc_fw_reset)(struct rtwn_softc *, int);
void (*sc_fw_download_enable)(struct rtwn_softc *, int);
+ int (*sc_fw_write_finish)(struct rtwn_softc *);
#endif
+
int (*sc_llt_init)(struct rtwn_softc *);
void (*sc_enable_mac_txrx)(struct rtwn_softc *);
int (*sc_set_page_size)(struct rtwn_softc *);
@@ -466,6 +469,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_fw_write_finish(_sc) \
+ (((_sc)->sc_fw_write_finish)((_sc)))
#define rtwn_get_qmap(_sc) \
(((_sc)->sc_get_qmap)((_sc)))
#define rtwn_set_desc_addr(_sc) \
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
@@ -44,6 +44,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/pci/rtwn_pci_var.h>
@@ -160,6 +161,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r88e_fw_reset;
sc->sc_fw_download_enable = r88e_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92c_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
@@ -208,6 +210,7 @@
sc->name = "RTL8188EE";
sc->fwname = "rtwn-rtl8188eefw";
sc->fwsig = 0x88e;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->page_count = R88EE_TX_PAGE_COUNT;
sc->pktbuf_count = R88E_TXPKTBUF_COUNT;
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
@@ -44,6 +44,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -153,6 +154,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r88e_fw_reset;
sc->sc_fw_download_enable = r88e_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92c_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
@@ -201,6 +203,7 @@
sc->name = "RTL8188EU";
sc->fwname = "rtwn-rtl8188eufw";
sc->fwsig = 0x88e;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->page_count = R88EU_TX_PAGE_COUNT;
sc->pktbuf_count = R88E_TXPKTBUF_COUNT;
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
@@ -45,6 +45,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -174,6 +175,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r88f_fw_reset;
sc->sc_fw_download_enable = r88f_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r88f_llt_init;
sc->sc_enable_mac_txrx = r88fu_enable_mac_txrx;
@@ -222,6 +224,7 @@
sc->name = "RTL8188FTV";
sc->fwname = "rtwn-rtl8188fufw";
sc->fwsig = 0x88f;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->ackto = 0x40;
sc->npubqpages = R88EU_PUBQ_NPAGES;
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
@@ -48,6 +48,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/pci/rtwn_pci_var.h>
@@ -81,6 +82,7 @@
else
sc->fwname = "rtwn-rtl8192cfwE_B";
sc->fwsig = 0x88c;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
rs->rs_scan_start = ic->ic_scan_start;
ic->ic_scan_start = r92c_scan_start;
@@ -190,6 +192,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r92ce_fw_reset;
sc->sc_fw_download_enable = r92c_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92c_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
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
@@ -44,6 +44,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -83,6 +84,7 @@
sc->fwname = "rtwn-rtl8192cfwT";
}
sc->fwsig = 0x88c;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
rs->rs_scan_start = ic->ic_scan_start;
ic->ic_scan_start = r92c_scan_start;
@@ -182,6 +184,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r92c_fw_reset;
sc->sc_fw_download_enable = r92c_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92c_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
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
@@ -44,6 +44,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -131,6 +132,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r92e_fw_reset;
sc->sc_fw_download_enable = r12a_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92e_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
@@ -181,6 +183,7 @@
sc->name = "RTL8192EU";
sc->fwname = "rtwn-rtl8192eufw";
sc->fwsig = 0x92e;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->page_count = R92E_TX_PAGE_COUNT;
sc->pktbuf_count = 0; /* Unused */
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
@@ -27,6 +27,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -116,6 +117,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r23b_fw_reset;
sc->sc_fw_download_enable = r23b_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92e_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
@@ -166,6 +168,7 @@
sc->name = "RTL8723BU";
sc->fwname = "rtwn-rtl8723bufw";
sc->fwsig = 0x530;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->page_count = R23B_TX_PAGE_COUNT;
sc->pktbuf_count = 0; /* Unused */
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
@@ -55,6 +55,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -232,6 +233,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r12a_fw_reset;
sc->sc_fw_download_enable = r12a_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92c_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
@@ -289,6 +291,7 @@
sc->name = "RTL8812AU";
sc->fwname = "rtwn-rtl8812aufw";
sc->fwsig = 0x950;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->page_count = R12A_TX_PAGE_COUNT;
sc->pktbuf_count = R12A_TXPKTBUF_COUNT;
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
@@ -50,6 +50,7 @@
#include <dev/rtwn/if_rtwnreg.h>
#include <dev/rtwn/if_rtwnvar.h>
+#include <dev/rtwn/if_rtwn_fw.h>
#include <dev/rtwn/if_rtwn_nop.h>
#include <dev/rtwn/usb/rtwn_usb_var.h>
@@ -216,6 +217,7 @@
#ifndef RTWN_WITHOUT_UCODE
sc->sc_fw_reset = r21a_fw_reset;
sc->sc_fw_download_enable = r12a_fw_download_enable;
+ sc->sc_fw_write_finish = rtwn_nop_int_softc;
#endif
sc->sc_llt_init = r92c_llt_init;
sc->sc_enable_mac_txrx = rtwn_nop_softc;
@@ -273,6 +275,7 @@
sc->name = "RTL8821AU";
sc->fwname = "rtwn-rtl8821aufw";
sc->fwsig = 0x210;
+ sc->fw_start_addr = R92C_FW_START_ADDR;
sc->page_count = R21A_TX_PAGE_COUNT;
sc->pktbuf_count = R12A_TXPKTBUF_COUNT;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 23, 10:45 PM (23 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41941527
Default Alt Text
D61929.1795473904.diff (9 KB)
Attached To
Mode
D61929: rtwn: add sc_start_addr field and rtwn_fw_write_finish method
Attached
Detach File
Event Timeline