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

Commit d7c44e0b authored by Raja Mani's avatar Raja Mani Committed by Kalle Valo
Browse files

ath6kl: Invoke WOW suspend/resume calls during PM operation 



Link ath6kl's wow suspend/resume functions with the actual suspend/resume path.

WOW mode is selected when the host sdio controller supports both
MMC_PM_KEEP_POWER and MMC_PM_WAKE_SDIO_IRQ capabilities.

kvalo: also adds a missing break in ath6kl_cfg80211_resume(), luckily
it didn't have any effect on functionality.

Signed-off-by: default avatarRaja Mani <rmani@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 524441e3

drivers/net/wireless/ath/ath6kl/cfg80211.c

+28 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,21 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar, 
	int ret;



	switch (mode) {

	case ATH6KL_CFG_SUSPEND_WOW:



		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "wow mode suspend\n");



		/* Flush all non control pkts in TX path */

		ath6kl_tx_data_cleanup(ar);



		ret = ath6kl_wow_suspend(ar, wow);

		if (ret) {

			ath6kl_err("wow suspend failed: %d\n", ret);

			return ret;

		}

		ar->state = ATH6KL_STATE_WOW;

		break;



	case ATH6KL_CFG_SUSPEND_DEEPSLEEP:



		ath6kl_cfg80211_stop(ar);
@@ -1811,6 +1826,18 @@ int ath6kl_cfg80211_resume(struct ath6kl *ar) 
	int ret;



	switch (ar->state) {

	case  ATH6KL_STATE_WOW:

		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "wow mode resume\n");



		ret = ath6kl_wow_resume(ar);

		if (ret) {

			ath6kl_warn("wow mode resume failed: %d\n", ret);

			return ret;

		}



		ar->state = ATH6KL_STATE_ON;

		break;



	case ATH6KL_STATE_DEEPSLEEP:

		if (ar->wmi->pwr_mode != ar->wmi->saved_pwr_mode) {

			ret = ath6kl_wmi_powermode_cmd(ar->wmi, 0,
@@ -1833,6 +1860,7 @@ int ath6kl_cfg80211_resume(struct ath6kl *ar) 
			ath6kl_warn("Failed to boot hw in resume: %d\n", ret);

			return ret;

		}

		break;



	default:

		break;

drivers/net/wireless/ath/ath6kl/sdio.c

+20 −0
Original line number Diff line number Diff line
@@ -798,6 +798,23 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow) 
		return ret;

	}



	if ((flags & MMC_PM_WAKE_SDIO_IRQ) && wow) {

		/*

		 * The host sdio controller is capable of keep power and

		 * sdio irq wake up at this point. It's fine to continue

		 * wow suspend operation.

		 */

		ret = ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_WOW, wow);

		if (ret)

			return ret;



		ret = sdio_set_host_pm_flags(func, MMC_PM_WAKE_SDIO_IRQ);

		if (ret)

			ath6kl_err("set sdio wake irq flag failed: %d\n", ret);



		return ret;

	}



	return ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_DEEPSLEEP, NULL);

}
@@ -820,6 +837,9 @@ static int ath6kl_sdio_resume(struct ath6kl *ar) 


	case ATH6KL_STATE_DEEPSLEEP:

		break;



	case ATH6KL_STATE_WOW:

		break;

	}



	ath6kl_cfg80211_resume(ar);