ath6kl: create core.c

Currently core functions are spread between various files, group all
the functions into file and rename the functions to follow the style
used elsewhere in the driver. This will make it easier to a separate core
module.

Also fix a bug where wiphy is freed too early.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 2 insertions, 211 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 2804921d5d8a..b8252ced0968 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -25,15 +25,9 @@
 #include "debug.h"
 #include "hif-ops.h"
 
-unsigned int debug_mask;
 static unsigned int testmode;
-static bool suspend_cutpower;
-static unsigned int uart_debug;
 
-module_param(debug_mask, uint, 0644);
 module_param(testmode, uint, 0644);
-module_param(suspend_cutpower, bool, 0444);
-module_param(uart_debug, uint, 0644);
 
 static const struct ath6kl_hw hw_list[] = {
         {
@@ -597,37 +591,6 @@ int ath6kl_configure_target(struct ath6kl *ar)
         return 0;
 }
 
-void ath6kl_core_free(struct ath6kl *ar)
-{
-        wiphy_free(ar->wiphy);
-}
-
-void ath6kl_core_cleanup(struct ath6kl *ar)
-{
-        ath6kl_hif_power_off(ar);
-
-        destroy_workqueue(ar->ath6kl_wq);
-
-        if (ar->htc_target)
-                ath6kl_htc_cleanup(ar->htc_target);
-
-        ath6kl_cookie_cleanup(ar);
-
-        ath6kl_cleanup_amsdu_rxbufs(ar);
-
-        ath6kl_bmi_cleanup(ar);
-
-        ath6kl_debug_cleanup(ar);
-
-        kfree(ar->fw_board);
-        kfree(ar->fw_otp);
-        kfree(ar->fw);
-        kfree(ar->fw_patch);
-        kfree(ar->fw_testscript);
-
-        ath6kl_cfg80211_cleanup(ar);
-}
-
 /* firmware upload */
 static int ath6kl_get_fw(struct ath6kl *ar, const char *filename,
                          u8 **fw, size_t *fw_len)
@@ -1065,7 +1028,7 @@ out:
         return ret;
 }
 
-static int ath6kl_fetch_firmwares(struct ath6kl *ar)
+int ath6kl_init_fetch_firmwares(struct ath6kl *ar)
 {
         int ret;
 
@@ -1485,7 +1448,7 @@ static int ath6kl_init_upload(struct ath6kl *ar)
         return status;
 }
 
-static int ath6kl_init_hw_params(struct ath6kl *ar)
+int ath6kl_init_hw_params(struct ath6kl *ar)
 {
         const struct ath6kl_hw *hw;
         int i;
@@ -1663,178 +1626,6 @@ int ath6kl_init_hw_stop(struct ath6kl *ar)
         return 0;
 }
 
