staging: wilc1000: Ignore errors from clockless registers

Some wilc1000 devices can return wrong spi responses when accessing
clockless registers while the device is in sleep mode, so responses
should be ignored for them. Once the device wakes up, the responses
will be reliable.

Signed-off-by: Adham Abozaeid <[email protected]>

Author: Adham Abozaeid

wilc/wilc_spi.c

@@ -541,7 +541,11 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
 
 	rsp = rb[rix++];
 
-	if (rsp != cmd) {
+	/*
+	 * Clockless registers operations might return unexptected responses,
+	 * even if successful.
+	 */
+	if (rsp != cmd && !clockless) {
 		dev_err(&spi->dev,
 			"Failed cmd response, cmd (%02x), resp (%02x)\n",
 			cmd, rsp);
@@ -552,7 +556,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
 	 * State response
 	 */
 	rsp = rb[rix++];
-	if (rsp != 0x00) {
+	if (rsp != 0x00 && !clockless) {
 		dev_err(&spi->dev, "Failed cmd state response state (%02x)\n",
 			rsp);
 		return N_FAIL;
@@ -579,7 +583,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
 				break;
 		} while (retry--);
 
-		if (retry <= 0) {
+		if (retry <= 0 && !clockless) {
 			dev_err(&spi->dev,
 				"Error, data read response (%02x)\n", rsp);
 			return N_RESET;

wilc/wilc_wfi_cfgoperations.c

@@ -1816,6 +1816,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
 		dev->type = ARPHRD_IEEE80211_RADIOTAP;
 		priv->wdev.iftype = type;
 		vif->iftype = WILC_MONITOR_MODE;
+
 		if (wl->initialized)
 			wilc_set_operation_mode(vif, wilc_get_vif_idx(vif),
 						 WILC_MONITOR_MODE,

wilc/wilc_wlan.c

@@ -754,7 +754,7 @@ void chip_allow_sleep(struct wilc *wilc, int source)
 void chip_wakeup_wilc1000(struct wilc *wilc, int source)
 {
 	u32 ret = 0;
-	u32 reg = 0, clk_status_val = 0, trials = 0;
+	u32 clk_status_val = 0, trials = 0;
 	u32 wakeup_reg, wakeup_bit;
 	u32 clk_status_reg, clk_status_bit;
 	u32 to_host_from_fw_reg, to_host_from_fw_bit;
@@ -782,28 +782,18 @@ void chip_wakeup_wilc1000(struct wilc *wilc, int source)
 		to_host_from_fw_bit = BIT(0);
 	}
 
-	ret = hif_func->hif_read_reg(wilc, from_host_to_fw_reg, &reg);
+
+	/*USE bit 0 to indicate host wakeup*/
+	ret = hif_func->hif_write_reg(wilc, from_host_to_fw_reg,
+				      from_host_to_fw_bit);
 	if (!ret)
 		goto _fail_;
 
-	if (!(reg & from_host_to_fw_bit)) {
-		/*USE bit 0 to indicate host wakeup*/
-		ret = hif_func->hif_write_reg(wilc, from_host_to_fw_reg,
-					      reg | from_host_to_fw_bit);
-		if (!ret)
-			goto _fail_;
-	}
-
-	ret = hif_func->hif_read_reg(wilc, wakeup_reg, &reg);
+	/* Set bit 1 */
+	ret = hif_func->hif_write_reg(wilc, wakeup_reg,
+				      wakeup_bit);
 	if (!ret)
 		goto _fail_;
-	/* Set bit 1 */
-	if (!(reg & wakeup_bit)) {
-		ret = hif_func->hif_write_reg(wilc, wakeup_reg,
-					      reg | wakeup_bit);
-		if (!ret)
-			goto _fail_;
-	}
 
 	do {
 		ret = hif_func->hif_read_reg(wilc, clk_status_reg,