ath11k: add hw_ops for pdev id to hw_mac mapping

pdev_id to hw_mac is different for ipq8074 and ipq6018
Below table has the mapping

pdev_id	ipq8074	ipq6018
-------	------- -------
  0		0	0
  1		2	1
  2		1	Not applicable

No functional changes. Compile tested only.

Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1592316055-24958-5-git-send-email-kvalo@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/Makefile b/drivers/net/wireless/ath/ath11k/Makefile
index 104186373c9e3cc5f9cb3f08a964678767437036..ee13a3becbcf9fdcf4b285adb8f3ae0462451fca 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/Makefile
+++ b/drivers/net/wireless/ath/ath11k/Makefile
@@ -16,7 +16,8 @@ ath11k-y += core.o \
            debug.o \
            ce.o \
            peer.o \
-           dbring.o
+           dbring.o \
+           hw.o
 
 ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o debugfs_sta.o
 ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index 2ea6da7682ce11e7423f1c48b373589b64b845bc..7e9bfeaaf4d2638d7f014138a1cf3d0bc70a5c36 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -734,6 +734,7 @@ static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg)
 
 static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)
 {
+       struct ath11k_hw_params *hw = &ab->hw_params;
        int i, j;
        int irq;
        int ret;
@@ -768,26 +769,26 @@ static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)
                        if (ath11k_reo_status_ring_mask[i] & BIT(j))
                                irq_grp->irqs[num_irq++] = reo2host_status;
 
-                       if (j < MAX_RADIOS) {
+                       if (j < ab->hw_params.max_radios) {
                                if (ath11k_rxdma2host_ring_mask[i] & BIT(j)) {
                                        irq_grp->irqs[num_irq++] =
-                                               rxdma2host_destination_ring_mac1
-                                               - ath11k_core_get_hw_mac_id(ab, j);
+                                               rxdma2host_destination_ring_mac1 -
+                                               ath11k_hw_get_mac_from_pdev_id(hw, j);
                                }
 
                                if (ath11k_host2rxdma_ring_mask[i] & BIT(j)) {
                                        irq_grp->irqs[num_irq++] =
-                                               host2rxdma_host_buf_ring_mac1
-                                               - ath11k_core_get_hw_mac_id(ab, j);
+                                               host2rxdma_host_buf_ring_mac1 -
+                                               ath11k_hw_get_mac_from_pdev_id(hw, j);
                                }
 
                                if (rx_mon_status_ring_mask[i] & BIT(j)) {
                                        irq_grp->irqs[num_irq++] =
                                                ppdu_end_interrupts_mac1 -
-                                               ath11k_core_get_hw_mac_id(ab, j);
+                                               ath11k_hw_get_mac_from_pdev_id(hw, j);
                                        irq_grp->irqs[num_irq++] =
                                                rxdma2host_monitor_status_ring_mac1 -
-                                               ath11k_core_get_hw_mac_id(ab, j);
+                                               ath11k_hw_get_mac_from_pdev_id(hw, j);
                                }
                        }
                }

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 67822508327c6716f38c1d97fb221fb7ce68a6c4..089b46ba86c5738f5fdf469acb60d7399d1e84c7 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -27,26 +27,10 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                        .cal_size =  IPQ8074_MAX_CAL_DATA_SZ,
                },
                .max_radios = 3,
+               .hw_ops = &ipq8074_ops,
        },
 };
 
-/* Map from pdev index to hw mac index */
-u8 ath11k_core_get_hw_mac_id(struct ath11k_base *ab, int pdev_idx)
-{
-       switch (pdev_idx) {
-       case 0:
-               return 0;
-       case 1:
-               return 2;
-       case 2:
-               return 1;
-       default:
-               ath11k_warn(ab, "Invalid pdev idx %d\n", pdev_idx);
-               return ATH11K_INVALID_HW_MAC_ID;
-       }
-}
-EXPORT_SYMBOL(ath11k_core_get_hw_mac_id);
-
 static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
                                         size_t name_len)
 {

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index e5c4e19020ee2dfe9cd5d0a74c37e714479dd03b..98de9c35e178340b9a445deb21b5de8764db2e9c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -860,7 +860,6 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ath11k,
 void ath11k_core_free_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd);
 
 void ath11k_core_halt(struct ath11k *ar);
-u8 ath11k_core_get_hw_mac_id(struct ath11k_base *ab, int pdev_idx);
 
 static inline const char *ath11k_scan_state_str(enum ath11k_scan_state state)
 {

diff --git a/drivers/net/wireless/ath/ath11k/hw.c b/drivers/net/wireless/ath/ath11k/hw.c
new file mode 100644 (file)
index 0000000..7cc5f36
--- /dev/null
+++ b/drivers/net/wireless/ath/ath11k/hw.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: BSD-3-Clause-Clear
+/*
+ * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ */
+
+#include "core.h"
+
+/* Map from pdev index to hw mac index */
+static u8 ath11k_hw_ipq8074_mac_from_pdev_id(int pdev_idx)
+{
+       switch (pdev_idx) {
+       case 0:
+               return 0;
+       case 1:
+               return 2;
+       case 2:
+               return 1;
+       default:
+               return ATH11K_INVALID_HW_MAC_ID;
+       }
+}
+
+static u8 ath11k_hw_ipq6018_mac_from_pdev_id(int pdev_idx)
+{
+       return pdev_idx;
+}
+
+const struct ath11k_hw_ops ipq8074_ops = {
+       .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id,
+};
+
+const struct ath11k_hw_ops ipq6018_ops = {
+       .get_hw_mac_from_pdev_id = ath11k_hw_ipq6018_mac_from_pdev_id,
+};

diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index ba897d186cf5bcd7b322a2ccb712153348fbb254..2fb986b9a6cbad49e897109d5316395a76f21fbb 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -104,6 +104,10 @@ enum ath11k_bus {
        ATH11K_BUS_PCI,
 };
 
+struct ath11k_hw_ops {
+       u8 (*get_hw_mac_from_pdev_id)(int pdev_id);
+};
+
 struct ath11k_hw_params {
        const char *name;
        u16 hw_rev;
@@ -113,8 +117,23 @@ struct ath11k_hw_params {
                size_t board_size;
                size_t cal_size;
        } fw;
+
+       const struct ath11k_hw_ops *hw_ops;
 };
 
+extern const struct ath11k_hw_ops ipq8074_ops;
+extern const struct ath11k_hw_ops ipq6018_ops;
+
+static inline
+int ath11k_hw_get_mac_from_pdev_id(struct ath11k_hw_params *hw,
+                                  int pdev_idx)
+{
+       if (hw->hw_ops->get_hw_mac_from_pdev_id)
+               return hw->hw_ops->get_hw_mac_from_pdev_id(pdev_idx);
+
+       return 0;
+}
+
 struct ath11k_fw_ie {
        __le32 id;
        __le32 len;

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 07d3e031c75a463bdc3fa8bdbc5428968c60199f..cdedb2ea7d87f01bc047b17d39f4152196af97c5 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6194,7 +6194,7 @@ int ath11k_mac_allocate(struct ath11k_base *ab)
                ar->ab = ab;
                ar->pdev = pdev;
                ar->pdev_idx = i;
-               ar->lmac_id = ath11k_core_get_hw_mac_id(ab, i);
+               ar->lmac_id = ath11k_hw_get_mac_from_pdev_id(&ab->hw_params, i);
 
                ar->wmi = &ab->wmi_ab.wmi[i];
                /* FIXME wmi[0] is already initialized during attach,