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

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

wl12xx: 1281/1283 support - Add acx commands 



New acx command that sets: Rx fifo enable reduced bus transactions
in RX path. Tx bus transactions padding to SDIO block size that
improve preference in Tx and essential for working with SDIO HS (48Mhz).
The max SDIO block size is 256 when working with Tx bus transactions
padding to SDIO block.

Add new ops to SDIO & SPI that handles the win size change in case of
transactions padding (relevant only for SDIO).

[Fix endianess issues; simplify sdio-specific block_size handling;
minor changes in comments; use "aligned_len" in one calculation
instead of "pad" to avoid confusion -- 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 5aa42346

drivers/net/wireless/wl12xx/acx.c

+26 −0
Original line number Diff line number Diff line
@@ -1019,6 +1019,32 @@ int wl1271_acx_sta_mem_cfg(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap)

{

	struct wl1271_acx_host_config_bitmap *bitmap_conf;

	int ret;



	bitmap_conf = kzalloc(sizeof(*bitmap_conf), GFP_KERNEL);

	if (!bitmap_conf) {

		ret = -ENOMEM;

		goto out;

	}



	bitmap_conf->host_cfg_bitmap = cpu_to_le32(host_cfg_bitmap);



	ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,

				   bitmap_conf, sizeof(*bitmap_conf));

	if (ret < 0) {

		wl1271_warning("wl1271 bitmap config opt failed: %d", ret);

		goto out;

	}



out:

	kfree(bitmap_conf);



	return ret;

}



int wl1271_acx_init_mem_config(struct wl1271 *wl)

{

	int ret;

drivers/net/wireless/wl12xx/acx.h

+11 −0
Original line number Diff line number Diff line
@@ -939,6 +939,16 @@ struct wl1271_acx_keep_alive_config { 
	u8 padding;

} __packed;



#define HOST_IF_CFG_RX_FIFO_ENABLE     BIT(0)

#define HOST_IF_CFG_TX_EXTRA_BLKS_SWAP BIT(1)

#define HOST_IF_CFG_TX_PAD_TO_SDIO_BLK BIT(3)



struct wl1271_acx_host_config_bitmap {

	struct acx_header header;



	__le32 host_cfg_bitmap;

} __packed;



enum {

	WL1271_ACX_TRIG_TYPE_LEVEL = 0,

	WL1271_ACX_TRIG_TYPE_EDGE,
@@ -1275,6 +1285,7 @@ int wl1271_acx_tx_config_options(struct wl1271 *wl); 
int wl1271_acx_ap_mem_cfg(struct wl1271 *wl);

int wl1271_acx_sta_mem_cfg(struct wl1271 *wl);

int wl1271_acx_init_mem_config(struct wl1271 *wl);

int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);

int wl1271_acx_init_rx_interrupt(struct wl1271 *wl);

int wl1271_acx_smart_reflex(struct wl1271 *wl);

int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable);

drivers/net/wireless/wl12xx/init.c

+27 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "cmd.h"

#include "reg.h"

#include "tx.h"

#include "io.h"



int wl1271_sta_init_templates_config(struct wl1271 *wl)

{
@@ -504,6 +505,27 @@ static int wl1271_set_ba_policies(struct wl1271 *wl) 
	return ret;

}



int wl1271_chip_specific_init(struct wl1271 *wl)

{

	int ret = 0;



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

		u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;



		if (wl1271_set_block_size(wl))

			/* Enable SDIO padding */

			host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;



		/* Must be before wl1271_acx_init_mem_config() */

		ret = wl1271_acx_host_if_cfg_bitmap(wl, host_cfg_bitmap);

		if (ret < 0)

			goto out;

	}

out:

	return ret;

}





int wl1271_hw_init(struct wl1271 *wl)

{

	struct conf_tx_ac_category *conf_ac;
@@ -519,6 +541,11 @@ int wl1271_hw_init(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	/* Chip-specific init */

	ret = wl1271_chip_specific_init(wl);

	if (ret < 0)

		return ret;



	/* Mode specific init */

	if (is_ap)

		ret = wl1271_ap_hw_init(wl);

drivers/net/wireless/wl12xx/init.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl); 
int wl1271_init_phy_config(struct wl1271 *wl);

int wl1271_init_pta(struct wl1271 *wl);

int wl1271_init_energy_detection(struct wl1271 *wl);

int wl1271_chip_specific_init(struct wl1271 *wl);

int wl1271_hw_init(struct wl1271 *wl);



#endif

drivers/net/wireless/wl12xx/io.c

+10 −0
Original line number Diff line number Diff line
@@ -43,6 +43,16 @@ 
#define OCP_STATUS_REQ_FAILED 0x20000

#define OCP_STATUS_RESP_ERROR 0x30000



bool wl1271_set_block_size(struct wl1271 *wl)

{

	if (wl->if_ops->set_block_size) {

		wl->if_ops->set_block_size(wl);

		return true;

	}



	return false;

}



void wl1271_disable_interrupts(struct wl1271 *wl)

{

	wl->if_ops->disable_irq(wl);