mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-20 10:51:27 +00:00
3affbc1cad
This series is based on * 2020-07-10 ipq6018-ilq-11-0_qca_oem-034672b0676c37b1f4519e5720e18e95fe6236ef Add support for * qsdk kernel/v4.4 * qsdk ethernet subsystem * v5.7 ath11k backport + QualComm staging patches (wlan_ap_1.0) * ath11k-firmware * hostapd/iw/... Feature support * full boot, system detection * sysupgrade to nand * HE support via latest hostapd * driver support for usb, crypto, hwmon, cpufreq, ... Missing * NSS/HW flow offloading - FW blob is not redistributable Using the qsdk v4.4 is an intermediate solution while the vanilla is being tested. Vanilla kernel is almost on feature par. Work has already started to upstream the ethernet and switch drivers. Once complete the target will be fully upstream. Signed-off-by: John Crispin <john@phrozen.org>
124 lines
3.2 KiB
Diff
124 lines
3.2 KiB
Diff
--- a/drivers/net/wireless/ath/ath11k/ahb.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
|
|
@@ -19,6 +19,9 @@ static const struct of_device_id ath11k_
|
|
{ .compatible = "qcom,ipq8074-wifi",
|
|
.data = (void *)ATH11K_HW_IPQ8074,
|
|
},
|
|
+ { .compatible = "qcom,ipq6018-wifi",
|
|
+ .data = (void *)ATH11K_HW_IPQ6018,
|
|
+ },
|
|
{ }
|
|
};
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/core.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/core.c
|
|
@@ -23,12 +23,24 @@ MODULE_PARM_DESC(debug_mask, "Debugging
|
|
MODULE_PARM_DESC(cryptmode, "crypto mode: 0-hardware, 1-software");
|
|
MODULE_PARM_DESC(rawmode, "RAW mode TX: 0-disable, 1-enable");
|
|
|
|
-static const struct ath11k_hw_params ath11k_hw_params = {
|
|
- .name = "ipq8074",
|
|
- .fw = {
|
|
- .dir = IPQ8074_FW_DIR,
|
|
- .board_size = IPQ8074_MAX_BOARD_DATA_SZ,
|
|
- .cal_size = IPQ8074_MAX_CAL_DATA_SZ,
|
|
+static const struct ath11k_hw_params ath11k_hw_params_list[] = {
|
|
+ {
|
|
+ .dev_id = ATH11K_HW_IPQ8074,
|
|
+ .name = "ipq8074",
|
|
+ .fw = {
|
|
+ .dir = IPQ8074_FW_DIR,
|
|
+ .board_size = IPQ8074_MAX_BOARD_DATA_SZ,
|
|
+ .cal_size = IPQ8074_MAX_CAL_DATA_SZ,
|
|
+ },
|
|
+ },
|
|
+ {
|
|
+ .dev_id = ATH11K_HW_IPQ6018,
|
|
+ .name = "ipq6018",
|
|
+ .fw = {
|
|
+ .dir = IPQ6018_FW_DIR,
|
|
+ .board_size = IPQ6018_MAX_BOARD_DATA_SZ,
|
|
+ .cal_size = IPQ6018_MAX_CAL_DATA_SZ,
|
|
+ },
|
|
},
|
|
};
|
|
|
|
@@ -803,6 +815,30 @@ static void ath11k_core_restart(struct w
|
|
complete(&ab->driver_recovery);
|
|
}
|
|
|
|
+static int ath11k_init_hw_params(struct ath11k_base *ab)
|
|
+{
|
|
+ const struct ath11k_hw_params *uninitialized_var(hw_params);
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(ath11k_hw_params_list); i++) {
|
|
+ hw_params = &ath11k_hw_params_list[i];
|
|
+
|
|
+ if (hw_params->dev_id == ab->hw_rev)
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (i == ARRAY_SIZE(ath11k_hw_params_list)) {
|
|
+ ath11k_err(ab, "Unsupported hardware version: 0x%x\n", ab->hw_rev);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ ab->hw_params = *hw_params;
|
|
+
|
|
+ ath11k_dbg(ab, ATH11K_DBG_BOOT, "Hardware name %s\n", ab->hw_params.name);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int ath11k_core_init(struct ath11k_base *ab)
|
|
{
|
|
struct device *dev = ab->dev;
|
|
@@ -821,7 +857,12 @@ int ath11k_core_init(struct ath11k_base
|
|
return -EINVAL;
|
|
}
|
|
ab->tgt_rproc = prproc;
|
|
- ab->hw_params = ath11k_hw_params;
|
|
+
|
|
+ ret = ath11k_init_hw_params(ab);
|
|
+ if (ret) {
|
|
+ ath11k_err(ab, "failed to get hw params %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
|
|
ret = ath11k_core_soc_create(ab);
|
|
if (ret) {
|
|
--- a/drivers/net/wireless/ath/ath11k/core.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/core.h
|
|
@@ -93,6 +93,7 @@ struct ath11k_skb_rxcb {
|
|
|
|
enum ath11k_hw_rev {
|
|
ATH11K_HW_IPQ8074,
|
|
+ ATH11K_HW_IPQ6018,
|
|
};
|
|
|
|
enum ath11k_firmware_mode {
|
|
--- a/drivers/net/wireless/ath/ath11k/hw.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/hw.h
|
|
@@ -72,6 +72,12 @@
|
|
#define IPQ8074_MAX_BOARD_DATA_SZ (256 * 1024)
|
|
#define IPQ8074_MAX_CAL_DATA_SZ IPQ8074_MAX_BOARD_DATA_SZ
|
|
|
|
+/* IPQ6018 definitions */
|
|
+#define IPQ6018_FW_DIR "IPQ6018"
|
|
+#define IPQ6018_MAX_BOARD_DATA_SZ (256 * 1024)
|
|
+#define IPQ6018_MAX_CAL_DATA_SZ IPQ6018_MAX_BOARD_DATA_SZ
|
|
+
|
|
+
|
|
#define ATH11K_BOARD_MAGIC "QCA-ATH11K-BOARD"
|
|
#define ATH11K_BOARD_API2_FILE "board-2.bin"
|
|
#define ATH11K_DEFAULT_BOARD_FILE "bdwlan.bin"
|
|
@@ -100,6 +106,7 @@ enum ath11k_hw_rate_ofdm {
|
|
|
|
struct ath11k_hw_params {
|
|
const char *name;
|
|
+ u16 dev_id;
|
|
struct {
|
|
const char *dir;
|
|
size_t board_size;
|