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

Commit 1a7fecb7 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: reset chip before reading chip_id in probe 



There are some very rare cases with some hardware
configuration that the device doesn't init quickly
enough in which case reading chip_id yielded 0.
This caused driver to subsequently fail to setup
the device.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent c545070e

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

+18 −12
Original line number Diff line number Diff line
@@ -2544,18 +2544,6 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		goto err_release;

	}



	chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

	if (chip_id == 0xffffffff) {

		ath10k_err(ar, "failed to get chip id\n");

		goto err_sleep;

	}



	if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) {

		ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n",

			   pdev->device, chip_id);

		goto err_sleep;

	}



	ret = ath10k_pci_alloc_pipes(ar);

	if (ret) {

		ath10k_err(ar, "failed to allocate copy engine pipes: %d\n",
@@ -2582,6 +2570,24 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		goto err_deinit_irq;

	}



	ret = ath10k_pci_chip_reset(ar);

	if (ret) {

		ath10k_err(ar, "failed to reset chip: %d\n", ret);

		goto err_free_irq;

	}



	chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

	if (chip_id == 0xffffffff) {

		ath10k_err(ar, "failed to get chip id\n");

		goto err_free_irq;

	}



	if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) {

		ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n",

			   pdev->device, chip_id);

		goto err_sleep;

	}



	ath10k_pci_sleep(ar);



	ret = ath10k_core_register(ar, chip_id);