lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: Add rt2800_wait_csr_ready

Browse Source 
Similar to rt2800_wait_wpdma_ready() we can add a
function to waiting until the CSR is ready. This
centralizes some additional code into rt2800lib.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ivo van Doorn
2010-08-30 21:13:08 +02:00
committed by John W. Linville
parent 2035c0cf8f
commit 5ffddc498c
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/wireless/rt2x00/rt2800lib.c
View File

@@ -255,6 +255,23 @@ void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
} }
EXPORT_SYMBOL_GPL(rt2800_mcu_request); EXPORT_SYMBOL_GPL(rt2800_mcu_request);
int rt2800_wait_csr_ready(struct rt2x00_dev *rt2x00dev)
{
unsigned int i = 0;
u32 reg;
for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
if (reg && reg != ~0)
return 0;
msleep(1);
}
ERROR(rt2x00dev, "Unstable hardware.\n");
return -EBUSY;
}
EXPORT_SYMBOL_GPL(rt2800_wait_csr_ready);
int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev) int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev)
{ {
unsigned int i; unsigned int i;
@@ -370,17 +387,8 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
/* /*
* Wait for stable hardware. * Wait for stable hardware.
*/ */
for (i = 0; i < REGISTER_BUSY_COUNT; i++) { if (rt2800_wait_csr_ready(rt2x00dev))
rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
if (reg && reg != ~0)
break;
msleep(1);
}
if (i == REGISTER_BUSY_COUNT) {
ERROR(rt2x00dev, "Unstable hardware.\n");
return -EBUSY; return -EBUSY;
}
if (rt2x00_is_pci(rt2x00dev)) if (rt2x00_is_pci(rt2x00dev))
rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002); rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002);

1
drivers/net/wireless/rt2x00/rt2800lib.h
View File

@@ -140,6 +140,7 @@ void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
const u8 command, const u8 token, const u8 command, const u8 token,
const u8 arg0, const u8 arg1); const u8 arg0, const u8 arg1);
int rt2800_wait_csr_ready(struct rt2x00_dev *rt2x00dev);
int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev); int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev);
int rt2800_check_firmware(struct rt2x00_dev *rt2x00dev, int rt2800_check_firmware(struct rt2x00_dev *rt2x00dev,

12
drivers/net/wireless/rt2x00/rt2800usb.c
View File

@@ -122,22 +122,12 @@ static void rt2800usb_toggle_rx(struct rt2x00_dev *rt2x00dev,
static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev) static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
{ {
u32 reg; u32 reg;
int i;
/* /*
* Wait until BBP and RF are ready. * Wait until BBP and RF are ready.
*/ */
for (i = 0; i < REGISTER_BUSY_COUNT; i++) { if (rt2800_wait_csr_ready(rt2x00dev))
rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
if (reg && reg != ~0)
break;
msleep(1);
}
if (i == REGISTER_BUSY_COUNT) {
ERROR(rt2x00dev, "Unstable hardware.\n");
return -EBUSY; return -EBUSY;
}
rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg); rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000); rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000);