openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: rtl8192e: Remove built-in firmware images 

The driver can already use request_firmware() to load firmware, and
always does so.  There is code in init_firmware() to use the static
firmware images, but it's unreachable!  Remove the data and simplify
init_firmware() accordingly.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ben Hutchings 2014-04-24 03:16:05 +01:00 committed by Greg Kroah-Hartman
parent 430fb25090
commit 84fcb4b3a3
5 changed files with 35 additions and 2840 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8192e/rtl8192e/Kconfig
View File

@ -5,4 +5,5 @@ config RTL8192E
select WIRELESS_EXT
select WEXT_PRIV
select CRYPTO
select FW_LOADER
---help---

97
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
View File

@ -228,13 +228,6 @@ bool init_firmware(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev);
bool rt_status = true;
u8 *firmware_img_buf[3] = { &Rtl8192PciEFwBootArray[0],
&Rtl8192PciEFwMainArray[0],
&Rtl8192PciEFwDataArray[0]};
u32 firmware_img_len[3] = { sizeof(Rtl8192PciEFwBootArray),
sizeof(Rtl8192PciEFwMainArray),
sizeof(Rtl8192PciEFwDataArray)};
u32 file_length = 0;
u8 *mapped_file = NULL;
u8 init_step = 0;
@ -257,77 +250,55 @@ bool init_firmware(struct net_device *dev)
" firmware state\n");
}
priv->firmware_source = FW_SOURCE_IMG_FILE;
for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA;
init_step++) {
if (rst_opt == OPT_SYSTEM_RESET) {
switch (priv->firmware_source) {
case FW_SOURCE_IMG_FILE:
{
if (pfirmware->firmware_buf_size[init_step] == 0) {
const char *fw_name[3] = {
RTL8192E_BOOT_IMG_FW,
RTL8192E_MAIN_IMG_FW,
RTL8192E_DATA_IMG_FW
};
const struct firmware *fw_entry;
int rc;
rc = request_firmware(&fw_entry,
fw_name[init_step], &priv->pdev->dev);
if (rc < 0) {
RT_TRACE(COMP_FIRMWARE, "request firm"
"ware fail!\n");
goto download_firmware_fail;
}
if (fw_entry->size >
if (pfirmware->firmware_buf_size[init_step] == 0) {
const char *fw_name[3] = {
RTL8192E_BOOT_IMG_FW,
RTL8192E_MAIN_IMG_FW,
RTL8192E_DATA_IMG_FW
};
const struct firmware *fw_entry;
int rc;
rc = request_firmware(&fw_entry,
fw_name[init_step],
&priv->pdev->dev);
if (rc < 0) {
RT_TRACE(COMP_FIRMWARE, "request firmware fail!\n");
goto download_firmware_fail;
}
if (fw_entry->size >
sizeof(pfirmware->firmware_buf[init_step])) {
RT_TRACE(COMP_FIRMWARE, "img file size "
RT_TRACE(COMP_FIRMWARE, "img file size "
"exceed the container struct "
"buffer fail!\n");
goto download_firmware_fail;
}
goto download_firmware_fail;
}
if (init_step != FW_INIT_STEP1_MAIN) {
memcpy(pfirmware->firmware_buf[init_step],
if (init_step != FW_INIT_STEP1_MAIN) {
memcpy(pfirmware->firmware_buf[init_step],
fw_entry->data, fw_entry->size);
pfirmware->firmware_buf_size[init_step] =
fw_entry->size;
pfirmware->firmware_buf_size[init_step] =
fw_entry->size;
} else {
memset(pfirmware->firmware_buf[init_step],
} else {
memset(pfirmware->firmware_buf[init_step],
0, 128);
memcpy(&pfirmware->firmware_buf[init_step][128],
memcpy(&pfirmware->firmware_buf[init_step][128],
fw_entry->data, fw_entry->size);
pfirmware->firmware_buf_size[init_step] =
fw_entry->size + 128;
}
if (rst_opt == OPT_SYSTEM_RESET)
release_firmware(fw_entry);
pfirmware->firmware_buf_size[init_step] =
fw_entry->size + 128;
}
mapped_file = pfirmware->firmware_buf[init_step];
file_length = pfirmware->firmware_buf_size[init_step];
break;
if (rst_opt == OPT_SYSTEM_RESET)
release_firmware(fw_entry);
}
case FW_SOURCE_HEADER_FILE:
mapped_file = firmware_img_buf[init_step];
file_length = firmware_img_len[init_step];
if (init_step == FW_INIT_STEP2_DATA) {
memcpy(pfirmware->firmware_buf[init_step], mapped_file, file_length);
pfirmware->firmware_buf_size[init_step] = file_length;
}
break;
default:
break;
}
} else if (rst_opt == OPT_FIRMWARE_RESET) {
mapped_file = pfirmware->firmware_buf[init_step];
file_length = pfirmware->firmware_buf_size[init_step];
}
mapped_file = pfirmware->firmware_buf[init_step];
file_length = pfirmware->firmware_buf_size[init_step];
rt_status = fw_download_code(dev, mapped_file, file_length);
if (!rt_status) {
goto download_firmware_fail;

5
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
View File

@ -43,11 +43,6 @@ enum desc_packet_type {
DESC_PACKET_TYPE_NORMAL = 1,
};
enum firmware_source {
FW_SOURCE_IMG_FILE = 0,
FW_SOURCE_HEADER_FILE = 1,
};
enum firmware_status {
FW_STATUS_0_INIT = 0,
FW_STATUS_1_MOVE_BOOT_CODE = 1,

2771
drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
View File

File diff suppressed because it is too large Load Diff

1
drivers/staging/rtl8192e/rtl8192e/rtl_core.h
View File

@ -582,7 +582,6 @@ struct r8192_priv {
struct rt_firmware *pFirmware;
enum rtl819x_loopback LoopbackMode;
enum firmware_source firmware_source;
struct timer_list watch_dog_timer;
struct timer_list fsync_timer;