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

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

wlcore: Propagate errors from wl1271_write 



Propagate errors from wl1271_write and request for recovery when
appropriate.
Also rename prefixes of wlcore functions which their prototypes had to
be changed.

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

drivers/net/wireless/ti/wl12xx/main.c

+18 −5
Original line number Diff line number Diff line
@@ -598,8 +598,10 @@ static const int wl12xx_rtable[REG_TABLE_LEN] = { 
#define WL128X_FW_NAME_SINGLE	"ti-connectivity/wl128x-fw-4-sr.bin"

#define WL128X_PLT_FW_NAME	"ti-connectivity/wl128x-fw-4-plt.bin"



static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)

static int wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)

{

	int ret;



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

		struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;

		struct wl127x_rx_mem_pool_addr rx_mem_addr;
@@ -616,9 +618,13 @@ static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len) 


		rx_mem_addr.addr_extra = rx_mem_addr.addr + 4;



		wl1271_write(wl, WL1271_SLV_REG_DATA,

			     &rx_mem_addr, sizeof(rx_mem_addr), false);

		ret = wlcore_write(wl, WL1271_SLV_REG_DATA, &rx_mem_addr,

				   sizeof(rx_mem_addr), false);

		if (ret < 0)

			return ret;

	}



	return 0;

}



static int wl12xx_identify_chip(struct wl1271 *wl)
@@ -1073,11 +1079,18 @@ static int wl12xx_boot(struct wl1271 *wl) 
	return ret;

}



static void wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,

static int wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,

			       void *buf, size_t len)

{

	wl1271_write(wl, cmd_box_addr, buf, len, false);

	int ret;



	ret = wlcore_write(wl, cmd_box_addr, buf, len, false);

	if (ret < 0)

		return ret;



	wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_CMD);



	return ret;

}



static void wl12xx_ack_event(struct wl1271 *wl)

drivers/net/wireless/ti/wl18xx/main.c

+12 −7
Original line number Diff line number Diff line
@@ -720,10 +720,11 @@ static void wl18xx_pre_upload(struct wl1271 *wl) 
	tmp = wl1271_read32(wl, WL18XX_SCR_PAD2);

}



static void wl18xx_set_mac_and_phy(struct wl1271 *wl)

static int wl18xx_set_mac_and_phy(struct wl1271 *wl)

{

	struct wl18xx_priv *priv = wl->priv;

	size_t len;

	int ret;



	/* the parameters struct is smaller for PG1 */

	if (wl->chip.id == CHIP_ID_185x_PG10)
@@ -732,8 +733,10 @@ static void wl18xx_set_mac_and_phy(struct wl1271 *wl) 
		len = sizeof(struct wl18xx_mac_and_phy_params);



	wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);

	wl1271_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy, len,

		     false);

	ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy,

			   len, false);



	return ret;

}



static void wl18xx_enable_interrupts(struct wl1271 *wl)
@@ -769,7 +772,9 @@ static int wl18xx_boot(struct wl1271 *wl) 
	if (ret < 0)

		goto out;



	wl18xx_set_mac_and_phy(wl);

	ret = wl18xx_set_mac_and_phy(wl);

	if (ret < 0)

		goto out;



	ret = wlcore_boot_run_firmware(wl);

	if (ret < 0)
@@ -781,7 +786,7 @@ static int wl18xx_boot(struct wl1271 *wl) 
	return ret;

}



static void wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,

static int wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,

			       void *buf, size_t len)

{

	struct wl18xx_priv *priv = wl->priv;
@@ -789,8 +794,8 @@ static void wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr, 
	memcpy(priv->cmd_buf, buf, len);

	memset(priv->cmd_buf + len, 0, WL18XX_CMD_MAX_SIZE - len);



	wl1271_write(wl, cmd_box_addr, priv->cmd_buf, WL18XX_CMD_MAX_SIZE,

		     false);

	return wlcore_write(wl, cmd_box_addr, priv->cmd_buf,

			    WL18XX_CMD_MAX_SIZE, false);

}



static void wl18xx_ack_event(struct wl1271 *wl)

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

+11 −6
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf, 
	struct wlcore_partition_set partition;

	int addr, chunk_num, partition_limit;

	u8 *p, *chunk;

	int ret;



	/* whal_FwCtrl_LoadFwImageSm() */
@@ -155,7 +156,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf, 
		memcpy(chunk, p, CHUNK_SIZE);

		wl1271_debug(DEBUG_BOOT, "uploading fw chunk 0x%p to 0x%x",

			     p, addr);

		wl1271_write(wl, addr, chunk, CHUNK_SIZE, false);

		ret = wlcore_write(wl, addr, chunk, CHUNK_SIZE, false);

		if (ret < 0)

			goto out;



		chunk_num++;

	}
@@ -166,10 +169,11 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf, 
	memcpy(chunk, p, fw_data_len % CHUNK_SIZE);

	wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%zd B) 0x%p to 0x%x",

		     fw_data_len % CHUNK_SIZE, p, addr);

	wl1271_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);

	ret = wlcore_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);



out:

	kfree(chunk);

	return 0;

	return ret;

}



int wlcore_boot_upload_firmware(struct wl1271 *wl)
@@ -212,6 +216,7 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl) 
	int i;

	u32 dest_addr, val;

	u8 *nvs_ptr, *nvs_aligned;

	int ret;



	if (wl->nvs == NULL) {

		wl1271_error("NVS file is needed during boot");
@@ -343,11 +348,11 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl) 
		return -ENOMEM;



	/* And finally we upload the NVS tables */

	wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS,

			  nvs_aligned, nvs_len, false);

	ret = wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS, nvs_aligned, nvs_len,

				false);



	kfree(nvs_aligned);

	return 0;

	return ret;



out_badnvs:

	wl1271_error("nvs data is malformed");

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

+9 −3
Original line number Diff line number Diff line
@@ -65,13 +65,17 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len, 
	WARN_ON(len % 4 != 0);

	WARN_ON(test_bit(WL1271_FLAG_IN_ELP, &wl->flags));



	wl1271_write(wl, wl->cmd_box_addr, buf, len, false);

	ret = wlcore_write(wl, wl->cmd_box_addr, buf, len, false);

	if (ret < 0)

		goto fail;



	/*

	 * TODO: we just need this because one bit is in a different

	 * place.  Is there any better way?

	 */

	wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);

	ret = wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);

	if (ret < 0)

		goto fail;



	timeout = jiffies + msecs_to_jiffies(WL1271_COMMAND_TIMEOUT);
@@ -1764,7 +1768,9 @@ int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
		return -EINVAL;



	/* flush all pending packets */

	wl1271_tx_work_locked(wl);

	ret = wlcore_tx_work_locked(wl);

	if (ret < 0)

		goto out;



	if (test_bit(wlvif->dev_role_id, wl->roc_map)) {

		ret = wl12xx_croc(wl, wlvif->dev_role_id);

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

+4 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static int wl1271_event_process(struct wl1271 *wl) 
	u32 vector;

	bool disconnect_sta = false;

	unsigned long sta_bitmap = 0;

	int ret;



	wl1271_event_mbox_dump(mbox);
@@ -228,7 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl) 


	if ((vector & DUMMY_PACKET_EVENT_ID)) {

		wl1271_debug(DEBUG_EVENT, "DUMMY_PACKET_ID_EVENT_ID");

		wl1271_tx_dummy_packet(wl);

		ret = wl1271_tx_dummy_packet(wl);

		if (ret < 0)

			return ret;

	}



	/*