ath10k: add device type enum to ath10k_bus_params

erstrom · Kalle Valo · commit 7c2dd6154fc2 · 2018-09-06T19:13:58.000+03:00
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 &lt;erik.stromdahl@gmail.com&gt;
Signed-off-by: Kalle Valo &lt;kvalo@codeaurora.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2928,6 +2928,7 @@ int ath10k_core_register(struct ath10k *ar,`
`2928`	`2928`	`const struct ath10k_bus_params *bus_params)`
`2929`	`2929`	`{`
`2930`	`2930`	`ar->chip_id = bus_params->chip_id;`
	`2931`	`+ ar->dev_type = bus_params->dev_type;`
`2931`	`2932`	`queue_work(ar->workqueue, &ar->register_work);`
`2932`	`2933`
`2933`	`2934`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -3637,6 +3637,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,`
`3637`	`3637`	`goto err_free_irq;`
`3638`	`3638`	`}`
`3639`	`3639`
	`3640`	`+ bus_params.dev_type = ATH10K_DEV_TYPE_LL;`
`3640`	`3641`	`bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);`
`3641`	`3642`	`if (bus_params.chip_id == 0xffffffff) {`
`3642`	`3643`	`ath10k_err(ar, "failed to get chip id\n");`
Original file line number	Diff line number	Diff line change
`@@ -2036,6 +2036,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,`
`2036`	`2036`	`goto err_free_wq;`
`2037`	`2037`	`}`
`2038`	`2038`
	`2039`	`+ bus_params.dev_type = ATH10K_DEV_TYPE_HL;`
`2039`	`2040`	`/* TODO: don't know yet how to get chip_id with SDIO */`
`2040`	`2041`	`bus_params.chip_id = 0;`
`2041`	`2042`	`ret = ath10k_core_register(ar, &bus_params);`
Original file line number	Diff line number	Diff line change
`@@ -1351,6 +1351,7 @@ static int ath10k_snoc_probe(struct platform_device *pdev)`
`1351`	`1351`	`goto err_free_irq;`
`1352`	`1352`	`}`
`1353`	`1353`
	`1354`	`+ bus_params.dev_type = ATH10K_DEV_TYPE_LL;`
`1354`	`1355`	`bus_params.chip_id = drv_data->hw_rev;`
`1355`	`1356`	`ret = ath10k_core_register(ar, &bus_params);`
`1356`	`1357`	`if (ret) {`