mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi->esp8089: update driver ver 1.8:

Browse Source 
1.Repair the coexistence of bluetooth module (unused coexistence agreement possible WIFI does not work).
  2.increasing the compatibility of kernel3.10.
  3.strengthen SoftAP and P2P GO the performance of the model.
This commit is contained in:
li bing
2014-10-20 10:18:31 +08:00
parent 07af23d4ff
commit cfaf65aa4c
8 changed files with 9319 additions and 9102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6178
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/eagle_fw1.h
View File

File diff suppressed because it is too large Load Diff

5720
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/eagle_fw2.h
View File

File diff suppressed because it is too large Load Diff

6399
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/eagle_fw3.h
View File

File diff suppressed because it is too large Load Diff

2
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_debug.h
View File

@@ -8,7 +8,7 @@
#ifdef ASSERT_PANIC
#define ESSERT(v) BUG_ON(!(v))
#else
#define ESSERT(v) WARN_ON(!(v))
#define ESSERT(v) if(!(v)) printk("ESSERT:%s %d\n", __FILE__, __LINE__)
#endif

100
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_mac80211.c
View File

@@ -355,6 +355,67 @@ static void esp_op_remove_interface(struct ieee80211_hw *hw,
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29))
#define BEACON_TIM_SAVE_MAX 20
u8 beacon_tim_saved[BEACON_TIM_SAVE_MAX];
int beacon_tim_count;
static void beacon_tim_init(void)
{
memset(beacon_tim_saved, BEACON_TIM_SAVE_MAX, 0);
beacon_tim_count = 0;
}
static u8 beacon_tim_save(u8 this_tim)
{
u8 all_tim = 0;
int i;
beacon_tim_saved[beacon_tim_count] = this_tim;
if(++beacon_tim_count >= BEACON_TIM_SAVE_MAX)
beacon_tim_count = 0;
for(i = 0; i < BEACON_TIM_SAVE_MAX; i++)
all_tim |= beacon_tim_saved[i];
return all_tim;
}
static bool beacon_tim_alter(struct sk_buff *beacon)
{
u8 *p, *tim_end;
u8 tim_count;
int len;
int remain_len;
struct ieee80211_mgmt * mgmt;
if (beacon == NULL)
return false;
mgmt = (struct ieee80211_mgmt *)((u8 *)beacon->data);
remain_len = beacon->len - ((u8 *)mgmt->u.beacon.variable - (u8 *)mgmt + 12);
p = mgmt->u.beacon.variable;
while (remain_len > 0) {
len = *(++p);
if (*p == WLAN_EID_TIM) { // tim field
tim_end = p + len;
tim_count = *(++p);
p += 2;
//multicast
if(tim_count == 0)
*p |= 0x1;
if((*p & 0xfe) == 0 && tim_end >= p+1){// we only support 8 sta in this case
p++;
*p = beacon_tim_save(*p);
}
return tim_count == 0;
}
p += (len + 1);
remain_len -= (2 + len);
}
return false;
}
unsigned long init_jiffies;
unsigned long cycle_beacon_count;
static void drv_handle_beacon(unsigned long data)
{
struct ieee80211_vif *vif = (struct ieee80211_vif *) data;
@@ -362,30 +423,43 @@ static void drv_handle_beacon(unsigned long data)
struct sk_buff *beacon;
struct sk_buff *skb;
static int dbgcnt = 0;
bool tim_reach = false;
if(evif->epub == NULL)
return;
mdelay(2400 * (cycle_beacon_count % 25) % 10000 /1000);
beacon = ieee80211_beacon_get(evif->epub->hw, vif);
tim_reach = beacon_tim_alter(beacon);
if (beacon && !(dbgcnt++ % 600)) {
ESP_IEEE80211_DBG(ESP_SHOW, " beacon length:%d,fc:0x%x\n", beacon->len,
((struct ieee80211_mgmt *)(beacon->data))->frame_control);
}
sip_tx_data_pkt_enqueue(evif->epub, beacon);
if(beacon)
sip_tx_data_pkt_enqueue(evif->epub, beacon);
if(cycle_beacon_count++ == 100){
init_jiffies = jiffies;
cycle_beacon_count -= 100;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28))
mod_timer(&evif->beacon_timer, jiffies+msecs_to_jiffies(vif->bss_conf.beacon_int));
mod_timer(&evif->beacon_timer, init_jiffies + msecs_to_jiffies(cycle_beacon_count * vif->bss_conf.beacon_int*1024/1000));
#else
mod_timer(&evif->beacon_timer, jiffies+msecs_to_jiffies(evif->beacon_interval));
mod_timer(&evif->beacon_timer, init_jiffies +msecs_to_jiffies(cycle_beacon_count * evif->beacon_interval*1024/1000));
#endif
//FIXME:the packets must be sent at home channel
//send buffer mcast frames
skb = ieee80211_get_buffered_bc(evif->epub->hw, vif);
while (skb) {
sip_tx_data_pkt_enqueue(evif->epub, skb);
if(tim_reach){
skb = ieee80211_get_buffered_bc(evif->epub->hw, vif);
while (skb) {
sip_tx_data_pkt_enqueue(evif->epub, skb);
skb = ieee80211_get_buffered_bc(evif->epub->hw, vif);
}
}
}
@@ -395,8 +469,15 @@ static void init_beacon_timer(struct ieee80211_vif *vif)
ESP_IEEE80211_DBG(ESP_DBG_OP, " %s enter: beacon interval %x\n", __func__, evif->beacon_interval);
beacon_tim_init();
init_timer(&evif->beacon_timer); //TBD, not init here...
evif->beacon_timer.expires=jiffies+msecs_to_jiffies(evif->beacon_interval*1024/1000);
cycle_beacon_count = 1;
init_jiffies = jiffies;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28))
evif->beacon_timer.expires = init_jiffies + msecs_to_jiffies(cycle_beacon_count * vif->bss_conf.beacon_int*1024/1000);
#else
evif->beacon_timer.expires = init_jiffies + msecs_to_jiffies(cycle_beacon_count * evif->beacon_interval*1024/1000);
#endif
evif->beacon_timer.data = (unsigned long) vif;
evif->beacon_timer.function = drv_handle_beacon;
add_timer(&evif->beacon_timer);
@@ -1699,10 +1780,9 @@ static void _esp_flush_rxq(struct esp_pub *epub)
struct sk_buff *skb = NULL;
while ((skb = skb_dequeue(&epub->rxq))) {
esp_dbg(ESP_DBG_TRACE, "%s call ieee80211_rx \n", __func__);
//local_bh_disable();
//do not log when in spin_lock
//esp_dbg(ESP_DBG_TRACE, "%s call ieee80211_rx \n", __func__);
ieee80211_rx(epub->hw, skb);
//local_bh_enable();
}
}

