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

Commit 84caf800 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Recover from fw crash 



Re-initialize the target when fw crash is reported.
This would make the device functional again after
target crash. During the target re-initialization
it is made sure that target is not bugged with data/cmd
request, ar->state ATH6KL_STATE_RECOVERY is used
for this purpose.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent ede615d2

drivers/net/wireless/ath/ath6kl/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ ath6kl_core-y += main.o 
ath6kl_core-y += txrx.o

ath6kl_core-y += wmi.o

ath6kl_core-y += core.o

ath6kl_core-y += recovery.o

ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o



obj-$(CONFIG_ATH6KL_SDIO) += ath6kl_sdio.o

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

+15 −2
Original line number Diff line number Diff line
@@ -2503,14 +2503,23 @@ static int __ath6kl_cfg80211_suspend(struct wiphy *wiphy, 
{

	struct ath6kl *ar = wiphy_priv(wiphy);



	ath6kl_recovery_suspend(ar);



	return ath6kl_hif_suspend(ar, wow);

}



static int __ath6kl_cfg80211_resume(struct wiphy *wiphy)

{

	struct ath6kl *ar = wiphy_priv(wiphy);

	int err;



	err = ath6kl_hif_resume(ar);

	if (err)

		return err;



	return ath6kl_hif_resume(ar);

	ar->fw_recovery.enable = true;



	return 0;

}



/*
@@ -3434,6 +3443,10 @@ void ath6kl_cfg80211_stop(struct ath6kl_vif *vif) 
	clear_bit(CONNECTED, &vif->flags);

	clear_bit(CONNECT_PEND, &vif->flags);



	/* Stop netdev queues, needed during recovery */

	netif_stop_queue(vif->ndev);

	netif_carrier_off(vif->ndev);



	/* disable scanning */

	if (ath6kl_wmi_scanparams_cmd(vif->ar->wmi, vif->fw_vif_idx, 0xFFFF,

				      0, 0, 0, 0, 0, 0, 0, 0, 0) != 0)
@@ -3447,7 +3460,7 @@ void ath6kl_cfg80211_stop_all(struct ath6kl *ar) 
	struct ath6kl_vif *vif;



	vif = ath6kl_vif_first(ar);

	if (!vif) {

	if (!vif && ar->state != ATH6KL_STATE_RECOVERY) {

		/* save the current power mode before enabling power save */

		ar->wmi->saved_pwr_mode = ar->wmi->pwr_mode;

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

+4 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type) 
	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: name=%s dev=0x%p, ar=0x%p\n",

		   __func__, wdev->netdev->name, wdev->netdev, ar);



	ath6kl_recovery_init(ar);



	return ret;



err_rxbuf_cleanup:
@@ -291,6 +293,8 @@ void ath6kl_core_cleanup(struct ath6kl *ar) 
{

	ath6kl_hif_power_off(ar);



	ath6kl_recovery_cleanup(ar);



	destroy_workqueue(ar->ath6kl_wq);



	if (ar->htc_target)

drivers/net/wireless/ath/ath6kl/core.h

+18 −0
Original line number Diff line number Diff line
@@ -645,6 +645,12 @@ enum ath6kl_state { 
	ATH6KL_STATE_DEEPSLEEP,

	ATH6KL_STATE_CUTPOWER,

	ATH6KL_STATE_WOW,

	ATH6KL_STATE_RECOVERY,

};



/* Fw error recovery */

enum ath6kl_fw_err {

	ATH6KL_FW_ASSERT,

};



struct ath6kl {
@@ -790,6 +796,12 @@ struct ath6kl { 


	bool wiphy_registered;



	struct ath6kl_fw_recovery {

		bool enable;

		struct work_struct recovery_work;

		unsigned long err_reason;

	} fw_recovery;



#ifdef CONFIG_ATH6KL_DEBUG

	struct {

		struct sk_buff_head fwlog_queue;
@@ -925,4 +937,10 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type); 
void ath6kl_core_cleanup(struct ath6kl *ar);

void ath6kl_core_destroy(struct ath6kl *ar);



/* Fw error recovery */

void ath6kl_init_hw_restart(struct ath6kl *ar);

void ath6kl_recovery_err_notify(struct ath6kl *ar, enum ath6kl_fw_err reason);

void ath6kl_recovery_init(struct ath6kl *ar);

void ath6kl_recovery_cleanup(struct ath6kl *ar);

void ath6kl_recovery_suspend(struct ath6kl *ar);

#endif /* CORE_H */

drivers/net/wireless/ath/ath6kl/debug.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ enum ATH6K_DEBUG_MASK { 
	ATH6KL_DBG_SUSPEND	= BIT(20),

	ATH6KL_DBG_USB		= BIT(21),

	ATH6KL_DBG_USB_BULK	= BIT(22),

	ATH6KL_DBG_RECOVERY	= BIT(23),

	ATH6KL_DBG_ANY	        = 0xffffffff  /* enable all logs */

};