gflt400: Use AVANTA_MC_RSFU from Marvell's SDK
Previous upgrade to SDK_2.7.25-thunderbolt_v1 in
go/fibercl/82563
incorrectly used files from the
"SDK_2.7.25-thunderbolt_v1/Source/ConfigFiles/Products/AVANTA_MC_SFU"
directory instead of
"SDK_2.7.25-thunderbolt_v1/Source/ConfigFiles/Products/AVANTA_MC_RSFU"
This cl fixes that
Change-Id: Idc4ebef2d5d872cd528139ebbe7661c1d9b12398
diff --git a/package/mv_app/xml_params/onu_profile_xml_cfg_file.xml.gflt400 b/package/mv_app/xml_params/onu_profile_xml_cfg_file.xml.gflt400
old mode 100644
new mode 100755
index b33d7ee..c035a04
--- a/package/mv_app/xml_params/onu_profile_xml_cfg_file.xml.gflt400
+++ b/package/mv_app/xml_params/onu_profile_xml_cfg_file.xml.gflt400
@@ -61,8 +61,8 @@
<Capability>
<!--ONU type: UINT32. -->
- <!--0:SFU, 1:HGU, 2:SBU, 3:CBU, 4:MDU, 5:MTU, 6:1FE+1POTS SFU, 7:Mixed HGU -->
- <attrib name="ONU type" value="0" />
+ <!--0:SFU, 1:HGU, 2:SBU, 3:CBU, 4:MDU, 5:MTU, 6:1FE+1POTS SFU, 7:Mixed HGU, 8:1GE+1SGMII Bridge -->
+ <attrib name="ONU type" value="8" />
<!-- 1=MV_PON_WAN_DUAL_MAC_INT_SWITCH 2=MV_PON_WAN_G0_INT_SWITCH 3=MV_PON_WAN_G1_LAN_G0_INT_SWITCH 4=MV_G0_WAN_G1_INT_SWITCH
5=MV_G1_WAN_G0_INT_SWITCH 6=MV_PON_G1_WAN_G0_INT_SWITCH 7=MV_PON_G0_WAN_G1_INT_SWITCH 8=MV_PON_WAN_DUAL_MAC_EXT_SWITCH
@@ -189,7 +189,7 @@
<!--Downstream multicast channel: UINT32. -->
<!--0: from multicast mac address channel, 1: from multicast gemport channel-->
- <attrib name="Downstream multicast channel" value="1" />
+ <attrib name="Downstream multicast channel" value="0" />
<!--IGMPV1 messages discard: UINT32. -->
<!--0: forward igmpv1 messages, 1: discard igmpv1 messages-->
diff --git a/package/mv_app/xml_params/tpm_xml_cfg_file_epon.xml.gflt400 b/package/mv_app/xml_params/tpm_xml_cfg_file_epon.xml.gflt400
index a5133b4..51ac252 100644
--- a/package/mv_app/xml_params/tpm_xml_cfg_file_epon.xml.gflt400
+++ b/package/mv_app/xml_params/tpm_xml_cfg_file_epon.xml.gflt400
@@ -393,9 +393,9 @@
<!-- TPM_PNC_MNGMT_DS -->
<range num="00" type="0" size="01" cntr_grp="0" lu_mask="1" min_reset_level = "1" />
<!-- TPM_PNC_MAC_LEARN -->
- <range num="01" type="0" size="00" cntr_grp="3" lu_mask="1" min_reset_level = "0" />
+ <range num="01" type="0" size="5" cntr_grp="3" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_CPU_WAN_LPBK_US -->
- <range num="02" type="0" size="00" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
+ <range num="02" type="0" size="5" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_NUM_VLAN_TAGS -->
<range num="03" type="0" size="09" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_DS_LOAD_BALANCE -->
diff --git a/package/mv_app/xml_params/tpm_xml_cfg_file_gpon.xml.gflt400 b/package/mv_app/xml_params/tpm_xml_cfg_file_gpon.xml.gflt400
index 620f8bc..220a6e6 100644
--- a/package/mv_app/xml_params/tpm_xml_cfg_file_gpon.xml.gflt400
+++ b/package/mv_app/xml_params/tpm_xml_cfg_file_gpon.xml.gflt400
@@ -181,13 +181,13 @@
<!-- Undefined queues will not be created in hardware -->
<queue_map>
<queue id="0" sched_method="0" owner="0" owner_q_num="0" size="0256" weight="0" />
- <queue id="1" sched_method="0" owner="3" owner_q_num="0" size="0256" weight="0" />
+ <queue id="1" sched_method="0" owner="2" owner_q_num="0" size="0256" weight="0" />
<queue id="2" sched_method="0" owner="0" owner_q_num="1" size="0256" weight="0" />
- <queue id="3" sched_method="0" owner="3" owner_q_num="1" size="0256" weight="0" />
+ <queue id="3" sched_method="0" owner="2" owner_q_num="1" size="0256" weight="0" />
<queue id="4" sched_method="0" owner="0" owner_q_num="2" size="0256" weight="0" />
- <queue id="5" sched_method="0" owner="3" owner_q_num="2" size="0256" weight="0" />
+ <queue id="5" sched_method="0" owner="2" owner_q_num="2" size="0256" weight="0" />
<queue id="6" sched_method="0" owner="0" owner_q_num="3" size="0256" weight="0" />
- <queue id="7" sched_method="0" owner="3" owner_q_num="3" size="0256" weight="0" />
+ <queue id="7" sched_method="0" owner="2" owner_q_num="3" size="0256" weight="0" />
</queue_map>
</tx_mod>
<!-- id : 0 = GMAC0, 1 = GMAC1, 2 = PMAC_0, 3 = PMAC_1, 4 = PMAC_2, 5 = PMAC_3, -->
@@ -200,8 +200,14 @@
<!-- size : queue size must be >0 -->
<!-- Undefined queues will not be created in hardware -->
<queue_map>
- <queue id="0" sched_method="0" owner="0" owner_q_num="0" size="1024" weight="0" />
- <queue id="1" sched_method="0" owner="1" owner_q_num="0" size="1024" weight="0" />
+ <queue id="0" sched_method="0" owner="0" owner_q_num="0" size="0256" weight="0" />
+ <queue id="1" sched_method="0" owner="1" owner_q_num="0" size="0256" weight="0" />
+ <queue id="2" sched_method="0" owner="0" owner_q_num="1" size="0256" weight="0" />
+ <queue id="3" sched_method="0" owner="1" owner_q_num="1" size="0256" weight="0" />
+ <queue id="4" sched_method="0" owner="0" owner_q_num="2" size="0256" weight="0" />
+ <queue id="5" sched_method="0" owner="1" owner_q_num="2" size="0256" weight="0" />
+ <queue id="6" sched_method="0" owner="0" owner_q_num="3" size="0256" weight="0" />
+ <queue id="7" sched_method="0" owner="1" owner_q_num="3" size="0256" weight="0" />
</queue_map>
</tx_mod>
<!-- id : 0 = GMAC0, 1 = GMAC1, 2 = PMAC_0, 3 = PMAC_1, 4 = PMAC_2, 5 = PMAC_3, -->
@@ -488,9 +494,9 @@
<chain id="4" type="5" num="6" />
<chain id="5" type="6" num="170" />
<chain id="6" type="7" num="4096" />
- <chain id="7" type="8" num="24" />
+ <chain id="7" type="8" num="16" />
<chain id="8" type="9" num="64" />
- <chain id="9" type="10" num="24" />
+ <chain id="9" type="10" num="16" />
</chain_parameters>
<udp_checksum_use_init>0</udp_checksum_use_init>
<udp_checksum_calc>0</udp_checksum_calc>
@@ -534,21 +540,21 @@
<!-- TPM_PNC_MAC_LEARN -->
<range num="01" type="0" size="0" cntr_grp="3" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_CPU_WAN_LPBK_US -->
- <range num="02" type="0" size="08" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
+ <range num="02" type="0" size="5" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_NUM_VLAN_TAGS -->
<range num="03" type="0" size="09" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_DS_LOAD_BALANCE -->
<range num="04" type="0" size="00" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_MULTI_LPBK -->
- <range num="05" type="0" size="10" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
+ <range num="05" type="0" size="20" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_VIRT_UNI -->
- <range num="06" type="0" size="03" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
+ <range num="06" type="0" size="13" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_LOOP_DET_US -->
<range num="07" type="0" size="03" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_DROP_PRECEDENCE -->
<range num="08" type="0" size="04" cntr_grp="0" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_L2_MAIN -->
- <range num="09" type="0" size="196" cntr_grp="1" lu_mask="1" min_reset_level = "0" />
+ <range num="09" type="0" size="154" cntr_grp="1" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_ETH_TYPE -->
<range num="10" type="0" size="16" cntr_grp="2" lu_mask="1" min_reset_level = "0" />
<!-- TPM_PNC_IGMP -->