18
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_sip.c
View File

@@ -609,9 +609,9 @@ void sip_rxq_process(struct work_struct *work)
return;
}
spin_lock(&sip->rx_lock);
mutex_lock(&sip->rx_mtx);
_sip_rxq_process(sip);
spin_unlock(&sip->rx_lock);
mutex_unlock(&sip->rx_mtx);
}
static inline void sip_rx_pkt_enqueue(struct esp_sip *sip, struct sk_buff *skb)
@@ -1099,9 +1099,13 @@ static int sip_pack_pkt(struct esp_sip *sip, struct sk_buff *skb, int *pm_state)
wh = (struct ieee80211_hdr *)skb->data;
if (ieee80211_is_mgmt(wh->frame_control)) {
/* addba/delba/bar may use different tid/ac */
if (ieee80211_is_beacon(wh->frame_control)||shdr->d_ac == WME_AC_VO) {
if (shdr->d_ac == WME_AC_VO) {
shdr->d_tid = 7;
}
if (ieee80211_is_beacon(wh->frame_control)) {
shdr->d_tid = 8;
shdr->d_ac = 4;
}
}
//#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
if (check_ac_tid(skb->data, shdr->d_ac, shdr->d_tid)) {
@@ -1608,7 +1612,7 @@ int sip_channel_value_inconsistency(u8 *start, size_t len, unsigned channel)
case WLAN_EID_SSID:
if (elen >= 33) {
esp_dbg(ESP_DBG_ERROR, "SSID to long\n");
show_buf(start-36, 256);
//show_buf(start-36, 256);
return -1;
}
memcpy(ssid, pos, elen);
@@ -1635,7 +1639,7 @@ int sip_channel_value_inconsistency(u8 *start, size_t len, unsigned channel)
channel_parsed = DS_Param[0];
} else {
esp_dbg(ESP_DBG_ERROR, "DS_Param not found\n");
show_buf(start-36, 256);
//show_buf(start-36, 256);
return -1;
}
@@ -1905,7 +1909,7 @@ struct esp_sip * sip_attach(struct esp_pub *epub)
}
}
spin_lock_init(&sip->rx_lock);
mutex_init(&sip->rx_mtx);
skb_queue_head_init(&sip->rxq);
#ifndef RX_SYNC
INIT_WORK(&sip->rx_process_work, sip_rxq_process);
@@ -1962,6 +1966,7 @@ void sip_detach(struct esp_sip *sip)
#endif/* RX_SYNC */
skb_queue_purge(&sip->rxq);
mutex_destroy(&sip->rx_mtx);
cancel_work_sync(&sip->epub->sendup_work);
skb_queue_purge(&sip->epub->rxq);
@@ -2002,6 +2007,7 @@ void sip_detach(struct esp_sip *sip)
cancel_work_sync(&sip->rx_process_work);
#endif/* RX_SYNC */
skb_queue_purge(&sip->rxq);
mutex_destroy(&sip->rx_mtx);
cancel_work_sync(&sip->epub->sendup_work);
skb_queue_purge(&sip->epub->rxq);
}

2
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_sip.h
View File

@@ -79,7 +79,7 @@ struct esp_sip {
u8 * rx_aggr_lastpkt_ptr;
#endif
spinlock_t rx_lock;
struct mutex rx_mtx;
struct sk_buff_head rxq;
#ifndef RX_SYNC
struct work_struct rx_process_work;

2
drivers/net/wireless/rockchip_wlan/esp8089/esp_driver/esp_version.h
View File

@@ -1 +1 @@
#define DRIVER_VER 0x8ca74364f124ll
#define DRIVER_VER 0x6272c30af2c8ll