Skip to content

aic_load_fw: enable BT patch loading for U02/U03; fix kernel 6.17+ build #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lorek123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

aic_load_fw: enable BT patch loading for U02/U03; fix kernel 6.17+ build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/aic8800/aic8800_fdrv/rwnx_rx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,7 @@ void reord_deinit_sta(struct aicwf_rx_priv* rx_priv, struct reord_ctrl_info *reo
reord_rxframe_free(&rx_priv->freeq_lock, &rx_priv->rxframes_freequeue, &req->rxframe_list);
}

AICWFDBG(LOGINFO, "reord dinit in_irq():%d in_atomic:%d in_softirq:%d\r\n", (int)in_irq()
AICWFDBG(LOGINFO, "reord dinit in_irq():%d in_atomic:%d in_softirq:%d\r\n", (int)hardirq_count()
,(int)in_atomic(), (int)in_softirq());
spin_unlock_bh(&preorder_ctrl->reord_list_lock);
}
Expand Down
7 changes: 0 additions & 7 deletions drivers/aic8800/aic_load_fw/aic_compat_8800d80.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ int aicfw_download_fw_8800d80(struct aic_usb_dev *usb_dev)

int i = 0;

#if 0
if (chip_id == CHIP_REV_U01) {
head = aicbt_patch_table_alloc(usb_dev, FW_PATCH_TABLE_NAME_8800D80);
} else {
Expand All @@ -397,9 +396,6 @@ int aicfw_download_fw_8800d80(struct aic_usb_dev *usb_dev)
return -1;
}

if(head == NULL){
return -1;
}
if (chip_id == CHIP_REV_U01) {
patch_info.addr_adid = FW_RAM_ADID_BASE_ADDR_8800D80;
patch_info.addr_patch = FW_RAM_PATCH_BASE_ADDR_8800D80;
Expand All @@ -414,11 +410,9 @@ int aicfw_download_fw_8800d80(struct aic_usb_dev *usb_dev)
}

printk("addr_adid 0x%x, addr_patch 0x%x\n", patch_info.addr_adid, patch_info.addr_patch);
#endif
if(testmode == FW_NORMAL_MODE){

if (chip_id != CHIP_REV_U01){
#if 0
if(rwnx_plat_bin_fw_upload_android(usb_dev, patch_info.addr_adid, FW_ADID_BASE_NAME_8800D80_U02)) {
return -1;
}
Expand All @@ -433,7 +427,6 @@ int aicfw_download_fw_8800d80(struct aic_usb_dev *usb_dev)
if (aicbt_patch_table_load(usb_dev, head)) {
return -1;
}
#endif

if (IS_CHIP_ID_H()){
if(rwnx_plat_bin_fw_upload_android(usb_dev, RAM_FMAC_FW_ADDR_8800D80_U02, FW_BASE_NAME_8800D80_H_U02))
Expand Down