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

Commit 55545b08 authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo
Browse files

ath10k: sdio: reset chip on power_down() 



The target device needs to be reset during power_down(), otherwise only the
first power_up() will work. And as ath10k calls power_up() during driver
initialisation the driver would be otherwise unusable.

Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00005-QCARMSWP-1.

Signed-off-by: default avatarWen Gong <wgong@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6cd70c65

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

+16 −8
Original line number Diff line number Diff line
@@ -1382,6 +1382,12 @@ static int ath10k_sdio_hif_power_up(struct ath10k *ar, 


	ath10k_dbg(ar, ATH10K_DBG_BOOT, "sdio power on\n");



	ret = ath10k_sdio_config(ar);

	if (ret) {

		ath10k_err(ar, "failed to config sdio: %d\n", ret);

		return ret;

	}



	sdio_claim_host(func);



	ret = sdio_enable_func(func);
@@ -1419,11 +1425,19 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar) 


	/* Disable the card */

	sdio_claim_host(ar_sdio->func);



	ret = sdio_disable_func(ar_sdio->func);

	if (ret) {

		ath10k_warn(ar, "unable to disable sdio function: %d\n", ret);

		sdio_release_host(ar_sdio->func);

		return;

	}



	ret = mmc_hw_reset(ar_sdio->func->card->host);

	if (ret)

		ath10k_warn(ar, "unable to disable sdio function: %d\n", ret);

		ath10k_warn(ar, "unable to reset sdio: %d\n", ret);



	sdio_release_host(ar_sdio->func);



	ar_sdio->is_disabled = true;

}
@@ -2028,12 +2042,6 @@ static int ath10k_sdio_probe(struct sdio_func *func, 


	ath10k_sdio_set_mbox_info(ar);



	ret = ath10k_sdio_config(ar);

	if (ret) {

		ath10k_err(ar, "failed to config sdio: %d\n", ret);

		goto err_free_wq;

	}



	bus_params.dev_type = ATH10K_DEV_TYPE_HL;

	/* TODO: don't know yet how to get chip_id with SDIO */

	bus_params.chip_id = 0;