login
Search
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 ...
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 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. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --- drivers/staging/rt3090/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: b/drivers/staging/rt3090/config.mk =================================================================== --- a/drivers/staging/rt3090/config.mk +++ b/drivers/staging/rt3090/config.mk @@ -1,5 +1,5 @@ # Support ATE function -HAS_ATE=y +HAS_ATE=n # Support 28xx QA ATE function HAS_28xx_QA=n _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Subject: [PATCH] Staging: rt3090: disable HAS_ANTENNA_DIVERSITY_SUPPORT option This makes rt3090 match other Ralink drivers and V2.2.0.0 vendor version. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --- drivers/staging/rt3090/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: b/drivers/staging/rt3090/config.mk =================================================================== --- a/drivers/staging/rt3090/config.mk +++ b/drivers/staging/rt3090/config.mk @@ -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 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] Staging: rt3090: remove private debugging ioctls
This makes rt3090 match other Ralink drivers.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/rt3090/oid.h | 12
drivers/staging/rt3090/sta_ioctl.c | 799 -------------------------------------
2 files changed, 811 deletions(-)
Index: b/drivers/staging/rt3090/oid.h
===================================================================
--- a/drivers/staging/rt3090/oid.h
+++ b/drivers/staging/rt3090/oid.h
@@ -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)
Index: b/drivers/staging/rt3090/sta_ioctl.c
===================================================================
--- a/drivers/staging/rt3090/sta_ioctl.c
+++ b/drivers/staging/rt3090/sta_ioctl.c
@@ -101,23 +101,6 @@ struct iw_priv_args privtab[] = {
IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "adhocEntry" },
/* --- sub-ioctls relations --- */
-#ifdef DBG
-{ RTPRIV_IOCTL_BBP,
- IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK,
- "bbp"},
-{ RTPRIV_IOCTL_MAC,
- IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | ...From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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
[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.
[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.
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 ...From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] Staging: rt28x0: remove unused code from common/dfs.c
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/staging/rt2860/common/dfs.c | 378 ------------------------------------
drivers/staging/rt2860/dfs.h | 75 -------
2 files changed, 453 deletions(-)
Index: b/drivers/staging/rt2860/common/dfs.c
===================================================================
--- a/drivers/staging/rt2860/common/dfs.c
+++ b/drivers/staging/rt2860/common/dfs.c
@@ -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 = ...From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Subject: [PATCH] Staging: remove no longer needed rt3090 driver rt2860 handles now all rt2860/rt3090 chipsets. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --- The patch itself can be obtained from: http://www.kernel.org/pub/linux/kernel/people/bart/ralink/staging-remove-no-longer-nee... [ 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 ...
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Subject: [PATCH] Staging: rt3090: remove private ioctls This makes rt3090 match other Ralink drivers. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --- drivers/staging/rt3090/oid.h | 117 - drivers/staging/rt3090/sta_ioctl.c | 2285 ------------------------------------- 2 files changed, 2 insertions(+), 2400 deletions(-) Index: b/drivers/staging/rt3090/oid.h =================================================================== --- a/drivers/staging/rt3090/oid.h +++ b/drivers/staging/rt3090/oid.h @@ -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 ...
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 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. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --- 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 ...
Very cool work, thanks so much. They are all now in my tree and in linux-next. greg k-h _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
