forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wl18xx: implement hw op for setting blocks in hw_tx_desc

Browse source 
Add the 18xx variant to the HW Tx descriptor union and set the 18xx
specific values during Tx.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Arik Nemtsov 2012-05-10 12:13:18 +03:00 • committed by Luciano Coelho
parent 624845b31c
commit fb0f2e4ac0
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/wireless/ti/wl18xx/main.c
View file

@ -26,6 +26,7 @@
#include "../wlcore/debug.h" #include "../wlcore/debug.h"
#include "../wlcore/io.h" #include "../wlcore/io.h"
#include "../wlcore/acx.h" #include "../wlcore/acx.h"
#include "../wlcore/tx.h"
#include "../wlcore/boot.h" #include "../wlcore/boot.h"
#include "reg.h" #include "reg.h"
@ -312,12 +313,21 @@ static u32 wl18xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
return (len + blk_size - 1) / blk_size + spare_blks; return (len + blk_size - 1) / blk_size + spare_blks;
} }
static void
wl18xx_set_tx_desc_blocks(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
u32 blks, u32 spare_blks)
{
desc->wl18xx_mem.total_mem_blocks = blks;
desc->wl18xx_mem.reserved = 0;
}
static struct wlcore_ops wl18xx_ops = { static struct wlcore_ops wl18xx_ops = {
.identify_chip = wl18xx_identify_chip, .identify_chip = wl18xx_identify_chip,
.boot = wl18xx_boot, .boot = wl18xx_boot,
.trigger_cmd = wl18xx_trigger_cmd, .trigger_cmd = wl18xx_trigger_cmd,
.ack_event = wl18xx_ack_event, .ack_event = wl18xx_ack_event,
.calc_tx_blocks = wl18xx_calc_tx_blocks, .calc_tx_blocks = wl18xx_calc_tx_blocks,
.set_tx_desc_blocks = wl18xx_set_tx_desc_blocks,
}; };
int __devinit wl18xx_probe(struct platform_device *pdev) int __devinit wl18xx_probe(struct platform_device *pdev)

14
drivers/net/wireless/ti/wlcore/tx.h
View file

@ -85,6 +85,19 @@ struct wl128x_tx_mem {
u8 extra_bytes; u8 extra_bytes;
} __packed; } __packed;
struct wl18xx_tx_mem {
/*
* Total number of memory blocks allocated by the host for
* this packet.
*/
u8 total_mem_blocks;
/*
* always zero
*/
u8 reserved;
} __packed;
/* /*
* On wl128x based devices, when TX packets are aggregated, each packet * On wl128x based devices, when TX packets are aggregated, each packet
* size must be aligned to the SDIO block size. The maximum block size * size must be aligned to the SDIO block size. The maximum block size
@ -100,6 +113,7 @@ struct wl1271_tx_hw_descr {
union { union {
struct wl127x_tx_mem wl127x_mem; struct wl127x_tx_mem wl127x_mem;
struct wl128x_tx_mem wl128x_mem; struct wl128x_tx_mem wl128x_mem;
struct wl18xx_tx_mem wl18xx_mem;
} __packed; } __packed;
/* Device time (in us) when the packet arrived to the driver */ /* Device time (in us) when the packet arrived to the driver */
__le32 start_time; __le32 start_time;