wifi: rtw88: 8822c: extend reserved page number

Extend 8822c's reserved page number to accommodate additional required
pages. Reserved page is an area of memory in the FIFO dedicated for
special purposes. Previously only one interface is supported so 8 pages
should suffice, extend it so we can support 2 interfaces concurrently.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230414121135.17828-4-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c
index 44e07b61b9b9c747d295718c705727d9f9c91aa3..a168f36c38ece8b6341a602ebfd2587818b11e91 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac.c
+++ b/drivers/net/wireless/realtek/rtw88/mac.c
@@ -1119,7 +1119,7 @@ static int set_trx_fifo_info(struct rtw_dev *rtwdev)
        u8 csi_buf_pg_num = chip->csi_buf_pg_num;
 
        /* config rsvd page num */
-       fifo->rsvd_drv_pg_num = 8;
+       fifo->rsvd_drv_pg_num = chip->rsvd_drv_pg_num;
        fifo->txff_pg_num = chip->txff_size >> 7;
        if (rtw_chip_wcpu_11n(rtwdev))
                fifo->rsvd_pg_num = fifo->rsvd_drv_pg_num;

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 790ebf781bc411434ad844288c71010c2f8c906a..532c56219a5f5c933656a91d65479747bd9f9da0 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -1177,6 +1177,7 @@ struct rtw_chip_info {
        u32 txff_size;
        u32 rxff_size;
        u32 fw_rxff_size;
+       u16 rsvd_drv_pg_num;
        u8 band;
        u8 page_size;
        u8 csi_buf_pg_num;

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 2d2f768bae2ea2d00a28492a74916e3f90ee077d..06e7454c9ca69305086edecc4ddfdf014fb30446 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -2743,6 +2743,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = {
        .ptct_efuse_size = 96 + 1,
        .txff_size = 32768,
        .rxff_size = 16384,
+       .rsvd_drv_pg_num = 8,
        .txgi_factor = 1,
        .is_pwr_by_rate_dec = true,
        .max_power_index = 0x3f,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index 7ae0541d7b995e4ebb2c7c39a0f97e164164f078..e5383676837849336d5bd78f49301515a294ab34 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -1920,6 +1920,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = {
        .ptct_efuse_size = 96,
        .txff_size = 65536,
        .rxff_size = 16384,
+       .rsvd_drv_pg_num = 8,
        .txgi_factor = 1,
        .is_pwr_by_rate_dec = true,
        .max_power_index = 0x3f,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 531b67787e2eb443abcae36e210304a62ce0406b..3017a9760da8dca8f982679336daafb081e0ef09 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -2540,6 +2540,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = {
        .txff_size = 262144,
        .rxff_size = 24576,
        .fw_rxff_size = 12288,
+       .rsvd_drv_pg_num = 8,
        .txgi_factor = 1,
        .is_pwr_by_rate_dec = true,
        .max_power_index = 0x3f,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 5a2c004b12df1f85004f868e8e6c4663c1e71f6f..cd965edc29cea3e994f630c1681b7ea4c573df6f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -5358,6 +5358,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = {
        .txff_size = 262144,
        .rxff_size = 24576,
        .fw_rxff_size = 12288,
+       .rsvd_drv_pg_num = 16,
        .txgi_factor = 2,
        .is_pwr_by_rate_dec = false,
        .max_power_index = 0x7f,