[01/12] ath11k: ahb: call ath11k_core_init() before irq configuration

Commit Message

Kalle Valo June 16, 2020, 2 p.m. UTC

From: Anilkumar Kolli <[e-mail]>

This is needed to init .max_radios in hw_params and onfigure external
interrupts for available pdev_ids.

Compile tested only.

Signed-off-by: Anilkumar Kolli <[e-mail]>
Signed-off-by: Kalle Valo <[e-mail]>
---
 drivers/net/wireless/ath/ath11k/ahb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Kalle Valo June 23, 2020, 7:53 a.m. UTC | #1

Kalle Valo <[e-mail]> wrote:

> This is needed to init .max_radios in hw_params and onfigure external
> interrupts for available pdev_ids.
> 
> Compile tested only.
> 
> Signed-off-by: Anilkumar Kolli <[e-mail]>
> Signed-off-by: Kalle Valo <[e-mail]>

12 patches applied to ath-next branch of ath.git, thanks.

166e22b38aa3 ath11k: ahb: call ath11k_core_init() before irq configuration
d3318abf41cf ath11k: convert ath11k_hw_params to an array
b1cc29e97d1b ath11k: define max_radios in hw_params
d547ca4c8cc5 ath11k: add hw_ops for pdev id to hw_mac mapping
3b94ae4c62db ath11k: Add bdf-addr in hw_params
7b57b2ddec21 ath11k: create a common function to request all firmware files
34d9fc80bac3 ath11k: don't use defines for hw specific firmware directories
31d78a3de4de ath11k: change ath11k_core_fetch_board_data_api_n() to use ath11k_core_create_firmware_path()
21b1a5a4c34c ath11k: remove useless info messages
6e5dd03c0b1f ath11k: qmi: cleanup info messages
b3a18338ebd6 ath11k: don't use defines in hw_params
a9bf09093203 ath11k: remove define ATH11K_QMI_DEFAULT_CAL_FILE_NAME

Patch

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index 30092841ac46..2ea6da7682ce 100644
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -951,15 +951,15 @@  static int ath11k_ahb_probe(struct platform_device *pdev)
 
 	ath11k_ahb_init_qmi_ce_config(ab);
 
-	ret = ath11k_ahb_config_irq(ab);
+	ret = ath11k_core_init(ab);
 	if (ret) {
-		ath11k_err(ab, "failed to configure irq: %d\n", ret);
+		ath11k_err(ab, "failed to init core: %d\n", ret);
 		goto err_ce_free;
 	}
 
-	ret = ath11k_core_init(ab);
+	ret = ath11k_ahb_config_irq(ab);
 	if (ret) {
-		ath11k_err(ab, "failed to init core: %d\n", ret);
+		ath11k_err(ab, "failed to configure irq: %d\n", ret);
 		goto err_ce_free;
 	}