Skip to content

L
linux-davinci
Commit 96ed5846 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: rtl8192e: coding style cleanups on r819xE_firmware.c 

This cleans up everything but a few 80 column issues in the
r819xE_firmware.c file.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5bf30d96
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 169 deletions
drivers/staging/rtl8192e/r819xE_firmware.c
View file @ 96ed5846
/************************************************************************************************** /*
* Procedure: Init boot code/firmware code/data session * Procedure: Init boot code/firmware code/data session
* *
* Description: This routine will intialize firmware. If any error occurs during the initialization * Description: This routine will intialize firmware. If any error occurs
* process, the routine shall terminate immediately and return fail. * during the initialization process, the routine shall terminate
* NIC driver should call NdisOpenFile only from MiniportInitialize. * immediately and return fail. NIC driver should call
* NdisOpenFile only from MiniportInitialize.
* *
* Arguments: The pointer of the adapter * Arguments: The pointer of the adapter
* Returns: * Returns:
* NDIS_STATUS_FAILURE - the following initialization process should be terminated * NDIS_STATUS_FAILURE - the following initialization process
* NDIS_STATUS_SUCCESS - if firmware initialization process success * should be terminated
**************************************************************************************************/ * NDIS_STATUS_SUCCESS - if firmware initialization process
//#include "ieee80211.h" * success
*/
#include "r8192E.h" #include "r8192E.h"
#include "r8192E_hw.h" #include "r8192E_hw.h"
#include <linux/firmware.h> #include <linux/firmware.h>
/* It should be double word alignment */ /* It should be double word alignment */
#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8 ) #define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4 * (v / 4) - 8)
typedef enum _firmware_init_step{ enum firmware_init_step {
FW_INIT_STEP0_BOOT = 0, FW_INIT_STEP0_BOOT = 0,
FW_INIT_STEP1_MAIN = 1, FW_INIT_STEP1_MAIN = 1,
FW_INIT_STEP2_DATA = 2, FW_INIT_STEP2_DATA = 2,
}firmware_init_step_e; };
typedef enum _opt_rst_type{ enum opt_rst_type {
OPT_SYSTEM_RESET = 0, OPT_SYSTEM_RESET = 0,
OPT_FIRMWARE_RESET = 1, OPT_FIRMWARE_RESET = 1,
}opt_rst_type_e; };
void firmware_init_param(struct net_device *dev) void firmware_init_param(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
rt_firmware *pfirmware = priv->pFirmware; rt_firmware *pfirmware = priv->pFirmware;
pfirmware->cmdpacket_frag_thresold = GET_COMMAND_PACKET_FRAG_THRESHOLD(MAX_TRANSMIT_BUFFER_SIZE); pfirmware->cmdpacket_frag_thresold =
GET_COMMAND_PACKET_FRAG_THRESHOLD(MAX_TRANSMIT_BUFFER_SIZE);
} }
/* /*
* segment the img and use the ptr and length to remember info on each segment * segment the img and use the ptr and length to remember info on each segment
*
*/ */
static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buffer_len) static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
u32 buffer_len)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
bool rt_status = true; bool rt_status = true;
u16 frag_threshold; u16 frag_threshold;
u16 frag_length, frag_offset = 0; u16 frag_length, frag_offset = 0;
//u16 total_size;
int i; int i;
rt_firmware *pfirmware = priv->pFirmware; rt_firmware *pfirmware = priv->pFirmware;
...@@ -58,83 +60,83 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u ...@@ -58,83 +60,83 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u
u8 bLastIniPkt; u8 bLastIniPkt;
firmware_init_param(dev); firmware_init_param(dev);
//Fragmentation might be required
/* Fragmentation might be required */
frag_threshold = pfirmware->cmdpacket_frag_thresold; frag_threshold = pfirmware->cmdpacket_frag_thresold;
do { do {
if((buffer_len - frag_offset) > frag_threshold) { if ((buffer_len - frag_offset) > frag_threshold) {
frag_length = frag_threshold ; frag_length = frag_threshold ;
bLastIniPkt = 0; bLastIniPkt = 0;
} else { } else {
frag_length = buffer_len - frag_offset; frag_length = buffer_len - frag_offset;
bLastIniPkt = 1; bLastIniPkt = 1;
} }
/* Allocate skb buffer to contain firmware info and tx descriptor info /*
* add 4 to avoid packet appending overflow. * Allocate skb buffer to contain firmware info and tx
* */ * descriptor info add 4 to avoid packet appending overflow.
//skb = dev_alloc_skb(USB_HWDESC_HEADER_LEN + frag_length + 4); */
skb = dev_alloc_skb(frag_length + 4); skb = dev_alloc_skb(frag_length + 4);
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev)); memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE); tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->queue_index = TXCMD_QUEUE; tcb_desc->queue_index = TXCMD_QUEUE;
tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT; tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
tcb_desc->bLastIniPkt = bLastIniPkt; tcb_desc->bLastIniPkt = bLastIniPkt;
//skb_reserve(skb, USB_HWDESC_HEADER_LEN);
seg_ptr = skb->data; seg_ptr = skb->data;
/* /*
* Transform from little endian to big endian * Transform from little endian to big endian and pending zero
* and pending zero
*/ */
for(i=0 ; i < frag_length; i+=4) { for (i = 0; i < frag_length; i += 4) {
*seg_ptr++ = ((i+0)<frag_length)?code_virtual_address[i+3]:0; *seg_ptr++ = ((i+0) < frag_length) ? code_virtual_address[i+3] : 0;
*seg_ptr++ = ((i+1)<frag_length)?code_virtual_address[i+2]:0; *seg_ptr++ = ((i+1) < frag_length) ? code_virtual_address[i+2] : 0;
*seg_ptr++ = ((i+2)<frag_length)?code_virtual_address[i+1]:0; *seg_ptr++ = ((i+2) < frag_length) ? code_virtual_address[i+1] : 0;
*seg_ptr++ = ((i+3)<frag_length)?code_virtual_address[i+0]:0; *seg_ptr++ = ((i+3) < frag_length) ? code_virtual_address[i+0] : 0;
} }
tcb_desc->txbuf_size= (u16)i; tcb_desc->txbuf_size = (u16)i;
skb_put(skb, i); skb_put(skb, i);
priv->ieee80211->softmac_hard_start_xmit(skb,dev); priv->ieee80211->softmac_hard_start_xmit(skb, dev);
code_virtual_address += frag_length; code_virtual_address += frag_length;
frag_offset += frag_length; frag_offset += frag_length;
}while(frag_offset < buffer_len); } while (frag_offset < buffer_len);
return rt_status; return rt_status;
} }
//----------------------------------------------------------------------------- /*
// Procedure: Check whether main code is download OK. If OK, turn on CPU * Procedure: Check whether main code is download OK. If OK, turn on CPU
// *
// Description: CPU register locates in different page against general register. * Description: CPU register locates in different page against general
// Switch to CPU register in the begin and switch back before return * register. Switch to CPU register in the begin and switch
// * back before return
// *
// Arguments: The pointer of the adapter * Arguments: The pointer of the adapter
// *
// Returns: * Returns:
// NDIS_STATUS_FAILURE - the following initialization process should be terminated * NDIS_STATUS_FAILURE - the following initialization process should be
// NDIS_STATUS_SUCCESS - if firmware initialization process success * terminated
//----------------------------------------------------------------------------- * NDIS_STATUS_SUCCESS - if firmware initialization process success
*/
static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
{ {
bool rt_status = true; bool rt_status = true;
int check_putcodeOK_time = 200000, check_bootOk_time = 200000; int check_putcodeOK_time = 200000;
int check_bootOk_time = 200000;
u32 CPU_status = 0; u32 CPU_status = 0;
/* Check whether put code OK */ /* Check whether put code OK */
do { do {
CPU_status = read_nic_dword(dev, CPU_GEN); CPU_status = read_nic_dword(dev, CPU_GEN);
if(CPU_status&CPU_GEN_PUT_CODE_OK) if (CPU_status & CPU_GEN_PUT_CODE_OK)
break; break;
}while(check_putcodeOK_time--); } while (check_putcodeOK_time--);
if(!(CPU_status&CPU_GEN_PUT_CODE_OK)) { if (!(CPU_status & CPU_GEN_PUT_CODE_OK)) {
RT_TRACE(COMP_ERR, "Download Firmware: Put code fail!\n"); RT_TRACE(COMP_ERR, "Download Firmware: Put code fail!\n");
goto CPUCheckMainCodeOKAndTurnOnCPU_Fail; goto CPUCheckMainCodeOKAndTurnOnCPU_Fail;
} else { } else {
...@@ -143,27 +145,27 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) ...@@ -143,27 +145,27 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
/* Turn On CPU */ /* Turn On CPU */
CPU_status = read_nic_dword(dev, CPU_GEN); CPU_status = read_nic_dword(dev, CPU_GEN);
write_nic_byte(dev, CPU_GEN, (u8)((CPU_status|CPU_GEN_PWR_STB_CPU)&0xff)); write_nic_byte(dev, CPU_GEN,
(u8)((CPU_status | CPU_GEN_PWR_STB_CPU) & 0xff));
mdelay(1); mdelay(1);
/* Check whether CPU boot OK */ /* Check whether CPU boot OK */
do { do {
CPU_status = read_nic_dword(dev, CPU_GEN); CPU_status = read_nic_dword(dev, CPU_GEN);
if(CPU_status&CPU_GEN_BOOT_RDY) if (CPU_status & CPU_GEN_BOOT_RDY)
break; break;
}while(check_bootOk_time--); } while (check_bootOk_time--);
if(!(CPU_status&CPU_GEN_BOOT_RDY)) { if (!(CPU_status & CPU_GEN_BOOT_RDY))
goto CPUCheckMainCodeOKAndTurnOnCPU_Fail; goto CPUCheckMainCodeOKAndTurnOnCPU_Fail;
} else { else
RT_TRACE(COMP_FIRMWARE, "Download Firmware: Boot ready!\n"); RT_TRACE(COMP_FIRMWARE, "Download Firmware: Boot ready!\n");
}
return rt_status; return rt_status;
CPUCheckMainCodeOKAndTurnOnCPU_Fail: CPUCheckMainCodeOKAndTurnOnCPU_Fail:
RT_TRACE(COMP_ERR, "ERR in %s()\n", __FUNCTION__); RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
rt_status = FALSE; rt_status = FALSE;
return rt_status; return rt_status;
} }
...@@ -179,12 +181,12 @@ static bool CPUcheck_firmware_ready(struct net_device *dev) ...@@ -179,12 +181,12 @@ static bool CPUcheck_firmware_ready(struct net_device *dev)
do { do {
CPU_status = read_nic_dword(dev, CPU_GEN); CPU_status = read_nic_dword(dev, CPU_GEN);
if(CPU_status&CPU_GEN_FIRM_RDY) if (CPU_status & CPU_GEN_FIRM_RDY)
break; break;
}while(check_time--); } while (check_time--);
if(!(CPU_status&CPU_GEN_FIRM_RDY)) if (!(CPU_status & CPU_GEN_FIRM_RDY))
goto CPUCheckFirmwareReady_Fail; goto CPUCheckFirmwareReady_Fail;
else else
RT_TRACE(COMP_FIRMWARE, "Download Firmware: Firmware ready!\n"); RT_TRACE(COMP_FIRMWARE, "Download Firmware: Firmware ready!\n");
...@@ -192,7 +194,7 @@ static bool CPUcheck_firmware_ready(struct net_device *dev) ...@@ -192,7 +194,7 @@ static bool CPUcheck_firmware_ready(struct net_device *dev)
return rt_status; return rt_status;
CPUCheckFirmwareReady_Fail: CPUCheckFirmwareReady_Fail:
RT_TRACE(COMP_ERR, "ERR in %s()\n", __FUNCTION__); RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
rt_status = false; rt_status = false;
return rt_status; return rt_status;
...@@ -205,8 +207,8 @@ bool init_firmware(struct net_device *dev) ...@@ -205,8 +207,8 @@ bool init_firmware(struct net_device *dev)
u32 file_length = 0; u32 file_length = 0;
u8 *mapped_file = NULL; u8 *mapped_file = NULL;
u32 init_step = 0; u32 init_step = 0;
opt_rst_type_e rst_opt = OPT_SYSTEM_RESET; enum opt_rst_type rst_opt = OPT_SYSTEM_RESET;
firmware_init_step_e starting_state = FW_INIT_STEP0_BOOT; enum firmware_init_step starting_state = FW_INIT_STEP0_BOOT;
rt_firmware *pfirmware = priv->pFirmware; rt_firmware *pfirmware = priv->pFirmware;
const struct firmware *fw_entry; const struct firmware *fw_entry;
...@@ -217,73 +219,59 @@ bool init_firmware(struct net_device *dev) ...@@ -217,73 +219,59 @@ bool init_firmware(struct net_device *dev)
RT_TRACE(COMP_FIRMWARE, " PlatformInitFirmware()==>\n"); RT_TRACE(COMP_FIRMWARE, " PlatformInitFirmware()==>\n");
if (pfirmware->firmware_status == FW_STATUS_0_INIT ) { if (pfirmware->firmware_status == FW_STATUS_0_INIT) {
/* it is called by reset */ /* it is called by reset */
rst_opt = OPT_SYSTEM_RESET; rst_opt = OPT_SYSTEM_RESET;
starting_state = FW_INIT_STEP0_BOOT; starting_state = FW_INIT_STEP0_BOOT;
// TODO: system reset /* TODO: system reset */
}else if(pfirmware->firmware_status == FW_STATUS_5_READY) { } else if (pfirmware->firmware_status == FW_STATUS_5_READY) {
/* it is called by Initialize */ /* it is called by Initialize */
rst_opt = OPT_FIRMWARE_RESET; rst_opt = OPT_FIRMWARE_RESET;
starting_state = FW_INIT_STEP2_DATA; starting_state = FW_INIT_STEP2_DATA;
}else { } else {
RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined firmware state\n"); RT_TRACE(COMP_FIRMWARE,
"PlatformInitFirmware: undefined firmware state\n");
} }
/* /*
* Download boot, main, and data image for System reset. * Download boot, main, and data image for System reset.
* Download data image for firmware reseta * Download data image for firmware reseta
*/ */
priv->firmware_source = FW_SOURCE_IMG_FILE; for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {
for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {
/* /*
* Open Image file, and map file to contineous memory if open file success. * Open Image file, and map file to contineous memory if open file success.
* or read image file from array. Default load from IMG file * or read image file from array. Default load from IMG file
*/ */
if(rst_opt == OPT_SYSTEM_RESET) { if (rst_opt == OPT_SYSTEM_RESET) {
switch(priv->firmware_source) { if (pfirmware->firmware_buf_size[init_step] == 0) {
case FW_SOURCE_IMG_FILE: rc = request_firmware(&fw_entry, fw_name[init_step], &priv->pdev->dev);
{ if (rc < 0) {
if(pfirmware->firmware_buf_size[init_step] == 0) {
rc = request_firmware(&fw_entry, fw_name[init_step],&priv->pdev->dev);
if(rc < 0 ) {
RT_TRACE(COMP_FIRMWARE, "request firmware fail!\n"); RT_TRACE(COMP_FIRMWARE, "request firmware fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
if(fw_entry->size > sizeof(pfirmware->firmware_buf[init_step])) { if (fw_entry->size > sizeof(pfirmware->firmware_buf[init_step])) {
RT_TRACE(COMP_FIRMWARE, "img file size exceed the container buffer fail!\n"); RT_TRACE(COMP_FIRMWARE, "img file size exceed the container buffer fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
if(init_step != FW_INIT_STEP1_MAIN) { if (init_step != FW_INIT_STEP1_MAIN) {
memcpy(pfirmware->firmware_buf[init_step],fw_entry->data,fw_entry->size); 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 { } else {
memset(pfirmware->firmware_buf[init_step],0,128); memset(pfirmware->firmware_buf[init_step], 0, 128);
memcpy(&pfirmware->firmware_buf[init_step][128],fw_entry->data,fw_entry->size); memcpy(&pfirmware->firmware_buf[init_step][128], fw_entry->data, fw_entry->size);
//mapped_file = pfirmware->firmware_buf[init_step];
pfirmware->firmware_buf_size[init_step] = fw_entry->size+128; pfirmware->firmware_buf_size[init_step] = fw_entry->size+128;
//file_length = fw_entry->size + 128;
} }
//pfirmware->firmware_buf_size = file_length;
if(rst_opt == OPT_SYSTEM_RESET) { if (rst_opt == OPT_SYSTEM_RESET)
release_firmware(fw_entry); release_firmware(fw_entry);
} }
}
mapped_file = pfirmware->firmware_buf[init_step]; mapped_file = pfirmware->firmware_buf[init_step];
file_length = pfirmware->firmware_buf_size[init_step]; file_length = pfirmware->firmware_buf_size[init_step];
break; } else if (rst_opt == OPT_FIRMWARE_RESET) {
}
default:
break;
}
}else if(rst_opt == OPT_FIRMWARE_RESET ) {
/* we only need to download data.img here */ /* we only need to download data.img here */
mapped_file = pfirmware->firmware_buf[init_step]; mapped_file = pfirmware->firmware_buf[init_step];
file_length = pfirmware->firmware_buf_size[init_step]; file_length = pfirmware->firmware_buf_size[init_step];
...@@ -291,24 +279,25 @@ bool init_firmware(struct net_device *dev) ...@@ -291,24 +279,25 @@ bool init_firmware(struct net_device *dev)
/* Download image file */ /* Download image file */
/* The firmware download process is just as following, /* The firmware download process is just as following,
* 1. that is each packet will be segmented and inserted to the wait queue. * 1. that is each packet will be segmented and inserted to the
* wait queue.
* 2. each packet segment will be put in the skb_buff packet. * 2. each packet segment will be put in the skb_buff packet.
* 3. each skb_buff packet data content will already include the firmware info * 3. each skb_buff packet data content will already include
* and Tx descriptor info * the firmware info and Tx descriptor info
* */ */
rt_status = fw_download_code(dev,mapped_file,file_length); rt_status = fw_download_code(dev, mapped_file, file_length);
if(rt_status != TRUE) { if (rt_status != TRUE)
goto download_firmware_fail; goto download_firmware_fail;
}
switch(init_step) { switch (init_step) {
case FW_INIT_STEP0_BOOT: case FW_INIT_STEP0_BOOT:
/* Download boot /* Download boot
* initialize command descriptor. * initialize command descriptor.
* will set polling bit when firmware code is also configured * will set polling bit when firmware code is also
* configured
*/ */
pfirmware->firmware_status = FW_STATUS_1_MOVE_BOOT_CODE; pfirmware->firmware_status = FW_STATUS_1_MOVE_BOOT_CODE;
//mdelay(1000); /* mdelay(1000); */
/* /*
* To initialize IMEM, CPU move code from 0x80000080, * To initialize IMEM, CPU move code from 0x80000080,
* hence, we send 0x80 byte packet * hence, we send 0x80 byte packet
...@@ -316,13 +305,15 @@ bool init_firmware(struct net_device *dev) ...@@ -316,13 +305,15 @@ bool init_firmware(struct net_device *dev)
break; break;
case FW_INIT_STEP1_MAIN: case FW_INIT_STEP1_MAIN:
/* Download firmware code. Wait until Boot Ready and Turn on CPU */ /* Download firmware code.
* Wait until Boot Ready and Turn on CPU */
pfirmware->firmware_status = FW_STATUS_2_MOVE_MAIN_CODE; pfirmware->firmware_status = FW_STATUS_2_MOVE_MAIN_CODE;
/* Check Put Code OK and Turn On CPU */ /* Check Put Code OK and Turn On CPU */
rt_status = CPUcheck_maincodeok_turnonCPU(dev); rt_status = CPUcheck_maincodeok_turnonCPU(dev);
if(rt_status != TRUE) { if (rt_status != TRUE) {
RT_TRACE(COMP_FIRMWARE, "CPUcheck_maincodeok_turnonCPU fail!\n"); RT_TRACE(COMP_FIRMWARE,
"CPUcheck_maincodeok_turnonCPU fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
...@@ -335,8 +326,10 @@ bool init_firmware(struct net_device *dev) ...@@ -335,8 +326,10 @@ bool init_firmware(struct net_device *dev)
mdelay(1); mdelay(1);
rt_status = CPUcheck_firmware_ready(dev); rt_status = CPUcheck_firmware_ready(dev);
if(rt_status != TRUE) { if (rt_status != TRUE) {
RT_TRACE(COMP_FIRMWARE, "CPUcheck_firmware_ready fail(%d)!\n",rt_status); RT_TRACE(COMP_FIRMWARE,
"CPUcheck_firmware_ready fail(%d)!\n",
rt_status);
goto download_firmware_fail; goto download_firmware_fail;
} }
...@@ -347,12 +340,10 @@ bool init_firmware(struct net_device *dev) ...@@ -347,12 +340,10 @@ bool init_firmware(struct net_device *dev)
} }
RT_TRACE(COMP_FIRMWARE, "Firmware Download Success\n"); RT_TRACE(COMP_FIRMWARE, "Firmware Download Success\n");
//assert(pfirmware->firmware_status == FW_STATUS_5_READY, ("Firmware Download Fail\n"));
return rt_status; return rt_status;
download_firmware_fail: download_firmware_fail:
RT_TRACE(COMP_ERR, "ERR in %s()\n", __FUNCTION__); RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);
rt_status = FALSE; rt_status = FALSE;
return rt_status; return rt_status;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment