[Feature][Modem]1.merge MTK P2 patch 2.RF:bias modification of frequency band

Change-Id: I846de8f085e50c1b9557ad8c5d0b2cc088b18d86
diff --git a/mcu/interface/service/sbp/sbp_feature.def b/mcu/interface/service/sbp/sbp_feature.def
index 7ad155f..e7d0714 100755
--- a/mcu/interface/service/sbp/sbp_feature.def
+++ b/mcu/interface/service/sbp/sbp_feature.def
@@ -69,7 +69,8 @@
 		<RECORD Date="2022-06-24" Author="ot901114">Add SBP_GMSS_TRIGGER_INCREMENTAL_MPSR</RECORD>
 		<RECORD Date="2022-05-16" Author="OT901109">Add SBP_NWSEL_CLEAR_RPLMN_FOR_POWER_ON_SEARCH</RECORD>
 		<RECORD Date="2022-05-16" Author="OT901109">Add SBP_NWSEL_CLEAR_RPLMN_FOR_HOME_COUNTRY_POWER_ON_SEARCH</RECORD>
-	</HISTORY>
+        <RECORD Date="2022-08-16" Author="mtk15164">Add SBP_NAS_SV_RAT_CAP_CONTROL_BY_MRS_CONFIG</RECORD>
+    </HISTORY>
 </SBP_DOC_INFO>
 ******* SBP Doc End ********/
 
@@ -22698,7 +22699,7 @@
 #endif
 
 /****** SBP Document BEGIN ************************************************************************
-<SBP title="SBP_KOR_SKT_NULL_MSISDN_REG - Blocking the registration for Korea SKT telecom requirement ">
+<SBP title="SBP_KOR_NULL_MSISDN_REG - Blocking the registration for Korea operator requirement ">
     <DESCRIPTION>
         <PARAG>If inserted USIM card has NULL MSISDN with registration mode, UE will not try to attach request to network. </PARAG>
     </DESCRIPTION>
@@ -22708,13 +22709,13 @@
         <VALUE value="1">Enabled</VALUE>
     </CONFIG>
     <DEFAULT>0</DEFAULT>
-    <OP>SKT</OP>
+    <OP>OP115 and OP116</OP>
     <DEPENDENCY>N/A</DEPENDENCY>
     <NOTE>None</NOTE>
     <AUTHOR>mtk06648</AUTHOR>
 </SBP>
 ******* SBP Document END **************************************************************************/
-SBP_FEATURE_DEF(SBP_KOR_SKT_NULL_MSISDN_REG, SBP_ATTR_NONE, "Do Not try to attach network if USIM has NULL MSISDN for SKT", "Disabled", "Enabled", 0)
+SBP_FEATURE_DEF(SBP_KOR_NULL_MSISDN_REG, SBP_ATTR_NONE, "Do Not try to attach network if USIM has NULL MSISDN for Korea operator requirement", "Disabled", "Enabled", 0)
 
 
 /****** SBP Document BEGIN ************************************************************************
@@ -33251,7 +33252,7 @@
         <VALUE value="0">Not support</VALUE>
         <VALUE value="1">Support</VALUE>
     </CONFIG>
-    <DEFAULT>0</DEFAULT>
+    <DEFAULT>1</DEFAULT>
     <OP>N/A</OP>
     <DEPENDENCY>N/A</DEPENDENCY>
     <NOTE>
@@ -33261,10 +33262,10 @@
     <AUTHOR>mtk16743</AUTHOR>
 </SBP>
 ******* SBP Document END **************************************************************************/
-#if defined(__SUPPORT_LTE_SKIPPED_FALLBACK_CA__)
-    SBP_FEATURE_DEF(SBP_SUPPORT_LTE_SKIPPED_FALLBACK_CA, SBP_ATTR_NONE, "Support of skippfallback CA combinations in LTE", "Not support", "Support", 1)
-#else
+#if defined(__DISABLE_SUPPORT_LTE_SKIPPED_FALLBACK_CA__)
     SBP_FEATURE_DEF(SBP_SUPPORT_LTE_SKIPPED_FALLBACK_CA, SBP_ATTR_NONE, "Support of skippfallback CA combinations in LTE", "Not support", "Support", 0)
