ath11k: Init hw_params before setting up AHB resources
authorManikanta Pubbisetty <quic_mpubbise@quicinc.com>
Tue, 17 May 2022 05:52:41 +0000 (11:22 +0530)
committerKalle Valo <quic_kvalo@quicinc.com>
Sun, 22 May 2022 12:30:50 +0000 (15:30 +0300)
As part of adding the support of WCN6750 to ath11k, bus_params
were moved to hw_params and this regressed the initialization
of WCN6750. By the time AHB resources are setup for WCN6750,
hw_params will not be initialized and therefore initialization
for WCN6750 will fail. This is applicable only for WCN6750,
no other device is impacted.

Fix this by moving the initialization of hw_params before
setting up AHB resources.

Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1

Fixes: 00402f49d26f ("ath11k: Add support for WCN6750 device")
Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220517055241.15885-1-quic_mpubbise@quicinc.com
drivers/net/wireless/ath/ath11k/ahb.c

index fa11807f48a94cd167df175a64371e30a42c84c2..d7d33d5cdfc5054b9e6c038bdff04b1adba64a0d 100644 (file)
@@ -976,11 +976,11 @@ static int ath11k_ahb_probe(struct platform_device *pdev)
        ab->hw_rev = hw_rev;
        platform_set_drvdata(pdev, ab);
 
-       ret = ath11k_ahb_setup_resources(ab);
+       ret = ath11k_core_pre_init(ab);
        if (ret)
                goto err_core_free;
 
-       ret = ath11k_core_pre_init(ab);
+       ret = ath11k_ahb_setup_resources(ab);
        if (ret)
                goto err_core_free;