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

Commit 0da13da7 authored by Ido Yariv's avatar Ido Yariv Committed by Luciano Coelho
Browse files

wl12xx: Clean up the block size alignment code 



Simplify and clean up the block size alignment code:
1. Set the block size according to the padding field type, as it cannot
   exceed the maximum value this field can hold.
2. Move the alignment code into a function instead of duplicating it in
   multiple places.
3. In the current implementation, the block_size member can be
   misleading because a zero value actually means that there's no need to
   align. Declare a block size alignment quirk instead.

Signed-off-by: default avatarIdo Yariv <ido@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent d29633b4

drivers/net/wireless/wl12xx/init.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ int wl1271_chip_specific_init(struct wl1271 *wl) 
	if (wl->chip.id == CHIP_ID_1283_PG20) {

		u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;



		if (wl1271_set_block_size(wl))

		if (wl->quirks & WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)

			/* Enable SDIO padding */

			host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;

drivers/net/wireless/wl12xx/io.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "wl12xx.h"

#include "wl12xx_80211.h"

#include "io.h"

#include "tx.h"



#define OCP_CMD_LOOP  32
@@ -46,7 +47,7 @@ 
bool wl1271_set_block_size(struct wl1271 *wl)

{

	if (wl->if_ops->set_block_size) {

		wl->if_ops->set_block_size(wl);

		wl->if_ops->set_block_size(wl, WL12XX_BUS_BLOCK_SIZE);

		return true;

	}

drivers/net/wireless/wl12xx/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1017,6 +1017,8 @@ static int wl1271_chip_wakeup(struct wl1271 *wl) 
		ret = wl1271_setup(wl);

		if (ret < 0)

			goto out;

		if (wl1271_set_block_size(wl))

			wl->quirks |= WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT;

		break;

	case CHIP_ID_1283_PG10:

	default:
@@ -1487,7 +1489,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl) 
	memset(wl->ap_hlid_map, 0, sizeof(wl->ap_hlid_map));

	wl->ap_fw_ps_map = 0;

	wl->ap_ps_map = 0;

	wl->block_size = 0;



	/*

	 * this is performed after the cancel_work calls and the associated
@@ -3632,7 +3633,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 
	wl->ap_ps_map = 0;

	wl->ap_fw_ps_map = 0;

	wl->quirks = 0;

	wl->block_size = 0;



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

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

drivers/net/wireless/wl12xx/sdio.c

+2 −10
Original line number Diff line number Diff line
@@ -51,15 +51,10 @@ static const struct sdio_device_id wl1271_devices[] = { 
};

MODULE_DEVICE_TABLE(sdio, wl1271_devices);



/* The max SDIO block size is 256 when working with tx padding to SDIO block */

#define TX_PAD_SDIO_BLK_SIZE                  256



static void wl1271_sdio_set_block_size(struct wl1271 *wl)

static void wl1271_sdio_set_block_size(struct wl1271 *wl, unsigned int blksz)

{

	wl->block_size = TX_PAD_SDIO_BLK_SIZE;



	sdio_claim_host(wl->if_priv);

	sdio_set_block_size(wl->if_priv, TX_PAD_SDIO_BLK_SIZE);

	sdio_set_block_size(wl->if_priv, blksz);

	sdio_release_host(wl->if_priv);

}
@@ -178,9 +173,6 @@ static int wl1271_sdio_power_on(struct wl1271 *wl) 
	sdio_claim_host(func);

	sdio_enable_func(func);



	/* Set the default block size in case it was modified */

	sdio_set_block_size(func, 0);



out:

	return ret;

}

drivers/net/wireless/wl12xx/tx.c

+14 −12
Original line number Diff line number Diff line
@@ -149,6 +149,15 @@ u8 wl1271_tx_get_hlid(struct sk_buff *skb) 
	}

}



static unsigned int wl12xx_calc_packet_alignment(struct wl1271 *wl,

						unsigned int packet_length)

{

	if (wl->quirks & WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)

		return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);

	else

		return ALIGN(packet_length, WL1271_TX_ALIGN_TO);

}



static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,

				u32 buf_offset, u8 hlid)

{
@@ -174,10 +183,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra, 


	/* approximate the number of blocks required for this packet

	   in the firmware */

	if (wl->block_size)

		len = ALIGN(total_len, wl->block_size);

	else

		len = total_len;

	len = wl12xx_calc_packet_alignment(wl, total_len);



	total_blocks = (len + TX_HW_BLOCK_SIZE - 1) / TX_HW_BLOCK_SIZE +

		spare_blocks;
@@ -291,9 +297,9 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb, 
	tx_attr |= rate_idx << TX_HW_ATTR_OFST_RATE_POLICY;

	desc->reserved = 0;



	if (wl->block_size) {

		aligned_len = ALIGN(skb->len, wl->block_size);

	aligned_len = wl12xx_calc_packet_alignment(wl, skb->len);



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

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

		desc->length = cpu_to_le16(aligned_len >> 2);
@@ -306,8 +312,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb, 
	} else {

		int pad;



		/* align the length (and store in terms of words) */

		aligned_len = ALIGN(skb->len, WL1271_TX_ALIGN_TO);

		/* Store the aligned length in terms of words */

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



		/* calculate number of padding bytes */
@@ -386,10 +391,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb, 
	 * In special cases, we want to align to a specific block size

	 * (eg. for wl128x with SDIO we align to 256).

	 */

	if (wl->block_size)

		total_len = ALIGN(skb->len, wl->block_size);

	else

		total_len = ALIGN(skb->len, WL1271_TX_ALIGN_TO);

	total_len = wl12xx_calc_packet_alignment(wl, skb->len);



	memcpy(wl->aggr_buf + buf_offset, skb->data, skb->len);

	memset(wl->aggr_buf + buf_offset + skb->len, 0, total_len - skb->len);