-int ath6kl_core_init(struct ath6kl *ar)
-{
-        struct ath6kl_bmi_target_info targ_info;
-        struct net_device *ndev;
-        int ret = 0, i;
-
-        ar->ath6kl_wq = create_singlethread_workqueue("ath6kl");
-        if (!ar->ath6kl_wq)
-                return -ENOMEM;
-
-        ret = ath6kl_bmi_init(ar);
-        if (ret)
-                goto err_wq;
-
-        /*
-         * Turn on power to get hardware (target) version and leave power
-         * on delibrately as we will boot the hardware anyway within few
-         * seconds.
-         */
-        ret = ath6kl_hif_power_on(ar);
-        if (ret)
-                goto err_bmi_cleanup;
-
-        ret = ath6kl_bmi_get_target_info(ar, &targ_info);
-        if (ret)
-                goto err_power_off;
-
-        ar->version.target_ver = le32_to_cpu(targ_info.version);
-        ar->target_type = le32_to_cpu(targ_info.type);
-        ar->wiphy->hw_version = le32_to_cpu(targ_info.version);
-
-        ret = ath6kl_init_hw_params(ar);
-        if (ret)
-                goto err_power_off;
-
-        ar->htc_target = ath6kl_htc_create(ar);
-
-        if (!ar->htc_target) {
-                ret = -ENOMEM;
-                goto err_power_off;
-        }
-
-        ret = ath6kl_fetch_firmwares(ar);
-        if (ret)
-                goto err_htc_cleanup;
-
-        /* FIXME: we should free all firmwares in the error cases below */
-
-        /* Indicate that WMI is enabled (although not ready yet) */
-        set_bit(WMI_ENABLED, &ar->flag);
-        ar->wmi = ath6kl_wmi_init(ar);
-        if (!ar->wmi) {
-                ath6kl_err("failed to initialize wmi\n");
-                ret = -EIO;
-                goto err_htc_cleanup;
-        }
-
-        ath6kl_dbg(ATH6KL_DBG_TRC, "%s: got wmi @ 0x%p.\n", __func__, ar->wmi);
-
-        ret = ath6kl_cfg80211_init(ar);
-        if (ret)
-                goto err_node_cleanup;
-
-        ret = ath6kl_debug_init(ar);
-        if (ret) {
-                wiphy_unregister(ar->wiphy);
-                goto err_node_cleanup;
-        }
-
-        for (i = 0; i < ar->vif_max; i++)
-                ar->avail_idx_map |= BIT(i);
-
-        rtnl_lock();
-
-        /* Add an initial station interface */
-        ndev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,
-                                    INFRA_NETWORK);
-
-        rtnl_unlock();
-
-        if (!ndev) {
-                ath6kl_err("Failed to instantiate a network device\n");
-                ret = -ENOMEM;
-                wiphy_unregister(ar->wiphy);
-                goto err_debug_init;
-        }
-
-
-        ath6kl_dbg(ATH6KL_DBG_TRC, "%s: name=%s dev=0x%p, ar=0x%p\n",
-                        __func__, ndev->name, ndev, ar);
-
-        /* setup access class priority mappings */
-        ar->ac_stream_pri_map[WMM_AC_BK] = 0; /* lowest  */
-        ar->ac_stream_pri_map[WMM_AC_BE] = 1;
-        ar->ac_stream_pri_map[WMM_AC_VI] = 2;
-        ar->ac_stream_pri_map[WMM_AC_VO] = 3; /* highest */
-
-        /* give our connected endpoints some buffers */
-        ath6kl_rx_refill(ar->htc_target, ar->ctrl_ep);
-        ath6kl_rx_refill(ar->htc_target, ar->ac2ep_map[WMM_AC_BE]);
-
-        /* allocate some buffers that handle larger AMSDU frames */
-        ath6kl_refill_amsdu_rxbufs(ar, ATH6KL_MAX_AMSDU_RX_BUFFERS);
-
-        ath6kl_cookie_init(ar);
-
-        ar->conf_flags = ATH6KL_CONF_IGNORE_ERP_BARKER |
-                         ATH6KL_CONF_ENABLE_11N | ATH6KL_CONF_ENABLE_TX_BURST;
-
-        if (suspend_cutpower)
-                ar->conf_flags |= ATH6KL_CONF_SUSPEND_CUTPOWER;
-
-        if (uart_debug)
-                ar->conf_flags |= ATH6KL_CONF_UART_DEBUG;
-
-        ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
-                            WIPHY_FLAG_HAVE_AP_SME |
-                            WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
-                            WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
-
-        if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))
-                ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
-
-        ar->wiphy->probe_resp_offload =
-                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
-                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
-                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P |
-                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;
-
-        set_bit(FIRST_BOOT, &ar->flag);
-
-        ndev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
-
-        ret = ath6kl_init_hw_start(ar);
-        if (ret) {
-                ath6kl_err("Failed to start hardware: %d\n", ret);
-                goto err_rxbuf_cleanup;
-        }
-
-        /*
-         * Set mac address which is received in ready event
-         * FIXME: Move to ath6kl_interface_add()
-         */
-        memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
-
-        return ret;
-
-err_rxbuf_cleanup:
-        ath6kl_htc_flush_rx_buf(ar->htc_target);
-        ath6kl_cleanup_amsdu_rxbufs(ar);
-        rtnl_lock();
-        ath6kl_cfg80211_vif_cleanup(netdev_priv(ndev));
-        rtnl_unlock();
-        wiphy_unregister(ar->wiphy);
-err_debug_init:
-        ath6kl_debug_cleanup(ar);
-err_node_cleanup:
-        ath6kl_wmi_shutdown(ar->wmi);
-        clear_bit(WMI_ENABLED, &ar->flag);
-        ar->wmi = NULL;
-err_htc_cleanup:
-        ath6kl_htc_cleanup(ar->htc_target);
-err_power_off:
-        ath6kl_hif_power_off(ar);
-err_bmi_cleanup:
-        ath6kl_bmi_cleanup(ar);
-err_wq:
-        destroy_workqueue(ar->ath6kl_wq);
-
-        return ret;
-}
-
 /* FIXME: move this to cfg80211.c and rename to ath6kl_cfg80211_vif_stop() */
 void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready)
 {