[PATCH v8 1/8] wifi: ath12k: Refactor core start api

Harshitha Prem
2024-05-31T18:04:33Z

From: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>

Hardware device group abstraction would be introduced, in future,
where radios across different devices can be grouped together to
support multi-link operation and register as a device group to mac80211.

Currently, ath12k_mac_allocate() and ath12k_mac_register() APIs are part
of ath12k_core_start() and ath12k_core_pdev_create() respectively and are
based on per device (ath12k_base). These APIs can be decoupled and moved
out to ath12k_core_qmi_firmware_ready() itself.

This refactor would be helpful for device group abstraction when mac80211
allocate and register will be changed from per device (ath12k_base) to
per device group (ath12k_hw_group).

Add changes to move allocate and register APIs from existing one and modify
corresponding deinit sequence.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Signed-off-by: Harshitha Prem <quic_hprem@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/net/wireless/ath/ath12k/core.c | 59 ++++++++++++--------------
drivers/net/wireless/ath/ath12k/pci.c | 1 +
2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index e7f628e935e4..342d0ab12105 100644
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -565,9 +565,10 @@ static void ath12k_core_stop(struct ath12k_base *ab)

ath12k_acpi_stop(ab);

+ ath12k_dp_rx_pdev_reo_cleanup(ab);
ath12k_hif_stop(ab);
ath12k_wmi_detach(ab);
- ath12k_dp_rx_pdev_reo_cleanup(ab);
+ ath12k_dp_free(ab);

/* De-Init of components as needed */
}
@@ -669,7 +670,7 @@ static int ath12k_core_soc_create(struct ath12k_base *ab)

static void ath12k_core_soc_destroy(struct ath12k_base *ab)
{
- ath12k_dp_free(ab);
+ ath12k_hif_power_down(ab, false);
ath12k_reg_free(ab);
ath12k_debugfs_soc_destroy(ab);
ath12k_qmi_deinit_service(ab);
@@ -679,30 +680,17 @@ static int ath12k_core_pdev_create(struct ath12k_base *ab)
{
int ret;

- ret = ath12k_mac_register(ab);
- if (ret) {
- ath12k_err(ab, "failed register the radio with mac80211: %d\n", ret);
- return ret;
- }
-
ret = ath12k_dp_pdev_alloc(ab);
if (ret) {
ath12k_err(ab, "failed to attach DP pdev: %d\n", ret);
- goto err_mac_unregister;
+ return ret;
}

return 0;
-
-err_mac_unregister:
- ath12k_mac_unregister(ab);
-
- return ret;
}

static void ath12k_core_pdev_destroy(struct ath12k_base *ab)
{
- ath12k_mac_unregister(ab);
- ath12k_hif_irq_disable(ab);
ath12k_dp_pdev_free(ab);
}

@@ -760,19 +748,12 @@ static int ath12k_core_start(struct ath12k_base *ab,
goto err_hif_stop;
}

- ret = ath12k_mac_allocate(ab);
- if (ret) {
- ath12k_err(ab, "failed to create new hw device with mac80211 :%d\n",
- ret);
- goto err_hif_stop;
- }
-
ath12k_dp_cc_config(ab);

ret = ath12k_dp_rx_pdev_reo_setup(ab);
if (ret) {
ath12k_err(ab, "failed to initialize reo destination rings: %d\n", ret);
- goto err_mac_destroy;
+ goto err_hif_stop;
}

ath12k_dp_hal_rx_desc_init(ab);
@@ -815,8 +796,6 @@ static int ath12k_core_start(struct ath12k_base *ab,

err_reo_cleanup:
ath12k_dp_rx_pdev_reo_cleanup(ab);
-err_mac_destroy:
- ath12k_mac_destroy(ab);
err_hif_stop:
ath12k_hif_stop(ab);
err_wmi_detach:
@@ -870,11 +849,25 @@ int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab)
goto err_dp_free;
}

+ ret = ath12k_mac_allocate(ab);
+ if (ret) {
+ ath12k_err(ab, "failed to create new hw device with mac80211 :%d\n",
+ ret);
+ goto err_core_stop;
+ }
+
+ ret = ath12k_mac_register(ab);
+ if (ret) {
+ ath12k_err(ab, "failed register the radio with mac80211: %d\n", ret);
+ goto err_mac_destroy;
+ }
+
ret = ath12k_core_pdev_create(ab);
if (ret) {
ath12k_err(ab, "failed to create pdev core: %d\n", ret);
- goto err_core_stop;
+ goto err_mac_unregister;
}
+
ath12k_hif_irq_enable(ab);

ret = ath12k_core_rfkill_config(ab);
@@ -888,10 +881,14 @@ int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab)
return 0;

err_core_pdev_destroy:
+ ath12k_hif_irq_disable(ab);
ath12k_core_pdev_destroy(ab);
+err_mac_unregister:
+ ath12k_mac_unregister(ab);
+err_mac_destroy:
+ ath12k_mac_destroy(ab);
err_core_stop:
ath12k_core_stop(ab);
- ath12k_mac_destroy(ab);
err_dp_free:
ath12k_dp_free(ab);
mutex_unlock(&ab->core_lock);
@@ -1205,15 +1202,15 @@ void ath12k_core_deinit(struct ath12k_base *ab)
{
mutex_lock(&ab->core_lock);

+ ath12k_hif_irq_disable(ab);
ath12k_core_pdev_destroy(ab);
+ ath12k_mac_unregister(ab);
+ ath12k_mac_destroy(ab);
ath12k_core_stop(ab);

mutex_unlock(&ab->core_lock);

- ath12k_hif_power_down(ab, false);
- ath12k_mac_destroy(ab);
ath12k_core_soc_destroy(ab);
- ath12k_fw_unmap(ab);
}

void ath12k_core_free(struct ath12k_base *ab)
diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index 11b95d037051..e0a24ad0480e 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -1529,6 +1529,7 @@ static void ath12k_pci_remove(struct pci_dev *pdev)

cancel_work_sync(&ab->reset_work);
ath12k_core_deinit(ab);
+ ath12k_fw_unmap(ab);

qmi_fail:
ath12k_mhi_unregister(ab_pci);
--
2.34.1