ath11k: add support for WCN6855 hw2.1

Ath11k fails to probe WCN6855 hw2.1 chip:

[ 6.983821] ath11k_pci 0000:06:00.0: enabling device (0000 -> 0002)
[ 6.983841] ath11k_pci 0000:06:00.0: Unsupported WCN6855 SOC hardware version: 18 17

This is caused by the wrong bit mask setting of hardware major version:
for QCA6390/QCN6855, it should be BIT8-11, not BIT8-16, so change the
definition to GENMASK(11, 8).

Also, add a separate entry for WCN6855 hw2.1 in ath11k_hw_params.

Please note that currently WCN6855 hw2.1 shares the same firmwares
as hw2.0, so users of this chip need to create a symlink as below:

	ln -s hw2.0 hw2.1

Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Fixes: 18ac1665e785 ("ath11k: pci: check TCSR_SOC_HW_VERSION")
Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20211129025613.21594-1-quic_bqiang@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index dd1a1bb078c39be0467252a628935ab9dfa7e8d9..5f6bdee26f310b8878c90c4b116fb639be867e5e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -284,6 +284,59 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                        .max_fft_bins = 0,
                },
 
+               .interface_modes = BIT(NL80211_IFTYPE_STATION) |
+                                       BIT(NL80211_IFTYPE_AP),
+               .supports_monitor = false,
+               .supports_shadow_regs = true,
+               .idle_ps = true,
+               .supports_sta_ps = true,
+               .cold_boot_calib = false,
+               .supports_suspend = true,
+               .hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),
+               .fix_l1ss = false,
+               .credit_flow = true,
+               .max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,
+               .hal_params = &ath11k_hw_hal_params_qca6390,
+               .supports_dynamic_smps_6ghz = false,
+               .alloc_cacheable_memory = false,
+               .wakeup_mhi = true,
+       },
+       {
+               .name = "wcn6855 hw2.1",
+               .hw_rev = ATH11K_HW_WCN6855_HW21,
+               .fw = {
+                       .dir = "WCN6855/hw2.1",
+                       .board_size = 256 * 1024,
+                       .cal_offset = 128 * 1024,
+               },
+               .max_radios = 3,
+               .bdf_addr = 0x4B0C0000,
+               .hw_ops = &wcn6855_ops,
+               .ring_mask = &ath11k_hw_ring_mask_qca6390,
+               .internal_sleep_clock = true,
+               .regs = &wcn6855_regs,
+               .qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,
+               .host_ce_config = ath11k_host_ce_config_qca6390,
+               .ce_count = 9,
+               .target_ce_config = ath11k_target_ce_config_wlan_qca6390,
+               .target_ce_count = 9,
+               .svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,
+               .svc_to_ce_map_len = 14,
+               .single_pdev_only = true,
+               .rxdma1_enable = false,
+               .num_rxmda_per_pdev = 2,
+               .rx_mac_buf_ring = true,
+               .vdev_start_delay = true,
+               .htt_peer_map_v2 = false,
+
+               .spectral = {
+                       .fft_sz = 0,
+                       .fft_pad_sz = 0,
+                       .summary_pad_sz = 0,
+                       .fft_hdr_len = 0,
+                       .max_fft_bins = 0,
+               },
+
                .interface_modes = BIT(NL80211_IFTYPE_STATION) |
                                        BIT(NL80211_IFTYPE_AP),
                .supports_monitor = false,

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 0103cfd0508d5df6a0103786f81f407c2cc2cd0a..1d13e6124693fee7a6d2a387000aab586b4bbb40 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -117,6 +117,7 @@ enum ath11k_hw_rev {
        ATH11K_HW_IPQ6018_HW10,
        ATH11K_HW_QCN9074_HW10,
        ATH11K_HW_WCN6855_HW20,
+       ATH11K_HW_WCN6855_HW21,
 };
 
 enum ath11k_firmware_mode {

diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
index d0f94a785a59dcd7aad77de55ac1cd0446fc0dfc..9a8e61ca9964b03668b1cd56ad6104cd9c2eb6d5 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mhi.c
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
@@ -366,6 +366,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)
                break;
        case ATH11K_HW_QCA6390_HW20:
        case ATH11K_HW_WCN6855_HW20:
+       case ATH11K_HW_WCN6855_HW21:
                ath11k_mhi_config = &ath11k_mhi_config_qca6390;
                break;
        default:

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index 1898b1a3396061f469e341647ebce42358408a5a..0a2b2ba4ae0713bdcded66b07e9f612bed5a4618 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -26,7 +26,7 @@
 #define WINDOW_RANGE_MASK              GENMASK(18, 0)
 
 #define TCSR_SOC_HW_VERSION            0x0224
-#define TCSR_SOC_HW_VERSION_MAJOR_MASK GENMASK(16, 8)
+#define TCSR_SOC_HW_VERSION_MAJOR_MASK GENMASK(11, 8)
 #define TCSR_SOC_HW_VERSION_MINOR_MASK GENMASK(7, 0)
 
 /* BAR0 + 4k is always accessible, and no
@@ -1409,9 +1409,21 @@ static int ath11k_pci_probe(struct pci_dev *pdev,
                                           &soc_hw_version_minor);
                switch (soc_hw_version_major) {
                case 2:
-                       ab->hw_rev = ATH11K_HW_WCN6855_HW20;
+                       switch (soc_hw_version_minor) {
+                       case 0x00:
+                       case 0x01:
+                               ab->hw_rev = ATH11K_HW_WCN6855_HW20;
+                               break;
+                       case 0x10:
+                       case 0x11:
+                               ab->hw_rev = ATH11K_HW_WCN6855_HW21;
+                               break;
+                       default:
+                               goto unsupported_wcn6855_soc;
+                       }
                        break;
                default:
+unsupported_wcn6855_soc:
                        dev_err(&pdev->dev, "Unsupported WCN6855 SOC hardware version: %d %d\n",
                                soc_hw_version_major, soc_hw_version_minor);
                        ret = -EOPNOTSUPP;