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

Commit ae77eccf authored by Shahar Levi's avatar Shahar Levi Committed by Luciano Coelho
Browse files

wl12xx: 1281/1283 support - Improve Tx & Rx path 



Reduced bus transactions in the Tx & Rx path.

[Removed unnecessary check wl->chip.id != CHIP_ID_1283_PG20 when
checking the quirk -- Luca]

Signed-off-by: default avatarShahar Levi <shahar_levi@ti.com>
Reviewed-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 13b107dd

drivers/net/wireless/wl12xx/rx.c

+19 −12
Original line number Diff line number Diff line
@@ -163,18 +163,25 @@ void wl1271_rx(struct wl1271 *wl, struct wl1271_fw_common_status *status) 
			break;

		}



		if (wl->chip.id != CHIP_ID_1283_PG20) {

			/*

			 * Choose the block we want to read

		 * For aggregated packets, only the first memory block should

		 * be retrieved. The FW takes care of the rest.

			 * For aggregated packets, only the first memory block

			 * should be retrieved. The FW takes care of the rest.

			 */

		mem_block = wl1271_rx_get_mem_block(status, drv_rx_counter);

			mem_block = wl1271_rx_get_mem_block(status,

							    drv_rx_counter);



			wl->rx_mem_pool_addr.addr = (mem_block << 8) +

			   le32_to_cpu(wl_mem_map->packet_memory_pool_start);



			wl->rx_mem_pool_addr.addr_extra =

				wl->rx_mem_pool_addr.addr + 4;

		wl1271_write(wl, WL1271_SLV_REG_DATA, &wl->rx_mem_pool_addr,



			wl1271_write(wl, WL1271_SLV_REG_DATA,

				     &wl->rx_mem_pool_addr,

				     sizeof(wl->rx_mem_pool_addr), false);

		}



		/* Read all available packets at once */

		wl1271_read(wl, WL1271_SLV_MEM_DATA, wl->aggr_buf,

drivers/net/wireless/wl12xx/tx.c

+21 −9
Original line number Diff line number Diff line
@@ -158,8 +158,14 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra, 
		desc = (struct wl1271_tx_hw_descr *)skb_push(

			skb, total_len - skb->len);



		/* HW descriptor fields change between wl127x and wl128x */

		if (wl->chip.id == CHIP_ID_1283_PG20) {

			desc->wl128x_mem.total_mem_blocks = total_blocks;

		} else {

			desc->wl127x_mem.extra_blocks = TX_HW_BLOCK_SPARE;

			desc->wl127x_mem.total_mem_blocks = total_blocks;

		}



		desc->id = id;



		wl->tx_blocks_available -= total_blocks;
@@ -249,6 +255,13 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb, 


		desc->wl128x_mem.extra_bytes = aligned_len - skb->len;

		desc->length = cpu_to_le16(aligned_len >> 2);



		wl1271_debug(DEBUG_TX, "tx_fill_hdr: hlid: %d "

			     "tx_attr: 0x%x len: %d life: %d mem: %d",

			     desc->hlid, tx_attr,

			     le16_to_cpu(desc->length),

			     le16_to_cpu(desc->life_time),

			     desc->wl128x_mem.total_mem_blocks);

	} else {

		int pad;
@@ -260,16 +273,15 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb, 
		pad = aligned_len - skb->len;

		tx_attr |= pad << TX_HW_ATTR_OFST_LAST_WORD_PAD;



		wl1271_debug(DEBUG_TX, "tx_fill_hdr: padding: %d", pad);

		wl1271_debug(DEBUG_TX, "tx_fill_hdr: pad: %d hlid: %d "

			     "tx_attr: 0x%x len: %d life: %d mem: %d", pad,

			     desc->hlid, tx_attr,

			     le16_to_cpu(desc->length),

			     le16_to_cpu(desc->life_time),

			     desc->wl127x_mem.total_mem_blocks);

	}



	desc->tx_attr = cpu_to_le16(tx_attr);



	wl1271_debug(DEBUG_TX, "tx_fill_hdr: hlid: %d tx_attr: 0x%x "

		     "len: %d life: %d mem: %d",

		     desc->hlid, le16_to_cpu(desc->tx_attr),

		     le16_to_cpu(desc->length),	le16_to_cpu(desc->life_time),

		     desc->wl127x_mem.total_mem_blocks);

}



/* caller must hold wl->mutex */