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

Commit 7c2dd615 authored by Erik Stromdahl's avatar Erik Stromdahl Committed by Kalle Valo
Browse files

ath10k: add device type enum to ath10k_bus_params 



Add dev_type parameter to struct ath10k_bus_params.

The dev type specifies if the device is a high latency device (usb and
sdio) or low latency device (pci, ahb and snoc)

The setup of high latency chips is sometimes different than
for chips using low latency interfaces.

Signed-off-by: default avatarErik Stromdahl <erik.stromdahl@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c0d8d565

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

+1 −0
Original line number Diff line number Diff line
@@ -806,6 +806,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev) 


	ath10k_pci_ce_deinit(ar);



	bus_params.dev_type = ATH10K_DEV_TYPE_LL;

	bus_params.chip_id = ath10k_ahb_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

	if (bus_params.chip_id == 0xffffffff) {

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

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

+1 −0
Original line number Diff line number Diff line
@@ -2928,6 +2928,7 @@ int ath10k_core_register(struct ath10k *ar, 
			 const struct ath10k_bus_params *bus_params)

{

	ar->chip_id = bus_params->chip_id;

	ar->dev_type = bus_params->dev_type;

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



	return 0;

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

+7 −0
Original line number Diff line number Diff line
@@ -915,8 +915,14 @@ struct ath10k_per_peer_tx_stats { 
	u32	reserved2;

};



enum ath10k_dev_type {

	ATH10K_DEV_TYPE_LL,

	ATH10K_DEV_TYPE_HL,

};



struct ath10k_bus_params {

	u32 chip_id;

	enum ath10k_dev_type dev_type;

};



struct ath10k {
@@ -929,6 +935,7 @@ struct ath10k { 
	enum ath10k_hw_rev hw_rev;

	u16 dev_id;

	u32 chip_id;

	enum ath10k_dev_type dev_type;

	u32 target_version;

	u8 fw_version_major;

	u32 fw_version_minor;

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

+1 −0
Original line number Diff line number Diff line
@@ -3637,6 +3637,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		goto err_free_irq;

	}



	bus_params.dev_type = ATH10K_DEV_TYPE_LL;

	bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

	if (bus_params.chip_id == 0xffffffff) {

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

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

+1 −0
Original line number Diff line number Diff line
@@ -2036,6 +2036,7 @@ static int ath10k_sdio_probe(struct sdio_func *func, 
		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;

	ret = ath10k_core_register(ar, &bus_params);