Commit 61932ba5 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore: spi: use private max-buf-size limit 



Limit SPI transmissions to the wl12xx max buffer size, as only 12xx was
tested with SPI.

This allows us to remove the global aggregation buffer constant.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luca@coelho.fi>
parent e166de55

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

+8 −2
Original line number Diff line number Diff line
@@ -66,7 +66,13 @@ 
/* HW limitation: maximum possible chunk size is 4095 bytes */

#define WSPI_MAX_CHUNK_SIZE    4092



#define WSPI_MAX_NUM_OF_CHUNKS (WL1271_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE)

/*

 * only support SPI for 12xx - this code should be reworked when 18xx

 * support is introduced

 */

#define SPI_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)



#define WSPI_MAX_NUM_OF_CHUNKS (SPI_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE)



struct wl12xx_spi_glue {

	struct device *dev;
@@ -271,7 +277,7 @@ static int __must_check wl12xx_spi_raw_write(struct device *child, int addr, 
	u32 chunk_len;

	int i;



	WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);

	WARN_ON(len > SPI_AGGR_BUFFER_SIZE);



	spi_message_init(&m);

	memset(t, 0, sizeof(t));

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

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

#define WL1271_AP_DEF_BEACON_EXP   20



#define WL1271_AGGR_BUFFER_SIZE (5 * PAGE_SIZE)



enum wlcore_state {

	WLCORE_STATE_OFF,

	WLCORE_STATE_RESTARTING,

CRA Git | Maintained and supported by SUSTech CRA and CCSE