drivers/aic8800d80
1
0 Fork 0
mirror of https://github.com/shenmintao/aic8800d80.git synced 2026-11-10 16:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from kaijia323/fix/0x8820-syscfg-and-connect-ealready

Browse Source 
fix(legacy-mcu1): support product 0x8820 and reject busy connect requests
This commit is contained in:
MinQ authored and GitHub committed 2026-10-28 22:20:43 +08:00
2 parents 0ec30e1b9b c79f1b9fec
commit 5a63ce8fe0
4 files changed
+200 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

drivers/aic8800/aic8800_fdrv/rwnx_main.c
+6 -1
View File
@@ -3206,7 +3206,12 @@ static int rwnx_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
if((int)atomic_read(&rwnx_vif->drv_conn_state) == (int)RWNX_DRV_STATUS_DISCONNECTING||
(int)atomic_read(&rwnx_vif->drv_conn_state) == (int)RWNX_DRV_STATUS_CONNECTING) {
AICWFDBG(LOGERROR, "%s driver is disconnecting or connecting ,return it \r\n", __func__);
return 0;
/*
* Returning 0 would accept this request without submitting it to
* the firmware or providing its own connect result.
* Reject the new request without changing an in-flight operation's state.
*/
return -EBUSY;
}
#endif
drivers/aic8800/aic_load_fw/aic_compat_8800d80.c
+23 -1
View File
@@ -233,6 +233,7 @@ int rwnx_plat_userconfig_load_8800d80(struct aic_usb_dev *usb_dev){
int system_config_8800d80(struct aic_usb_dev *usb_dev){
int syscfg_num;
int ret, cnt;
u32 product_id;
const u32 mem_addr = 0x40500000;
const u32 cache_mem_addr = 0x40100020;
struct dbg_mem_read_cfm rd_mem_addr_cfm;
@@ -245,7 +246,9 @@ int system_config_8800d80(struct aic_usb_dev *usb_dev){
chip_mcu_id = 1;
}
chip_id = (u8)(rd_mem_addr_cfm.memdata >> 16);
printk("chip_id=%x, chip_mcu_id = %d\n", chip_id, chip_mcu_id);
product_id = rd_mem_addr_cfm.memdata & 0xFFFF;
printk("chip_id=%x, chip_mcu_id = %d, product_id=0x%04x\n",
chip_id, chip_mcu_id, product_id);
printk("AIC8800D80 legacy: using Radxa SDK V3 loader profile\n");
if (chip_mcu_id == 1) {
ret = rwnx_send_dbg_mem_read_req(usb_dev, cache_mem_addr, &rd_mem_addr_cfm);
@@ -261,6 +264,25 @@ int system_config_8800d80(struct aic_usb_dev *usb_dev){
}
printk("AIC8800D80 MCU1: enabled Bluetooth cache fix\n");
}
/*
* Product 0x8820 needs these extra system-configuration writes for
* MM_START to complete (#118/#119). Keep the normal patch uploads:
* skipping them causes Bluetooth HCI Reset to time out on the
* reported MCU1 unit.
*/
if (product_id == 0x8820) {
ret = rwnx_send_dbg_mem_write_req(usb_dev, 0x40500010, 0x2);
if (ret) {
printk("0x8820: 40500010 write fail: %d\n", ret);
return ret;
}
ret = rwnx_send_dbg_mem_mask_write_req(usb_dev, 0x40506024, 0xff, 0xdf);
if (ret) {
printk("0x8820: 40506024 mask write fail: %d\n", ret);
return ret;
}
printk("AIC8800D80 0x8820: applied vendor syscfg writes\n");
}
#if 1
syscfg_num = sizeof(syscfg_tbl_8800d80) / sizeof(u32) / 2;
for (cnt = 0; cnt < syscfg_num; cnt++) {