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

Commit 9ebcb232 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore: track FW-allocated packets per link 



Move FW-allocation tracking code to the fw_status function and track
allocations made by all links. These will be incorporated in the
improved Tx scheduling algorithm.

Manually zero the system link counters on op_stop, as this link is not
allocated the normal way.

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

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

+17 −12
Original line number Original line Diff line number Diff line
@@ -359,9 +359,8 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl, 
					   struct wl12xx_vif *wlvif,

					   struct wl12xx_vif *wlvif,

					   struct wl_fw_status_2 *status)

					   struct wl_fw_status_2 *status)

{

{

	struct wl1271_link *lnk;

	u32 cur_fw_ps_map;

	u32 cur_fw_ps_map;

	u8 hlid, cnt;

	u8 hlid;





	/* TODO: also use link_fast_bitmap here */

	/* TODO: also use link_fast_bitmap here */
@@ -375,17 +374,9 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl, 
		wl->ap_fw_ps_map = cur_fw_ps_map;

		wl->ap_fw_ps_map = cur_fw_ps_map;

	}

	}





	for_each_set_bit(hlid, wlvif->ap.sta_hlid_map, WL12XX_MAX_LINKS) {

	for_each_set_bit(hlid, wlvif->ap.sta_hlid_map, WL12XX_MAX_LINKS)

		lnk = &wl->links[hlid];

		cnt = status->counters.tx_lnk_free_pkts[hlid] -

			lnk->prev_freed_pkts;



		lnk->prev_freed_pkts = status->counters.tx_lnk_free_pkts[hlid];

		lnk->allocated_pkts -= cnt;



		wl12xx_irq_ps_regulate_link(wl, wlvif, hlid,

		wl12xx_irq_ps_regulate_link(wl, wlvif, hlid,

					    lnk->allocated_pkts);

					    wl->links[hlid].allocated_pkts);

	}

}

}





static int wlcore_fw_status(struct wl1271 *wl,

static int wlcore_fw_status(struct wl1271 *wl,
@@ -399,6 +390,7 @@ static int wlcore_fw_status(struct wl1271 *wl, 
	int i;

	int i;

	size_t status_len;

	size_t status_len;

	int ret;

	int ret;

	struct wl1271_link *lnk;





	status_len = WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +

	status_len = WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +

		sizeof(*status_2) + wl->fw_status_priv_len;

		sizeof(*status_2) + wl->fw_status_priv_len;
@@ -424,6 +416,17 @@ static int wlcore_fw_status(struct wl1271 *wl, 
		wl->tx_pkts_freed[i] = status_2->counters.tx_released_pkts[i];

		wl->tx_pkts_freed[i] = status_2->counters.tx_released_pkts[i];

	}

	}







	for_each_set_bit(i, wl->links_map, WL12XX_MAX_LINKS) {

		lnk = &wl->links[i];

		/* prevent wrap-around in freed-packets counter */

		lnk->allocated_pkts -=

			(status_2->counters.tx_lnk_free_pkts[i] -

			 lnk->prev_freed_pkts) & 0xff;



		lnk->prev_freed_pkts = status_2->counters.tx_lnk_free_pkts[i];

	}



	/* prevent wrap-around in total blocks counter */

	/* prevent wrap-around in total blocks counter */

	if (likely(wl->tx_blocks_freed <=

	if (likely(wl->tx_blocks_freed <=

		   le32_to_cpu(status_2->total_released_blks)))

		   le32_to_cpu(status_2->total_released_blks)))
@@ -1886,6 +1889,8 @@ static void wlcore_op_stop_locked(struct wl1271 *wl) 
	wl->active_sta_count = 0;

	wl->active_sta_count = 0;





	/* The system link is always allocated */

	/* The system link is always allocated */

	wl->links[WL12XX_SYSTEM_HLID].allocated_pkts = 0;

	wl->links[WL12XX_SYSTEM_HLID].prev_freed_pkts = 0;

	__set_bit(WL12XX_SYSTEM_HLID, wl->links_map);

	__set_bit(WL12XX_SYSTEM_HLID, wl->links_map);





	/*

	/*

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -224,9 +224,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
		ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));

		ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));

		wl->tx_allocated_pkts[ac]++;

		wl->tx_allocated_pkts[ac]++;





		if (!wl12xx_is_dummy_packet(wl, skb) && wlvif &&

		if (test_bit(hlid, wl->links_map))

		    wlvif->bss_type == BSS_TYPE_AP_BSS &&

		    test_bit(hlid, wlvif->ap.sta_hlid_map))

			wl->links[hlid].allocated_pkts++;

			wl->links[hlid].allocated_pkts++;





		ret = 0;

		ret = 0;