Merge pull request sonic-net#56 from tigerfu000/202311.0_as9736_64d

[Platform][AS9736-64D]: Fix syncd init failed during system boot-up phase for BRCM community SAI
MuLinForest · Jun 12, 2024 · 02f59e1 · 02f59e1
2 parents 1ea392b + 7bc5043
commit 02f59e1
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 81 deletions.
diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/hwsku.json b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/hwsku.json
@@ -318,16 +318,6 @@
  "Ethernet504": {
  "default_brkout_mode": "1x100G[40G](4)",
  "autoneg": "off"
- },
-
- "Ethernet512": {
- "default_brkout_mode": "1x10G[1G]",
- "autoneg": "off"
- },
-
- "Ethernet513": {
- "default_brkout_mode": "1x10G[1G]",
- "autoneg": "off"
  }
  }
 }

diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/port_config.ini b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/port_config.ini
@@ -63,5 +63,3 @@ Ethernet480 386,387,388,389 Eth61(Port61) 61
 Ethernet488 402,403,404,405 Eth62(Port62) 62 100000
 Ethernet496 394,395,396,397 Eth63(Port63) 63 100000
 Ethernet504 410,411,412,413 Eth64(Port64) 64 100000
-Ethernet512 514 Eth65(Port65) 65 10000
-Ethernet513 516 Eth66(Port66) 66 10000
diff --git a/...e/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/th4-as9736-64x100G.config.yml b/...e/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D-100G/th4-as9736-64x100G.config.yml
@@ -27,7 +27,7 @@ bcm_device:
  sai_tunnel_support: 2
  bcm_tunnel_term_compatible_mode: 1
  l3_ecmp_member_first_lkup_mem_size: 12288
- sai_port_pmap_phy_lanes : 1
+ sai_port_pmap_phy_lanes : 0
  sai_disable_ports_when_sw_shutdown: 1
 ...
 ---
@@ -100,8 +100,6 @@ bcm_device:
  212: { dport_map_port: 62 }
  208: { dport_map_port: 63 }
  216: { dport_map_port: 64 }
- 152: { dport_map_port: 65 }
- 50: { dport_map_port: 66 }
 ...
 ---
 device:
@@ -1141,14 +1139,6 @@ device:
  PORT_ID: 267
  :
  PC_PHYS_PORT_ID: 253
- ?
- PORT_ID: 50
- :
- PC_PHYS_PORT_ID: 258
- ?
- PORT_ID: 152
- :
- PC_PHYS_PORT_ID: 257
 ...
 ---
 device:
@@ -1185,15 +1175,8 @@ device:
  FEC_MODE: PC_FEC_RS528
  MAX_FRAME_SIZE: 9416
  LINK_TRAINING: 0
- ? # BCM56990 2x10g management port
- PORT_ID: [50, 152]
- :
- ENABLE: 0
- SPEED: 10000
- NUM_LANES: 1
- MAX_FRAME_SIZE: 9416
  SER_CONFIG:
- SER_ENABLE: 0
+ SER_ENABLE: 1
  PORT_CONFIG:
  PORT_SYSTEM_PROFILE_OPERMODE_PIPEUNIQUE: 1
 device:

diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/hwsku.json b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/hwsku.json
@@ -254,14 +254,6 @@
 
  "Ethernet504": {
  "default_brkout_mode": "1x400G"
- },
-
- "Ethernet512": {
- "default_brkout_mode": "1x10G[1G]"
- },
-
- "Ethernet513": {
- "default_brkout_mode": "1x10G[1G]"
  }
  }
 }
diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/port_config.ini b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/port_config.ini
@@ -63,5 +63,3 @@ Ethernet480 386,387,388,389,390,391,392,393 Eth61(Port6
 Ethernet488 402,403,404,405,406,407,408,409 Eth62(Port62) 62 400000
 Ethernet496 394,395,396,397,398,399,400,401 Eth63(Port63) 63 400000
 Ethernet504 410,411,412,413,414,415,416,417 Eth64(Port64) 64 400000
-Ethernet512 514 Eth65(Port65) 65 10000
-Ethernet513 516 Eth66(Port66) 66 10000
diff --git a/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/th4-as9736-64x400G.config.yml b/device/accton/x86_64-accton_as9736_64d-r0/Accton-AS9736-64D/th4-as9736-64x400G.config.yml
@@ -12,14 +12,15 @@ bcm_device:
  0:
  global:
  pktio_mode: 1
- rx_cosq_mapping_management_mode: 1
+ rx_cosq_mapping_management_mode: 0
  vlan_default_port: 3
  l3_alpm_template: 1
  port_allow_tpid_disable: 1
  riot_overlay_l3_intf_mem_size: 4096
  riot_overlay_l3_egress_mem_size: 8192
  l3_ecmp_member_first_lkup_mem_size: 8192
  l3_intf_vlan_split_egress: 1
+ bcm_tunnel_term_compatible_mode: 1
 ...
 ---
 bcm_device:
@@ -91,8 +92,6 @@ bcm_device:
  212: { dport_map_port: 62 }
  208: { dport_map_port: 63 }
  216: { dport_map_port: 64 }
- 152: { dport_map_port: 65 }
- 50: { dport_map_port: 66 }
 ...
 ---
 device:
@@ -1131,26 +1130,11 @@ device:
  PORT_ID: 267
  :
  PC_PHYS_PORT_ID: 253
- ?
- PORT_ID: 50
- :
- PC_PHYS_PORT_ID: 258
- ?
- PORT_ID: 152
- :
- PC_PHYS_PORT_ID: 257
 ...
 ---
 device:
  0:
  PC_PORT:
- ?
- PORT_ID: [50, 152]
- :
- ENABLE: 0
- SPEED: 10000
- NUM_LANES: 1
- FEC_MODE: PC_FEC_NONE
  ?
  PORT_ID: 0
  :
@@ -1165,6 +1149,7 @@ device:
  SPEED: 400000
  NUM_LANES: 8
  FEC_MODE: PC_FEC_RS544_2XN
+ MAX_FRAME_SIZE: 9416
 
  PC_PMD_FIRMWARE:
  ?

diff --git a/device/accton/x86_64-accton_as9736_64d-r0/platform.json b/device/accton/x86_64-accton_as9736_64d-r0/platform.json
@@ -546,12 +546,6 @@
  },
  {
  "name": "Ethernet504"
- },
- {
- "name": "Ethernet512"
- },
- {
- "name": "Ethernet513"
  }
  ]
  },
@@ -1386,22 +1380,6 @@
  "2x50G(4)": ["Eth64/1(Port64)", "Eth64/2(Port64)"],
  "4x25G[10G](4)": ["Eth64/1(Port64)", "Eth64/2(Port64)", "Eth64/3(Port64)", "Eth64/4(Port64)"]
  }
- },
-
- "Ethernet512": {
- "index": "65",
- "lanes": "514",
- "breakout_modes": {
- "1x10G[1G]": ["Eth65(Port65)"]
- }
- },
-
- "Ethernet513": {
- "index": "66",
- "lanes": "516",
- "breakout_modes": {
- "1x10G[1G]": ["Eth66(Port66)"]
- }
  }
  }
 }