gaoyang3513/MilkV-Duo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111 from LevitatingBusinessMan/aic8800_config

Browse Source 
Enable the config file for aic8800
This commit is contained in:
Carbon
2024-06-25 02:10:00 +00:00
committed by GitHub
parent 66daf080a3 a4490dd1ed
commit 2ded0da822
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
linux_5.10/drivers/net/wireless/aicsemi/aic8800/aic8800_fdrv/rwnx_cfgfile.c
View File

@ -13,6 +13,10 @@
#include "rwnx_defs.h"
#include "rwnx_cfgfile.h"
int rwnx_request_firmware_common(struct rwnx_hw *rwnx_hw,
u32** buffer, const char *filename);
void rwnx_release_firmware_common(u32** buffer);
/**
*
*/
@ -52,36 +56,36 @@ static const char *rwnx_find_tag(const u8 *file_data, unsigned int file_size,
int rwnx_parse_configfile(struct rwnx_hw *rwnx_hw, const char *filename,
struct rwnx_conf_file *config)
{
const struct firmware *config_fw;
u8 dflt_mac[ETH_ALEN] = { 0, 111, 111, 111, 111, 0 };
int ret;
u32 *config_fw=NULL;
int size;
const u8 *tag_ptr;
RWNX_DBG(RWNX_FN_ENTRY_STR);
ret = request_firmware(&config_fw, filename, rwnx_hw->dev);
if (ret) {
printk(KERN_CRIT "%s: Failed to get %s (%d)\n", __func__, filename, ret);
return ret;
size = rwnx_request_firmware_common(rwnx_hw, &config_fw, filename);
if (size <= 0) {
RWNX_DBG("%s: Failed to get %s (%d)\n", __func__, filename, size);
return -1;
}
/* Get MAC Address */
tag_ptr = rwnx_find_tag(config_fw->data, config_fw->size,
tag_ptr = rwnx_find_tag((u8*) config_fw, size,
"MAC_ADDR=", strlen("00:00:00:00:00:00"));
if (tag_ptr != NULL) {
u8 *addr = config->mac_addr;
if (sscanf(tag_ptr,
"%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
addr + 0, addr + 1, addr + 2,
addr + 3, addr + 4, addr + 5) != ETH_ALEN)
memcpy(config->mac_addr, dflt_mac, ETH_ALEN);
} else
memcpy(config->mac_addr, dflt_mac, ETH_ALEN);
RWNX_DBG("MAC Address is:\n%pM\n", config->mac_addr);
addr + 3, addr + 4, addr + 5) != ETH_ALEN) {
printk(KERN_CRIT "%s: Invalid MAC_ADDR in %s\n", __func__, filename);
return -1;
}
}
/* Release the configuration file */
release_firmware(config_fw);
if (config_fw) {
rwnx_release_firmware_common(&config_fw);
}
return 0;
}

17
linux_5.10/drivers/net/wireless/aicsemi/aic8800/aic8800_fdrv/rwnx_main.c
View File

@ -6781,15 +6781,13 @@ int rwnx_cfg80211_init(struct rwnx_plat *rwnx_plat, void **platform_data)
tcp_ack_init(rwnx_hw);
#endif
#if 0
/* Set a default mac address with the last 2 bytes randomized */
memcpy(init_conf.mac_addr, dflt_mac, ETH_ALEN);
ret = rwnx_parse_configfile(rwnx_hw, RWNX_CONFIG_FW_NAME, &init_conf);
if (ret) {
wiphy_err(wiphy, "rwnx_parse_configfile failed\n");
goto err_config;
// do nothing
}
#else
memcpy(init_conf.mac_addr, dflt_mac, ETH_ALEN);
#endif
rwnx_hw->vif_started = 0;
rwnx_hw->monitor_vif = RWNX_INVALID_VIF;
@ -6976,14 +6974,13 @@ int rwnx_cfg80211_init(struct rwnx_plat *rwnx_plat, void **platform_data)
if (mac_addr_efuse[0] | mac_addr_efuse[1] | mac_addr_efuse[2] | mac_addr_efuse[3]) {
memcpy(init_conf.mac_addr, mac_addr_efuse, ETH_ALEN);
}else{
memcpy(init_conf.mac_addr, dflt_mac, ETH_ALEN);
}
}
AICWFDBG(LOGINFO, "get macaddr: %02x:%02x:%02x:%02x:%02x:%02x\r\n",
AICWFDBG(LOGINFO, "efuse macaddr: %02x:%02x:%02x:%02x:%02x:%02x\r\n",
mac_addr_efuse[0], mac_addr_efuse[1], mac_addr_efuse[2],
mac_addr_efuse[3], mac_addr_efuse[4], mac_addr_efuse[5]);
memcpy(wiphy->perm_addr, init_conf.mac_addr, ETH_ALEN);
/* Reset FW */