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

Commit 7505f7c3 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: create a chip revision whitelist 



This will make it easier to extend and maintain
list of supported hardware.

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

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

+0 −37
Original line number Diff line number Diff line
@@ -1136,34 +1136,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar) 
	return 0;

}



static int ath10k_core_check_chip_id(struct ath10k *ar)

{

	u32 hw_revision = MS(ar->chip_id, SOC_CHIP_ID_REV);



	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot chip_id 0x%08x hw_revision 0x%x\n",

		   ar->chip_id, hw_revision);



	/* Check that we are not using hw1.0 (some of them have same pci id

	 * as hw2.0) before doing anything else as ath10k crashes horribly

	 * due to missing hw1.0 workarounds. */

	switch (hw_revision) {

	case QCA988X_HW_1_0_CHIP_ID_REV:

		ath10k_err(ar, "ERROR: qca988x hw1.0 is not supported\n");

		return -EOPNOTSUPP;



	case QCA988X_HW_2_0_CHIP_ID_REV:

		/* known hardware revision, continue normally */

		return 0;



	default:

		ath10k_warn(ar, "Warning: hardware revision unknown (0x%x), expect problems\n",

			    ar->chip_id);

		return 0;

	}



	return 0;

}



static void ath10k_core_register_work(struct work_struct *work)

{

	struct ath10k *ar = container_of(work, struct ath10k, register_work);
@@ -1211,16 +1183,7 @@ static void ath10k_core_register_work(struct work_struct *work) 


int ath10k_core_register(struct ath10k *ar, u32 chip_id)

{

	int status;



	ar->chip_id = chip_id;



	status = ath10k_core_check_chip_id(ar);

	if (status) {

		ath10k_err(ar, "Unsupported chip id 0x%08x\n", ar->chip_id);

		return status;

	}



	queue_work(ar->workqueue, &ar->register_work);



	return 0;

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

+31 −0
Original line number Diff line number Diff line
@@ -64,6 +64,14 @@ static const struct pci_device_id ath10k_pci_id_table[] = { 
	{0}

};



static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = {

	/* QCA988X pre 2.0 chips are not supported because they need some nasty

	 * hacks. ath10k doesn't have them and these devices crash horribly

	 * because of that.

	 */

	{ QCA988X_2_0_DEVICE_ID, QCA988X_HW_2_0_CHIP_ID_REV },

};



static void ath10k_pci_buffer_cleanup(struct ath10k *ar);

static int ath10k_pci_cold_reset(struct ath10k *ar);

static int ath10k_pci_warm_reset(struct ath10k *ar);
@@ -2476,6 +2484,23 @@ static void ath10k_pci_release(struct ath10k *ar) 
	pci_disable_device(pdev);

}



static bool ath10k_pci_chip_is_supported(u32 dev_id, u32 chip_id)

{

	const struct ath10k_pci_supp_chip *supp_chip;

	int i;

	u32 rev_id = MS(chip_id, SOC_CHIP_ID_REV);



	for (i = 0; i < ARRAY_SIZE(ath10k_pci_supp_chips); i++) {

		supp_chip = &ath10k_pci_supp_chips[i];



		if (supp_chip->dev_id == dev_id &&

		    supp_chip->rev_id == rev_id)

			return true;

	}



	return false;

}



static int ath10k_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *pci_dev)

{
@@ -2521,6 +2546,12 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		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",

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

+5 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ struct ath10k_pci_pipe { 
	struct tasklet_struct intr;

};



struct ath10k_pci_supp_chip {

	u32 dev_id;

	u32 rev_id;

};



struct ath10k_pci {

	struct pci_dev *pdev;

	struct device *dev;