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: Erik Stromdahl <erik.stromdahl@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index cfe4552..4cd69ac 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -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");

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index df8e7f7..93f5a21 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -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;

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 5505ead..61631ab 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -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;

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index c337a8b..873dbb6 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -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");

diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index 1d4fd23..983ecfe 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -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);

diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index 21b525a..b83edb9 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -1351,6 +1351,7 @@ static int ath10k_snoc_probe(struct platform_device *pdev)
                goto err_free_irq;
        }
 
+       bus_params.dev_type = ATH10K_DEV_TYPE_LL;
        bus_params.chip_id = drv_data->hw_rev;
        ret = ath10k_core_register(ar, &bus_params);
        if (ret) {

diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
index 275e00b..f731d35 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/usb.c
+++ b/drivers/net/wireless/ath/ath10k/usb.c
@@ -1016,6 +1016,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,
        ar->id.vendor = vendor_id;
        ar->id.device = product_id;
 
+       bus_params.dev_type = ATH10K_DEV_TYPE_HL;
        /* TODO: don't know yet how to get chip_id with USB */
        bus_params.chip_id = 0;
        ret = ath10k_core_register(ar, &bus_params);