Staging: updates for Ralink drivers
cover Staging: updates for Ralink drivers
Hi,
Here are some major updates to Ralink drivers from the staging tree.
rt28x0 drivers are updated to match V2.1.0.0 vendor's drivers, rt2860 driver gets RT3090 PCIe chipset support and no longer needed separate rt3090 driver is removed.
The end result is 100 KLOC gone and shared common code for all chipsets.
The patchset was tested with RT2860 and RT3070 chipsets.
patches:
#1-4: update rt3090 driver to match other Ralink drivers
#5: port changes from vendor's V2.1.0.0 rt28x0 drivers #6: remove unused DFS code from rt2x00 drivers #7: add RT3090 PCIe chipset support to rt2860 driver #8: remove no longer needed rt3090 driver
diffstat:
drivers/staging/Kconfig | 2 drivers/staging/Makefile | 1 drivers/staging/rt2860/2860_main_dev.c | 1319 --- drivers/staging/rt2860/Kconfig | 5 drivers/staging/rt2860/Makefile | 33 drivers/staging/rt2860/aironet.h | 210 drivers/staging/rt2860/ap.h | 12 drivers/staging/rt2860/chip/mac_pci.h | 377 drivers/staging/rt2860/chip/mac_usb.h | 365 drivers/staging/rt2860/chip/rt2860.h | 56 drivers/staging/rt2860/chip/rt2870.h | 47 drivers/staging/rt2860/chip/rt3070.h | 68 drivers/staging/rt2860/chip/rt3090.h | 72 drivers/staging/rt2860/chip/rt30xx.h | 48 drivers/staging/rt2860/chip/rtmp_mac.h | 1334 +++ drivers/staging/rt2860/chip/rtmp_phy.h | 588 + drivers/staging/rt2860/chips/rt3070.c | 185 drivers/staging/rt2860/chips/rt3090.c | 123 drivers/staging/rt2860/chips/rt30xx.c | 537 + drivers/staging/rt2860/chlist.h | 1215 -- drivers/staging/rt2860/common/2860_rtmp_init.c | 897 -- drivers/staging/rt2860/common/action.c | 12 drivers/staging/rt2860/common/ba_action.c | 147 drivers/staging/rt2860/common/cmm_aes.c | 1404 +++ drivers/staging/rt2860/common/cmm_asic.c | 2560 ++++++ drivers/staging/rt2860/common/cmm_cfg.c | 290 drivers/staging/rt2860/common/cmm_data.c | 906 -- drivers/staging/rt2860/common/cmm_data_2860.c | 1197 -- drivers/staging/rt2860/common/cmm_data_pci.c | 1159 ++ drivers/staging/rt2860/common/cmm_data_usb.c | 968 ++ drivers/staging/rt2860/common/cmm_info.c | 822 + drivers/staging/rt2860/common/cmm_mac_pci.c | 1759 ++++ drivers/staging/rt2860/common/cmm_mac_usb.c | 1216 ++ drivers/staging/rt2860/common/cmm_profile.c | 1779 ++++ drivers/staging/rt2860/common/cmm_sanity.c | 233 drivers/staging/rt2860/common/cmm_sync.c | 83 drivers/staging/rt2860/common/cmm_tkip.c | 882 ++ drivers/staging/rt2860/common/cmm_wep.c | 499 + drivers/staging/rt2860/common/cmm_wpa.c | 3332 ++++++- drivers/staging/rt2860/common/crypt_hmac.c | 279 drivers/staging/rt2860/common/crypt_md5.c | 352 drivers/staging/rt2860/common/crypt_sha2.c | 535 + drivers/staging/rt2860/common/dfs.c | 444 - drivers/staging/rt2860/common/ee_efuse.c | 1525 +++ drivers/staging/rt2860/common/ee_prom.c | 270 drivers/staging/rt2860/common/eeprom.c | 1462 --- drivers/staging/rt2860/common/firmware.h | 2 drivers/staging/rt2860/common/firmware_3070.h | 517 + drivers/staging/rt2860/common/md5.c | 1415 --- drivers/staging/rt2860/common/mlme.c | 9620 ++++++++--------------- drivers/staging/rt2860/common/rt_channel.c | 1280 +++ drivers/staging/rt2860/common/rt_rf.c | 202 drivers/staging/rt2860/common/rtmp_init.c | 2042 ++-- drivers/staging/rt2860/common/rtmp_mcu.c | 331 drivers/staging/rt2860/common/rtmp_timer.c | 327 drivers/staging/rt2860/common/rtmp_tkip.c | 1586 --- drivers/staging/rt2860/common/rtmp_wep.c | 497 - drivers/staging/rt2860/common/spectrum.c | 460 - drivers/staging/rt2860/config.mk | 241 drivers/staging/rt2860/crypt_hmac.h | 82 drivers/staging/rt2860/crypt_md5.h | 80 drivers/staging/rt2860/crypt_sha2.h | 109 drivers/staging/rt2860/dfs.h | 107 drivers/staging/rt2860/eeprom.h | 93 drivers/staging/rt2860/iface/rtmp_pci.h | 85 drivers/staging/rt2860/iface/rtmp_usb.h | 200 drivers/staging/rt2860/md5.h | 107 drivers/staging/rt2860/mlme.h | 89 drivers/staging/rt2860/oid.h | 135 drivers/staging/rt2860/pci_main_dev.c | 1258 ++- drivers/staging/rt2860/rt2860.h | 333 drivers/staging/rt2860/rt28xx.h | 1688 ---- drivers/staging/rt2860/rt_config.h | 32 drivers/staging/rt2860/rt_linux.c | 618 + drivers/staging/rt2860/rt_linux.h | 979 +- drivers/staging/rt2860/rt_main_dev.c | 767 - drivers/staging/rt2860/rt_pci_rbus.c | 881 ++ drivers/staging/rt2860/rt_profile.c | 1839 ---- drivers/staging/rt2860/rt_usb.c | 828 + drivers/staging/rt2860/rtmp.h | 2943 ++----- drivers/staging/rt2860/rtmp_chip.h | 268 drivers/staging/rt2860/rtmp_def.h | 294 drivers/staging/rt2860/rtmp_dot11.h | 102 drivers/staging/rt2860/rtmp_iface.h | 84 drivers/staging/rt2860/rtmp_mcu.h | 55 drivers/staging/rt2860/rtmp_os.h | 98 drivers/staging/rt2860/rtmp_timer.h | 156 drivers/staging/rt2860/rtmp_type.h | 55 drivers/staging/rt2860/rtusb_io.h | 189 drivers/staging/rt2860/spectrum.h | 169 drivers/staging/rt2860/spectrum_def.h | 148 drivers/staging/rt2860/sta/aironet.c | 1312 --- drivers/staging/rt2860/sta/assoc.c | 339 drivers/staging/rt2860/sta/auth.c | 138 drivers/staging/rt2860/sta/auth_rsp.c | 20 drivers/staging/rt2860/sta/connect.c | 827 - drivers/staging/rt2860/sta/rtmp_data.c | 258 drivers/staging/rt2860/sta/sanity.c | 44 drivers/staging/rt2860/sta/sync.c | 424 - drivers/staging/rt2860/sta/wpa.c | 2042 ---- drivers/staging/rt2860/sta_ioctl.c | 768 + drivers/staging/rt2860/usb_main_dev.c | 897 ++ drivers/staging/rt2860/wpa.h | 111 drivers/staging/rt2870/2870_main_dev.c | 1530 --- drivers/staging/rt2870/Makefile | 32 drivers/staging/rt2870/chips/rt3070.c | 1 drivers/staging/rt2870/chips/rt30xx.c | 1 drivers/staging/rt2870/common/2870_rtmp_init.c | 1730 ---- drivers/staging/rt2870/common/acction.c | 1 drivers/staging/rt2870/common/cmm_aes.c | 1 drivers/staging/rt2870/common/cmm_asic.c | 1 drivers/staging/rt2870/common/cmm_cfg.c | 1 drivers/staging/rt2870/common/cmm_data_2870.c | 936 -- drivers/staging/rt2870/common/cmm_data_usb.c | 1 drivers/staging/rt2870/common/cmm_mac_usb.c | 1 drivers/staging/rt2870/common/cmm_profile.c | 1 drivers/staging/rt2870/common/cmm_tkip.c | 1 drivers/staging/rt2870/common/cmm_wep.c | 1 drivers/staging/rt2870/common/crypt_hmac.c | 1 drivers/staging/rt2870/common/crypt_md5.c | 1 drivers/staging/rt2870/common/crypt_sha2.c | 1 drivers/staging/rt2870/common/ee_efuse.c | 1 drivers/staging/rt2870/common/rt_channel.c | 1 drivers/staging/rt2870/common/rt_rf.c | 1 drivers/staging/rt2870/common/rtmp_mcu.c | 1 drivers/staging/rt2870/common/rtmp_timer.c | 1 drivers/staging/rt2870/common/rtusb_bulk.c | 37 drivers/staging/rt2870/common/rtusb_data.c | 55 drivers/staging/rt2870/common/rtusb_io.c | 465 - drivers/staging/rt2870/rt2870.h | 583 - drivers/staging/rt2870/rt_usb.c | 1 drivers/staging/rt2870/usb_main_dev.c | 1 drivers/staging/rt3070/firmware.h | 2 drivers/staging/rt3090/Kconfig | 5 drivers/staging/rt3090/Makefile | 80 drivers/staging/rt3090/action.h | 66 drivers/staging/rt3090/ap.h | 512 - drivers/staging/rt3090/ap_apcli.h | 276 drivers/staging/rt3090/ap_autoChSel.h | 79 drivers/staging/rt3090/ap_autoChSel_cmm.h | 66 drivers/staging/rt3090/ap_cfg.h | 118 drivers/staging/rt3090/ap_ids.h | 82 drivers/staging/rt3090/ap_mbss.h | 72 drivers/staging/rt3090/ap_uapsd.h | 636 - drivers/staging/rt3090/ap_wds.h | 212 drivers/staging/rt3090/chips/rt3090.c | 123 drivers/staging/rt3090/chips/rt30xx.c | 525 - drivers/staging/rt3090/chips/rt3370.c | 121 drivers/staging/rt3090/chips/rt3390.c | 122 drivers/staging/rt3090/chips/rt33xx.c | 536 - drivers/staging/rt3090/chlist.h | 130 drivers/staging/rt3090/common/action.c | 1057 -- drivers/staging/rt3090/common/ba_action.c | 1779 ---- drivers/staging/rt3090/common/cmm_aes.c | 1560 --- drivers/staging/rt3090/common/cmm_asic.c | 2753 ------ drivers/staging/rt3090/common/cmm_cfg.c | 295 drivers/staging/rt3090/common/cmm_data.c | 2763 ------ drivers/staging/rt3090/common/cmm_data_pci.c | 1576 --- drivers/staging/rt3090/common/cmm_info.c | 3717 -------- drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 ---- drivers/staging/rt3090/common/cmm_profile.c | 2321 ----- drivers/staging/rt3090/common/cmm_sanity.c | 1718 ---- drivers/staging/rt3090/common/cmm_sync.c | 734 - drivers/staging/rt3090/common/cmm_tkip.c | 966 -- drivers/staging/rt3090/common/cmm_wep.c | 500 - drivers/staging/rt3090/common/cmm_wpa.c | 3149 ------- drivers/staging/rt3090/common/crypt_aes.c | 1007 -- drivers/staging/rt3090/common/crypt_biginteger.c | 1119 -- drivers/staging/rt3090/common/crypt_dh.c | 234 drivers/staging/rt3090/common/crypt_hmac.c | 279 drivers/staging/rt3090/common/crypt_md5.c | 353 drivers/staging/rt3090/common/crypt_sha2.c | 536 - drivers/staging/rt3090/common/dfs.c | 481 - drivers/staging/rt3090/common/ee_efuse.c | 1548 --- drivers/staging/rt3090/common/ee_prom.c | 308 drivers/staging/rt3090/common/eeprom.c | 98 drivers/staging/rt3090/common/igmp_snoop.c | 1365 --- drivers/staging/rt3090/common/mlme.c | 6550 --------------- drivers/staging/rt3090/common/mlme_ex.c | 215 drivers/staging/rt3090/common/netif_block.c | 147 drivers/staging/rt3090/common/rt_channel.c | 1287 --- drivers/staging/rt3090/common/rt_rf.c | 201 drivers/staging/rt3090/common/rtmp_init.c | 3882 --------- drivers/staging/rt3090/common/rtmp_mcu.c | 568 - drivers/staging/rt3090/common/rtmp_timer.c | 327 drivers/staging/rt3090/common/spectrum.c | 2221 ----- drivers/staging/rt3090/config.mk | 191 drivers/staging/rt3090/crypt_hmac.h | 81 drivers/staging/rt3090/crypt_md5.h | 78 drivers/staging/rt3090/crypt_sha2.h | 107 drivers/staging/rt3090/dfs.h | 137 drivers/staging/rt3090/eeprom.h | 82 drivers/staging/rt3090/firmware.h | 2 drivers/staging/rt3090/igmp_snoop.h | 152 drivers/staging/rt3090/ipv6.h | 215 drivers/staging/rt3090/link_list.h | 133 drivers/staging/rt3090/mac_pci.h | 454 - drivers/staging/rt3090/mlme.h | 1360 --- drivers/staging/rt3090/mlme_ex.h | 83 drivers/staging/rt3090/mlme_ex_def.h | 53 drivers/staging/rt3090/netif_block.h | 56 drivers/staging/rt3090/oid.h | 1144 -- drivers/staging/rt3090/pci_main_dev.c | 1195 -- drivers/staging/rt3090/rt3090.h | 77 drivers/staging/rt3090/rt30xx.h | 48 drivers/staging/rt3090/rt3370.h | 64 drivers/staging/rt3090/rt3390.h | 77 drivers/staging/rt3090/rt33xx.h | 48 drivers/staging/rt3090/rt_ate.c | 6089 -------------- drivers/staging/rt3090/rt_ate.h | 314 drivers/staging/rt3090/rt_config.h | 126 drivers/staging/rt3090/rt_linux.c | 1623 --- drivers/staging/rt3090/rt_linux.h | 1034 -- drivers/staging/rt3090/rt_main_dev.c | 897 -- drivers/staging/rt3090/rt_pci_rbus.c | 989 -- drivers/staging/rt3090/rt_profile.c | 101 drivers/staging/rt3090/rtmp.h | 6873 ---------------- drivers/staging/rt3090/rtmp_chip.h | 355 drivers/staging/rt3090/rtmp_def.h | 1650 --- drivers/staging/rt3090/rtmp_dot11.h | 146 drivers/staging/rt3090/rtmp_iface.h | 81 drivers/staging/rt3090/rtmp_mac.h | 2304 ----- drivers/staging/rt3090/rtmp_mcu.h | 55 drivers/staging/rt3090/rtmp_os.h | 93 drivers/staging/rt3090/rtmp_pci.h | 110 drivers/staging/rt3090/rtmp_phy.h | 631 - drivers/staging/rt3090/rtmp_timer.h | 162 drivers/staging/rt3090/rtmp_type.h | 147 drivers/staging/rt3090/spectrum.h | 234 drivers/staging/rt3090/spectrum_def.h | 257 drivers/staging/rt3090/sta/assoc.c | 1673 --- drivers/staging/rt3090/sta/auth.c | 491 - drivers/staging/rt3090/sta/auth_rsp.c | 151 drivers/staging/rt3090/sta/connect.c | 2759 ------ drivers/staging/rt3090/sta/dls.c | 2207 ----- drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 - drivers/staging/rt3090/sta/rtmp_data.c | 2661 ------ drivers/staging/rt3090/sta/sanity.c | 382 drivers/staging/rt3090/sta/sync.c | 1840 ---- drivers/staging/rt3090/sta/wpa.c | 396 drivers/staging/rt3090/sta_ioctl.c | 7561 ------------------ drivers/staging/rt3090/vr_ikans.h | 71 drivers/staging/rt3090/wpa.h | 447 - 243 files changed, 41013 insertions(+), 141016 deletions(-)
PATCH 1/8 Staging: rt3090: disable HAS_ATE option
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt3090: disable HAS_ATE option
Disable ATE debugging functionality.
This makes rt3090 match other Ralink drivers and V2.2.0.0 vendor version.
--- drivers/staging/rt3090/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rt3090/config.mk +1 -1
@@ -1,5 +1,5 @@ # Support ATE function -HAS_ATE=y +HAS_ATE=n # Support 28xx QA ATE function HAS_28xx_QA=n
PATCH 2/8 Staging: rt3090: disable HAS_ANTENNA_DIVERSITY_SUPPORT option
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt3090: disable HAS_ANTENNA_DIVERSITY_SUPPORT option
This makes rt3090 match other Ralink drivers and V2.2.0.0 vendor version.
--- drivers/staging/rt3090/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rt3090/config.mk +1 -1
@@ -84,7 +84,7 @@ HAS_AUTO_CH_SELECT_ENHANCE=n HAS_BG_FT_SUPPORT=n #Support Antenna Diversity -HAS_ANTENNA_DIVERSITY_SUPPORT=y +HAS_ANTENNA_DIVERSITY_SUPPORT=n ################################################# WFLAGS := -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT -DLINUX -Wall -Wstrict-prototypes -Wno-trigraphs -Wpointer-sign
PATCH 3/8 Staging: rt3090: remove private debugging ioctls
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt3090: remove private debugging ioctls
This makes rt3090 match other Ralink drivers.
--- drivers/staging/rt3090/oid.h | 12 drivers/staging/rt3090/sta_ioctl.c | 799 ------------------------------------- 2 files changed, 811 deletions(-)
drivers/staging/rt3090/oid.h +0 -12
@@ -679,18 +679,6 @@ typedef struct _NDIS_802_11_CAPABILITY#define RT_PRIV_IOCTL (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon#define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) -#ifdef DBG -#define RTPRIV_IOCTL_BBP (SIOCIWFIRSTPRIV + 0x03) -#define RTPRIV_IOCTL_MAC (SIOCIWFIRSTPRIV + 0x05) - -#ifdef RTMP_RF_RW_SUPPORT -// TODO: shiang, Need to reassign the oid number. ArchTeam use (SIOCIWFIRSTPRIV + 0x19) for this oid -#define RTPRIV_IOCTL_RF (SIOCIWFIRSTPRIV + 0x13) // edit by johnli, fix read rf register problem -#endif // RTMP_RF_RW_SUPPORT // - -#define RTPRIV_IOCTL_E2P (SIOCIWFIRSTPRIV + 0x07) -#endif // DBG // -#ifdef RALINK_ATE #ifdef RALINK_28xx_QA#define RTPRIV_IOCTL_ATE (SIOCIWFIRSTPRIV + 0x08)
drivers/staging/rt3090/sta_ioctl.c +0 -799
836 lines not on this page · raw message
PATCH 4/8 Staging: rt3090: remove private ioctls
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt3090: remove private ioctls
This makes rt3090 match other Ralink drivers.
--- drivers/staging/rt3090/oid.h | 117 - drivers/staging/rt3090/sta_ioctl.c | 2285 ------------------------------------- 2 files changed, 2 insertions(+), 2400 deletions(-)
drivers/staging/rt3090/oid.h +0 -117
@@ -98,143 +98,26 @@#define OID_GET_SET_TOGGLE 0x8000#define OID_GET_SET_FROM_UI 0x4000 -#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0103 -#define OID_802_11_NETWORK_TYPE_IN_USE 0x0104 -#define OID_802_11_RSSI_TRIGGER 0x0107 -#define RT_OID_802_11_RSSI 0x0108 //rt2860 only , kathy -#define RT_OID_802_11_RSSI_1 0x0109 //rt2860 only , kathy -#define RT_OID_802_11_RSSI_2 0x010A //rt2860 only , kathy -#define OID_802_11_NUMBER_OF_ANTENNAS 0x010B -#define OID_802_11_RX_ANTENNA_SELECTED 0x010C -#define OID_802_11_TX_ANTENNA_SELECTED 0x010D -#define OID_802_11_SUPPORTED_RATES 0x010E#define OID_802_11_ADD_WEP 0x0112 -#define OID_802_11_REMOVE_WEP 0x0113#define OID_802_11_DISASSOCIATE 0x0114 -#define OID_802_11_PRIVACY_FILTER 0x0118 -#define OID_802_11_ASSOCIATION_INFORMATION 0x011E -#define OID_802_11_TEST 0x011F - - -#define RT_OID_802_11_COUNTRY_REGION 0x0507#define OID_802_11_BSSID_LIST_SCAN 0x0508#define OID_802_11_SSID 0x0509#define OID_802_11_BSSID 0x050A -#define RT_OID_802_11_RADIO 0x050B -#define RT_OID_802_11_PHY_MODE 0x050C -#define RT_OID_802_11_STA_CONFIG 0x050D -#define OID_802_11_DESIRED_RATES 0x050E -#define RT_OID_802_11_PREAMBLE 0x050F -#define OID_802_11_WEP_STATUS 0x0510 -#define OID_802_11_AUTHENTICATION_MODE 0x0511 -#define OID_802_11_INFRASTRUCTURE_MODE 0x0512 -#define RT_OID_802_11_RESET_COUNTERS 0x0513 -#define OID_802_11_RTS_THRESHOLD 0x0514 -#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0515 -#define OID_802_11_POWER_MODE 0x0516 -#define OID_802_11_TX_POWER_LEVEL 0x0517 -#define RT_OID_802_11_ADD_WPA 0x0518 -#define OID_802_11_REMOVE_KEY 0x0519 -#define OID_802_11_ADD_KEY 0x0520 -#define OID_802_11_CONFIGURATION 0x0521 -#define OID_802_11_TX_PACKET_BURST 0x0522 -#define RT_OID_802_11_QUERY_NOISE_LEVEL 0x0523 -#define RT_OID_802_11_EXTRA_INFO 0x0524 -#ifdef DBG -#define RT_OID_802_11_HARDWARE_REGISTER 0x0525 -#endif -#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS -#define OID_802_11_DEAUTHENTICATION 0x0526 -#define OID_802_11_DROP_UNENCRYPTED 0x0527#define OID_802_11_MIC_FAILURE_REPORT_FRAME 0x0528 -#define OID_802_11_EAP_METHOD 0x0529 - -// For 802.1x daemin using to require current driver configuration -#define OID_802_11_RADIUS_QUERY_SETTING 0x0540#define RT_OID_DEVICE_NAME 0x0607#define RT_OID_VERSION_INFO 0x0608 -#define OID_802_11_BSSID_LIST 0x0609 -#define OID_802_3_CURRENT_ADDRESS 0x060A#define OID_GEN_MEDIA_CONNECT_STATUS 0x060B -#define RT_OID_802_11_QUERY_LINK_STATUS 0x060C -#define OID_802_11_RSSI 0x060D -#define OID_802_11_STATISTICS 0x060E#define OID_GEN_RCV_OK 0x060F#define OID_GEN_RCV_NO_BUFFER 0x0610 -#define RT_OID_802_11_QUERY_EEPROM_VERSION 0x0611 -#define RT_OID_802_11_QUERY_FIRMWARE_VERSION 0x0612 -#define RT_OID_802_11_QUERY_LAST_RX_RATE 0x0613 -#define RT_OID_802_11_TX_POWER_LEVEL_1 0x0614 -#define RT_OID_802_11_QUERY_PIDVID 0x0615//for WPA_SUPPLICANT_SUPPORT #define OID_SET_COUNTERMEASURES 0x0616 -#define OID_802_11_SET_IEEE8021X 0x0617 -#define OID_802_11_SET_IEEE8021X_REQUIRE_KEY 0x0618 -#define OID_802_11_PMKID 0x0620#define RT_OID_WPA_SUPPLICANT_SUPPORT 0x0621#define RT_OID_WE_VERSION_COMPILED 0x0622#define RT_OID_NEW_DRIVER 0x0623 -#define RT_OID_802_11_SNR_0 0x0630 -#define RT_OID_802_11_SNR_1 0x0631 -#define RT_OID_802_11_QUERY_LAST_TX_RATE 0x0632 -#define RT_OID_802_11_QUERY_HT_PHYMODE 0x0633 -#define RT_OID_802_11_SET_HT_PHYMODE 0x0634 -#define OID_802_11_RELOAD_DEFAULTS 0x0635 -#define RT_OID_802_11_QUERY_APSD_SETTING 0x0636 -#define RT_OID_802_11_SET_APSD_SETTING 0x0637 -#define RT_OID_802_11_QUERY_APSD_PSM 0x0638 -#define RT_OID_802_11_SET_APSD_PSM 0x0639 -#define RT_OID_802_11_QUERY_DLS 0x063A -#define RT_OID_802_11_SET_DLS 0x063B -#define RT_OID_802_11_QUERY_DLS_PARAM 0x063C -#define RT_OID_802_11_SET_DLS_PARAM 0x063D -#define RT_OID_802_11_QUERY_WMM 0x063E -#define RT_OID_802_11_SET_WMM 0x063F -#define RT_OID_802_11_QUERY_IMME_BA_CAP 0x0640 -#define RT_OID_802_11_SET_IMME_BA_CAP 0x0641 -#define RT_OID_802_11_QUERY_BATABLE 0x0642 -#define RT_OID_802_11_ADD_IMME_BA 0x0643 -#define RT_OID_802_11_TEAR_IMME_BA 0x0644#define RT_OID_DRIVER_DEVICE_NAME 0x0645 -#define RT_OID_802_11_QUERY_DAT_HT_PHYMODE 0x0646#define RT_OID_QUERY_MULTIPLE_CARD_SUPPORT 0x0647 -#define OID_802_11_SET_PSPXLINK_MODE 0x0648 -/*+++ add by woody +++*/ -#define OID_802_11_SET_PASSPHRASE 0x0649 -// Ralink defined OIDs -// Dennis Lee move to platform specific - -#define RT_OID_802_11_BSSID (OID_GET_SET_TOGGLE | OID_802_11_BSSID) -#define RT_OID_802_11_SSID (OID_GET_SET_TOGGLE | OID_802_11_SSID) -#define RT_OID_802_11_INFRASTRUCTURE_MODE (OID_GET_SET_TOGGLE | OID_802_11_INFRASTRUCTURE_MODE) -#define RT_OID_802_11_ADD_WEP (OID_GET_SET_TOGGLE | OID_802_11_ADD_WEP) -#define RT_OID_802_11_ADD_KEY (OID_GET_SET_TOGGLE | OID_802_11_ADD_KEY) -#define RT_OID_802_11_REMOVE_WEP (OID_GET_SET_TOGGLE | OID_802_11_REMOVE_WEP) -#define RT_OID_802_11_REMOVE_KEY (OID_GET_SET_TOGGLE | OID_802_11_REMOVE_KEY) -#define RT_OID_802_11_DISASSOCIATE (OID_GET_SET_TOGGLE | OID_802_11_DISASSOCIATE) -#define RT_OID_802_11_AUTHENTICATION_MODE (OID_GET_SET_TOGGLE | OID_802_11_AUTHENTICATION_MODE) -#define RT_OID_802_11_PRIVACY_FILTER (OID_GET_SET_TOGGLE | OID_802_11_PRIVACY_FILTER) -#define RT_OID_802_11_BSSID_LIST_SCAN (OID_GET_SET_TOGGLE | OID_802_11_BSSID_LIST_SCAN) -#define RT_OID_802_11_WEP_STATUS (OID_GET_SET_TOGGLE | OID_802_11_WEP_STATUS) -#define RT_OID_802_11_RELOAD_DEFAULTS (OID_GET_SET_TOGGLE | OID_802_11_RELOAD_DEFAULTS) -#define RT_OID_802_11_NETWORK_TYPE_IN_USE (OID_GET_SET_TOGGLE | OID_802_11_NETWORK_TYPE_IN_USE) -#define RT_OID_802_11_TX_POWER_LEVEL (OID_GET_SET_TOGGLE | OID_802_11_TX_POWER_LEVEL) -#define RT_OID_802_11_RSSI_TRIGGER (OID_GET_SET_TOGGLE | OID_802_11_RSSI_TRIGGER) -#define RT_OID_802_11_FRAGMENTATION_THRESHOLD (OID_GET_SET_TOGGLE | OID_802_11_FRAGMENTATION_THRESHOLD) -#define RT_OID_802_11_RTS_THRESHOLD (OID_GET_SET_TOGGLE | OID_802_11_RTS_THRESHOLD) -#define RT_OID_802_11_RX_ANTENNA_SELECTED (OID_GET_SET_TOGGLE | OID_802_11_RX_ANTENNA_SELECTED) -#define RT_OID_802_11_TX_ANTENNA_SELECTED (OID_GET_SET_TOGGLE | OID_802_11_TX_ANTENNA_SELECTED) -#define RT_OID_802_11_SUPPORTED_RATES (OID_GET_SET_TOGGLE | OID_802_11_SUPPORTED_RATES) -#define RT_OID_802_11_DESIRED_RATES (OID_GET_SET_TOGGLE | OID_802_11_DESIRED_RATES) -#define RT_OID_802_11_CONFIGURATION (OID_GET_SET_TOGGLE | OID_802_11_CONFIGURATION) -#define RT_OID_802_11_POWER_MODE (OID_GET_SET_TOGGLE | OID_802_11_POWER_MODE) -#define RT_OID_802_11_SET_PSPXLINK_MODE (OID_GET_SET_TOGGLE | OID_802_11_SET_PSPXLINK_MODE) -#define RT_OID_802_11_EAP_METHOD (OID_GET_SET_TOGGLE | OID_802_11_EAP_METHOD) -#define RT_OID_802_11_SET_PASSPHRASE (OID_GET_SET_TOGGLE | OID_802_11_SET_PASSPHRASE) - - typedef enum _NDIS_802_11_STATUS_TYPE {
drivers/staging/rt3090/sta_ioctl.c +2 -2283
2,304 lines not on this page · raw message
PATCH 5/8 Staging: rt28x0: updates from vendor's V2.1.0.0 drivers
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: updates from vendor's V2.1.0.0 drivers
Port changes from:
* 2009_0420_RT2860_Linux_STA_V2.1.0.0
* 2009_0302_RT2870_Linux_STA_v2.1.0.0
* 2009_0525_RT3070_Linux_STA_v2.1.1.0
to in-kernel drivers.
Quoted 1 line
From the RT2860 driver release note:
[2.1.0.0]
1. New generation schema for multiple OS porting
2. Fixed Ad-hoc ping failed in noisy environment. (Probe Response has too many retry packet then cause "not enough space in MgmtRing")
3. Fixed WPA(2)PSK issue when group cipher of AP is WEP40 or WEP104.
4. Modified iwpriv ra0 get_site_survey:
In scan list result: Security shows "NONE" when AP is OPEN/NONE, shows "WEP" when AP is OPEN/WEP or SHARED/WEP, shows "WPAPSK(WPA2PSK)/TKIP(AES)" when AP is WPAPSK(WPA2PSK)/TKIP(AES) shows "WPA(WPA2)/TKIP(AES)" when AP is WPA(WPA2)/TKIP(AES)
5. Support kthread.
6. Add New A band channel list region 15 contains the whole channels in the A band region 4 and the new CE channel 167,169,171,173
7. Add New IEEE802.11r functionality.
8. Fixed WPA2-Enterprise failed when AP reboot or turn off then turn on.
9. Fixed STA cannot connect to 11B only AP when the setting of is PHY_11GN.
Quoted 1 line
From the RT2870 driver release note:
[V2.1.0.0]
1. New generation schema for multiple OS porting.
2. Fixed Ad-hoc ping failed in noisy environment. (Probe Response has too many retry packet then cause "not enough space in MgmtRing").
3. Fixed WPS failed with D-Link DIR-628 in 5GHz.
4. Change FastRoaming in DAT file to AutoRoaming.
5. Support kthread.
6. Add New A band channel list region 15 contains the whole channels in the A band region and the new CE channel 167,169,171,173.
7. New IEEE802.11r functionality.
Quoted 1 line
From the RT3070 driver release note:
Version V2.1.1.0
1. Linux kernel 2.6.29 support.
2. Fix eFuse write from BIN file bug.
Version 2.1.0.0
1. New generation schema for multiple OS porting
2. Fixed Ad-hoc ping failed in noisy environment.
3. Modified iwpriv ra0 get_site_survey:
4. Change FastRoaming in DAT file to AutoRoaming.
5. Support kthread.
6. New IEEE802.11r functionality.
Tested with RT2860 and RT3070 chipsets.
---
The patch itself can be obtained from:
[ it is too big for the mailing list ]
drivers/staging/rt2860/2860_main_dev.c | 1319 --- drivers/staging/rt2860/Makefile | 26 drivers/staging/rt2860/aironet.h | 210 drivers/staging/rt2860/ap.h | 12 drivers/staging/rt2860/chip/mac_pci.h | 365 drivers/staging/rt2860/chip/mac_usb.h | 365 drivers/staging/rt2860/chip/rt2860.h | 56 drivers/staging/rt2860/chip/rt2870.h | 47 drivers/staging/rt2860/chip/rt3070.h | 68 drivers/staging/rt2860/chip/rt30xx.h | 48 drivers/staging/rt2860/chip/rtmp_mac.h | 1334 +++ drivers/staging/rt2860/chip/rtmp_phy.h | 405 + drivers/staging/rt2860/chips/rt3070.c | 185 drivers/staging/rt2860/chips/rt30xx.c | 525 + drivers/staging/rt2860/chlist.h | 1215 --- drivers/staging/rt2860/common/2860_rtmp_init.c | 897 -- drivers/staging/rt2860/common/action.c | 12 drivers/staging/rt2860/common/ba_action.c | 147 drivers/staging/rt2860/common/cmm_aes.c | 1404 +++ drivers/staging/rt2860/common/cmm_asic.c | 2531 ++++++ drivers/staging/rt2860/common/cmm_cfg.c | 290 drivers/staging/rt2860/common/cmm_data.c | 906 -- drivers/staging/rt2860/common/cmm_data_2860.c | 1197 --- drivers/staging/rt2860/common/cmm_data_pci.c | 1153 +++ drivers/staging/rt2860/common/cmm_data_usb.c | 968 ++ drivers/staging/rt2860/common/cmm_info.c | 822 +- drivers/staging/rt2860/common/cmm_mac_pci.c | 1504 +++ drivers/staging/rt2860/common/cmm_mac_usb.c | 1216 +++ drivers/staging/rt2860/common/cmm_profile.c | 1736 ++++ drivers/staging/rt2860/common/cmm_sanity.c | 233 drivers/staging/rt2860/common/cmm_sync.c | 70 drivers/staging/rt2860/common/cmm_tkip.c | 882 ++ drivers/staging/rt2860/common/cmm_wep.c | 499 + drivers/staging/rt2860/common/cmm_wpa.c | 3332 +++++++- drivers/staging/rt2860/common/crypt_hmac.c | 279 drivers/staging/rt2860/common/crypt_md5.c | 352 drivers/staging/rt2860/common/crypt_sha2.c | 535 + drivers/staging/rt2860/common/dfs.c | 66 drivers/staging/rt2860/common/ee_efuse.c | 1525 ++++ drivers/staging/rt2860/common/ee_prom.c | 270 drivers/staging/rt2860/common/eeprom.c | 1462 --- drivers/staging/rt2860/common/firmware.h | 2 drivers/staging/rt2860/common/firmware_3070.h | 517 + drivers/staging/rt2860/common/md5.c | 1415 --- drivers/staging/rt2860/common/mlme.c | 9508 ++++++++----------------- drivers/staging/rt2860/common/rt_channel.c | 1280 +++ drivers/staging/rt2860/common/rt_rf.c | 194 drivers/staging/rt2860/common/rtmp_init.c | 1969 ++--- drivers/staging/rt2860/common/rtmp_mcu.c | 233 drivers/staging/rt2860/common/rtmp_timer.c | 323 drivers/staging/rt2860/common/rtmp_tkip.c | 1586 ---- drivers/staging/rt2860/common/rtmp_wep.c | 497 - drivers/staging/rt2860/common/spectrum.c | 460 + drivers/staging/rt2860/config.mk | 241 drivers/staging/rt2860/crypt_hmac.h | 82 drivers/staging/rt2860/crypt_md5.h | 80 drivers/staging/rt2860/crypt_sha2.h | 109 drivers/staging/rt2860/dfs.h | 32 drivers/staging/rt2860/eeprom.h | 93 drivers/staging/rt2860/iface/rtmp_pci.h | 83 drivers/staging/rt2860/iface/rtmp_usb.h | 200 drivers/staging/rt2860/md5.h | 107 drivers/staging/rt2860/mlme.h | 89 drivers/staging/rt2860/oid.h | 135 drivers/staging/rt2860/pci_main_dev.c | 873 ++ drivers/staging/rt2860/rt2860.h | 333 drivers/staging/rt2860/rt28xx.h | 1688 ---- drivers/staging/rt2860/rt_config.h | 32 drivers/staging/rt2860/rt_linux.c | 615 + drivers/staging/rt2860/rt_linux.h | 966 +- drivers/staging/rt2860/rt_main_dev.c | 750 - drivers/staging/rt2860/rt_pci_rbus.c | 877 ++ drivers/staging/rt2860/rt_profile.c | 1839 ---- drivers/staging/rt2860/rt_usb.c | 828 ++ drivers/staging/rt2860/rtmp.h | 2894 +++---- drivers/staging/rt2860/rtmp_chip.h | 265 drivers/staging/rt2860/rtmp_def.h | 289 drivers/staging/rt2860/rtmp_dot11.h | 102 drivers/staging/rt2860/rtmp_iface.h | 84 drivers/staging/rt2860/rtmp_mcu.h | 55 drivers/staging/rt2860/rtmp_os.h | 98 drivers/staging/rt2860/rtmp_timer.h | 156 drivers/staging/rt2860/rtmp_type.h | 55 drivers/staging/rt2860/rtusb_io.h | 189 drivers/staging/rt2860/spectrum.h | 169 drivers/staging/rt2860/spectrum_def.h | 148 drivers/staging/rt2860/sta/aironet.c | 1312 --- drivers/staging/rt2860/sta/assoc.c | 327 drivers/staging/rt2860/sta/auth.c | 138 drivers/staging/rt2860/sta/auth_rsp.c | 16 drivers/staging/rt2860/sta/connect.c | 637 - drivers/staging/rt2860/sta/rtmp_data.c | 257 drivers/staging/rt2860/sta/sanity.c | 44 drivers/staging/rt2860/sta/sync.c | 398 - drivers/staging/rt2860/sta/wpa.c | 1994 ----- drivers/staging/rt2860/sta_ioctl.c | 761 +- drivers/staging/rt2860/usb_main_dev.c | 897 ++ drivers/staging/rt2860/wpa.h | 104 drivers/staging/rt2870/2870_main_dev.c | 1530 ---- drivers/staging/rt2870/Makefile | 32 drivers/staging/rt2870/chips/rt3070.c | 1 drivers/staging/rt2870/chips/rt30xx.c | 1 drivers/staging/rt2870/common/2870_rtmp_init.c | 1730 ---- drivers/staging/rt2870/common/acction.c | 1 drivers/staging/rt2870/common/cmm_aes.c | 1 drivers/staging/rt2870/common/cmm_asic.c | 1 drivers/staging/rt2870/common/cmm_cfg.c | 1 drivers/staging/rt2870/common/cmm_data_2870.c | 936 -- drivers/staging/rt2870/common/cmm_data_usb.c | 1 drivers/staging/rt2870/common/cmm_mac_usb.c | 1 drivers/staging/rt2870/common/cmm_profile.c | 1 drivers/staging/rt2870/common/cmm_tkip.c | 1 drivers/staging/rt2870/common/cmm_wep.c | 1 drivers/staging/rt2870/common/crypt_hmac.c | 1 drivers/staging/rt2870/common/crypt_md5.c | 1 drivers/staging/rt2870/common/crypt_sha2.c | 1 drivers/staging/rt2870/common/ee_efuse.c | 1 drivers/staging/rt2870/common/rt_channel.c | 1 drivers/staging/rt2870/common/rt_rf.c | 1 drivers/staging/rt2870/common/rtmp_mcu.c | 1 drivers/staging/rt2870/common/rtmp_timer.c | 1 drivers/staging/rt2870/common/rtusb_bulk.c | 37 drivers/staging/rt2870/common/rtusb_data.c | 55 drivers/staging/rt2870/common/rtusb_io.c | 465 - drivers/staging/rt2870/rt2870.h | 583 - drivers/staging/rt2870/rt_usb.c | 1 drivers/staging/rt2870/usb_main_dev.c | 1 drivers/staging/rt3070/firmware.h | 2 128 files changed, 39592 insertions(+), 35692 deletions(-)
PATCH 6/8 Staging: rt28x0: remove unused code from common/dfs.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove unused code from common/dfs.c
--- drivers/staging/rt2860/common/dfs.c | 378 ------------------------------------ drivers/staging/rt2860/dfs.h | 75 ------- 2 files changed, 453 deletions(-)
drivers/staging/rt2860/common/dfs.c +0 -378
@@ -37,196 +37,6 @@#include "../rt_config.h" -typedef struct _RADAR_DURATION_TABLE -{ -ULONG RDDurRegion; -ULONG RadarSignalDuration; -ULONG Tolerance; -}RADAR_DURATION_TABLE , *PRADAR_DURATION_TABLE ; - - - -UCHAR RdIdleTimeTable[MAX_RD_REGION ][4 ] = -{ - {9 ,250 ,250 ,250 },// CE -#ifdef DFS_FCC_BW40_FIX - {1 ,250 ,250 ,250 },// FCC -#else - {4 ,250 ,250 ,250 },// FCC -#endif - {4 ,250 ,250 ,250 },// JAP - {15 ,250 ,250 ,250 },// JAP_W53 - {4 ,250 ,250 ,250 }// JAP_W56 -}; - -/* -======================================================================== - -Routine Description: -Bbp Radar detection routine - -Arguments: -pAd Pointer to our adapter - -Return Value: - -======================================================================== -*/ -VOID BbpRadarDetectionStart ( - IN PRTMP_ADAPTER pAd) -{ -UINT8 RadarPeriod; - -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,114 ,0x02 ); -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,121 ,0x20 ); -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,122 ,0x00 ); -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,123 ,0x08 /*0x80*/ ); -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,124 ,0x28 ); -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,125 ,0xff ); - -#ifdef MERGE_ARCH_TEAM -if ((pAd->CommonCfg.RadarDetect.RDDurRegion ==JAP ) || (pAd->CommonCfg.RadarDetect.RDDurRegion ==JAP_W53 ) || (pAd->CommonCfg.RadarDetect.RDDurRegion ==JAP_W56 )) - { - pAd->CommonCfg.RadarDetect.RDDurRegion =JAP ; - pAd->CommonCfg.RadarDetect.RDDurRegion =JapRadarType (pAd); -if (pAd->CommonCfg.RadarDetect.RDDurRegion ==JAP_W56 ) - { - pAd->CommonCfg.RadarDetect.DfsSessionTime =13 ; - } -else if (pAd->CommonCfg.RadarDetect.RDDurRegion ==JAP_W53 ) - { - pAd->CommonCfg.RadarDetect.DfsSessionTime =15 ; - } - } -#endif // MERGE_ARCH_TEAM // - - RadarPeriod = ((UINT )RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0 ] + (UINT )pAd->CommonCfg.RadarDetect.DfsSessionTime) <250 ? - (RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0 ] + pAd->CommonCfg.RadarDetect.DfsSessionTime) :250 ; - -#ifdef MERGE_ARCH_TEAM - - -#else // Original RT28xx source code. -RTMP_IO_WRITE8 (pAd,0x7020 ,0x1d ); -RTMP_IO_WRITE8 (pAd,0x7021 ,0x40 ); -#endif // MERGE_ARCH_TEAM // - -RadarDetectionStart (pAd,0 , RadarPeriod); -return ; -} - -/* -======================================================================== - -Routine Description: -Bbp Radar detection routine - -Arguments: -pAd Pointer to our adapter - -Return Value: - -======================================================================== -*/ -VOID BbpRadarDetectionStop ( - IN PRTMP_ADAPTER pAd) -{ -RTMP_IO_WRITE8 (pAd,0x7020 ,0x1d ); -RTMP_IO_WRITE8 (pAd,0x7021 ,0x60 ); - -RadarDetectionStop (pAd); -return ; -} - -/* -======================================================================== - -Routine Description: -Radar detection routine - -Arguments: -pAd Pointer to our adapter - -Return Value: - -======================================================================== -*/ -VOID RadarDetectionStart ( - IN PRTMP_ADAPTER pAd, - IN BOOLEAN CTSProtect, - IN UINT8 CTSPeriod) -{ -UINT8 DfsActiveTime = (pAd->CommonCfg.RadarDetect.DfsSessionTime &0x1f ); -UINT8 CtsProtect = (CTSProtect ==1 ) ?0x02 :0x01 ;// CTS protect. - -if (CTSProtect !=0 ) - { -switch (pAd->CommonCfg.RadarDetect.RDDurRegion) - { -case FCC : -case JAP_W56 : - CtsProtect =0x03 ; -break ; - -case JAP : - { -UCHAR RDDurRegion; - RDDurRegion =JapRadarType (pAd); -if (RDDurRegion ==JAP_W56 ) - CtsProtect =0x03 ; -else - CtsProtect =0x02 ; -break ; - } - -case CE : -case JAP_W53 : -default : - CtsProtect =0x02 ; -break ; - } - } -else - CtsProtect =0x01 ; - - -// send start-RD with CTS protection command to MCU -// highbyte [7] reserve -// highbyte [6:5] 0x: stop Carrier/Radar detection -// highbyte [10]: Start Carrier/Radar detection without CTS protection, 11: Start Carrier/Radar detection with CTS protection -// highbyte [4:0] Radar/carrier detection duration. In 1ms. - -// lowbyte [7:0] Radar/carrier detection period, in 1ms. -AsicSendCommandToMcu (pAd,0x60 ,0xff , CTSPeriod, DfsActiveTime | (CtsProtect <<5 )); -//AsicSendCommandToMcu(pAd, 0x63, 0xff, 10, 0); - -return ; -} - -/* -======================================================================== - -Routine Description: -Radar detection routine - -Arguments: -pAd Pointer to our adapter - -Return Value: -TRUE Found radar signal -FALSE Not found radar signal - -======================================================================== -*/ -VOID RadarDetectionStop ( - IN PRTMP_ADAPTER pAd) -{ -DBGPRINT (RT_DEBUG_TRACE ,("RadarDetectionStop.\n" )); -AsicSendCommandToMcu (pAd,0x60 ,0xff ,0x00 ,0x00 );// send start-RD with CTS protection command to MCU - -return ; -} -/* ========================================================================
@@ -260,191 +70,3 @@ BOOLEAN RadarChannelCheck(return result; } - -ULONG JapRadarType ( - IN PRTMP_ADAPTER pAd) -{ -ULONG i; -const UCHAR Channel[15 ]={52 ,56 ,60 ,64 ,100 ,104 ,108 ,112 ,116 ,120 ,124 ,128 ,132 ,136 ,140 }; - -if (pAd->CommonCfg.RadarDetect.RDDurRegion !=JAP ) - { -return pAd->CommonCfg.RadarDetect.RDDurRegion; - } - -for (i=0 ; i<15 ; i++) - { -if (pAd->CommonCfg.Channel == Channel[i]) - { -break ; - } - } - -if (i <4 ) -return JAP_W53 ; -else if (i <15 ) -return JAP_W56 ; -else -return JAP ;// W52 - -} - -ULONG RTMPBbpReadRadarDuration ( - IN PRTMP_ADAPTER pAd) -{ -UINT8 byteValue =0 ; -ULONG result; - -BBP_IO_READ8_BY_REG_ID (pAd,BBP_R115 , &byteValue); - - result =0 ; -switch (byteValue) - { -case 1 :// radar signal detected by pulse mode. -case 2 :// radar signal detected by width mode. - result =RTMPReadRadarDuration (pAd); -break ; - -case 0 :// No radar signal. -default : - - result =0 ; -break ; - } - -return result; -} - -ULONG RTMPReadRadarDuration ( - IN PRTMP_ADAPTER pAd) -{ -ULONG result =0 ; - -return result; - -} - -VOID RTMPCleanRadarDuration ( - IN PRTMP_ADAPTER pAd) -{ -return ; -} - -/* -======================================================================== -Routine Description: -Radar wave detection. The API should be invoke each second. - -Arguments: -pAd - Adapter pointer - -Return Value: -None - -======================================================================== -*/ -VOID ApRadarDetectPeriodic ( - IN PRTMP_ADAPTER pAd) -{ -INT i; - - pAd->CommonCfg.RadarDetect.InServiceMonitorCount++; - -for (i=0 ; i<pAd->ChannelListNum; i++) - { -if (pAd->ChannelList[i].RemainingTimeForUse >0 ) - { - pAd->ChannelList[i].RemainingTimeForUse --; -if ((pAd->Mlme.PeriodicRound%5 ) ==0 ) - { -DBGPRINT (RT_DEBUG_TRACE , ("RadarDetectPeriodic - ch=%d, RemainingTimeForUse=%d\n" , pAd->ChannelList[i].Channel, pAd->ChannelList[i].RemainingTimeForUse)); - } - } - } - -//radar detect -if ((pAd->CommonCfg.Channel >14 ) - && (pAd->CommonCfg.bIEEE80211H ==1 ) - &&RadarChannelCheck (pAd, pAd->CommonCfg.Channel)) - { -RadarDetectPeriodic (pAd); - } - -return ; -} - -// Periodic Radar detection, switch channel will occur in RTMPHandleTBTTInterrupt() -// Before switch channel, driver needs doing channel switch announcement. -VOID RadarDetectPeriodic ( - IN PRTMP_ADAPTER pAd) -{ -// need to check channel availability, after switch channel -if (pAd->CommonCfg.RadarDetect.RDMode !=RD_SILENCE_MODE ) -return ; - -// channel availability check time is 60sec, use 65 for assurance -if (pAd->CommonCfg.RadarDetect.RDCount++ > pAd->CommonCfg.RadarDetect.ChMovingTime) - { -DBGPRINT (RT_DEBUG_TRACE , ("Not found radar signal, start send beacon and radar detection in service monitor\n\n" )); -BbpRadarDetectionStop (pAd); -AsicEnableBssSync (pAd); - pAd->CommonCfg.RadarDetect.RDMode =RD_NORMAL_MODE ; - - -return ; - } - -return ; -} - - -/* -========================================================================== -Description: -change channel moving time for DFS testing. - -Arguments: -pAdapter Pointer to our adapter -wrq Pointer to the ioctl argument - -Return Value: -None - -Note: -Usage: -1.) iwpriv ra0 set ChMovTime=[value] -========================================================================== -*/ -INT Set_ChMovingTime_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UINT8 Value; - - Value = (UINT8 )simple_strtol (arg,0 ,10 ); - - pAd->CommonCfg.RadarDetect.ChMovingTime = Value; - -DBGPRINT (RT_DEBUG_TRACE , ("%s:: %d\n" , __func__, - pAd->CommonCfg.RadarDetect.ChMovingTime)); - -return TRUE; -} - -INT Set_LongPulseRadarTh_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UINT8 Value; - - Value = (UINT8 )simple_strtol (arg,0 ,10 ) >10 ?10 :simple_strtol (arg,0 ,10 ); - - pAd->CommonCfg.RadarDetect.LongPulseRadarTh = Value; - -DBGPRINT (RT_DEBUG_TRACE , ("%s:: %d\n" , __func__, - pAd->CommonCfg.RadarDetect.LongPulseRadarTh)); - -return TRUE; -} - -
drivers/staging/rt2860/dfs.h +0 -75
81 lines not on this page · raw message
PATCH 7/8 Staging: rt2860: add RT3090 chipset support
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt2860: add RT3090 chipset support
Add support for RT3090 chipset
(based on 2009_0612_RT3090_Linux_STA_V2.1.0.0_DPO).
Tested with RT2860.
--- drivers/staging/rt2860/Kconfig | 5 drivers/staging/rt2860/Makefile | 7 drivers/staging/rt2860/chip/mac_pci.h | 12 drivers/staging/rt2860/chip/rt3090.h | 72 +++++ drivers/staging/rt2860/chip/rtmp_phy.h | 183 ++++++++++++ drivers/staging/rt2860/chips/rt3090.c | 123 ++++++++ drivers/staging/rt2860/chips/rt30xx.c | 12 drivers/staging/rt2860/common/cmm_asic.c | 29 ++ drivers/staging/rt2860/common/cmm_data_pci.c | 6 drivers/staging/rt2860/common/cmm_mac_pci.c | 255 ++++++++++++++--- drivers/staging/rt2860/common/cmm_profile.c | 43 +++ drivers/staging/rt2860/common/cmm_sync.c | 13 drivers/staging/rt2860/common/mlme.c | 112 +++++-- drivers/staging/rt2860/common/rt_rf.c | 8 drivers/staging/rt2860/common/rtmp_init.c | 73 ++++- drivers/staging/rt2860/common/rtmp_mcu.c | 98 ++++++ drivers/staging/rt2860/common/rtmp_timer.c | 4 drivers/staging/rt2860/iface/rtmp_pci.h | 2 drivers/staging/rt2860/pci_main_dev.c | 384 ++++++++++++++++++++++++--- drivers/staging/rt2860/rt_linux.c | 3 drivers/staging/rt2860/rt_linux.h | 13 drivers/staging/rt2860/rt_main_dev.c | 17 - drivers/staging/rt2860/rt_pci_rbus.c | 4 drivers/staging/rt2860/rtmp.h | 49 ++- drivers/staging/rt2860/rtmp_chip.h | 3 drivers/staging/rt2860/rtmp_def.h | 5 drivers/staging/rt2860/sta/assoc.c | 12 drivers/staging/rt2860/sta/auth_rsp.c | 4 drivers/staging/rt2860/sta/connect.c | 190 ++----------- drivers/staging/rt2860/sta/rtmp_data.c | 1 drivers/staging/rt2860/sta/sync.c | 26 + drivers/staging/rt2860/sta/wpa.c | 48 --- drivers/staging/rt2860/sta_ioctl.c | 7 drivers/staging/rt2860/wpa.h | 7 drivers/staging/rt3090/common/rtmp_mcu.c | 8 drivers/staging/rt3090/firmware.h | 2 36 files changed, 1416 insertions(+), 424 deletions(-)
drivers/staging/rt2860/Kconfig +3 -2
@@ -1,5 +1,6 @@ config RT2860 - tristate "Ralink 2860 wireless support" + tristate "Ralink 2860/3090 wireless support" depends on PCI && X86 && WLAN_80211 ---help--- - This is an experimental driver for the Ralink 2860 wireless chip. + This is an experimental driver for the Ralink 2860 and 3090 + wireless chips.
drivers/staging/rt2860/Makefile +6 -1
@@ -3,6 +3,7 @@ obj-$(CONFIG_RT2860) += rt2860sta.o # TODO: all of these should be removed EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT EXTRA_CFLAGS += -DRTMP_MAC_PCI -DRTMP_PCI_SUPPORT -DRT2860 +EXTRA_CFLAGS += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3090 EXTRA_CFLAGS += -DDBG rt2860sta-objs := \
@@ -46,4 +47,8 @@ rt2860sta-objs := \ common/cmm_mac_pci.o \ common/cmm_data_pci.o \ common/ee_prom.o \ - common/rtmp_mcu.o + common/rtmp_mcu.o \ + common/ee_efuse.o \ + chips/rt30xx.o \ + common/rt_rf.o \ + chips/rt3090.o
drivers/staging/rt2860/chip/mac_pci.h +12 -0
@@ -133,6 +133,18 @@ typedef struct PACKED _RXD_STRUC{ UINT32 Rsv1:13; }RXD_STRUC , *PRXD_STRUC ,RT28XX_RXD_STRUC , *PRT28XX_RXD_STRUC ; +typedef union _TX_ATTENUATION_CTRL_STRUC { +struct + { +ULONG RF_ISOLATION_ENABLE:1 ; +ULONG Reserve2:7 ; +ULONG PCIE_PHY_TX_ATTEN_VALUE:3 ; +ULONG PCIE_PHY_TX_ATTEN_EN:1 ; +ULONG Reserve1:20 ; + } field; + +ULONG word; +}TX_ATTENUATION_CTRL_STRUC , *PTX_ATTENUATION_CTRL_STRUC ;/* ----------------- EEPROM Related MACRO ----------------- */
drivers/staging/rt2860/chip/rt3090.h new file +72 -0
72 lines not on this page · raw message
drivers/staging/rt2860/chip/rtmp_phy.h +182 -1
207 lines not on this page · raw message
drivers/staging/rt2860/chips/rt3090.c new file +123 -0
123 lines not on this page · raw message
drivers/staging/rt2860/chips/rt30xx.c +12 -0
@@ -101,7 +101,13 @@ VOID RT30xxSetRxAnt(if (Ant ==0 ) {// Main antenna +#ifdef RTMP_MAC_PCI +RTMP_IO_READ32 (pAd,E2PROM_CSR , &x); + x |= (EESK ); +RTMP_IO_WRITE32 (pAd,E2PROM_CSR , x); +#else AsicSendCommandToMcu (pAd,0x73 ,0xFF ,0x1 ,0x0 ); +#endif // RTMP_MAC_PCI // RTMP_IO_READ32 (pAd,GPIO_CTRL_CFG , &Value); Value &= ~(0x0808 );
@@ -111,7 +117,13 @@ VOID RT30xxSetRxAnt(else {// Aux antenna +#ifdef RTMP_MAC_PCI +RTMP_IO_READ32 (pAd,E2PROM_CSR , &x); + x &= ~(EESK ); +RTMP_IO_WRITE32 (pAd,E2PROM_CSR , x); +#else AsicSendCommandToMcu (pAd,0x73 ,0xFF ,0x0 ,0x0 ); +#endif // RTMP_MAC_PCI // RTMP_IO_READ32 (pAd,GPIO_CTRL_CFG , &Value); Value &= ~(0x0808 ); Value |=0x08 ;
drivers/staging/rt2860/common/cmm_asic.c +29 -0
@@ -808,6 +808,28 @@ VOID AsicSwitchChannel(RTMP_IO_WRITE32 (pAd,TX_PIN_CFG , TxPinCfg); +#if defined(RT3090 ) || defined(RT3390 ) +// PCIe PHY Transmit attenuation adjustment +if (IS_RT3090A (pAd) ||IS_RT3390 (pAd)) + { +TX_ATTENUATION_CTRL_STRUC TxAttenuationCtrl = {0 }; + +RTMP_IO_READ32 (pAd,PCIE_PHY_TX_ATTENUATION_CTRL , &TxAttenuationCtrl.word); + +if (Channel ==14 )// Channel #14 + { + TxAttenuationCtrl.field.PCIE_PHY_TX_ATTEN_EN =1 ;// Enable PCIe PHY Tx attenuation + TxAttenuationCtrl.field.PCIE_PHY_TX_ATTEN_VALUE =4 ;// 9/16 full drive level + } +else // Channel #1~#13 + { + TxAttenuationCtrl.field.PCIE_PHY_TX_ATTEN_EN =0 ;// Disable PCIe PHY Tx attenuation + TxAttenuationCtrl.field.PCIE_PHY_TX_ATTEN_VALUE =0 ;// n/a + } + +RTMP_IO_WRITE32 (pAd,PCIE_PHY_TX_ATTENUATION_CTRL , TxAttenuationCtrl.word); + } +#endif }else {
@@ -2477,6 +2499,13 @@ VOID AsicTurnOnRFClk(UCHAR index;RTMP_RF_REGS *RFRegTable; +#ifdef PCIE_PS_SUPPORT +// The RF programming sequence is difference between 3xxx and 2xxx +if ((IS_RT3090 (pAd) ||IS_RT3572 (pAd) ||IS_RT3390 (pAd))) + { +return ; + } +#endif // PCIE_PS_SUPPORT // RFRegTable = RF2850RegTable;
drivers/staging/rt2860/common/cmm_data_pci.c +0 -6
@@ -638,9 +638,6 @@ BOOLEAN RTMPHandleTxRingDmaDoneInterruptif (TxRingBitmap.field.Ac0DmaDone) bReschedule =RTMPFreeTXDUponTxDmaDone (pAd,QID_AC_BE ); -if (TxRingBitmap.field.HccaDmaDone) - bReschedule |=RTMPFreeTXDUponTxDmaDone (pAd,QID_HCCA ); -if (TxRingBitmap.field.Ac3DmaDone) bReschedule |=RTMPFreeTXDUponTxDmaDone (pAd,QID_AC_VO );
@@ -791,7 +788,6 @@ VOID RTMPHandleRxCoherentInterrupt(RTMPRingCleanUp (pAd,QID_AC_BK );RTMPRingCleanUp (pAd,QID_AC_VI );RTMPRingCleanUp (pAd,QID_AC_VO ); -RTMPRingCleanUp (pAd,QID_HCCA );RTMPRingCleanUp (pAd,QID_MGMT );RTMPRingCleanUp (pAd,QID_RX );
@@ -1147,7 +1143,5 @@ VOID RTMPWriteTxDescriptor( pTxD->QSEL= (QueueSEL);//RT2860c?? fixed using EDCA queue for test... We doubt Queue1 has problem. 2006-09-26 Jan //pTxD->QSEL= FIFO_EDCA; -if (pAd->bGenOneHCCA == TRUE) - pTxD->QSEL=FIFO_HCCA ; pTxD->DMADONE =0 ; }
drivers/staging/rt2860/common/cmm_mac_pci.c +207 -48
483 lines not on this page · raw message
drivers/staging/rt2860/common/cmm_profile.c +43 -0
49 lines not on this page · raw message
drivers/staging/rt2860/common/cmm_sync.c +0 -13
@@ -432,19 +432,6 @@ VOID ScanNextChannel( } { -#ifdef RT2860 -/* -If all peer Ad-hoc clients leave, driver would do LinkDown and LinkUp. -In LinkUp, CommonCfg.Ssid would copy SSID from MlmeAux. -To prevent SSID is zero or wrong in Beacon, need to recover MlmeAux.SSID here. -*/ -if (ADHOC_ON (pAd)) - { -NdisZeroMemory (pAd->MlmeAux.Ssid,MAX_LEN_OF_SSID ); - pAd->MlmeAux.SsidLen = pAd->CommonCfg.SsidLen; -NdisMoveMemory (pAd->MlmeAux.Ssid, pAd->CommonCfg.Ssid, pAd->CommonCfg.SsidLen); - } -#endif // RT2860 // // // To prevent data lost. // Send an NULL data with turned PSM bit on to current associated AP before SCAN progress.
drivers/staging/rt2860/common/mlme.c +85 -27
185 lines not on this page · raw message
drivers/staging/rt2860/common/rt_rf.c +8 -0
@@ -187,6 +187,14 @@ VOID RtmpChipOpsRFHook( } }#endif // RT3070 // +#ifdef RT3090 +if (IS_RT3090 (pAd) && (pAd->infType ==RTMP_DEV_INF_PCI )) + { + pChipOps->AsicRfTurnOff = RT30xxLoadRFSleepModeSetup; + pChipOps->AsicRfInit = NICInitRT3090RFRegisters; + pChipOps->AsicReverseRfFromSleepMode = RT30xxReverseRFSleepModeSetup; + } +#endif // RT3090 // }#endif // RT30xx // }
drivers/staging/rt2860/common/rtmp_init.c +63 -10
152 lines not on this page · raw message
drivers/staging/rt2860/common/rtmp_mcu.c +88 -10
133 lines not on this page · raw message
drivers/staging/rt2860/common/rtmp_timer.c +2 -2
@@ -59,10 +59,10 @@ BUILD_TIMER_FUNCTION(DisassocTimeout);BUILD_TIMER_FUNCTION (LinkDownExec);BUILD_TIMER_FUNCTION (StaQuickResponeForRateUpExec);BUILD_TIMER_FUNCTION (WpaDisassocApAndBlockAssoc); -#ifdef RTMP_PCI_SUPPORT +#ifdef RTMP_MAC_PCI BUILD_TIMER_FUNCTION (PsPollWakeExec);BUILD_TIMER_FUNCTION (RadioOnExec); -#endif // RTMP_PCI_SUPPORT // +#endif // RTMP_MAC_PCI // #ifdef RTMP_MAC_USB BUILD_TIMER_FUNCTION (RtmpUsbStaAsicForceWakeupTimeout);#endif // RTMP_MAC_USB //
drivers/staging/rt2860/iface/rtmp_pci.h +0 -2
@@ -38,9 +38,7 @@#define RT28XX_PUT_DEVICE (dev_p) -#ifndef SA_SHIRQ #define SA_SHIRQ IRQF_SHARED -#endif #ifdef PCI_MSI_SUPPORT #define RTMP_MSI_ENABLE (_pAd) \
drivers/staging/rt2860/pci_main_dev.c +349 -35
545 lines not on this page · raw message
drivers/staging/rt2860/rt_linux.c +3 -0
@@ -283,6 +283,9 @@ VOID RTMPFreeAdapter(#ifdef RTMP_MAC_PCI NdisFreeSpinLock (&pAd->RxRingLock); +#ifdef RT3090 +NdisFreeSpinLock (&pAd->McuCmdLock); +#endif // RT3090 // #endif // RTMP_MAC_PCI // for (index =0 ; index <NUM_OF_TX_RING ; index++)
drivers/staging/rt2860/rt_linux.h +12 -1
@@ -590,6 +590,12 @@ void linux_pci_unmap_single(void *handle *_pV =0 ; \ } +#define RTMP_IO_FORCE_READ32 (_A, _R, _pV) \ +{ \ + (*_pV = readl((void *)((_A)->CSRBaseAddress + MAC_CSR0))); \ + (*_pV = readl((void *)((_A)->CSRBaseAddress + (_R)))); \ +} +#define RTMP_IO_READ8 (_A, _R, _pV) \ { \ (*_pV = readl((void *)((_A)->CSRBaseAddress + MAC_CSR0))); \
@@ -605,7 +611,12 @@ void linux_pci_unmap_single(void *handle } \ } - +#define RTMP_IO_FORCE_WRITE32 (_A, _R, _V) \ +{ \ + UINT Val; \ + Val = readl((void *)((_A)->CSRBaseAddress + MAC_CSR0)); \ + writel(_V, (void *)((_A)->CSRBaseAddress + (_R))); \ +}#if defined(RALINK_2880 ) || defined(RALINK_3052 )#define RTMP_IO_WRITE8 (_A, _R, _V) \
drivers/staging/rt2860/rt_main_dev.c +9 -8
@@ -226,9 +226,9 @@ int rt28xx_close(IN PNET_DEV dev)return 0 ;// close ok { -#ifdef RTMP_PCI_SUPPORT +#ifdef RTMP_MAC_PCI RTMPPCIeLinkCtrlValueRestore (pAd,RESTORE_CLOSE ); -#endif // RTMP_PCI_SUPPORT // +#endif // RTMP_MAC_PCI // // If dirver doesn't wake up firmware here, // NICLoadFirmware will hang forever when interface is up again.
@@ -320,6 +320,10 @@ int rt28xx_close(IN PNET_DEV dev) brc=RT28xxPciAsicRadioOff (pAd,RTMP_HALT ,0 ); + +//In solution 3 of 3090F, the bPCIclkOff will be set to TRUE after calling RT28xxPciAsicRadioOff + pAd->bPCIclkOff = FALSE; +if (brc==FALSE) {DBGPRINT (RT_DEBUG_ERROR ,("%s call RT28xxPciAsicRadioOff fail !!\n" , __func__));
@@ -400,11 +404,6 @@ int rt28xx_open(IN PNET_DEV dev)return -1 ; } -#ifdef RTMP_PCI_SUPPORT -RTMPInitPCIeLinkCtrlValue (pAd); -#endif // RTMP_PCI_SUPPORT // - -if (net_dev->priv_flags ==INT_MAIN ) {if (pAd->OpMode ==OPMODE_STA )
@@ -449,7 +448,9 @@ int rt28xx_open(IN PNET_DEV dev)// RTMP_IO_WRITE32(pAd, XIFS_TIME_CFG, reg); } - +#ifdef RTMP_MAC_PCI +RTMPInitPCIeLinkCtrlValue (pAd); +#endif // RTMP_MAC_PCI // return (retval);
drivers/staging/rt2860/rt_pci_rbus.c +1 -3
@@ -236,7 +236,6 @@ VOID Invalid_Remaining_Packet( PhysicalAddress =PCI_MAP_SINGLE (pAd, (void *)(VirtualAddress+1600 ),RX_BUFFER_NORMSIZE -1600 ,-1 ,PCI_DMA_FROMDEVICE ); } - NDIS_STATUS RtmpNetTaskInit(IN RTMP_ADAPTER *pAd) {POS_COOKIE pObj;
@@ -871,7 +870,6 @@ void linux_pci_unmap_single(void *handle pAd=(PRTMP_ADAPTER )handle; pObj = (POS_COOKIE )pAd->OS_Cookie; -if (size >0 ) -pci_unmap_single (pObj->pci_dev, dma_addr, size, direction); +pci_unmap_single (pObj->pci_dev, dma_addr, size, direction); }
drivers/staging/rt2860/rtmp.h +37 -12
130 lines not on this page · raw message
drivers/staging/rt2860/rtmp_chip.h +3 -0
@@ -49,6 +49,9 @@#ifdef RT3070 #include "chip/rt3070.h" #endif // RT3070 // +#ifdef RT3090 +#include "chip/rt3090.h" +#endif // RT3090 // // We will have a cost down version which mac version is 0x3090xxxx //
drivers/staging/rt2860/rtmp_def.h +5 -0
@@ -221,6 +221,11 @@#define fRTMP_PS_GO_TO_SLEEP_NOW 0x00000008#define fRTMP_PS_TOGGLE_L1 0x00000010 // Use Toggle L1 mechanism for rt28xx PCIe +#ifdef RT3090 +#define WAKE_MCU_CMD 0x31 +#define SLEEP_MCU_CMD 0x30 +#define RFOFF_MCU_CMD 0x35 +#endif // RT3090 // #define CCKSETPROTECT 0x1#define OFDMSETPROTECT 0x2
drivers/staging/rt2860/sta/assoc.c +0 -12
@@ -464,18 +464,6 @@ VOID MlmeAssocReqAction(break ; } } -#ifdef RT2860 -/* -When AuthMode is WPA2-Enterprise and AP reboot or STA lost AP, -AP would not do PMK cache with STA after STA re-connect to AP again. -In this case, driver doesn't need to send PMKID to AP and WpaSupplicant. -*/ -if ((pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2) && - (NdisEqualMemory (pAd->MlmeAux.Bssid, pAd->CommonCfg.LastBssid,MAC_ADDR_LEN ))) - { - FoundPMK = FALSE; - } -#endif // RT2860 // if (FoundPMK) {// Set PMK number
drivers/staging/rt2860/sta/auth_rsp.c +0 -4
@@ -137,10 +137,6 @@ VOID PeerDeauthAction(if (pAd->CommonCfg.bWirelessEvent)RTMPSendWirelessEvent (pAd,IW_DEAUTH_EVENT_FLAG , pAd->MacTab.Content[BSSID_WCID ].Addr,BSS0 ,0 ); -if ((pAd->StaCfg.WpaSupplicantUP !=WPA_SUPPLICANT_DISABLE ) && - (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPA2)) - pAd->StaCfg.bLostAp = TRUE; -LinkDown (pAd, TRUE); } }
drivers/staging/rt2860/sta/connect.c +34 -156
253 lines not on this page · raw message
drivers/staging/rt2860/sta/rtmp_data.c +0 -1
@@ -1208,7 +1208,6 @@ NDIS_STATUS RTMPFreeTXDRequest(case QID_AC_BE :case QID_AC_VI :case QID_AC_VO : -case QID_HCCA :if (pAd->TxRing[QueIdx].TxSwFreeIdx > pAd->TxRing[QueIdx].TxCpuIdx) FreeNumber = pAd->TxRing[QueIdx].TxSwFreeIdx - pAd->TxRing[QueIdx].TxCpuIdx -1 ;else
drivers/staging/rt2860/sta/sync.c +16 -10
@@ -195,13 +195,23 @@ VOID MlmeScanReqAction( pAd->StaCfg.ScanCnt++;#ifdef RTMP_MAC_PCI -if ((OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE)) && +if ((OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_PCIE_DEVICE)) && (IDLE_ON (pAd)) && (pAd->StaCfg.bRadio == TRUE) && (RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_IDLE_RADIO_OFF))) { +if (pAd->StaCfg.PSControl.field.EnableNewPS == FALSE) + { +AsicSendCommandToMcu (pAd,0x31 , PowerWakeCID,0x00 ,0x02 ); +AsicCheckCommanOk (pAd, PowerWakeCID); +RTMP_CLEAR_FLAG (pAd, fRTMP_ADAPTER_IDLE_RADIO_OFF); +DBGPRINT (RT_DEBUG_TRACE , ("PSM - Issue Wake up command \n" )); + } +else + {RT28xxPciAsicRadioOn (pAd,GUI_IDLE_POWER_SAVE ); } + }#endif // RTMP_MAC_PCI // // first check the parameter sanity
@@ -303,7 +313,7 @@ VOID MlmeJoinReqAction(DBGPRINT (RT_DEBUG_TRACE , ("SYNC - MlmeJoinReqAction(BSS #%ld)\n" , pInfo->BssIdx));#ifdef RTMP_MAC_PCI -if ((OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE)) && +if ((OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_PCIE_DEVICE)) && (IDLE_ON (pAd)) && (pAd->StaCfg.bRadio == TRUE) && (RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_IDLE_RADIO_OFF)))
@@ -338,9 +348,7 @@ VOID MlmeJoinReqAction(RTMP_BBP_IO_READ8_BY_REG_ID (pAd,BBP_R4 , &BBPValue); BBPValue &= (~0x18 );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R4 , BBPValue); -#ifdef RT2860 - pAd->CommonCfg.BBPCurrentBW =BW_20 ; -#endif // RT2860 // +DBGPRINT (RT_DEBUG_TRACE , ("SYNC - BBP R4 to 20MHz.l\n" ));// switch channel and waiting for beacon timer
@@ -898,8 +906,6 @@ VOID PeerBeaconAtJoinAction(else //Used the default TX Power Percentage. pAd->CommonCfg.TxPowerPercentage = pAd->CommonCfg.TxPowerDefault; -InitChannelRelatedValue (pAd); - pAd->Mlme.SyncMachine.CurrState =SYNC_IDLE ; Status =MLME_SUCCESS ;MlmeEnqueue (pAd,MLME_CNTL_STATE_MACHINE ,MT2_JOIN_CONF ,2 , &Status);
@@ -1317,7 +1323,7 @@ VOID PeerBeacon(if (MessageToMe) {#ifdef RTMP_MAC_PCI -if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE)) +if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_PCIE_DEVICE)) {// Restore to correct BBP R3 value if (pAd->Antenna.field.RxPath >1 )
@@ -1336,7 +1342,7 @@ VOID PeerBeacon(else if (BcastFlag && (DtimCount ==0 ) &&OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_RECEIVE_DTIM)) {#ifdef RTMP_MAC_PCI -if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE)) +if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_PCIE_DEVICE)) {if (pAd->Antenna.field.RxPath >1 )RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R3 , pAd->StaCfg.BBPR3);
@@ -1356,7 +1362,7 @@ VOID PeerBeacon(// TODO: consider scheduled HCCA. might not be proper to use traditional DTIM-based power-saving scheme // can we cheat here (i.e. just check MGMT & AC_BE) for better performance? #ifdef RTMP_MAC_PCI -if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE)) +if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_PCIE_DEVICE)) {if (pAd->Antenna.field.RxPath >1 )RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R3 , pAd->StaCfg.BBPR3);
drivers/staging/rt2860/sta/wpa.c +0 -48
51 lines not on this page · raw message
drivers/staging/rt2860/sta_ioctl.c +7 -0
@@ -160,6 +160,12 @@ INT Set_PSMode_Proc( IN PRTMP_ADAPTER pAdapter, IN PSTRING arg); +#ifdef RT3090 +INT Set_PCIePSLevel_Proc ( +IN PRTMP_ADAPTER pAdapter, +IN PUCHAR arg); +#endif // RT3090 // +INT Set_Wpa_Support ( IN PRTMP_ADAPTER pAd, IN PSTRING arg);
@@ -515,6 +521,7 @@ rt_ioctl_giwname(struct net_device *dev, {strncpy (name,"Ralink STA" ,IFNAMSIZ );// RT2870 2.1.0.0 uses "RT2870 Wireless" +// RT3090 2.1.0.0 uses "RT2860 Wireless" return 0 ; }
drivers/staging/rt2860/wpa.h +0 -7
@@ -347,13 +347,6 @@ typedef enum _WpaMixPairCipherWPA_TKIPAES_WPA2_TKIPAES =0x0F , } WPA_MIX_PAIR_CIPHER; -// 802.1x authentication format -typedef struct _IEEE8021X_FRAME { -UCHAR Version;// 1.0 -UCHAR Type;// 0 = EAP Packet -USHORT Length; -}IEEE8021X_FRAME , *PIEEE8021X_FRAME ; - typedef struct PACKED _RSN_IE_HEADER_STRUCT {UCHAR Eid;UCHAR Length;
drivers/staging/rt3090/common/rtmp_mcu.c +4 -4
@@ -43,7 +43,7 @@// New 8k byte firmware size for RT3071/RT3072 #define FIRMWAREIMAGE_MAX_LENGTH 0x2000 -#define FIRMWAREIMAGE_LENGTH (sizeof (FirmwareImage) / sizeof(UCHAR)) +#define FIRMWAREIMAGE_LENGTH (sizeof (FirmwareImage_3090) / sizeof(UCHAR))#define FIRMWARE_MAJOR_VERSION 0#define FIRMWAREIMAGEV1_LENGTH 0x1000
@@ -335,8 +335,8 @@ NDIS_STATUS RtmpAsicLoadFirmware(UINT32 MacReg =0 ;UINT32 Version = (pAd->MACVersion >>16 ); - pFirmwareImage = FirmwareImage; - FileLength =sizeof (FirmwareImage); + pFirmwareImage = FirmwareImage_3090; + FileLength =sizeof (*pFirmwareImage);// New 8k byte firmware size for RT3071/RT3072 //DBGPRINT(RT_DEBUG_TRACE, ("Usb Chip\n"));
@@ -347,7 +347,7 @@ NDIS_STATUS RtmpAsicLoadFirmware(#ifdef RTMP_MAC_PCI if ((Version ==0x2860 ) ||IS_RT3090 (pAd)||IS_RT3390 (pAd)) { - pFirmwareImage = FirmwareImage; + pFirmwareImage = FirmwareImage_3090; FileLength =FIRMWAREIMAGE_LENGTH ; }#endif // RTMP_MAC_PCI //
drivers/staging/rt3090/firmware.h +1 -1
@@ -2,7 +2,7 @@/* AUTO GEN PLEASE DO NOT MODIFY IT */ -UCHAR FirmwareImage [] = { +UCHAR FirmwareImage_3090 [] = {0x02 ,0x02 ,0xf3 ,0x02 ,0x02 ,0xa1 ,0x22 ,0x22 ,0xff ,0xff ,0xff ,0x02 ,0x01 ,0x27 ,0xff ,0xff ,0xff ,0xff ,0xff ,0x02 ,0x00 ,0x1e ,0xff ,0xff ,0xff ,0xff ,0xff ,0x02 ,0x00 ,0xd8 ,0xc0 ,0xe0 ,0xc0 ,0xf0 ,0xc0 ,0x83 ,0xc0 ,0x82 ,0xc0 ,0xd0 ,0x75 ,0xd0 ,0x18 ,0xc2 ,0xaf ,0x30 ,0x45 ,0x03 ,
PATCH 8/8 Staging: remove no longer needed rt3090 driver
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: remove no longer needed rt3090 driver
rt2860 handles now all rt2860/rt3090 chipsets.
---
The patch itself can be obtained from:
[ it is too big for the mailing list ]
drivers/staging/Kconfig | 2 drivers/staging/Makefile | 1 drivers/staging/rt2860/pci_main_dev.c | 1 drivers/staging/rt3090/Kconfig | 5 drivers/staging/rt3090/Makefile | 80 drivers/staging/rt3090/action.h | 66 drivers/staging/rt3090/ap.h | 512 - drivers/staging/rt3090/ap_apcli.h | 276 drivers/staging/rt3090/ap_autoChSel.h | 79 drivers/staging/rt3090/ap_autoChSel_cmm.h | 66 drivers/staging/rt3090/ap_cfg.h | 118 drivers/staging/rt3090/ap_ids.h | 82 drivers/staging/rt3090/ap_mbss.h | 72 drivers/staging/rt3090/ap_uapsd.h | 636 -- drivers/staging/rt3090/ap_wds.h | 212 drivers/staging/rt3090/chips/rt3090.c | 123 drivers/staging/rt3090/chips/rt30xx.c | 525 - drivers/staging/rt3090/chips/rt3370.c | 121 drivers/staging/rt3090/chips/rt3390.c | 122 drivers/staging/rt3090/chips/rt33xx.c | 536 - drivers/staging/rt3090/chlist.h | 130 drivers/staging/rt3090/common/action.c | 1057 --- drivers/staging/rt3090/common/ba_action.c | 1779 ----- drivers/staging/rt3090/common/cmm_aes.c | 1560 ----- drivers/staging/rt3090/common/cmm_asic.c | 2753 --------- drivers/staging/rt3090/common/cmm_cfg.c | 295 drivers/staging/rt3090/common/cmm_data.c | 2763 --------- drivers/staging/rt3090/common/cmm_data_pci.c | 1576 ----- drivers/staging/rt3090/common/cmm_info.c | 3717 ------------ drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 ----- drivers/staging/rt3090/common/cmm_profile.c | 2321 ------- drivers/staging/rt3090/common/cmm_sanity.c | 1718 ----- drivers/staging/rt3090/common/cmm_sync.c | 734 -- drivers/staging/rt3090/common/cmm_tkip.c | 966 --- drivers/staging/rt3090/common/cmm_wep.c | 500 - drivers/staging/rt3090/common/cmm_wpa.c | 3149 ---------- drivers/staging/rt3090/common/crypt_aes.c | 1007 --- drivers/staging/rt3090/common/crypt_biginteger.c | 1119 --- drivers/staging/rt3090/common/crypt_dh.c | 234 drivers/staging/rt3090/common/crypt_hmac.c | 279 drivers/staging/rt3090/common/crypt_md5.c | 353 - drivers/staging/rt3090/common/crypt_sha2.c | 536 - drivers/staging/rt3090/common/dfs.c | 481 - drivers/staging/rt3090/common/ee_efuse.c | 1548 ----- drivers/staging/rt3090/common/ee_prom.c | 308 - drivers/staging/rt3090/common/eeprom.c | 98 drivers/staging/rt3090/common/igmp_snoop.c | 1365 ---- drivers/staging/rt3090/common/mlme.c | 6550 --------------------- drivers/staging/rt3090/common/mlme_ex.c | 215 drivers/staging/rt3090/common/netif_block.c | 147 drivers/staging/rt3090/common/rt_channel.c | 1287 ---- drivers/staging/rt3090/common/rt_rf.c | 201 drivers/staging/rt3090/common/rtmp_init.c | 3882 ------------ drivers/staging/rt3090/common/rtmp_mcu.c | 560 - drivers/staging/rt3090/common/rtmp_timer.c | 327 - drivers/staging/rt3090/common/spectrum.c | 2221 ------- drivers/staging/rt3090/config.mk | 187 drivers/staging/rt3090/crypt_hmac.h | 81 drivers/staging/rt3090/crypt_md5.h | 78 drivers/staging/rt3090/crypt_sha2.h | 107 drivers/staging/rt3090/dfs.h | 137 drivers/staging/rt3090/eeprom.h | 82 drivers/staging/rt3090/igmp_snoop.h | 152 drivers/staging/rt3090/ipv6.h | 215 drivers/staging/rt3090/link_list.h | 133 drivers/staging/rt3090/mac_pci.h | 454 - drivers/staging/rt3090/mlme.h | 1360 ---- drivers/staging/rt3090/mlme_ex.h | 83 drivers/staging/rt3090/mlme_ex_def.h | 53 drivers/staging/rt3090/netif_block.h | 56 drivers/staging/rt3090/oid.h | 1015 --- drivers/staging/rt3090/pci_main_dev.c | 1195 --- drivers/staging/rt3090/rt3090.h | 77 drivers/staging/rt3090/rt30xx.h | 48 drivers/staging/rt3090/rt3370.h | 64 drivers/staging/rt3090/rt3390.h | 77 drivers/staging/rt3090/rt33xx.h | 48 drivers/staging/rt3090/rt_ate.c | 6089 -------------------- drivers/staging/rt3090/rt_ate.h | 314 - drivers/staging/rt3090/rt_config.h | 126 drivers/staging/rt3090/rt_linux.c | 1623 ----- drivers/staging/rt3090/rt_linux.h | 1034 --- drivers/staging/rt3090/rt_main_dev.c | 897 --- drivers/staging/rt3090/rt_pci_rbus.c | 989 --- drivers/staging/rt3090/rt_profile.c | 101 drivers/staging/rt3090/rtmp.h | 6873 ----------------------- drivers/staging/rt3090/rtmp_chip.h | 355 - drivers/staging/rt3090/rtmp_def.h | 1650 ----- drivers/staging/rt3090/rtmp_dot11.h | 146 drivers/staging/rt3090/rtmp_iface.h | 81 drivers/staging/rt3090/rtmp_mac.h | 2304 ------- drivers/staging/rt3090/rtmp_mcu.h | 55 drivers/staging/rt3090/rtmp_os.h | 93 drivers/staging/rt3090/rtmp_pci.h | 110 drivers/staging/rt3090/rtmp_phy.h | 631 -- drivers/staging/rt3090/rtmp_timer.h | 162 drivers/staging/rt3090/rtmp_type.h | 147 drivers/staging/rt3090/spectrum.h | 234 drivers/staging/rt3090/spectrum_def.h | 257 drivers/staging/rt3090/sta/assoc.c | 1673 ----- drivers/staging/rt3090/sta/auth.c | 491 - drivers/staging/rt3090/sta/auth_rsp.c | 151 drivers/staging/rt3090/sta/connect.c | 2759 --------- drivers/staging/rt3090/sta/dls.c | 2207 ------- drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 - drivers/staging/rt3090/sta/rtmp_data.c | 2661 -------- drivers/staging/rt3090/sta/sanity.c | 382 - drivers/staging/rt3090/sta/sync.c | 1840 ------ drivers/staging/rt3090/sta/wpa.c | 396 - drivers/staging/rt3090/sta_ioctl.c | 4477 -------------- drivers/staging/rt3090/vr_ikans.h | 71 drivers/staging/rt3090/wpa.h | 447 - 112 files changed, 1 insertion(+), 101234 deletions(-)
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Hi,
Here are some major updates to Ralink drivers from the staging tree.
Quoted 7 lines
rt28x0 drivers are updated to match V2.1.0.0 vendor's drivers, rt2860 driver gets RT3090 PCIe chipset support and no longer needed separate rt3090 driver is removed.
The end result is 100 KLOC gone and shared common code for all chipsets.
The patchset was tested with RT2860 and RT3070 chipsets.
Very cool work, thanks so much. They are all now in my tree and in linux-next.
greg k-h