Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b0624f authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore/wl12xx: set the number of Tx descriptors per chip family 



Each chip family can have a different amount of Tx descriptors. These
are set on init.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 96e0c683

drivers/net/wireless/ti/wl12xx/main.c

+1 −0
Original line number Diff line number Diff line
@@ -674,6 +674,7 @@ static int __devinit wl12xx_probe(struct platform_device *pdev) 
	wl->ops = &wl12xx_ops;

	wl->ptable = wl12xx_ptable;

	wl->rtable = wl12xx_rtable;

	wl->num_tx_desc = 16;



	return wlcore_probe(wl, pdev);

}

drivers/net/wireless/ti/wlcore/acx.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ int wl12xx_acx_mem_cfg(struct wl1271 *wl) 
	mem_conf->rx_mem_block_num = mem->rx_block_num;

	mem_conf->tx_min_mem_block_num = mem->tx_min_block_num;

	mem_conf->num_ssid_profiles = mem->ssid_profiles;

	mem_conf->total_tx_descriptors = cpu_to_le32(ACX_TX_DESCRIPTORS);

	mem_conf->total_tx_descriptors = cpu_to_le32(wl->num_tx_desc);

	mem_conf->dyn_mem_enable = mem->dynamic_memory;

	mem_conf->tx_free_req = mem->min_req_tx_blocks;

	mem_conf->rx_free_req = mem->min_req_rx_blocks;

drivers/net/wireless/ti/wlcore/main.c

+3 −1
Original line number Diff line number Diff line
@@ -5269,7 +5269,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size) 
	__set_bit(WL12XX_SYSTEM_HLID, wl->links_map);



	memset(wl->tx_frames_map, 0, sizeof(wl->tx_frames_map));

	for (i = 0; i < ACX_TX_DESCRIPTORS; i++)

	for (i = 0; i < wl->num_tx_desc; i++)

		wl->tx_frames[i] = NULL;



	spin_lock_init(&wl->wl_lock);
@@ -5411,6 +5411,8 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) 
		goto out_free_hw;

	}



	BUG_ON(wl->num_tx_desc > WLCORE_MAX_TX_DESCRIPTORS);



	wl->irq = platform_get_irq(pdev, 0);

	wl->ref_clock = pdata->board_ref_clock;

	wl->tcxo_clock = pdata->board_tcxo_clock;

drivers/net/wireless/ti/wlcore/tx.c

+5 −5
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb) 
{

	int id;



	id = find_first_zero_bit(wl->tx_frames_map, ACX_TX_DESCRIPTORS);

	if (id >= ACX_TX_DESCRIPTORS)

	id = find_first_zero_bit(wl->tx_frames_map, wl->num_tx_desc);

	if (id >= wl->num_tx_desc)

		return -EBUSY;



	__set_bit(id, wl->tx_frames_map);
@@ -74,7 +74,7 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb) 
static void wl1271_free_tx_id(struct wl1271 *wl, int id)

{

	if (__test_and_clear_bit(id, wl->tx_frames_map)) {

		if (unlikely(wl->tx_frames_cnt == ACX_TX_DESCRIPTORS))

		if (unlikely(wl->tx_frames_cnt == wl->num_tx_desc))

			clear_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags);



		wl->tx_frames[id] = NULL;
@@ -818,7 +818,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl, 
	u8 retries = 0;



	/* check for id legality */

	if (unlikely(id >= ACX_TX_DESCRIPTORS || wl->tx_frames[id] == NULL)) {

	if (unlikely(id >= wl->num_tx_desc || wl->tx_frames[id] == NULL)) {

		wl1271_warning("TX result illegal id: %d", id);

		return;

	}
@@ -1011,7 +1011,7 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues) 
	if (reset_tx_queues)

		wl1271_handle_tx_low_watermark(wl);



	for (i = 0; i < ACX_TX_DESCRIPTORS; i++) {

	for (i = 0; i < wl->num_tx_desc; i++) {

		if (wl->tx_frames[i] == NULL)

			continue;

drivers/net/wireless/ti/wlcore/wl12xx.h

+0 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ 
#define WL1271_AP_BSS_INDEX        0

#define WL1271_AP_DEF_BEACON_EXP   20



#define ACX_TX_DESCRIPTORS         16



#define WL1271_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)



enum wl1271_state {