Skip to content

Commit

Permalink
ath11k_nss: Revert setting fw_mem_mode for IPQ807x
Browse files Browse the repository at this point in the history
Leave it set to '0', as it will kernel panic with 2K skb patch. This
flag was incorrectly assumed to save memory on 1G platforms.

ath11k_nss: remove leftover max_tx_ring

it was not removed when applying patch to replace it with 'max_tx_ring =
DP_TCL_NUM_RING_MAX +1'

ath11k_nss: Import bugfix patches

ath11k_nss: Experimental build for IPQ6018

This will require setting the correct `ATH11K_MEM_PROFILE_XXX` for your
platform. Setting it to value lower/higher than physically available
will cause NULL virtual address kernel panics.

I believe this setting was not originally meant to reduce memory
footprint of 1G+ platforms, but to account for platforms that were
512M or less.

Will require tweaking to allow for the old behvaior on 1G+ IPQ807x,
while still saving memory for platforms <= 512M.
  • Loading branch information
qosmio committed Aug 12, 2024
1 parent e011b9d commit 291e7f1
Show file tree
Hide file tree
Showing 28 changed files with 1,601 additions and 120 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,6 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
static struct ath11k_hw_params ath11k_hw_params[] = {
{
.hw_rev = ATH11K_HW_IPQ8074,
@@ -95,7 +97,7 @@ static struct ath11k_hw_params ath11k_hw
.coldboot_cal_mm = false,
.coldboot_cal_ftm = false,
.cbcal_restart_fw = true,
- .fw_mem_mode = 0,
+ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE,
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_suspend = false,
@@ -127,6 +129,7 @@ static struct ath11k_hw_params ath11k_hw
.tcl_ring_retry = true,
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
Expand All @@ -254,7 +245,15 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_suspend = false,
@@ -259,7 +262,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -210,6 +213,7 @@ static struct ath11k_hw_params ath11k_hw
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
.smp2p_wow_exit = false,
.support_fw_mac_sequence = false,
+ .num_vdevs_peers = ath11k_vdevs_peers,
},
{
.name = "qca6390 hw2.0",
@@ -259,7 +263,7 @@ static struct ath11k_hw_params ath11k_hw
.coldboot_cal_mm = false,
.coldboot_cal_ftm = false,
.cbcal_restart_fw = false,
Expand All @@ -263,7 +262,7 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_suspend = true,
@@ -426,7 +429,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -426,7 +430,7 @@ static struct ath11k_hw_params ath11k_hw
.coldboot_cal_mm = false,
.coldboot_cal_ftm = false,
.cbcal_restart_fw = false,
Expand All @@ -272,15 +271,15 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_suspend = true,
@@ -462,6 +465,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -462,6 +466,7 @@ static struct ath11k_hw_params ath11k_hw
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
.smp2p_wow_exit = false,
.support_fw_mac_sequence = true,
+ .num_vdevs_peers = ath11k_vdevs_peers,
},
{
.name = "wcn6855 hw2.1",
@@ -509,7 +513,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -509,7 +514,7 @@ static struct ath11k_hw_params ath11k_hw
.coldboot_cal_mm = false,
.coldboot_cal_ftm = false,
.cbcal_restart_fw = false,
Expand All @@ -289,15 +288,15 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_suspend = true,
@@ -545,6 +549,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -545,6 +550,7 @@ static struct ath11k_hw_params ath11k_hw
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
.smp2p_wow_exit = false,
.support_fw_mac_sequence = true,
+ .num_vdevs_peers = ath11k_vdevs_peers,
},
{
.name = "wcn6750 hw1.0",
@@ -593,7 +598,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -593,7 +599,7 @@ static struct ath11k_hw_params ath11k_hw
.coldboot_cal_mm = true,
.coldboot_cal_ftm = true,
.cbcal_restart_fw = false,
Expand All @@ -306,7 +305,15 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_suspend = false,
@@ -672,7 +677,7 @@ static struct ath11k_hw_params ath11k_hw
@@ -626,6 +632,7 @@ static struct ath11k_hw_params ath11k_hw
.tx_ring_size = DP_TCL_DATA_RING_SIZE_WCN6750,
.smp2p_wow_exit = true,
.support_fw_mac_sequence = true,
+ .num_vdevs_peers = ath11k_vdevs_peers,
},
{
.hw_rev = ATH11K_HW_IPQ5018_HW10,
@@ -672,7 +679,7 @@ static struct ath11k_hw_params ath11k_hw
.supports_monitor = false,
.supports_sta_ps = false,
.supports_shadow_regs = false,
Expand All @@ -315,7 +322,7 @@ Signed-off-by: Ramya Gnanasekar <[email protected]>
.num_vdevs = 16 + 1,
.num_peers = 512,
.supports_regdb = false,
@@ -707,6 +712,22 @@ static struct ath11k_hw_params ath11k_hw
@@ -707,6 +714,22 @@ static struct ath11k_hw_params ath11k_hw
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
.smp2p_wow_exit = false,
.support_fw_mac_sequence = false,
Expand Down
Loading

0 comments on commit 291e7f1

Please sign in to comment.