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

Commit 2920743a authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wl12xx: use 1 spare block in all cases 



Remove support for firmwares that require 2 spare blocks for packet TX
(and delete the WL12XX_QUIRK_USE_2_SPARE_BLOCKS quirk definition)

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent c302b2c9

drivers/net/wireless/wl12xx/boot.c

+0 −10
Original line number Diff line number Diff line
@@ -107,16 +107,6 @@ static unsigned int wl12xx_get_fw_ver_quirks(struct wl1271 *wl) 
	unsigned int quirks = 0;

	unsigned int *fw_ver = wl->chip.fw_ver;



	/* Only for wl127x */

	if ((fw_ver[FW_VER_CHIP] == FW_VER_CHIP_WL127X) &&

	    /* Check STA version */

	    (((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&

	      (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_STA_MIN)) ||

	     /* Check AP version */

	     ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP) &&

	      (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_AP_MIN))))

		quirks |= WL12XX_QUIRK_USE_2_SPARE_BLOCKS;



	/* Only new station firmwares support routing fw logs to the host */

	if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&

	    (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))

drivers/net/wireless/wl12xx/tx.c

+2 −5
Original line number Diff line number Diff line
@@ -169,12 +169,9 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra, 
	u32 len;

	u32 total_blocks;

	int id, ret = -EBUSY;

	u32 spare_blocks;



	if (unlikely(wl->quirks & WL12XX_QUIRK_USE_2_SPARE_BLOCKS))

		spare_blocks = 2;

	else

		spare_blocks = 1;

	/* we use 1 spare block */

	u32 spare_blocks = 1;



	if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)

		return -EAGAIN;

drivers/net/wireless/wl12xx/wl12xx.h

+0 −6
Original line number Diff line number Diff line
@@ -656,12 +656,6 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen); 
/* Each RX/TX transaction requires an end-of-transaction transfer */

#define WL12XX_QUIRK_END_OF_TRANSACTION		BIT(0)



/*

 * Older firmwares use 2 spare TX blocks

 * (for STA < 6.1.3.50.58 or for AP < 6.2.0.0.47)

 */

#define WL12XX_QUIRK_USE_2_SPARE_BLOCKS		BIT(1)



/* WL128X requires aggregated packets to be aligned to the SDIO block size */

#define WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT	BIT(2)