Merge "[Bugfix][API-1269]fix ethernet memory leak" into GSW3.0-No-Connman
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-main.conf b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-main.conf
index e18e1a3..6c2398a 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-main.conf
+++ b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-main.conf
@@ -19,3 +19,5 @@
NAND_CHIP_NAME = "MT29F8G08ADBFA"
TEE_SUPPORT_SRC = "yes"
+#you.chen@20230927 add for console log level
+CFG_TEE_LOG_LEVEL = "1"
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-example_%.bbappend b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-example_%.bbappend
index c928ed7..521cf87 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-example_%.bbappend
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-example_%.bbappend
@@ -1 +1,5 @@
inherit optee-build
+EXTRA_OEMAKE_append = " \
+ 'CFG_TEE_TA_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ "
+
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-os_3.2.0.bbappend b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-os_3.2.0.bbappend
index fb9bfb7..58e7840 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-os_3.2.0.bbappend
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-os_3.2.0.bbappend
@@ -3,6 +3,8 @@
EXTRA_OEMAKE_append = "'PLATFORM_FLAVOR=mt2735' \
'CROSS_COMPILE=${TEE_TOOLCHAIN}' \
'ta-targets=ta_arm64' \
+ 'CFG_TEE_TA_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ 'CFG_TEE_CORE_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
'SUPPORT_RPMB=${TEE_SUPPORT_RPMB}' \
"
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-services.bbappend b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-services.bbappend
index 1db7fe6..3364f1b 100644
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-services.bbappend
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-bsp/trustzone/optee-services.bbappend
@@ -1,2 +1,7 @@
LIC_FILES_CHKSUM_remove = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
LIC_FILES_CHKSUM_append = "file://${S}/LICENSE;md5=cb3d385c0d64a57fad9b9e0e9029f607"
+
+EXTRA_OEMAKE_append = " \
+ 'CFG_TEE_TA_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ 'CFG_TEE_CORE_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ "
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
index 10da31d..f901286 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-core/initial/files/init_mount_nand
@@ -122,6 +122,8 @@
}
init_log() {
+ #you.chen@2023-09-27 add for console log level
+ cat /proc/cmdline | grep " loglevel=0 " > /dev/null && setconsole /dev/tty30
#you.chen@2022-07-11 add gsw's emmc init scrips begin
if [ -f /usr/share/init/init_mmc ]; then
/bin/sh /usr/share/init/init_mmc
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/auto2735evb.dts b/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/auto2735evb.dts
index c6c19ed..f08030c 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/auto2735evb.dts
+++ b/meta-sdk/meta/meta-lynqSDK-T800/recipes-kernel/linux/files/auto2735evb.dts
@@ -39,7 +39,7 @@
ubi.mtd=9,0,1 ubi.mtd=10,0,1 ubi.mtd=11,0,1 ubi.mtd=28,0,1 ubi.mtd=27,0,1\
rootwait \
androidboot.selinux=permissive androidboot.hardware=mt6890 \
- initcall_debug=1 page_owner=on";
+ initcall_debug=1 page_owner=on loglevel=0 systemd.show_status=0 systemd.default_standard_output=kmsg";
atag,videolfb-fb_base_l = <0x7e605000>;
atag,videolfb-fb_base_h = <0x0>;
diff --git a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf
index 0c51fd9..d2ede59 100755
--- a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf
+++ b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf
@@ -24,3 +24,5 @@
NAND_CHIP_NAME = "MT29F8G08ADBFA"
#support lynq_atsvc [hong.liu add for lynq atsvc on 2022.12.1]
LYNQ_ATSVC_SUPPORT = "yes"
+#you.chen@20230927 add for console log level
+CFG_TEE_LOG_LEVEL = "1"
diff --git a/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-example_%.bbappend b/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-example_%.bbappend
index c928ed7..521cf87 100644
--- a/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-example_%.bbappend
+++ b/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-example_%.bbappend
@@ -1 +1,5 @@
inherit optee-build
+EXTRA_OEMAKE_append = " \
+ 'CFG_TEE_TA_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ "
+
diff --git a/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-os_3.2.0.bbappend b/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-os_3.2.0.bbappend
index 6328f20..f2a21bd 100755
--- a/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-os_3.2.0.bbappend
+++ b/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-os_3.2.0.bbappend
@@ -3,6 +3,8 @@
EXTRA_OEMAKE_append = "'PLATFORM_FLAVOR=mt2735' \
'CROSS_COMPILE=${TEE_TOOLCHAIN}' \
'ta-targets=ta_arm64' \
+ 'CFG_TEE_TA_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ 'CFG_TEE_CORE_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
'SUPPORT_RPMB=${TEE_SUPPORT_RPMB}' \
"
diff --git a/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-services.bbappend b/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-services.bbappend
index 1db7fe6..3364f1b 100644
--- a/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-services.bbappend
+++ b/meta/meta-mediatek-mt2735/recipes-bsp/trustzone/optee-services.bbappend
@@ -1,2 +1,7 @@
LIC_FILES_CHKSUM_remove = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
LIC_FILES_CHKSUM_append = "file://${S}/LICENSE;md5=cb3d385c0d64a57fad9b9e0e9029f607"
+
+EXTRA_OEMAKE_append = " \
+ 'CFG_TEE_TA_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ 'CFG_TEE_CORE_LOG_LEVEL=${CFG_TEE_LOG_LEVEL}' \
+ "
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/config_pcie.trxse b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/config_pcie.trxse
index 90d5993..975fae4 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/config_pcie.trxse
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/config_pcie.trxse
Binary files differ
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw955572fcipa_rev2.52.txt b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw955572fcipa_rev2.52.txt
index 8891dad..bd1353c 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw955572fcipa_rev2.52.txt
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw955572fcipa_rev2.52.txt
@@ -1,13 +1,13 @@
-#
-NVRAMRev=$Rev$
+#V1.0_20230822_88570
+NVRAMRev=$Rev: 35 $
sromrev=11
-boardrev=0x1254
-boardtype=0x0884
+boardrev=0x1158
+boardtype=0x0860
boardflags=0x00400001
boardflags2=0x00800000
boardflags3=0x40002100
#boardnum=57410
-macaddr=00:90:4c:2d:80:01
+macaddr=00:90:4c:2f:70:01
#Regulatory specific
ccode=0
@@ -53,37 +53,48 @@
rxgains5ghtrisoa1=7
rxgains5ghtrelnabypa1=0
+#RFLDO3P3 war
+rfldo3p3_cap_war=1
+
+#TCXO war
+tcxo_war=0x1
+
#RSSI related
-rssicorrnorm_c0=0,0
-rssicorrnorm_c1=1,0
-rssicorrnorm5g_c0=13,14,17,9,10,13,8,14,12,6,7,11
-rssicorrnorm5g_c1=13,15,16,10,13,13,10,14,12,7,8,11
-low_pwr_rssi_bias_5g_c0=0,-8,-12,0,-8,-12,0,0,-12,0,-8,-12
-low_pwr_rssi_bias_5g_c1=0,-6,-8,0,-6,-8,0,-6,-8,0,-6,-8
-rssicorrnorm6g_c0=15,9,18,16,18,16,36,34,40,52,52,60
-rssicorrnorm6g_c1=8,6,12,12,10,16,26,30,30,46,46,52
+rssicorrnorm_c0=8,0
+rssicorrnorm_c1=9,0
+rssicorrnorm5g_c0=14,13,12,10,4,5,8,8,6,6,1,3
+rssicorrnorm5g_c1=13,13,11,10,7,5,10,8,6,7,2,4
+low_pwr_rssi_thresh_qdBm_5g=-334
+low_pwr_rssi_bias_5g_c0=0,-3,-6,0,-3,-6,0,-3,-7,0,-4,-7
+low_pwr_rssi_bias_5g_c1=0,-3,-7,0,-2,-7,0,-2,-6,0,-3,-7
+rssicorrnorm6g_c0=12,11,12,12,12,14,3,2,1,8,7,8
+rssicorrnorm6g_c1=12,10,14,10,10,14,0,0,-2,6,0,6
rssi_cal_freq_grp_2g= 0x08,0x01,0x91,0x2a,0x23,0xb3,0xc4
rssi_delta_5gl=-6 4 -8 -8 -6 4 -8 -8 -6 4 -8 -8 -3 6 -3 -4 -3 6 -3 -4 -3 6 -3 -4
rssi_delta_5gml=-1 3 -1 -3 -1 3 -1 -3 -1 3 -1 -3 -1 2 0 -2 -1 2 0 -2 -1 2 0 -2
rssi_delta_5gmu=0 3 -1 -2 0 3 -1 -2 0 3 -1 -2 0 2 0 -2 0 2 0 -2 0 2 0 -2
rssi_delta_5gh=2 4 2 -1 2 4 2 -1 2 4 2 -1 0 0 2 -2 0 0 2 -2 0 0 2 -2
-rssi_delta_6gunii5=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii6=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii7=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii8=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+rssi_delta_6gunii5=-4 0 0 0 -4 0 0 0 -4 0 0 0 -4 0 0 0 -3 0 0 0 -7 0 0 0
+rssi_delta_6gunii6=-1 0 0 0 -4 0 0 0 -4 0 0 0 -5 0 0 0 -4 0 0 0 -6 0 0 0
+rssi_delta_6gunii7=0 0 0 0 -1 0 0 0 2 0 0 0 -4 0 0 0 -1 0 0 0 -1 0 0 0
+rssi_delta_6gunii8=-4 0 0 0 -3 0 0 0 -1 0 0 0 -9 0 0 0 -2 0 0 0 -5 0 0 0
rssi_cal_rev=1
rxgaincal_rssical=1
gain_cal_temp=25
rxgain_tempcoeff2g_sub=40,40,40,40,40,40,40,40,40,40
-rxgain_tempcoeff5gl=20,20
-rxgain_tempcoeff5gml=20,20
-rxgain_tempcoeff5gmu=20,20
+rxgain_tempcoeff5gl=18,18
+rxgain_tempcoeff5gml=22,22
+rxgain_tempcoeff5gmu=22,22
rxgain_tempcoeff5gh=20,20
rxgain_tempcoeff2g_sub_elnaoff=40,40,40,40,40,40,40,40,40,40
-rxgain_tempcoeff5gl_elnaoff=20,20
-rxgain_tempcoeff5gml_elnaoff=20,20
-rxgain_tempcoeff5gmu_elnaoff=20,20
+rxgain_tempcoeff5gl_elnaoff=18,18
+rxgain_tempcoeff5gml_elnaoff=22,22
+rxgain_tempcoeff5gmu_elnaoff=22,22
rxgain_tempcoeff5gh_elnaoff=20,20
+rxgain_tempcoeff6g_unii5=12,10
+rxgain_tempcoeff6g_unii6=20,14
+rxgain_tempcoeff6g_unii7=6,14
+rxgain_tempcoeff6g_unii8=20,20
rssi_cal_freq_grp_2g= 0x08,0x01,0x91,0x2a,0x23,0xb3,0xc4
rssi_delta_2gb0=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
rssi_delta_2gb1=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -124,7 +135,6 @@
fdss_level_5g=9,9
fdss_interp_en=0
fdss_level_2g=4,4
-
#FIXME: fdss level for 6G made same as 5G for now
fdss_level_6g=9,9
@@ -174,23 +184,21 @@
# SINGLE RANGE TPC/TSSI
#2G OFDM
#pa2ga0=-106,6424,-703
-pa2ga0=-129,5802,-662
+pa2ga0=-126,6076,-712
#pa2ga1=-120,6301,-702
-pa2ga1=-120,5960,-669
-
+pa2ga1=-145,6073,-714
#2G CCK
-pa2ga2=-100,6347,-701
-pa2ga3=-112,6411,-721
-
+pa2ga2=-123,6406,-752
+pa2ga3=-137,6413,-758
#5G High pwr
-pa5ga0=-200,6256,-774,-177,6168,-750,-184,6098,-747,-171,5929,-707
-pa5ga1=-186,6086,-743,-162,6493,-771,-184,6140,-756,-188,5943,-734
+pa5ga0=-230,5605,-725,-177,6168,-750,-188,5969,-728,-192,5946,-729
+pa5ga1=-242,5281,-704,-162,6493,-771,-198,5782,-720,-213,5806,-734
#5G Low pwr
pa5ga2=-239,4574,-587,-233,5017,-643,-225,5518,-705,-231,5352,-684
pa5ga3=-229,5269,-675,-239,4366,-560,-234,4693,-603,-225,5414,-693
#PA Params 6G UNII-5,6,7,8
pa6ga0=-150,6336,-746,-119,6732,-773,-166,6212,-767,-154,5988,-742
-pa6ga1=-175,6181,-746,-173,6265,-759,-194,5830,-737,-186,6190,-766
+pa6ga1=-170,6398,-786,-140,6587,-774,-193,5815,-742,-122,6358,-755
# Max power and offsets
@@ -243,13 +251,13 @@
mcsbw405ghpo=0x65322222
mcsbw805ghpo=0x76322222
# ppr offsets for UNII-5/6 of 6GHz band
-mcsbw206glpo=0x87522222
-mcsbw406glpo=0x87522222
-mcsbw806glpo=0x87522222
+mcsbw206glpo=0x87100000
+mcsbw406glpo=0x65100000
+mcsbw806glpo=0x76310000
# ppr offsets for UNII-7/8 of 6GHz band
-mcsbw206gmpo=0x87522222
-mcsbw406gmpo=0x98622222
-mcsbw806gmpo=0x98622222
+mcsbw206gmpo=0x98530000
+mcsbw406gmpo=0x98642100
+mcsbw806gmpo=0xA9532100
powoffs2gtna0=-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3
powoffs2gtna1=-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2
@@ -257,15 +265,13 @@
mcs1024qam5glpo=0xBABAA9
mcs1024qam5gmpo=0xBABAA9
mcs1024qam5ghpo=0xBABAA9
-mcs1024qam5gx1po=0xBABAA9
-mcs1024qam5gx2po=0xBABAA9
mcs8poexp=0
mcs9poexp=0
mcs10poexp=0
# 1024QAM rates' offset for 6GHz UNII-5/6
-mcs1024qam6glpo=0xBBBBAA
+mcs1024qam6glpo=0xAABBBB
# 1024QAM rates' offset for 6GHz UNII-7/8
-mcs1024qam6gmpo=0xBBBBAA
+mcs1024qam6gmpo=0xDDCCDD
#UL-OFDMA PPR's accros RU's
#currently programmed same PPR accross RU's
@@ -357,9 +363,9 @@
swctrlmap_2g=0x00000110,0x00000020,0x01100110,0x000000,0x17F
swctrlmapext_2g=0x00000202,0x00000000,0x00000000,0x000000,0x0DF
-clb2gslice0core0=0x230
+clb2gslice0core0=0x030
clb5gslice0core0=0x200
-clb2gslice0core1=0x201
+clb2gslice0core1=0x001
clb5gslice0core1=0x200
#For TDM coex use the following
btc_prisel_ant_mask=0x0
@@ -377,6 +383,7 @@
# --- PAPD Cal related params ----
# 0:NBPAPD 1:WBPAPD
txwbpapden=1
+wb_auto_board_adj=1
# NB PAPD Cal params
# 0x5Gc02Gc0,5Gc12Gc1
nb_eps_offset=0x01db01da,0x01db01da
@@ -406,9 +413,9 @@
wb_txattn=0,1,1,1,0,1,1,1
wb_rxattn=0,0,0,0,0,0,0,0
wb_tia_gain_mode=2,2,2,2,2,2,2,2
-wb_eps_offset=472,467,467,467,472,467,467,467
+wb_eps_offset=470,460,462,462,470,464,464,465
wb_papdcalidx=10,10,10,10,10,10,10,10
-wb_bbmult=64,80,80,80,64,80,80,80
+wb_bbmult=64,110,100,100,64,90,90,90
wb_calref_db=26,24,24,24,26,24,24,24
wb_txbuf_offset=43,42,39,39,43,42,39,39
wb_frac_del=255,255,255,255,255,255,255,255
@@ -425,43 +432,43 @@
wb_tia_gain_mode_6g20=2,2,2,2,6,6,6,6
wb_tia_gain_mode_6g40=3,3,3,3,6,6,6,6
wb_tia_gain_mode_6g80=4,4,4,4,6,6,6,6
-wb_papdcalidx_6g20=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40=25,25,25,25,30,32,30,32
-wb_papdcalidx_6g80=27,28,27,28,30,32,30,32
-wb_bbmult_6g20=66,64,70,64,76,76,76,86
-wb_bbmult_6g40=76,76,68,76,80,80,76,86
-wb_bbmult_6g80=76,80,66,80,84,84,84,80
-wb_eps_offset_6g20=467,469,467,467,472,473,471,470
-wb_eps_offset_6g40=463,463,462,463,471,472,471,470
-wb_eps_offset_6g80=464,465,464,466,471,472,468,472
-wb_calref_db_6g20=26,26,26,26,27,27,29,28
-wb_calref_db_6g40=30,30,32,30,27,27,29,28
-wb_calref_db_6g80=32,30,34,30,27,27,29,28
+wb_papdcalidx_6g20=25,30,25,30,25,30,30,25
+wb_papdcalidx_6g40=25,30,25,30,25,30,20,30
+wb_papdcalidx_6g80=25,30,25,30,25,30,20,25
+wb_bbmult_6g20=70,70,65,70,70,70,76,80
+wb_bbmult_6g40=70,70,65,70,70,70,80,75
+wb_bbmult_6g80=70,70,65,70,70,70,75,80
+wb_eps_offset_6g20=464,469,465,469,468,470,471,465
+wb_eps_offset_6g40=463,468,465,468,468,469,462,468
+wb_eps_offset_6g80=464,468,466,469,469,470,464,466
+wb_calref_db_6g20=30,30,30,30,30,30,29,30
+wb_calref_db_6g40=30,30,30,30,30,30,30,30
+wb_calref_db_6g80=30,30,30,30,30,30,30,30
#2nd LUT parameters
wb_multipapd_en=1
-wb_PapdLutSel_idx_6g20=42,42,42,42,42,42,39,42
-wb_PapdLutSel_idx_6g40=42,42,42,42,42,42,42,45
-wb_PapdLutSel_idx_6g80=42,42,42,42,39,39,41,44
-wb_eps_index_offset_6g20=0,0,0,4,2,7,3,5
-wb_eps_index_offset_6g40=10,7,9,3,2,8,0,8
-wb_eps_index_offset_6g80=12,7,5,5,2,4,3,8
-wb_papdcalidx_6g20_lut1=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40_lut1=25,25,25,25,30,32,32,32
-wb_papdcalidx_6g80_lut1=27,28,27,28,30,10,10,32
-wb_bbmult_6g20_lut1=54,50,55,35,52,45,56,66
-wb_bbmult_6g40_lut1=28,42,32,45,70,42,50,45
-wb_bbmult_6g80_lut1=35,50,50,50,50,30,40,50
-wb_calref_db_6g20_lut1=30,26,30,30,30,30,32,28
-wb_calref_db_6g40_lut1=30,30,32,30,27,30,35,28
-wb_calref_db_6g80_lut1=28,30,30,30,30,30,32,28
+wb_PapdLutSel_idx_6g20=42,56,52,80,38,42,39,39
+wb_PapdLutSel_idx_6g40=40,40,80,80,46,40,37,40
+wb_PapdLutSel_idx_6g80=42,48,80,80,54,40,36,40
+wb_eps_index_offset_6g20=6,6,5,6,4,7,3,6
+wb_eps_index_offset_6g40=6,6,5,6,6,6,11,7
+wb_eps_index_offset_6g80=7,7,5,7,8,8,8,6
+wb_papdcalidx_6g20_lut1=30,35,30,35,30,35,30,30
+wb_papdcalidx_6g40_lut1=30,35,30,35,30,35,35,35
+wb_papdcalidx_6g80_lut1=30,35,30,35,30,35,25,30
+wb_bbmult_6g20_lut1=70,70,65,70,70,70,56,80
+wb_bbmult_6g40_lut1=70,70,65,70,70,70,80,75
+wb_bbmult_6g80_lut1=70,70,65,70,70,70,75,80
+wb_calref_db_6g20_lut1=28,28,28,28,28,28,32,28
+wb_calref_db_6g40_lut1=28,28,28,28,28,28,28,28
+wb_calref_db_6g80_lut1=28,28,28,28,28,28,28,28
# 2g/5G 2nd PAPD LUT parameters applicable for -40degc
-wb_eps_offset_lut1=22,10,10,7,22,10,10,7
+wb_eps_offset_lut1=22,11,7,3,22,5,7,8
wb_calref_db_lut1=23,19,19,19,23,19,19,19
wb_papdcalidx_lut1=10,10,10,10,10,10,10,10
-wb_bbmult_lut1=25,40,40,40,25,40,40,40
-wb_PapdLutSel_idx_2g5g=53,52,53,52,53,52,53,52
+wb_bbmult_lut1=25,40,40,26,25,40,40,40
+wb_PapdLutSel_idx_2g5g=53,62,63,62,53,62,54,54
# energy detect threshold
ed_thresh2g=-65
@@ -493,8 +500,6 @@
#PALDO settings 0=3.3 1=3.35 2=3.41 3=3.46 4=2.86, 5=2.97 6=3.08, 7=3.19
#paldo3p3_voltage=0
-#2G lowpwr settings 0=TOT 1=setting1 2=setting2 3=settingHE(lowpwr)
-ipa2glowpwr=3
#temperature throttling
tvpm=1
@@ -507,7 +512,8 @@
tvpm_txc_txdc_init_step=50
##Dynamic Desense Params for 2 ant hybrid coex
-#btcdyn_flags=3
+##btcdyn_flags = bit 3- PWRCTRL: bit 2- MSWITCH: bit 1- DESENSE: bit 0- DYNCTL
+#btcdyn_flags=0xB
#btcdyn_dflt_dsns_level=0
#btcdyn_low_dsns_level=1
#btcdyn_mid_dsns_level=2
@@ -516,7 +522,8 @@
#btcdyn_dsns_rows=2
#btcdyn_dsns_row1=5,-4,0,-50,-70
#btcdyn_dsns_row0=5,12,0,-50,-65
-
+#btcdyn_wlpwr_val=2,4,6,8,10,12,14,16
+#btcdyn_wlpwr_thresh=-10,-20,-30,-40,-50,-60,-70
ppr_hitemp_offset=70,10
# idx 0: PPR temp thresh, default 150
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_CN_rev1.58.txt b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_CN_rev1.58.txt
index ebdbd7e..d2189c2 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_CN_rev1.58.txt
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_CN_rev1.58.txt
@@ -1,5 +1,5 @@
-#
-NVRAMRev=$Rev$
+#V1.0_20230822_88570
+NVRAMRev=$Rev: 35 $
sromrev=11
boardrev=0x1158
boardtype=0x0860
@@ -60,10 +60,10 @@
tcxo_war=0x1
#RSSI related
-rssicorrnorm_c0=0,0
-rssicorrnorm_c1=1,0
-rssicorrnorm5g_c0=14,17,20,10,12,13,8,16,14,6,9,11
-rssicorrnorm5g_c1=13,17,19,10,15,13,10,16,14,7,10,12
+rssicorrnorm_c0=8,0
+rssicorrnorm_c1=9,0
+rssicorrnorm5g_c0=14,13,12,10,4,5,8,8,6,6,1,3
+rssicorrnorm5g_c1=13,13,11,10,7,5,10,8,6,7,2,4
low_pwr_rssi_thresh_qdBm_5g=-334
low_pwr_rssi_bias_5g_c0=0,-3,-6,0,-3,-6,0,-3,-7,0,-4,-7
low_pwr_rssi_bias_5g_c1=0,-3,-7,0,-2,-7,0,-2,-6,0,-3,-7
@@ -74,10 +74,10 @@
rssi_delta_5gml=-1 3 -1 -3 -1 3 -1 -3 -1 3 -1 -3 -1 2 0 -2 -1 2 0 -2 -1 2 0 -2
rssi_delta_5gmu=0 3 -1 -2 0 3 -1 -2 0 3 -1 -2 0 2 0 -2 0 2 0 -2 0 2 0 -2
rssi_delta_5gh=2 4 2 -1 2 4 2 -1 2 4 2 -1 0 0 2 -2 0 0 2 -2 0 0 2 -2
-rssi_delta_6gunii5=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii6=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii7=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii8=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+rssi_delta_6gunii5=-4 0 0 0 -4 0 0 0 -4 0 0 0 -4 0 0 0 -3 0 0 0 -7 0 0 0
+rssi_delta_6gunii6=-1 0 0 0 -4 0 0 0 -4 0 0 0 -5 0 0 0 -4 0 0 0 -6 0 0 0
+rssi_delta_6gunii7=0 0 0 0 -1 0 0 0 2 0 0 0 -4 0 0 0 -1 0 0 0 -1 0 0 0
+rssi_delta_6gunii8=-4 0 0 0 -3 0 0 0 -1 0 0 0 -9 0 0 0 -2 0 0 0 -5 0 0 0
rssi_cal_rev=1
rxgaincal_rssical=1
gain_cal_temp=25
@@ -91,9 +91,9 @@
rxgain_tempcoeff5gml_elnaoff=22,22
rxgain_tempcoeff5gmu_elnaoff=22,22
rxgain_tempcoeff5gh_elnaoff=20,20
-rxgain_tempcoeff6g_unii5=20,20
-rxgain_tempcoeff6g_unii6=20,20
-rxgain_tempcoeff6g_unii7=20,20
+rxgain_tempcoeff6g_unii5=12,10
+rxgain_tempcoeff6g_unii6=20,14
+rxgain_tempcoeff6g_unii7=6,14
rxgain_tempcoeff6g_unii8=20,20
rssi_cal_freq_grp_2g= 0x08,0x01,0x91,0x2a,0x23,0xb3,0xc4
rssi_delta_2gb0=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -183,16 +183,16 @@
# SINGLE RANGE TPC/TSSI
#2G OFDM
-#pa2ga0=-89,6036,-654
-pa2ga0=-129,5802,-662
+#pa2ga0=-106,6424,-703
+pa2ga0=-126,6076,-712
#pa2ga1=-120,6301,-702
-pa2ga1=-123,6120,-688
+pa2ga1=-145,6073,-714
#2G CCK
-pa2ga2=-91,6576,-737
-pa2ga3=-106,6697,-748
+pa2ga2=-123,6406,-752
+pa2ga3=-137,6413,-758
#5G High pwr
-pa5ga0=-195,5950,-731,-177,6168,-750,-183,6006,-736,-185,5910,-731
-pa5ga1=-179,6049,-724,-162,6493,-771,-196,6016,-752,-197,6161,-764
+pa5ga0=-230,5605,-725,-177,6168,-750,-188,5969,-728,-192,5946,-729
+pa5ga1=-242,5281,-704,-162,6493,-771,-198,5782,-720,-213,5806,-734
#5G Low pwr
pa5ga2=-239,4574,-587,-233,5017,-643,-225,5518,-705,-231,5352,-684
pa5ga3=-229,5269,-675,-239,4366,-560,-234,4693,-603,-225,5414,-693
@@ -251,13 +251,13 @@
mcsbw405ghpo=0x65322222
mcsbw805ghpo=0x76322222
# ppr offsets for UNII-5/6 of 6GHz band
-mcsbw206glpo=0x87522222
-mcsbw406glpo=0x87522222
-mcsbw806glpo=0x87522222
+mcsbw206glpo=0x87100000
+mcsbw406glpo=0x65100000
+mcsbw806glpo=0x76310000
# ppr offsets for UNII-7/8 of 6GHz band
-mcsbw206gmpo=0x87522222
-mcsbw406gmpo=0x98622222
-mcsbw806gmpo=0x98622222
+mcsbw206gmpo=0x98530000
+mcsbw406gmpo=0x98642100
+mcsbw806gmpo=0xA9532100
powoffs2gtna0=-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3
powoffs2gtna1=-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2
@@ -265,8 +265,6 @@
mcs1024qam5glpo=0xBABAA9
mcs1024qam5gmpo=0xBABAA9
mcs1024qam5ghpo=0xBABAA9
-mcs1024qam5gx1po=0xBABAA9
-mcs1024qam5gx2po=0xBABAA9
mcs8poexp=0
mcs9poexp=0
mcs10poexp=0
@@ -365,9 +363,9 @@
swctrlmap_2g=0x00000110,0x00000020,0x01100110,0x000000,0x17F
swctrlmapext_2g=0x00000202,0x00000000,0x00000000,0x000000,0x0DF
-clb2gslice0core0=0x230
+clb2gslice0core0=0x030
clb5gslice0core0=0x200
-clb2gslice0core1=0x201
+clb2gslice0core1=0x001
clb5gslice0core1=0x200
#For TDM coex use the following
btc_prisel_ant_mask=0x0
@@ -385,6 +383,7 @@
# --- PAPD Cal related params ----
# 0:NBPAPD 1:WBPAPD
txwbpapden=1
+wb_auto_board_adj=1
# NB PAPD Cal params
# 0x5Gc02Gc0,5Gc12Gc1
nb_eps_offset=0x01db01da,0x01db01da
@@ -414,9 +413,9 @@
wb_txattn=0,1,1,1,0,1,1,1
wb_rxattn=0,0,0,0,0,0,0,0
wb_tia_gain_mode=2,2,2,2,2,2,2,2
-wb_eps_offset=470,467,467,467,470,467,467,467
+wb_eps_offset=470,460,462,462,470,464,464,465
wb_papdcalidx=10,10,10,10,10,10,10,10
-wb_bbmult=64,80,80,80,64,80,80,80
+wb_bbmult=64,110,100,100,64,90,90,90
wb_calref_db=26,24,24,24,26,24,24,24
wb_txbuf_offset=43,42,39,39,43,42,39,39
wb_frac_del=255,255,255,255,255,255,255,255
@@ -433,43 +432,43 @@
wb_tia_gain_mode_6g20=2,2,2,2,6,6,6,6
wb_tia_gain_mode_6g40=3,3,3,3,6,6,6,6
wb_tia_gain_mode_6g80=4,4,4,4,6,6,6,6
-wb_papdcalidx_6g20=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40=25,25,25,25,30,32,30,32
-wb_papdcalidx_6g80=27,28,27,28,30,32,30,32
-wb_bbmult_6g20=66,64,70,64,76,76,76,86
-wb_bbmult_6g40=76,76,68,76,80,80,76,86
-wb_bbmult_6g80=76,80,66,80,84,84,84,80
-wb_eps_offset_6g20=467,469,467,467,472,473,471,470
-wb_eps_offset_6g40=463,463,462,463,471,472,471,470
-wb_eps_offset_6g80=464,465,464,466,471,472,468,472
-wb_calref_db_6g20=26,26,26,26,27,27,29,28
-wb_calref_db_6g40=30,30,32,30,27,27,29,28
-wb_calref_db_6g80=32,30,34,30,27,27,29,28
+wb_papdcalidx_6g20=25,30,25,30,25,30,30,25
+wb_papdcalidx_6g40=25,30,25,30,25,30,20,30
+wb_papdcalidx_6g80=25,30,25,30,25,30,20,25
+wb_bbmult_6g20=70,70,65,70,70,70,76,80
+wb_bbmult_6g40=70,70,65,70,70,70,80,75
+wb_bbmult_6g80=70,70,65,70,70,70,75,80
+wb_eps_offset_6g20=464,469,465,469,468,470,471,465
+wb_eps_offset_6g40=463,468,465,468,468,469,462,468
+wb_eps_offset_6g80=464,468,466,469,469,470,464,466
+wb_calref_db_6g20=30,30,30,30,30,30,29,30
+wb_calref_db_6g40=30,30,30,30,30,30,30,30
+wb_calref_db_6g80=30,30,30,30,30,30,30,30
#2nd LUT parameters
wb_multipapd_en=1
-wb_PapdLutSel_idx_6g20=42,42,42,42,42,42,39,42
-wb_PapdLutSel_idx_6g40=42,42,42,42,42,42,42,45
-wb_PapdLutSel_idx_6g80=42,42,42,42,39,39,41,44
-wb_eps_index_offset_6g20=0,0,0,4,2,7,3,5
-wb_eps_index_offset_6g40=10,7,9,5,2,8,0,8
-wb_eps_index_offset_6g80=12,7,5,5,2,4,3,8
-wb_papdcalidx_6g20_lut1=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40_lut1=25,25,25,25,30,32,32,32
-wb_papdcalidx_6g80_lut1=27,28,27,28,30,10,10,32
-wb_bbmult_6g20_lut1=54,50,55,35,52,45,56,66
-wb_bbmult_6g40_lut1=28,42,32,45,70,42,50,45
-wb_bbmult_6g80_lut1=35,50,50,50,50,30,40,50
-wb_calref_db_6g20_lut1=30,26,30,30,30,30,32,28
-wb_calref_db_6g40_lut1=30,30,32,30,27,30,35,28
-wb_calref_db_6g80_lut1=28,30,30,30,30,30,32,28
+wb_PapdLutSel_idx_6g20=42,56,52,80,38,42,39,39
+wb_PapdLutSel_idx_6g40=40,40,80,80,46,40,37,40
+wb_PapdLutSel_idx_6g80=42,48,80,80,54,40,36,40
+wb_eps_index_offset_6g20=6,6,5,6,4,7,3,6
+wb_eps_index_offset_6g40=6,6,5,6,6,6,11,7
+wb_eps_index_offset_6g80=7,7,5,7,8,8,8,6
+wb_papdcalidx_6g20_lut1=30,35,30,35,30,35,30,30
+wb_papdcalidx_6g40_lut1=30,35,30,35,30,35,35,35
+wb_papdcalidx_6g80_lut1=30,35,30,35,30,35,25,30
+wb_bbmult_6g20_lut1=70,70,65,70,70,70,56,80
+wb_bbmult_6g40_lut1=70,70,65,70,70,70,80,75
+wb_bbmult_6g80_lut1=70,70,65,70,70,70,75,80
+wb_calref_db_6g20_lut1=28,28,28,28,28,28,32,28
+wb_calref_db_6g40_lut1=28,28,28,28,28,28,28,28
+wb_calref_db_6g80_lut1=28,28,28,28,28,28,28,28
# 2g/5G 2nd PAPD LUT parameters applicable for -40degc
-wb_eps_offset_lut1=22,10,10,7,22,10,10,7
+wb_eps_offset_lut1=22,11,7,3,22,5,7,8
wb_calref_db_lut1=23,19,19,19,23,19,19,19
wb_papdcalidx_lut1=10,10,10,10,10,10,10,10
-wb_bbmult_lut1=25,40,40,40,25,40,40,40
-wb_PapdLutSel_idx_2g5g=53,52,53,52,53,52,53,52
+wb_bbmult_lut1=25,40,40,26,25,40,40,40
+wb_PapdLutSel_idx_2g5g=53,62,63,62,53,62,54,54
# energy detect threshold
ed_thresh2g=-65
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_EU_rev1.58.txt b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_EU_rev1.58.txt
index 1e62d0f..bb8b4f8 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_EU_rev1.58.txt
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_EU_rev1.58.txt
@@ -1,5 +1,5 @@
-#
-NVRAMRev=$Rev$
+#V1.0_20230822_88570
+NVRAMRev=$Rev: 35 $
sromrev=11
boardrev=0x1158
boardtype=0x0860
@@ -60,10 +60,10 @@
tcxo_war=0x1
#RSSI related
-rssicorrnorm_c0=0,0
-rssicorrnorm_c1=1,0
-rssicorrnorm5g_c0=14,17,20,10,12,13,8,16,14,6,9,11
-rssicorrnorm5g_c1=13,17,19,10,15,13,10,16,14,7,10,12
+rssicorrnorm_c0=8,0
+rssicorrnorm_c1=9,0
+rssicorrnorm5g_c0=14,13,12,10,4,5,8,8,6,6,1,3
+rssicorrnorm5g_c1=13,13,11,10,7,5,10,8,6,7,2,4
low_pwr_rssi_thresh_qdBm_5g=-334
low_pwr_rssi_bias_5g_c0=0,-3,-6,0,-3,-6,0,-3,-7,0,-4,-7
low_pwr_rssi_bias_5g_c1=0,-3,-7,0,-2,-7,0,-2,-6,0,-3,-7
@@ -74,10 +74,10 @@
rssi_delta_5gml=-1 3 -1 -3 -1 3 -1 -3 -1 3 -1 -3 -1 2 0 -2 -1 2 0 -2 -1 2 0 -2
rssi_delta_5gmu=0 3 -1 -2 0 3 -1 -2 0 3 -1 -2 0 2 0 -2 0 2 0 -2 0 2 0 -2
rssi_delta_5gh=2 4 2 -1 2 4 2 -1 2 4 2 -1 0 0 2 -2 0 0 2 -2 0 0 2 -2
-rssi_delta_6gunii5=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii6=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii7=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii8=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+rssi_delta_6gunii5=-4 0 0 0 -4 0 0 0 -4 0 0 0 -4 0 0 0 -3 0 0 0 -7 0 0 0
+rssi_delta_6gunii6=-1 0 0 0 -4 0 0 0 -4 0 0 0 -5 0 0 0 -4 0 0 0 -6 0 0 0
+rssi_delta_6gunii7=0 0 0 0 -1 0 0 0 2 0 0 0 -4 0 0 0 -1 0 0 0 -1 0 0 0
+rssi_delta_6gunii8=-4 0 0 0 -3 0 0 0 -1 0 0 0 -9 0 0 0 -2 0 0 0 -5 0 0 0
rssi_cal_rev=1
rxgaincal_rssical=1
gain_cal_temp=25
@@ -91,9 +91,9 @@
rxgain_tempcoeff5gml_elnaoff=22,22
rxgain_tempcoeff5gmu_elnaoff=22,22
rxgain_tempcoeff5gh_elnaoff=20,20
-rxgain_tempcoeff6g_unii5=20,20
-rxgain_tempcoeff6g_unii6=20,20
-rxgain_tempcoeff6g_unii7=20,20
+rxgain_tempcoeff6g_unii5=12,10
+rxgain_tempcoeff6g_unii6=20,14
+rxgain_tempcoeff6g_unii7=6,14
rxgain_tempcoeff6g_unii8=20,20
rssi_cal_freq_grp_2g= 0x08,0x01,0x91,0x2a,0x23,0xb3,0xc4
rssi_delta_2gb0=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -183,16 +183,16 @@
# SINGLE RANGE TPC/TSSI
#2G OFDM
-#pa2ga0=-89,6036,-654
-pa2ga0=-129,5802,-662
+#pa2ga0=-106,6424,-703
+pa2ga0=-126,6076,-712
#pa2ga1=-120,6301,-702
-pa2ga1=-123,6120,-688
+pa2ga1=-145,6073,-714
#2G CCK
-pa2ga2=-91,6576,-737
-pa2ga3=-106,6697,-748
+pa2ga2=-123,6406,-752
+pa2ga3=-137,6413,-758
#5G High pwr
-pa5ga0=-195,5950,-731,-177,6168,-750,-183,6006,-736,-185,5910,-731
-pa5ga1=-179,6049,-724,-162,6493,-771,-196,6016,-752,-197,6161,-764
+pa5ga0=-230,5605,-725,-177,6168,-750,-188,5969,-728,-192,5946,-729
+pa5ga1=-242,5281,-704,-162,6493,-771,-198,5782,-720,-213,5806,-734
#5G Low pwr
pa5ga2=-239,4574,-587,-233,5017,-643,-225,5518,-705,-231,5352,-684
pa5ga3=-229,5269,-675,-239,4366,-560,-234,4693,-603,-225,5414,-693
@@ -251,13 +251,13 @@
mcsbw405ghpo=0x65322222
mcsbw805ghpo=0x76322222
# ppr offsets for UNII-5/6 of 6GHz band
-mcsbw206glpo=0x87522222
-mcsbw406glpo=0x87522222
-mcsbw806glpo=0x87522222
+mcsbw206glpo=0x87100000
+mcsbw406glpo=0x65100000
+mcsbw806glpo=0x76310000
# ppr offsets for UNII-7/8 of 6GHz band
-mcsbw206gmpo=0x87522222
-mcsbw406gmpo=0x98622222
-mcsbw806gmpo=0x98622222
+mcsbw206gmpo=0x98530000
+mcsbw406gmpo=0x98642100
+mcsbw806gmpo=0xA9532100
powoffs2gtna0=-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3
powoffs2gtna1=-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2
@@ -265,8 +265,6 @@
mcs1024qam5glpo=0xBABAA9
mcs1024qam5gmpo=0xBABAA9
mcs1024qam5ghpo=0xBABAA9
-mcs1024qam5gx1po=0xBABAA9
-mcs1024qam5gx2po=0xBABAA9
mcs8poexp=0
mcs9poexp=0
mcs10poexp=0
@@ -365,9 +363,9 @@
swctrlmap_2g=0x00000110,0x00000020,0x01100110,0x000000,0x17F
swctrlmapext_2g=0x00000202,0x00000000,0x00000000,0x000000,0x0DF
-clb2gslice0core0=0x230
+clb2gslice0core0=0x030
clb5gslice0core0=0x200
-clb2gslice0core1=0x201
+clb2gslice0core1=0x001
clb5gslice0core1=0x200
#For TDM coex use the following
btc_prisel_ant_mask=0x0
@@ -385,6 +383,7 @@
# --- PAPD Cal related params ----
# 0:NBPAPD 1:WBPAPD
txwbpapden=1
+wb_auto_board_adj=1
# NB PAPD Cal params
# 0x5Gc02Gc0,5Gc12Gc1
nb_eps_offset=0x01db01da,0x01db01da
@@ -414,9 +413,9 @@
wb_txattn=0,1,1,1,0,1,1,1
wb_rxattn=0,0,0,0,0,0,0,0
wb_tia_gain_mode=2,2,2,2,2,2,2,2
-wb_eps_offset=470,467,467,467,470,467,467,467
+wb_eps_offset=470,460,462,462,470,464,464,465
wb_papdcalidx=10,10,10,10,10,10,10,10
-wb_bbmult=64,80,80,80,64,80,80,80
+wb_bbmult=64,110,100,100,64,90,90,90
wb_calref_db=26,24,24,24,26,24,24,24
wb_txbuf_offset=43,42,39,39,43,42,39,39
wb_frac_del=255,255,255,255,255,255,255,255
@@ -433,43 +432,43 @@
wb_tia_gain_mode_6g20=2,2,2,2,6,6,6,6
wb_tia_gain_mode_6g40=3,3,3,3,6,6,6,6
wb_tia_gain_mode_6g80=4,4,4,4,6,6,6,6
-wb_papdcalidx_6g20=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40=25,25,25,25,30,32,30,32
-wb_papdcalidx_6g80=27,28,27,28,30,32,30,32
-wb_bbmult_6g20=66,64,70,64,76,76,76,86
-wb_bbmult_6g40=76,76,68,76,80,80,76,86
-wb_bbmult_6g80=76,80,66,80,84,84,84,80
-wb_eps_offset_6g20=467,469,467,467,472,473,471,470
-wb_eps_offset_6g40=463,463,462,463,471,472,471,470
-wb_eps_offset_6g80=464,465,464,466,471,472,468,472
-wb_calref_db_6g20=26,26,26,26,27,27,29,28
-wb_calref_db_6g40=30,30,32,30,27,27,29,28
-wb_calref_db_6g80=32,30,34,30,27,27,29,28
+wb_papdcalidx_6g20=25,30,25,30,25,30,30,25
+wb_papdcalidx_6g40=25,30,25,30,25,30,20,30
+wb_papdcalidx_6g80=25,30,25,30,25,30,20,25
+wb_bbmult_6g20=70,70,65,70,70,70,76,80
+wb_bbmult_6g40=70,70,65,70,70,70,80,75
+wb_bbmult_6g80=70,70,65,70,70,70,75,80
+wb_eps_offset_6g20=464,469,465,469,468,470,471,465
+wb_eps_offset_6g40=463,468,465,468,468,469,462,468
+wb_eps_offset_6g80=464,468,466,469,469,470,464,466
+wb_calref_db_6g20=30,30,30,30,30,30,29,30
+wb_calref_db_6g40=30,30,30,30,30,30,30,30
+wb_calref_db_6g80=30,30,30,30,30,30,30,30
#2nd LUT parameters
wb_multipapd_en=1
-wb_PapdLutSel_idx_6g20=42,42,42,42,42,42,39,42
-wb_PapdLutSel_idx_6g40=42,42,42,42,42,42,42,45
-wb_PapdLutSel_idx_6g80=42,42,42,42,39,39,41,44
-wb_eps_index_offset_6g20=0,0,0,4,2,7,3,5
-wb_eps_index_offset_6g40=10,7,9,5,2,8,0,8
-wb_eps_index_offset_6g80=12,7,5,5,2,4,3,8
-wb_papdcalidx_6g20_lut1=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40_lut1=25,25,25,25,30,32,32,32
-wb_papdcalidx_6g80_lut1=27,28,27,28,30,10,10,32
-wb_bbmult_6g20_lut1=54,50,55,35,52,45,56,66
-wb_bbmult_6g40_lut1=28,42,32,45,70,42,50,45
-wb_bbmult_6g80_lut1=35,50,50,50,50,30,40,50
-wb_calref_db_6g20_lut1=30,26,30,30,30,30,32,28
-wb_calref_db_6g40_lut1=30,30,32,30,27,30,35,28
-wb_calref_db_6g80_lut1=28,30,30,30,30,30,32,28
+wb_PapdLutSel_idx_6g20=42,56,52,80,38,42,39,39
+wb_PapdLutSel_idx_6g40=40,40,80,80,46,40,37,40
+wb_PapdLutSel_idx_6g80=42,48,80,80,54,40,36,40
+wb_eps_index_offset_6g20=6,6,5,6,4,7,3,6
+wb_eps_index_offset_6g40=6,6,5,6,6,6,11,7
+wb_eps_index_offset_6g80=7,7,5,7,8,8,8,6
+wb_papdcalidx_6g20_lut1=30,35,30,35,30,35,30,30
+wb_papdcalidx_6g40_lut1=30,35,30,35,30,35,35,35
+wb_papdcalidx_6g80_lut1=30,35,30,35,30,35,25,30
+wb_bbmult_6g20_lut1=70,70,65,70,70,70,56,80
+wb_bbmult_6g40_lut1=70,70,65,70,70,70,80,75
+wb_bbmult_6g80_lut1=70,70,65,70,70,70,75,80
+wb_calref_db_6g20_lut1=28,28,28,28,28,28,32,28
+wb_calref_db_6g40_lut1=28,28,28,28,28,28,28,28
+wb_calref_db_6g80_lut1=28,28,28,28,28,28,28,28
# 2g/5G 2nd PAPD LUT parameters applicable for -40degc
-wb_eps_offset_lut1=22,10,10,7,22,10,10,7
+wb_eps_offset_lut1=22,11,7,3,22,5,7,8
wb_calref_db_lut1=23,19,19,19,23,19,19,19
wb_papdcalidx_lut1=10,10,10,10,10,10,10,10
-wb_bbmult_lut1=25,40,40,40,25,40,40,40
-wb_PapdLutSel_idx_2g5g=53,52,53,52,53,52,53,52
+wb_bbmult_lut1=25,40,40,26,25,40,40,40
+wb_PapdLutSel_idx_2g5g=53,62,63,62,53,62,54,54
# energy detect threshold
ed_thresh2g=-65
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_rev1.58.txt b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_rev1.58.txt
index ebdbd7e..d2189c2 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_rev1.58.txt
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/cyw989570fcref_rev1.58.txt
@@ -1,5 +1,5 @@
-#
-NVRAMRev=$Rev$
+#V1.0_20230822_88570
+NVRAMRev=$Rev: 35 $
sromrev=11
boardrev=0x1158
boardtype=0x0860
@@ -60,10 +60,10 @@
tcxo_war=0x1
#RSSI related
-rssicorrnorm_c0=0,0
-rssicorrnorm_c1=1,0
-rssicorrnorm5g_c0=14,17,20,10,12,13,8,16,14,6,9,11
-rssicorrnorm5g_c1=13,17,19,10,15,13,10,16,14,7,10,12
+rssicorrnorm_c0=8,0
+rssicorrnorm_c1=9,0
+rssicorrnorm5g_c0=14,13,12,10,4,5,8,8,6,6,1,3
+rssicorrnorm5g_c1=13,13,11,10,7,5,10,8,6,7,2,4
low_pwr_rssi_thresh_qdBm_5g=-334
low_pwr_rssi_bias_5g_c0=0,-3,-6,0,-3,-6,0,-3,-7,0,-4,-7
low_pwr_rssi_bias_5g_c1=0,-3,-7,0,-2,-7,0,-2,-6,0,-3,-7
@@ -74,10 +74,10 @@
rssi_delta_5gml=-1 3 -1 -3 -1 3 -1 -3 -1 3 -1 -3 -1 2 0 -2 -1 2 0 -2 -1 2 0 -2
rssi_delta_5gmu=0 3 -1 -2 0 3 -1 -2 0 3 -1 -2 0 2 0 -2 0 2 0 -2 0 2 0 -2
rssi_delta_5gh=2 4 2 -1 2 4 2 -1 2 4 2 -1 0 0 2 -2 0 0 2 -2 0 0 2 -2
-rssi_delta_6gunii5=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii6=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii7=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-rssi_delta_6gunii8=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+rssi_delta_6gunii5=-4 0 0 0 -4 0 0 0 -4 0 0 0 -4 0 0 0 -3 0 0 0 -7 0 0 0
+rssi_delta_6gunii6=-1 0 0 0 -4 0 0 0 -4 0 0 0 -5 0 0 0 -4 0 0 0 -6 0 0 0
+rssi_delta_6gunii7=0 0 0 0 -1 0 0 0 2 0 0 0 -4 0 0 0 -1 0 0 0 -1 0 0 0
+rssi_delta_6gunii8=-4 0 0 0 -3 0 0 0 -1 0 0 0 -9 0 0 0 -2 0 0 0 -5 0 0 0
rssi_cal_rev=1
rxgaincal_rssical=1
gain_cal_temp=25
@@ -91,9 +91,9 @@
rxgain_tempcoeff5gml_elnaoff=22,22
rxgain_tempcoeff5gmu_elnaoff=22,22
rxgain_tempcoeff5gh_elnaoff=20,20
-rxgain_tempcoeff6g_unii5=20,20
-rxgain_tempcoeff6g_unii6=20,20
-rxgain_tempcoeff6g_unii7=20,20
+rxgain_tempcoeff6g_unii5=12,10
+rxgain_tempcoeff6g_unii6=20,14
+rxgain_tempcoeff6g_unii7=6,14
rxgain_tempcoeff6g_unii8=20,20
rssi_cal_freq_grp_2g= 0x08,0x01,0x91,0x2a,0x23,0xb3,0xc4
rssi_delta_2gb0=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -183,16 +183,16 @@
# SINGLE RANGE TPC/TSSI
#2G OFDM
-#pa2ga0=-89,6036,-654
-pa2ga0=-129,5802,-662
+#pa2ga0=-106,6424,-703
+pa2ga0=-126,6076,-712
#pa2ga1=-120,6301,-702
-pa2ga1=-123,6120,-688
+pa2ga1=-145,6073,-714
#2G CCK
-pa2ga2=-91,6576,-737
-pa2ga3=-106,6697,-748
+pa2ga2=-123,6406,-752
+pa2ga3=-137,6413,-758
#5G High pwr
-pa5ga0=-195,5950,-731,-177,6168,-750,-183,6006,-736,-185,5910,-731
-pa5ga1=-179,6049,-724,-162,6493,-771,-196,6016,-752,-197,6161,-764
+pa5ga0=-230,5605,-725,-177,6168,-750,-188,5969,-728,-192,5946,-729
+pa5ga1=-242,5281,-704,-162,6493,-771,-198,5782,-720,-213,5806,-734
#5G Low pwr
pa5ga2=-239,4574,-587,-233,5017,-643,-225,5518,-705,-231,5352,-684
pa5ga3=-229,5269,-675,-239,4366,-560,-234,4693,-603,-225,5414,-693
@@ -251,13 +251,13 @@
mcsbw405ghpo=0x65322222
mcsbw805ghpo=0x76322222
# ppr offsets for UNII-5/6 of 6GHz band
-mcsbw206glpo=0x87522222
-mcsbw406glpo=0x87522222
-mcsbw806glpo=0x87522222
+mcsbw206glpo=0x87100000
+mcsbw406glpo=0x65100000
+mcsbw806glpo=0x76310000
# ppr offsets for UNII-7/8 of 6GHz band
-mcsbw206gmpo=0x87522222
-mcsbw406gmpo=0x98622222
-mcsbw806gmpo=0x98622222
+mcsbw206gmpo=0x98530000
+mcsbw406gmpo=0x98642100
+mcsbw806gmpo=0xA9532100
powoffs2gtna0=-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3
powoffs2gtna1=-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2
@@ -265,8 +265,6 @@
mcs1024qam5glpo=0xBABAA9
mcs1024qam5gmpo=0xBABAA9
mcs1024qam5ghpo=0xBABAA9
-mcs1024qam5gx1po=0xBABAA9
-mcs1024qam5gx2po=0xBABAA9
mcs8poexp=0
mcs9poexp=0
mcs10poexp=0
@@ -365,9 +363,9 @@
swctrlmap_2g=0x00000110,0x00000020,0x01100110,0x000000,0x17F
swctrlmapext_2g=0x00000202,0x00000000,0x00000000,0x000000,0x0DF
-clb2gslice0core0=0x230
+clb2gslice0core0=0x030
clb5gslice0core0=0x200
-clb2gslice0core1=0x201
+clb2gslice0core1=0x001
clb5gslice0core1=0x200
#For TDM coex use the following
btc_prisel_ant_mask=0x0
@@ -385,6 +383,7 @@
# --- PAPD Cal related params ----
# 0:NBPAPD 1:WBPAPD
txwbpapden=1
+wb_auto_board_adj=1
# NB PAPD Cal params
# 0x5Gc02Gc0,5Gc12Gc1
nb_eps_offset=0x01db01da,0x01db01da
@@ -414,9 +413,9 @@
wb_txattn=0,1,1,1,0,1,1,1
wb_rxattn=0,0,0,0,0,0,0,0
wb_tia_gain_mode=2,2,2,2,2,2,2,2
-wb_eps_offset=470,467,467,467,470,467,467,467
+wb_eps_offset=470,460,462,462,470,464,464,465
wb_papdcalidx=10,10,10,10,10,10,10,10
-wb_bbmult=64,80,80,80,64,80,80,80
+wb_bbmult=64,110,100,100,64,90,90,90
wb_calref_db=26,24,24,24,26,24,24,24
wb_txbuf_offset=43,42,39,39,43,42,39,39
wb_frac_del=255,255,255,255,255,255,255,255
@@ -433,43 +432,43 @@
wb_tia_gain_mode_6g20=2,2,2,2,6,6,6,6
wb_tia_gain_mode_6g40=3,3,3,3,6,6,6,6
wb_tia_gain_mode_6g80=4,4,4,4,6,6,6,6
-wb_papdcalidx_6g20=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40=25,25,25,25,30,32,30,32
-wb_papdcalidx_6g80=27,28,27,28,30,32,30,32
-wb_bbmult_6g20=66,64,70,64,76,76,76,86
-wb_bbmult_6g40=76,76,68,76,80,80,76,86
-wb_bbmult_6g80=76,80,66,80,84,84,84,80
-wb_eps_offset_6g20=467,469,467,467,472,473,471,470
-wb_eps_offset_6g40=463,463,462,463,471,472,471,470
-wb_eps_offset_6g80=464,465,464,466,471,472,468,472
-wb_calref_db_6g20=26,26,26,26,27,27,29,28
-wb_calref_db_6g40=30,30,32,30,27,27,29,28
-wb_calref_db_6g80=32,30,34,30,27,27,29,28
+wb_papdcalidx_6g20=25,30,25,30,25,30,30,25
+wb_papdcalidx_6g40=25,30,25,30,25,30,20,30
+wb_papdcalidx_6g80=25,30,25,30,25,30,20,25
+wb_bbmult_6g20=70,70,65,70,70,70,76,80
+wb_bbmult_6g40=70,70,65,70,70,70,80,75
+wb_bbmult_6g80=70,70,65,70,70,70,75,80
+wb_eps_offset_6g20=464,469,465,469,468,470,471,465
+wb_eps_offset_6g40=463,468,465,468,468,469,462,468
+wb_eps_offset_6g80=464,468,466,469,469,470,464,466
+wb_calref_db_6g20=30,30,30,30,30,30,29,30
+wb_calref_db_6g40=30,30,30,30,30,30,30,30
+wb_calref_db_6g80=30,30,30,30,30,30,30,30
#2nd LUT parameters
wb_multipapd_en=1
-wb_PapdLutSel_idx_6g20=42,42,42,42,42,42,39,42
-wb_PapdLutSel_idx_6g40=42,42,42,42,42,42,42,45
-wb_PapdLutSel_idx_6g80=42,42,42,42,39,39,41,44
-wb_eps_index_offset_6g20=0,0,0,4,2,7,3,5
-wb_eps_index_offset_6g40=10,7,9,5,2,8,0,8
-wb_eps_index_offset_6g80=12,7,5,5,2,4,3,8
-wb_papdcalidx_6g20_lut1=10,10,10,10,30,32,30,32
-wb_papdcalidx_6g40_lut1=25,25,25,25,30,32,32,32
-wb_papdcalidx_6g80_lut1=27,28,27,28,30,10,10,32
-wb_bbmult_6g20_lut1=54,50,55,35,52,45,56,66
-wb_bbmult_6g40_lut1=28,42,32,45,70,42,50,45
-wb_bbmult_6g80_lut1=35,50,50,50,50,30,40,50
-wb_calref_db_6g20_lut1=30,26,30,30,30,30,32,28
-wb_calref_db_6g40_lut1=30,30,32,30,27,30,35,28
-wb_calref_db_6g80_lut1=28,30,30,30,30,30,32,28
+wb_PapdLutSel_idx_6g20=42,56,52,80,38,42,39,39
+wb_PapdLutSel_idx_6g40=40,40,80,80,46,40,37,40
+wb_PapdLutSel_idx_6g80=42,48,80,80,54,40,36,40
+wb_eps_index_offset_6g20=6,6,5,6,4,7,3,6
+wb_eps_index_offset_6g40=6,6,5,6,6,6,11,7
+wb_eps_index_offset_6g80=7,7,5,7,8,8,8,6
+wb_papdcalidx_6g20_lut1=30,35,30,35,30,35,30,30
+wb_papdcalidx_6g40_lut1=30,35,30,35,30,35,35,35
+wb_papdcalidx_6g80_lut1=30,35,30,35,30,35,25,30
+wb_bbmult_6g20_lut1=70,70,65,70,70,70,56,80
+wb_bbmult_6g40_lut1=70,70,65,70,70,70,80,75
+wb_bbmult_6g80_lut1=70,70,65,70,70,70,75,80
+wb_calref_db_6g20_lut1=28,28,28,28,28,28,32,28
+wb_calref_db_6g40_lut1=28,28,28,28,28,28,28,28
+wb_calref_db_6g80_lut1=28,28,28,28,28,28,28,28
# 2g/5G 2nd PAPD LUT parameters applicable for -40degc
-wb_eps_offset_lut1=22,10,10,7,22,10,10,7
+wb_eps_offset_lut1=22,11,7,3,22,5,7,8
wb_calref_db_lut1=23,19,19,19,23,19,19,19
wb_papdcalidx_lut1=10,10,10,10,10,10,10,10
-wb_bbmult_lut1=25,40,40,40,25,40,40,40
-wb_PapdLutSel_idx_2g5g=53,52,53,52,53,52,53,52
+wb_bbmult_lut1=25,40,40,26,25,40,40,40
+wb_PapdLutSel_idx_2g5g=53,62,63,62,53,62,54,54
# energy detect threshold
ed_thresh2g=-65
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/w870_rtecdc_mfg.trxs b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/w870_rtecdc_mfg.trxs
deleted file mode 100755
index 7c31483..0000000
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/w870_rtecdc_mfg.trxs
+++ /dev/null
Binary files differ
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/w870_rtecdc_mfg.trxse b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/w870_rtecdc_mfg.trxse
new file mode 100755
index 0000000..09df6bd
--- /dev/null
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/files/wifi/wg870/w870_rtecdc_mfg.trxse
Binary files differ
diff --git a/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb b/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb
index 2f94a88..f0f56bc 100755
--- a/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb
+++ b/meta/meta-mediatek-mt2735/recipes-kernel/modules/wg870-drv-insmod.bb
@@ -10,7 +10,7 @@
file://wifi/wg870/cyw989570fcref_rev1.58.txt \
file://wifi/wg870/cyw989570fcref_EU_rev1.58.txt \
file://wifi/wg870/cyw989570fcref_CN_rev1.58.txt \
- file://wifi/wg870/w870_rtecdc_mfg.trxs "
+ file://wifi/wg870/w870_rtecdc_mfg.trxse "
inherit systemd
@@ -26,7 +26,7 @@
install -d ${D}/etc/wg870/
install -m 755 ${WORKDIR}/wifi/wg870/config_pcie.trxse ${D}/etc/wg870/
install -m 755 ${WORKDIR}/wifi/wg870/89570_mobiltek_ivi_v4.clm_blob ${D}/etc/wg870/
- install -m 755 ${WORKDIR}/wifi/wg870/w870_rtecdc_mfg.trxs ${D}/etc/wg870/
+ install -m 755 ${WORKDIR}/wifi/wg870/w870_rtecdc_mfg.trxse ${D}/etc/wg870/
install -m 755 ${WORKDIR}/wifi/wg870/cyw989570fcref_rev1.58.txt ${D}/etc/wg870/
install -m 755 ${WORKDIR}/wifi/wg870/cyw989570fcref_EU_rev1.58.txt ${D}/etc/wg870/
install -m 755 ${WORKDIR}/wifi/wg870/cyw989570fcref_CN_rev1.58.txt ${D}/etc/wg870/
diff --git a/src/bsp/lk/app/blxboot/imagelist.c b/src/bsp/lk/app/blxboot/imagelist.c
index 9522ea0..fdda944 100755
--- a/src/bsp/lk/app/blxboot/imagelist.c
+++ b/src/bsp/lk/app/blxboot/imagelist.c
@@ -918,8 +918,8 @@
if ((err = fit_get_image(part_name, &img->imgdata->buf)) == 0) {
err = fit_load_images(img->imgdata->buf, img->imgdata, true);
if (err) break;
+ load_medmcu();
}
- load_medmcu();
} while (0);
return err;
diff --git a/src/bsp/lk/platform/mt2735/drivers/md/ccci_ld_md_core.c b/src/bsp/lk/platform/mt2735/drivers/md/ccci_ld_md_core.c
index 57ff400..dafb84d 100644
--- a/src/bsp/lk/platform/mt2735/drivers/md/ccci_ld_md_core.c
+++ b/src/bsp/lk/platform/mt2735/drivers/md/ccci_ld_md_core.c
@@ -36,6 +36,7 @@
#include <sys/types.h>
#include <stdint.h>
#include <string.h>
+#include <lib/mempool.h>
#include "ccci_fit.h"
#include "mtk_ccci_ld_md.h"
@@ -364,7 +365,7 @@
{
unsigned char *md_mem_base;
const char *partition_list[2];
- int ret, load_size;
+ int ret = 0, load_size = 0;
void *fit = NULL;
/* reserve memory for modem with max requirement */
@@ -381,18 +382,21 @@
ret = ccci_fit_get_image(get_fit_buf[0].label, &get_fit_buf[0].load_buf);
if (ret < 0) {
ALWAYS_LOG("fit_get_image failed: %s %d!\n", get_fit_buf[0].label, ret);
+ load_size = ret;
goto _Exit;
}
ret = ccci_fit_conf_verify_sig(NULL, get_fit_buf[0].load_buf);
if (ret < 0) {
ALWAYS_LOG("fit_conf_verify_sig failed: %s %d!\n", get_fit_buf[0].label, ret);
+ load_size = ret;
goto _Exit;
}
ret = ccci_fit_load_image(NULL, "kernel", get_fit_buf[0].load_buf, NULL ,NULL, NULL, true);
if (ret < 0) {
ALWAYS_LOG("MD-fit image verify failed!\n");
+ load_size = ret;
goto _Exit;
}
load_size = copy_image_by_name(get_fit_buf[0].load_buf, main_img->image_name, md_mem_base,
@@ -463,7 +467,7 @@
/* --- load raw data to DRAM that listed at table --- */
static int ld_img_at_list(struct download_info_s img_list[], struct modem_info_s *info)
{
- int load_size;
+ int load_size = 0;
int md_mem_resv_size = 0;
int md_mem_required_size = 0;
unsigned char *md_resv_mem_addr = NULL;
@@ -540,8 +544,10 @@
}
}
- //need load partition and verify in first time
- if(j == i) {
+ // load partition and verify in first time
+ // different images may share the same partitation
+ // skip loading partition if it is loaded before
+ if(j == i) { // the partition isn't loaded before
ret = ccci_fit_get_image(get_fit_buf[i].label, &get_fit_buf[i].load_buf);
if (ret < 0) {
ALWAYS_LOG("fit_get_image failed: %s %d!\n", get_fit_buf[i].label, ret);
@@ -561,6 +567,7 @@
}
}
+ // load image
load_size = copy_image_by_name(get_fit_buf[i].load_buf, curr[i].image_name, curr[i].mem_addr,
curr[i].max_size, curr[i].ext_flag);
#else
@@ -593,16 +600,25 @@
ALWAYS_LOG("arch_sync_cache_range: addr[%p], size[0x%08x]\n",
md_resv_mem_addr, md_mem_resv_size);
info->errno = 0;
+ ret = 0;
/* Retrieve not used memory if needed*/
if (md_mem_resv_size != md_mem_required_size)
ccci_free_not_used_reserved_memory(md_resv_mem_addr, md_mem_resv_size,
md_mem_required_size);
- return 0;
-
_MD_Exit:
- if (md_resv_mem_addr) {
+#ifdef MTK_SECURITY_SW_SUPPORT
+ ALWAYS_LOG("Free buf memory\n");
+ for (j = 0; j < (sizeof(get_fit_buf) / sizeof(get_fit_buf[0])); j++) {
+ if (get_fit_buf[j].load_buf) {
+ mempool_free(get_fit_buf[j].load_buf);
+ get_fit_buf[j].load_buf = NULL;
+ }
+ }
+#endif
+
+ if (ret && md_resv_mem_addr) {
ALWAYS_LOG("Free reserved memory\n");
ccci_free_not_used_reserved_memory(md_resv_mem_addr, md_mem_resv_size, 0);
}
@@ -831,7 +847,8 @@
CRITICAL_LOG("[MD1 Baseband version] %s(%d)\r\n", buf, ret);
ret = ccci_get_md_version(MD_SYS3, buf, 128);
CRITICAL_LOG("[MD3 Baseband version] %s(%d)\r\n", buf, ret);
- return 0;
+
+ return err_code;
}
void ccci_update_md_version(int md_id, unsigned char ver[])
diff --git a/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c b/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c
index 0582cb9..6f5ad6b 100644
--- a/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c
+++ b/src/kernel/linux/v4.19/drivers/misc/mediatek/lpm/modules/debug/mt6880/mtk_logger.c
@@ -566,6 +566,7 @@
int log_size = 0;
unsigned int wr = WR_UNKNOWN;
const char *scenario = prefix ?: "UNKNOWN";
+ printk("wakeup var : %d,%d,%d,%d,%d\n",wakesrc->r12,wakesrc->r12_ext,wakesrc->wake_misc,wakesrc->is_abort,wakesrc->r13);//jb.qi add for debug have not wakeup source in syslog when resume
/* Disable rcu lock checking */
if (type == MT_LPM_ISSUER_SUSPEND)