+#else
+    SBP_FEATURE_DEF(SBP_SUPPORT_LTE_SKIPPED_FALLBACK_CA, SBP_ATTR_NONE, "Support of skippfallback CA combinations in LTE", "Not support", "Support", 1)
 #endif
 
 /****** SBP Document BEGIN ************************************************************************
@@ -33304,7 +33305,7 @@
         <VALUE value="0">Disabled</VALUE>
         <VALUE value="1">Enabled</VALUE>
     </CONFIG>
-    <DEFAULT>0</DEFAULT>
+    <DEFAULT>1</DEFAULT>
     <OP>N/A</OP>
     <DEPENDENCY>N/A</DEPENDENCY>
     <NOTE>
@@ -33314,7 +33315,11 @@
     <AUTHOR>mtk16743</AUTHOR>
 </SBP>
 ******* SBP Document END **************************************************************************/
-SBP_FEATURE_DEF(SBP_CA_MAX_MIMO_LAYERS, SBP_ATTR_NONE, "Support of maximumCCsRetrieval in LTE", "Disabled", "Enabled", 0)
+#if defined __DISABLE_LTE_SUPPORT_MAX_CC_RETRIEVAL__
+    SBP_FEATURE_DEF(SBP_CA_MAX_MIMO_LAYERS, SBP_ATTR_NONE, "Support of maximumCCsRetrieval in LTE", "Disabled", "Enabled", 0)
+#else
+    SBP_FEATURE_DEF(SBP_CA_MAX_MIMO_LAYERS, SBP_ATTR_NONE, "Support of maximumCCsRetrieval in LTE", "Disabled", "Enabled", 1)
+#endif
 
 /****** SBP Document BEGIN ************************************************************************
 <SBP title="SBP_NR_PARTIAL_BAND_USE_NVRAM - Use NVRAM to config NR partial band under MCC">
@@ -33851,7 +33856,7 @@
 /****** SBP Document BEGIN ************************************************************************
 <SBP title="SBP_NR_CAP_DISABLE_PUSCH_LBRM - disable pusch_LBRM transmission in NR">
     <DESCRIPTION>
-       <PARAG> 
+       <PARAG>
 	   To force disable NR LBRM PUSCH transmission. The capabitliy report of pusch_LBRM in 38.306 will be affected.
        </PARAG>
     </DESCRIPTION>
@@ -33968,8 +33973,8 @@
 /****** SBP Document BEGIN ************************************************************************
 <SBP title="SBP_LBS_LPP_ALLOW_NILR_AFTER_EMC_END - LBS to allow/deny NILR session after an emergency call ends">
     <DESCRIPTION>
-        <PARAG>The UE SHALL allow NI-LR for Emergency Service Calls regardless of the location privacy settings or 
-		GPS settings on the UE. UE SHALL allow NI-LR to be supported for upto 5minutes after an emergency call ends 
+        <PARAG>The UE SHALL allow NI-LR for Emergency Service Calls regardless of the location privacy settings or
+		GPS settings on the UE. UE SHALL allow NI-LR to be supported for upto 5minutes after an emergency call ends
 		(in case of a premature or dropped call where PSAP may wish to do a locate).
         </PARAG>
     </DESCRIPTION>
@@ -33993,8 +33998,510 @@
     SBP_FEATURE_DEF(SBP_LBS_LPP_ALLOW_NILR_AFTER_EMC_END, SBP_ATTR_NONE, "The NILR session not allowed after an emergency call ends.", "Allow NILR", "Not allow NILR", 0)
 #endif
 
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_SA_LTE_B1_MEAS_SKIP_SERVING_MEAS_OBJECT_CHECK - NRRC Skips MeasObj Check of Serving Frequency for LTE B1 in SA Mode during VoNR">
+    <DESCRIPTION>
+        <PARAG>
+            If this SBP is turn ON, NRRC skips measObj check of serving frequency for LTE B1 in SA Mode during VoNR
+        </PARAG>
+    </DESCRIPTION>
+    <CONFIG>
+       <VALUE value="0">Disable</VALUE>
+       <VALUE value="1">Enable</VALUE>
+    </CONFIG>
+    <CATEGORY>NRRC</CATEGORY>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>None</NOTE>
+    <AUTHOR>mtk12264</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __SA_LTE_B1_MEAS_SKIP_SERVING_MEAS_OBJECT_CHECK__
+	SBP_FEATURE_DEF(SBP_SA_LTE_B1_MEAS_SKIP_SERVING_MEAS_OBJECT_CHECK, SBP_ATTR_NONE, "NRRC Skips MeasObj Check of Serving Frequency for LTE B1 in SA mode during VoNR", "Disabled", "Enabled", 1)
+#else
+	SBP_FEATURE_DEF(SBP_SA_LTE_B1_MEAS_SKIP_SERVING_MEAS_OBJECT_CHECK, SBP_ATTR_NONE, "NRRC Skips MeasObj Check of Serving Frequency for LTE B1 in SA mode during VoNR", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_DEREG_VOWIFI_WHEN_CS_CALL_ONGOING">
+    <DESCRIPTION>
+        <PARAG> When CS call is ongoing, UE should dereg VoWiFi </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>IMC</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disabled</VALUE>
+        <VALUE value="1">Enabled</VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>None</NOTE>
+    <AUTHOR>mtk16701</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#if defined(__SBP_DEREG_VOWIFI_WHEN_CS_CALL_ONGOING__)
+    SBP_FEATURE_DEF(SBP_DEREG_VOWIFI_WHEN_CS_CALL_ONGOING, SBP_ATTR_NONE, "Enable that UE should dereg VoWiFi when CS call is ongoing.", "Not Enabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_DEREG_VOWIFI_WHEN_CS_CALL_ONGOING, SBP_ATTR_NONE, "Disable that UE should dereg VoWiFi when CS call is ongoing.", "Not Enabled", "Enabled", 0)
+#endif
+
 SBP_FEATURE_DEF_END(169)
 
+/* 171st byte*/
+SBP_FEATURE_DEF_BEGIN(170)
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_ERRC_A3_HO_ENH_TRIGGER_EARLY_REEST - Trigger Early Re-establishment if N/W not responding for 10 consecutive A3 MR  ">
+    <DESCRIPTION>
+        <PARAG>
+        If the n/w is not responding for consecutive 10 A3 MR and serving cell has low RSRQ and SINR ,then trigger early re-establisment to avoid T-put loss.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>ERRC</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable. </VALUE>
+        <VALUE value="1">Enable. </VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP></OP>
+    <DEPENDENCY>if compile option __SBP_ERRC_A3_HO_ENH_TRIGGER_EARLY_REEST__ is defined, the SBP is enabled</DEPENDENCY>
+    <NOTE>
+        IS_VIOLATE_STANDARD=Y
+        VIOLATED_STANDARD= 3GPP TS 36.331
+    </NOTE>
+    <AUTHOR>ot903712</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __SBP_ERRC_A3_HO_ENH_TRIGGER_EARLY_REEST__
+    SBP_FEATURE_DEF(SBP_ERRC_A3_HO_ENH_TRIGGER_EARLY_REEST, SBP_ATTR_NONE, "Trigger Early Re-establishment if N/W not responding for 10 consecutive A3 MR.", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_ERRC_A3_HO_ENH_TRIGGER_EARLY_REEST, SBP_ATTR_NONE, "Trigger Early Re-establishment if N/W not responding for 10 consecutive A3 MR.", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_ENABLE_PINGPONG_BAR_NR_IRAT - Enable NR IRAT ping-pong-bar enhancement ">
+    <DESCRIPTION>
+        <PARAG>
+            Enable NR IRAT ping-pong-bar enhancement.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NR</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Not Enabled</VALUE>
+        <VALUE value="1">Enabled</VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>if compile option __ENABLE_PINGPONG_BAR_NR_IRAT__ is defined, the SBP is enabled</DEPENDENCY>
+    <NOTE>N/A</NOTE>
+    <AUTHOR>mtk02689</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#if defined(__ENABLE_PINGPONG_BAR_NR_IRAT__)
+    SBP_FEATURE_DEF(SBP_ENABLE_PINGPONG_BAR_NR_IRAT, SBP_ATTR_NONE, "Enable NR IRAT ping-pong-bar enhancement", "Not Enabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_ENABLE_PINGPONG_BAR_NR_IRAT, SBP_ATTR_NONE, "Enable NR IRAT ping-pong-bar enhancement", "Not Enabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_NR_BAR_CELL_NW_REJECT_WITH_LONG_WAIT_TIME">
+    <DESCRIPTION>
+        <PARAG>
+            When this SBP is turned on, NR serving cell is set as barred,
+            if RRC connection establishment is rejected constantly
+            by the NW with a long wait time.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NR</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disabled</VALUE>
+        <VALUE value="1">Enabled</VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>N/A</NOTE>
+    <AUTHOR>mtk11329</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+SBP_FEATURE_DEF(SBP_NR_BAR_CELL_NW_REJECT_WITH_LONG_WAIT_TIME, SBP_ATTR_NONE, "Set NR serving cell as barred, if RRC conn. est. is rejected by NW with a long wait time.", "Disabled", "Enabled", 0)
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="MULTIPLE_APN_REQUIREMENT - Multiple APNs for each protocol type.">
+    <DESCRIPTION>
+        <PARAG>
+            MOLY00379474: PDP_type of IA PDN conflicts with User APN setting, TC3 acquires us to activate another type of PDN.
+            ALPS05666551: TMO test needs to reject PDN reuse due to protocol type conflict.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>EAS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable. </VALUE>
+        <VALUE value="1">Enable. </VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>None</NOTE>
+    <AUTHOR>mtk13643</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __MULTIPLE_APN_REQUIREMENT__
+    SBP_FEATURE_DEF(SBP_MULTIPLE_APN_REQUIREMENT, SBP_ATTR_NONE, "Multiple APN feature is enable.", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_MULTIPLE_APN_REQUIREMENT, SBP_ATTR_NONE, "Multiple APN feature is disable.", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_VGMM_BYPASS_SR_BLOCK_IN_CONNECTED">
+    <DESCRIPTION>
+        <PARAG>
+        Seldomly in RJIO, NW would not response SR, because NW does not receive PDU RELEASE COMPLETE yet.
+        When this SBP is on, if UE is in connected, VGMM will send VGSM PDU RELEASE COMPLETE to NW evenif the other SR is ongoing.
+        This SBP is only used in RJIO.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NAS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable </VALUE>
+        <VALUE value="1">Enable </VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>None</NOTE>
+    <AUTHOR>mtk16210</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __SBP_VGMM_BYPASS_SR_BLOCK_IN_CONNECTED__
+    SBP_FEATURE_DEF(SBP_VGMM_BYPASS_SR_BLOCK_IN_CONNECTED, SBP_ATTR_NONE, "Enable VGMM bypss SR block in connected", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_VGMM_BYPASS_SR_BLOCK_IN_CONNECTED, SBP_ATTR_NONE, "Enable VGMM bypss SR block in connected", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_L5SMS_CBM_ALL_CLOSE_DEFAULT">
+    <DESCRIPTION>
+        <PARAG> make all 3gpp CBM close in low layer defaultly. Low layer would not receive the CBM and not notify L5(not to HOST). make this as 1 could save resource
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NAS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable. </VALUE>
+        <VALUE value="1">Enable. </VALUE>
+    </CONFIG>
+    <DEFAULT>Disable</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>None</NOTE>
+    <AUTHOR>mtk14954</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+SBP_FEATURE_DEF(SBP_L5SMS_CBM_ALL_CLOSE_DEFAULT, SBP_ATTR_NONE, "make all 3gpp CBM close in low layer defaultly", "DISABLE", "ENABLE", 0)
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_DISABLE_SIB12_FOR_CMAS_DISABLE - Disable SIB12 reception when CMAS is disabled from Higher layers">
+    <DESCRIPTION>
+        <PARAG>
+        If this SBP is turn ON, UE doesn't  receive SIB12 when CMAS is disabled from Higher layers.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>EAS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable. UE receive SIB12 when CMAS is disabled from Higher layers. </VALUE>
+        <VALUE value="1">Enable. UE doesn't  receive SIB12 when CMAS is disabled from Higher layers. </VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>
+    </DEPENDENCY>
+    <NOTE>
+    </NOTE>
+    <AUTHOR>mtk25376</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __DISABLE_SIB12_FOR_CMAS_DISABLE__
+SBP_FEATURE_DEF(SBP_DISABLE_SIB12_FOR_CMAS_DISABLE, SBP_ATTR_NONE, "Disable SIB12 reception when CMAS is disabled from Higher layers", "Disable", "Enable", 1)
+#else
+SBP_FEATURE_DEF(SBP_DISABLE_SIB12_FOR_CMAS_DISABLE, SBP_ATTR_NONE, "Disable SIB12 reception when CMAS is disabled from Higher layers", "Disable", "Enable", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_NR_TO_LTE_B1B2_CUSTOM_CELL_THRESH_FOR_VONR - additional pcell/ncell custom threshold check for B1/B2 report when under VoNR ongoing ">
+    <DESCRIPTION>
+        <PARAG>
+            Enable/Disable additional pcell/ncell custom threshold check for B1/B2 report when under VoNR ongoing.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NR</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Not Enabled</VALUE>
+        <VALUE value="1">Enabled</VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>if compile option __ENABLE_NR_TO_LTE_B1B2_CUSTOM_CELL_THRESH_FOR_VONR__ is defined, the SBP is enabled</DEPENDENCY>
+    <NOTE>N/A</NOTE>
+    <AUTHOR>mtk12473</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#if defined(__ENABLE_NR_TO_LTE_B1B2_CUSTOM_CELL_THRESH_FOR_VONR__)
+    SBP_FEATURE_DEF(SBP_NR_TO_LTE_B1B2_CUSTOM_CELL_THRESH_FOR_VONR, SBP_ATTR_NONE, "additional pcell/ncell custom threshold check for B1/B2 report when under VoNR ongoing", "Not Enabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_NR_TO_LTE_B1B2_CUSTOM_CELL_THRESH_FOR_VONR, SBP_ATTR_NONE, "additional pcell/ncell custom threshold check for B1/B2 report when under VoNR ongoing", "Not Enabled", "Enabled", 0)
+#endif
+
+SBP_FEATURE_DEF_END(170)
+
+/* 172st byte*/
+SBP_FEATURE_DEF_BEGIN(171)
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_NR_CUSTOM_A2_THRESH_ADJUST_FOR_VONR - additional pcell custom thresh and a2 threshold for A2 report when under VoNR ongoing ">
+    <DESCRIPTION>
+        <PARAG>
+            Enable/Disable additional pcell custom thresh and a2 threshold for A2 report when under VoNR ongoing.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NR</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Not Enabled</VALUE>
+        <VALUE value="1">Enabled</VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>if compile option __ENABLE_NR_CUSTOM_A2_THRESH_ADJUST_FOR_VONR__ is defined, the SBP is enabled</DEPENDENCY>
+    <NOTE>N/A</NOTE>
+    <AUTHOR>mtk12473</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#if defined(__ENABLE_NR_CUSTOM_A2_THRESH_ADJUST_FOR_VONR__)
+    SBP_FEATURE_DEF(SBP_NR_CUSTOM_A2_THRESH_ADJUST_FOR_VONR, SBP_ATTR_NONE, "additional pcell custom thresh and a2 threshold for A2 report when under VoNR ongoing", "Not Enabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_NR_CUSTOM_A2_THRESH_ADJUST_FOR_VONR, SBP_ATTR_NONE, "additional pcell custom thresh and a2 threshold for A2 report when under VoNR ongoing", "Not Enabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_OP12_ONSITE_LTE_UICC">
+    <DESCRIPTION>
+        <PARAG>
+            If the ICCID begins with 89999480, the device consider the UICC to be an "On Site LTE UICC".
+            The device shall not only comply with all existing LTE device requirements defined OP12 Wireless,
+            but also follow the data-centric and/or IMS-less requirements.
+        </PARAG>
+    </DESCRIPTION>
+    <CONFIG>
+       <VALUE value="0">Disable to check if this SIM is OP12 onsite UICC</VALUE>
+       <VALUE value="1">Enable to check if this SIM is OP12 onsite UICC</VALUE>
+    </CONFIG>
+    <CATEGORY>L4</CATEGORY>
+    <DEFAULT>0</DEFAULT>
+    <OP>OP12</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>IS_VIOLATE_STANDARD=N</NOTE>
+    <AUTHOR>mtk22699</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#if defined(__SBP_ENABLE_OP12_ONSITE_LTE_UICC__)
+    SBP_FEATURE_DEF(SBP_OP12_ONSITE_LTE_UICC, SBP_ATTR_NONE, "this SIM is OP12 onsite UICC", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_OP12_ONSITE_LTE_UICC, SBP_ATTR_NONE, "this SIM is OP12 onsite UICC", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_L5_SIM_REPORT_REQUESTED_PIN_TYPE_WHEN_BLOCKED">
+    <DESCRIPTION>
+        <PARAG>
+            when verify pin fail max times and blocked:
+            1.If sbp on, reported pin type is the same as in the request and remaining_attempts is 0.
+            2.If sbp off, reported pin type is the puk corresponding to the pin type in the request and remaining_attempts is puk remaining times.
+        </PARAG>
+    </DESCRIPTION>
+    <CONFIG>
+       <VALUE value="0">report pin type puk and puk remain_attemps</VALUE>
+       <VALUE value="1">report pin type pin and pin remain_attemps 0</VALUE>
+    </CONFIG>
+    <CATEGORY>MIPC</CATEGORY>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>
+        This SBP can be controlled by compile option __L5_SIM_REPORT_REQUESTED_PIN_TYPE_WHEN_BLOCKED__
+    </DEPENDENCY>
+    <NOTE>
+        None
+        IS_VIOLATE_STANDARD=N
+    </NOTE>
+    <AUTHOR>mtk21075</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __L5_SIM_REPORT_REQUESTED_PIN_TYPE_WHEN_BLOCKED__
+    SBP_FEATURE_DEF(SBP_L5_SIM_REPORT_REQUESTED_PIN_TYPE_WHEN_BLOCKED, SBP_ATTR_NONE, "report pin type is the same as in the request and remaining_attempts is 0 when verify pin fail max times and blocked", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_L5_SIM_REPORT_REQUESTED_PIN_TYPE_WHEN_BLOCKED, SBP_ATTR_NONE, "report pin type is the same as in the request and remaining_attempts is 0 when verify pin fail max times and blocked", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_L5_SIM_REPORT_SIM_STATUS_IND_WHEN_VERIFY_FAIL_TO_BLOCKED">
+    <DESCRIPTION>
+        <PARAG>
+            1.If sbp on, modem will send sim status ind to AP when verify pin failed max times and changed to PUK
+            2.If sbp off, modem will not send sim status ind to AP when verify pin failed max times and changed to PUK
+        </PARAG>
+    </DESCRIPTION>
+    <CONFIG>
+       <VALUE value="0">off</VALUE>
+       <VALUE value="1">on</VALUE>
+    </CONFIG>
+    <CATEGORY>MIPC</CATEGORY>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>
+        This SBP can be controlled by compile option __L5_SIM_REPORT_SIM_STATUS_IND_WHEN_VERIFY_FAIL_TO_BLOCKED__
+    </DEPENDENCY>
+    <NOTE>
+        None
+        IS_VIOLATE_STANDARD=N
+    </NOTE>
+    <AUTHOR>mtk21075</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __L5_SIM_REPORT_SIM_STATUS_IND_WHEN_VERIFY_FAIL_TO_BLOCKED__
+    SBP_FEATURE_DEF(SBP_L5_SIM_REPORT_SIM_STATUS_IND_WHEN_VERIFY_FAIL_TO_BLOCKED, SBP_ATTR_NONE, "when verify fail to block and send ind", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_L5_SIM_REPORT_SIM_STATUS_IND_WHEN_VERIFY_FAIL_TO_BLOCKED, SBP_ATTR_NONE, "when verify fail to block and send ind", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN *****************************************************************************
+<SBP title="SBP_TPC_ETM_TRIGGER_EARLIER_FOR_MT6308H">
+    <DESCRIPTION>
+        <PARAG>
+            1. This feaure is to resolve MT6308H's HW limition issue.
+            2. When UL power difference is large between different channnels, there is an undershoot issue for MT6308H, TPC would trigger ETM bias earlier than normal scenario.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>RF</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable</VALUE>
+        <VALUE value="1">Enable</VALUE>
+    </CONFIG>
+    <DEFAULT>0</DEFAULT>
+    <OP>Verizon</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>
+     N/A
+    </NOTE>
+    <AUTHOR>mtk11568</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+  SBP_FEATURE_DEF(SBP_TPC_ETM_TRIGGER_EARLIER_FOR_MT6308H, SBP_ATTR_NONE, "Enable TPC trigger ETM Bias earlier", "Disable", "Enable", 1)
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_4G5_MRU_PREFER_UL_DATA_STATUS">
+    <DESCRIPTION>
+        <PARAG>
+            Wait TFTPF matching result before IRAT MRU start. So uplink_data_status may set correctly in registration request.
+        </PARAG>
+    </DESCRIPTION>
+    <CONFIG>
+       <VALUE value="0">Disable</VALUE>
+       <VALUE value="1">Enable</VALUE>
+    </CONFIG>
+    <CATEGORY>NAS</CATEGORY>
+    <DEFAULT>0</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>N/A</NOTE>
+    <AUTHOR>mtk13167</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef __SBP_4G5_MRU_PREFER_UL_DATA_STATUS__
+    SBP_FEATURE_DEF(SBP_4G5_MRU_PREFER_UL_DATA_STATUS, SBP_ATTR_NONE, "prefer uplink data status in 4G5 HO MRU", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_4G5_MRU_PREFER_UL_DATA_STATUS, SBP_ATTR_NONE, "prefer uplink data status in 4G5 HO MRU", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_ENABLE_PHB_DUMP_LOGGING - Logging of PHB dump data.">
+    <DESCRIPTION>
+        <PARAG> 
+        If this SBP is enabled, then the PHB dump data logging will be enabled.
+        If this SBP is disabled, then the PHB dump data logging will be disabled.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>L4</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Disable. </VALUE>
+        <VALUE value="1">Enable. </VALUE>
+    </CONFIG>
+    <DEFAULT>Disable</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>None</NOTE>
+    <AUTHOR>mtk15332</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#if defined(__ENABLE_PHB_DUMP_LOGGING__)
+    SBP_FEATURE_DEF(SBP_ENABLE_PHB_DUMP_LOGGING, SBP_ATTR_NONE, "Enables the logging of PHB dump data", "Disabled", "Enabled", 1)
+#else
+    SBP_FEATURE_DEF(SBP_ENABLE_PHB_DUMP_LOGGING, SBP_ATTR_NONE, "Disables the logging of PHB dump data", "Disabled", "Enabled", 0)
+#endif
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_SDAP_AS_REFLECTIVE_QOS_SUPPORT - UE supports SDAP AS Reflective QoS (AS RQoS)">
+    <DESCRIPTION>
+        <PARAG>
+            Under NR SA, configuration for NRRC capability SDAP as-ReflectiveQoS.
+            When this SBP is enabled, UE supports SDAP AS Reflective QoS (AS RQoS).
+            Please refer to TS 37.324 for detail.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>AS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Not supported: UE does not support SDAP AS Reflective QoS</VALUE>
+        <VALUE value="1">Supported: UE supports SDAP AS Reflective QoS</VALUE>
+    </CONFIG>
+    <DEFAULT>1</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>N/A</NOTE>
+    <AUTHOR>mtk16615</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+    SBP_FEATURE_DEF(SBP_SDAP_AS_REFLECTIVE_QOS_SUPPORT, SBP_ATTR_NONE, "UE supports SDAP AS Reflective QoS", "Not supported", "Supported", 1)
+
+SBP_FEATURE_DEF_END(171)
+
+/* 173rd byte*/
+SBP_FEATURE_DEF_BEGIN(172)
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_NAS_SV_RAT_CAP_CONTROL_BY_MRS_CONFIG - To disable RAT capability according to mrs rat cap config ">
+    <DESCRIPTION>
+        <PARAG> To disable RAT capability according to mrs rat cap config. </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NAS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">Not Enabled</VALUE>
+        <VALUE value="1">Enabled</VALUE>
+    </CONFIG>
+    <DEFAULT>1</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>
+    IS_VIOLATE_STANDARD=N
+    </NOTE>
+    <AUTHOR>mtk14832</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+#ifdef _DISABLE_NAS_SV_RAT_CAP_CONTROL_BY_MRS_CONFIG_
+   SBP_FEATURE_DEF(SBP_NAS_SV_RAT_CAP_CONTROL_BY_MRS_CONFIG, SBP_ATTR_NONE, "disable the feature.",  "Not Enabled", "Enabled", 0)
+#else
+   SBP_FEATURE_DEF(SBP_NAS_SV_RAT_CAP_CONTROL_BY_MRS_CONFIG, SBP_ATTR_NONE, "enable the feature.",  "Not Enabled", "Enabled", 1)
+#endif
+
+SBP_FEATURE_DEF_END(172)
+
 #undef SBP_FEATURE_DEF_BEGIN
 #undef SBP_FEATURE_DEF
 #undef SBP_FEATURE_DEF_END
diff --git a/mcu/interface/service/sbp/sbp_public_utility.h b/mcu/interface/service/sbp/sbp_public_utility.h
index cf10b33..bbc0b7b 100755
--- a/mcu/interface/service/sbp/sbp_public_utility.h
+++ b/mcu/interface/service/sbp/sbp_public_utility.h
@@ -535,6 +535,7 @@
     SBP_ID_ALIV = 359,
     SBP_ID_CTEXCEL = 360,
     SBP_ID_BMOBILE = 362,
+	SBP_ID_CBN = 388,
 	SBP_ID_LICT = 398,
 
     /* Lab testing SBP ID */