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

Commit 15b90070 authored by Hamad Kadmany's avatar Hamad Kadmany
Browse files

Revert "wil6210: prevent XTAL off in device bootloader" 



This reverts commit 05f7adbb
("wil6210: prevent XTAL off in device bootloader").

Original commit was found to be causing flood of WMI MBOX
interrupts while device is being reset.

CRs-Fixed: 1097247
Change-Id: If7cee7d36230225621ea74bca8ebb0e1077b94e6
Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent 5142c18b

drivers/net/wireless/ath/wil6210/interrupt.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void wil6210_unmask_irq_misc(struct wil6210_priv *wil, bool unmask_halp) 
	      unmask_halp ? WIL6210_IMC_MISC : WIL6210_IMC_MISC_NO_HALP);

}



void wil6210_unmask_halp(struct wil6210_priv *wil)

static void wil6210_unmask_halp(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);
@@ -149,7 +149,7 @@ void wil6210_unmask_halp(struct wil6210_priv *wil) 
	      BIT_DMA_EP_MISC_ICR_HALP);

}



void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil)

static void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

drivers/net/wireless/ath/wil6210/main.c

+4 −26
Original line number Diff line number Diff line
@@ -875,29 +875,19 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
	flush_workqueue(wil->wq_service);

	flush_workqueue(wil->wmi_wq);



	wil6210_unmask_irq_pseudo(wil);

	wil6210_unmask_halp(wil);

	wil_halp_vote(wil);



	wil_bl_crash_info(wil, false);

	rc = wil_target_reset(wil);

	/* wil_target_reset clears the HALP IRQ, need to set it again.

	 * Call wil_halp_unvote to clear the HALP reference counter

	 * and unmask the HALP interrupt before setting it again

	 */

	wil_halp_unvote(wil);

	wil_halp_vote(wil);

	wil_rx_fini(wil);

	if (rc) {

		wil_bl_crash_info(wil, true);

		goto out;

		return rc;

	}



	rc = wil_get_bl_info(wil);

	if (rc == -EAGAIN && !load_fw) /* ignore RF error if not going up */

		rc = 0;

	if (rc)

		goto out;

		return rc;



	wil_set_oob_mode(wil, oob_mode);

	if (load_fw) {
@@ -909,19 +899,14 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
		/* Loading f/w from the file */

		rc = wil_request_firmware(wil, WIL_FW_NAME, true);

		if (rc)

			goto out;

			return rc;

		rc = wil_request_firmware(wil, WIL_FW2_NAME, true);

		if (rc)

			goto out;

			return rc;



		/* Mark FW as loaded from host */

		wil_s(wil, RGF_USER_USAGE_6, 1);



		/* Clear the HALP while in BL, before clearing all the IRQs

		 * and running the FW.

		 */

		wil_halp_unvote(wil);



		/* clear any interrupts which on-card-firmware

		 * may have set

		 */
@@ -932,9 +917,6 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
		wil_w(wil, RGF_CAF_ICR + offsetof(struct RGF_ICR, IMV), ~0);



		wil_release_cpu(wil);

	} else {

		/* Allow XTAL off when going down */

		wil_halp_unvote(wil);

	}



	/* init after reset */
@@ -973,10 +955,6 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
	}



	return rc;



out:

	wil_halp_unvote(wil);

	return rc;

}



void wil_fw_error_recovery(struct wil6210_priv *wil)

drivers/net/wireless/ath/wil6210/wil6210.h

+0 −3
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ void wil_configure_interrupt_moderation(struct wil6210_priv *wil); 
void wil_disable_irq(struct wil6210_priv *wil);

void wil_enable_irq(struct wil6210_priv *wil);

void wil6210_mask_halp(struct wil6210_priv *wil);

void wil6210_unmask_halp(struct wil6210_priv *wil);



/* P2P */

bool wil_p2p_is_social_scan(struct cfg80211_scan_request *request);
@@ -903,8 +902,6 @@ void wil6210_unmask_irq_tx(struct wil6210_priv *wil); 
void wil_rx_handle(struct wil6210_priv *wil, int *quota);

void wil6210_unmask_irq_rx(struct wil6210_priv *wil);



void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil);



int wil_iftype_nl2wmi(enum nl80211_iftype type);



int wil_ioctl(struct wil6210_priv *wil, void __user *data, int cmd);