Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 test0r
|
44e085360f |
@@ -125,8 +125,6 @@ int bes_host_slave_sync(struct bes2600_common *hw_priv)
|
||||
}
|
||||
*/
|
||||
|
||||
//#define DATA_DUMP_OBSERVE
|
||||
|
||||
static int bes_firmware_download_write_reg(struct platform_fw_t *fw_data, u32 addr, u32 val)
|
||||
{
|
||||
u8 frame_num = 0;
|
||||
@@ -468,14 +466,6 @@ static int bes_firmware_download(struct platform_fw_t *fw_data, const char *fw_n
|
||||
|
||||
const struct firmware *fw_bin;
|
||||
|
||||
#ifdef DATA_DUMP_OBSERVE
|
||||
char *observe;
|
||||
size_t observe_len;
|
||||
loff_t observe_off = 0;
|
||||
mm_segment_t old_fs;
|
||||
struct file *observe_file = NULL;
|
||||
#endif
|
||||
|
||||
struct fw_msg_hdr_t header;
|
||||
struct fw_info_t fw_info;
|
||||
struct download_fw_t download_addr;
|
||||
@@ -583,14 +573,6 @@ retry:
|
||||
}
|
||||
download_addr.addr = fw_info.addr;
|
||||
|
||||
#ifdef DATA_DUMP_OBSERVE
|
||||
observe_file = filp_open("/lib/firmware/bes2002_fw_write.bin", O_CREAT | O_RDWR, 0);
|
||||
if (IS_ERR(observe_file)) {
|
||||
bes_err("create data_dump file err:%ld\n", IS_ERR(observe_file));
|
||||
observe_file = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
while (code_length) {
|
||||
|
||||
#if 1
|
||||
@@ -640,17 +622,6 @@ retry:
|
||||
//mdelay(5000);
|
||||
bes_devel("tx_download_firmware_data:%x %d\n", download_addr.addr, length);
|
||||
|
||||
#ifdef DATA_DUMP_OBSERVE
|
||||
if (observe_file) {
|
||||
observe = (char *)(long_buf + sizeof(struct fw_msg_hdr_t) + sizeof(struct download_fw_t));
|
||||
observe_len = length - sizeof(struct fw_msg_hdr_t) - sizeof(struct download_fw_t);
|
||||
old_fs = get_fs();
|
||||
set_fs(KERNEL_DS);
|
||||
vfs_write(observe_file, observe, observe_len, &observe_off);
|
||||
set_fs(old_fs);
|
||||
}
|
||||
#endif
|
||||
|
||||
ret = bes2600_data_write(long_buf, length > 512 ? length : 512);
|
||||
if (ret) {
|
||||
bes_err("tx download fw data err:%d\n", ret);
|
||||
@@ -832,11 +803,6 @@ retry:
|
||||
|
||||
err2:
|
||||
kfree(long_buf);
|
||||
#ifdef DATA_DUMP_OBSERVE
|
||||
if (observe_file) {
|
||||
filp_close(observe_file, NULL);
|
||||
}
|
||||
#endif
|
||||
err1:
|
||||
kfree(short_buf);
|
||||
release_firmware(fw_bin);
|
||||
|
||||
@@ -790,41 +790,6 @@ void bes2600_core_release(struct bes2600_common *self)
|
||||
return;
|
||||
}
|
||||
|
||||
#if (GET_MAC_ADDR_METHOD == 2) || (GET_MAC_ADDR_METHOD == 3) /* To use macaddr and ps mode of customers */
|
||||
int access_file(char *path, char *buffer, int size, int isRead)
|
||||
{
|
||||
int ret=0;
|
||||
struct file *fp;
|
||||
mm_segment_t old_fs = get_fs();
|
||||
|
||||
if(isRead)
|
||||
fp = filp_open(path,O_RDONLY,S_IRUSR);
|
||||
else
|
||||
fp = filp_open(path,O_CREAT|O_WRONLY,S_IRUSR);
|
||||
|
||||
if (IS_ERR(fp)) {
|
||||
bes_err("BES2600 : can't open %s\n", path);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (isRead) {
|
||||
fp->f_pos = 0;
|
||||
set_fs(KERNEL_DS);
|
||||
ret = vfs_read(fp,buffer,size,&fp->f_pos);
|
||||
set_fs(old_fs);
|
||||
} else {
|
||||
fp->f_pos = 0;
|
||||
set_fs(KERNEL_DS);
|
||||
ret = vfs_write(fp,buffer,size,&fp->f_pos);
|
||||
set_fs(old_fs);
|
||||
}
|
||||
filp_close(fp,NULL);
|
||||
|
||||
bes_info("BES2600 : access_file return code(%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
int bes2600_wifi_start(struct bes2600_common *hw_priv)
|
||||
{
|
||||
int ret = 0, if_id;
|
||||
|
||||
+1
-59
@@ -14,50 +14,11 @@
|
||||
#include "scan.h"
|
||||
#include "sta.h"
|
||||
#include "pm.h"
|
||||
#include "epta_coex.h"
|
||||
#include "epta_request.h"
|
||||
#include "bes_pwr.h"
|
||||
|
||||
/*
|
||||
* After this many consecutive WSM scan rejections from firmware, stop
|
||||
* issuing new scans for BES2600_SCAN_BACKOFF_JIFFIES and let the state
|
||||
* that's rejecting them (coex window, firmware-internal busy) clear.
|
||||
*/
|
||||
#define BES2600_SCAN_REJECT_THRESHOLD 3
|
||||
#define BES2600_SCAN_BACKOFF_JIFFIES (10 * HZ)
|
||||
|
||||
static void bes2600_scan_restart_delayed(struct bes2600_vif *priv);
|
||||
|
||||
/*
|
||||
* Decide whether to skip sending the next WSM scan command without
|
||||
* bothering the firmware. Two triggers:
|
||||
*
|
||||
* 1. BT A2DP is streaming in non-FDD coex mode. The firmware is
|
||||
* known to reject scan requests during that window; short-
|
||||
* circuiting here saves a WSM round-trip and avoids the
|
||||
* wsm_generic_confirm / scan_work warning cascade that follows.
|
||||
*
|
||||
* 2. We already saw >= BES2600_SCAN_REJECT_THRESHOLD consecutive
|
||||
* rejections on recent scan attempts and the backoff window has
|
||||
* not yet elapsed. Whatever was rejecting them is likely still
|
||||
* rejecting them; give it time.
|
||||
*
|
||||
* Returns true if the caller should abandon the scan iteration.
|
||||
*/
|
||||
static bool bes2600_scan_should_defer(struct bes2600_common *hw_priv)
|
||||
{
|
||||
#ifdef WIFI_BT_COEXIST_EPTA_ENABLE
|
||||
if (!coex_is_fdd_mode() && coex_is_bt_a2dp())
|
||||
return true;
|
||||
#endif
|
||||
|
||||
if (hw_priv->scan.reject_count >= BES2600_SCAN_REJECT_THRESHOLD &&
|
||||
time_before(jiffies, hw_priv->scan.backoff_until))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BES2600_TESTMODE
|
||||
static int bes2600_advance_scan_start(struct bes2600_common *hw_priv)
|
||||
{
|
||||
@@ -741,29 +702,10 @@ void bes2600_scan_work(struct work_struct *work)
|
||||
wsm_unlock_tx(hw_priv);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
if (bes2600_scan_should_defer(hw_priv)) {
|
||||
hw_priv->scan.status = -EBUSY;
|
||||
hw_priv->scan.reject_count++;
|
||||
hw_priv->scan.backoff_until =
|
||||
jiffies + BES2600_SCAN_BACKOFF_JIFFIES;
|
||||
wiphy_dbg(priv->hw->wiphy,
|
||||
"[SCAN] deferred (coex/backoff, reject_count=%u)\n",
|
||||
hw_priv->scan.reject_count);
|
||||
kfree(scan.ch);
|
||||
goto fail;
|
||||
}
|
||||
hw_priv->scan.status = bes2600_scan_start(priv, &scan);
|
||||
}
|
||||
kfree(scan.ch);
|
||||
if (hw_priv->scan.status) {
|
||||
hw_priv->scan.reject_count++;
|
||||
hw_priv->scan.backoff_until =
|
||||
jiffies + BES2600_SCAN_BACKOFF_JIFFIES;
|
||||
/* Lower callers already logged the reason at wiphy_warn. */
|
||||
if (WARN_ON(hw_priv->scan.status))
|
||||
goto fail;
|
||||
}
|
||||
hw_priv->scan.reject_count = 0;
|
||||
hw_priv->scan.curr = it;
|
||||
}
|
||||
up(&hw_priv->conf_lock);
|
||||
|
||||
@@ -42,17 +42,6 @@ struct bes2600_scan {
|
||||
struct delayed_work probe_work;
|
||||
int direct_probe;
|
||||
u8 if_id;
|
||||
/*
|
||||
* Track consecutive firmware-side WSM scan rejections so we can
|
||||
* back off briefly instead of re-issuing the same scan on every
|
||||
* mac80211 background-scan tick. Firmware returns WSM status != 0
|
||||
* for a handful of transient conditions (BT A2DP active in non-
|
||||
* FDD coex, firmware-internal busy windows) and keeps rejecting
|
||||
* until the state clears; retrying at full cadence just floods
|
||||
* dmesg.
|
||||
*/
|
||||
unsigned int reject_count;
|
||||
unsigned long backoff_until;
|
||||
};
|
||||
|
||||
int bes2600_hw_scan(struct ieee80211_hw *hw,
|
||||
|
||||
+1
-13
@@ -134,20 +134,8 @@ static int wsm_generic_confirm(struct bes2600_common *hw_priv,
|
||||
struct wsm_buf *buf)
|
||||
{
|
||||
u32 status = WSM_GET32(buf);
|
||||
|
||||
/*
|
||||
* A non-SUCCESS status here is a firmware-side policy decision for
|
||||
* the command whose confirm this is -- commonly WSM status 2 for
|
||||
* scan (0x0407) rejected because of a coex window or transient
|
||||
* firmware-busy state. It is not a driver/kernel bug, so avoid the
|
||||
* WARN()/stack-trace treatment; the caller already emits a
|
||||
* wiphy_warn identifying the request id and will propagate the
|
||||
* error to mac80211.
|
||||
*/
|
||||
if (status != WSM_STATUS_SUCCESS) {
|
||||
bes_devel("%s ret %u\n", __func__, status);
|
||||
if (WARN(status != WSM_STATUS_SUCCESS, "wsm_generic_confirm ret %u", status))
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
|
||||
underflow:
|
||||
|
||||
Reference in New Issue
Block a user