Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| adc6c1f332 |
+46
-17
@@ -179,6 +179,34 @@ static int factory_section_read_file(char *path, void *buffer)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* factory_section_write_file - Write data of specified length to file
|
||||||
|
* @path: path of the file
|
||||||
|
* @buffer: storage of write data
|
||||||
|
* @size: length of data to write
|
||||||
|
*
|
||||||
|
* Return: length on success, negative error code otherwise.
|
||||||
|
*/
|
||||||
|
static int factory_section_write_file(char *path, void *buffer, int size)
|
||||||
|
{
|
||||||
|
int ret = 0;
|
||||||
|
struct file *fp;
|
||||||
|
|
||||||
|
bes_devel("writing %s \n", path);
|
||||||
|
|
||||||
|
fp = filp_open(path, O_TRUNC | O_CREAT | O_RDWR, S_IRUSR);
|
||||||
|
if (IS_ERR(fp)) {
|
||||||
|
bes_devel("BES2600 : can't open %s\n",path);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = kernel_write(fp, buffer, size, &fp->f_pos);
|
||||||
|
|
||||||
|
filp_close(fp,NULL);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static inline int factory_parse(uint8_t *source_buf, struct factory_t *factory)
|
static inline int factory_parse(uint8_t *source_buf, struct factory_t *factory)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
@@ -870,22 +898,9 @@ static inline int factory_build(uint8_t *dest_buf, struct factory_t *factory)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Rebuild the serialised calibration blob in file_buffer from the live
|
|
||||||
* in-memory factory_save_p. Previously this function also persisted the
|
|
||||||
* blob back to FACTORY_PATH via filp_open(O_CREAT) + kernel_write(); that
|
|
||||||
* is not acceptable in mainline, so the persistence step has been removed.
|
|
||||||
*
|
|
||||||
* The in-memory factory_save_p remains authoritative for the duration of
|
|
||||||
* the session; on the next probe the firmware-class file is read back
|
|
||||||
* read-only via request_firmware(). If cross-reboot persistence of runtime
|
|
||||||
* calibration updates becomes a requirement, the expected route is a
|
|
||||||
* userspace-facing dump interface (debugfs read-only blob, or nl80211
|
|
||||||
* vendor command) that lets userspace read the serialised form and store
|
|
||||||
* it under its own privileges.
|
|
||||||
*/
|
|
||||||
static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *factory_save_p)
|
static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *factory_save_p)
|
||||||
{
|
{
|
||||||
|
int ret = 0;
|
||||||
int w_size;
|
int w_size;
|
||||||
u32 crc_len = sizeof(factory_data_t);
|
u32 crc_len = sizeof(factory_data_t);
|
||||||
#ifndef STANDARD_FACTORY_EFUSE_FLAG
|
#ifndef STANDARD_FACTORY_EFUSE_FLAG
|
||||||
@@ -894,11 +909,13 @@ static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *facto
|
|||||||
|
|
||||||
bes_devel("enter %s\n", __func__);
|
bes_devel("enter %s\n", __func__);
|
||||||
|
|
||||||
if (!file_buffer)
|
if (!file_buffer) {
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
if (!factory_save_p)
|
if (!factory_save_p) {
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
}
|
||||||
|
|
||||||
/* All initialized to space */
|
/* All initialized to space */
|
||||||
memset(file_buffer, 32, FACTORY_MAX_SIZE);
|
memset(file_buffer, 32, FACTORY_MAX_SIZE);
|
||||||
@@ -910,10 +927,22 @@ static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *facto
|
|||||||
w_size = factory_build(file_buffer, factory_save_p);
|
w_size = factory_build(file_buffer, factory_save_p);
|
||||||
|
|
||||||
if (w_size < 0 || w_size > FACTORY_MAX_SIZE) {
|
if (w_size < 0 || w_size > FACTORY_MAX_SIZE) {
|
||||||
bes_err("%s: build failed! w_size = %d.", __func__, w_size);
|
bes_err("%s: build failed! ret = %d.", __func__, ret);
|
||||||
return -ETXTBSY;
|
return -ETXTBSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef FACTORY_SAVE_MULTI_PATH
|
||||||
|
/* avoid trailing characters '\0' */
|
||||||
|
file_buffer[w_size] = 32;
|
||||||
|
ret = factory_section_write_file(FACTORY_PATH, file_buffer, FACTORY_MAX_SIZE);
|
||||||
|
#else
|
||||||
|
ret = factory_section_write_file(FACTORY_PATH, file_buffer, w_size);
|
||||||
|
#endif
|
||||||
|
if(ret < 0) {
|
||||||
|
bes_err("%s: write failed! ret = %d.", __func__, ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+59
-1
@@ -14,11 +14,50 @@
|
|||||||
#include "scan.h"
|
#include "scan.h"
|
||||||
#include "sta.h"
|
#include "sta.h"
|
||||||
#include "pm.h"
|
#include "pm.h"
|
||||||
|
#include "epta_coex.h"
|
||||||
#include "epta_request.h"
|
#include "epta_request.h"
|
||||||
#include "bes_pwr.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);
|
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
|
#ifdef CONFIG_BES2600_TESTMODE
|
||||||
static int bes2600_advance_scan_start(struct bes2600_common *hw_priv)
|
static int bes2600_advance_scan_start(struct bes2600_common *hw_priv)
|
||||||
{
|
{
|
||||||
@@ -702,10 +741,29 @@ void bes2600_scan_work(struct work_struct *work)
|
|||||||
wsm_unlock_tx(hw_priv);
|
wsm_unlock_tx(hw_priv);
|
||||||
} else
|
} else
|
||||||
#endif
|
#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);
|
hw_priv->scan.status = bes2600_scan_start(priv, &scan);
|
||||||
|
}
|
||||||
kfree(scan.ch);
|
kfree(scan.ch);
|
||||||
if (WARN_ON(hw_priv->scan.status))
|
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. */
|
||||||
goto fail;
|
goto fail;
|
||||||
|
}
|
||||||
|
hw_priv->scan.reject_count = 0;
|
||||||
hw_priv->scan.curr = it;
|
hw_priv->scan.curr = it;
|
||||||
}
|
}
|
||||||
up(&hw_priv->conf_lock);
|
up(&hw_priv->conf_lock);
|
||||||
|
|||||||
@@ -42,6 +42,17 @@ struct bes2600_scan {
|
|||||||
struct delayed_work probe_work;
|
struct delayed_work probe_work;
|
||||||
int direct_probe;
|
int direct_probe;
|
||||||
u8 if_id;
|
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,
|
int bes2600_hw_scan(struct ieee80211_hw *hw,
|
||||||
|
|||||||
+13
-1
@@ -134,8 +134,20 @@ static int wsm_generic_confirm(struct bes2600_common *hw_priv,
|
|||||||
struct wsm_buf *buf)
|
struct wsm_buf *buf)
|
||||||
{
|
{
|
||||||
u32 status = WSM_GET32(buf);
|
u32 status = WSM_GET32(buf);
|
||||||
if (WARN(status != WSM_STATUS_SUCCESS, "wsm_generic_confirm ret %u", status))
|
|
||||||
|
/*
|
||||||
|
* 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);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
underflow:
|
underflow:
|
||||||
|
|||||||
Reference in New Issue
Block a user