From b8800b5d64a13b028250c9a94e8547f68730b7f0 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Thu, 15 Aug 2024 03:15:33 +0000 Subject: [PATCH 1/3] Change the Yaml settings to use 8 UC and 4 MC queues, as SONIC only uses 8 UC queues. Signed-off-by: Ze Gan --- .../th5-a7060x6-64pe.config.bcm | 62 +++---------------- 1 file changed, 9 insertions(+), 53 deletions(-) diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm index eecb986fdb45..9378be1cc25d 100644 --- a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm @@ -1907,25 +1907,14 @@ bcm_device: 0: global: ftem_mem_entries: 65536 - sai_stats_support_mask: 0 - global_flexctr_ing_action_num_reserved: 20 - global_flexctr_ing_pool_num_reserved: 8 - global_flexctr_ing_op_profile_num_reserved: 20 - global_flexctr_ing_group_num_reserved: 2 - global_flexctr_egr_action_num_reserved: 8 - global_flexctr_egr_pool_num_reserved: 5 - global_flexctr_egr_op_profile_num_reserved: 10 - global_flexctr_egr_group_num_reserved: 1 ... --- device: 0: # Per pipe flex counter configuration CTR_EFLEX_CONFIG: - CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 1 - CTR_ING_EFLEX_OPERMODE_PIPE_INSTANCE_UNIQUE: 1 - CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 1 - CTR_EGR_EFLEX_OPERMODE_PIPE_INSTANCE_UNIQUE: 1 + CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 0 + CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 0 # IFP mode FP_CONFIG: @@ -1947,7 +1936,7 @@ device: THRESHOLD_MODE: LOSSY_AND_LOSSLESS TM_SCHEDULER_CONFIG: - NUM_MC_Q: NUM_MC_Q_2 + NUM_MC_Q: NUM_MC_Q_4 ... @@ -2144,7 +2133,7 @@ device: TM_PORT_MC_Q_TO_SERVICE_POOL: ? PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351] - TM_MC_Q_ID: [[0,1]] + TM_MC_Q_ID: [[0,3]] : USE_QGROUP_MIN: 0 @@ -2161,7 +2150,7 @@ device: ? # uplink, downlink and loopback ports, 2 MC queues PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351] - TM_MC_Q_ID: [[0,1]] + TM_MC_Q_ID: [[0,3]] : MIN_GUARANTEE_CELLS: 0 SHARED_LIMITS: 1 @@ -2622,7 +2611,7 @@ device: TM_PORT_UC_Q_TO_SERVICE_POOL: ? PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351] - TM_UC_Q_ID: [0,1,2,5,6,8,9] + TM_UC_Q_ID: [0,1,2,5,6] : USE_QGROUP_MIN: 0 TM_EGR_SERVICE_POOL_ID: 0 @@ -2648,7 +2637,7 @@ device: TM_EGR_SERVICE_POOL_ID: 1 ? PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351] - TM_MC_Q_ID: [[0,1]] + TM_MC_Q_ID: [[0,3]] : USE_QGROUP_MIN: 0 TM_EGR_SERVICE_POOL_ID: 0 @@ -2676,23 +2665,6 @@ device: YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 RED_LIMIT_CELLS_STATIC: 0 RED_LIMIT_DYNAMIC: PERCENTAGE_625 - ? - PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]] - TM_UC_Q_ID: [8,9] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_CELLS_STATIC: 0 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - DYNAMIC_GROUP: MID_PRI_GROUP - RESUME_OFFSET_CELLS: 2 - COLOR_SPECIFIC_LIMITS: 0 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 - YELLOW_LIMIT_CELLS_STATIC: 0 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_CELLS_STATIC: 0 - RED_LIMIT_DYNAMIC: PERCENTAGE_625 ? PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]] TM_UC_Q_ID: [3,4] @@ -2724,23 +2696,6 @@ device: YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 RED_LIMIT_CELLS_STATIC: 0 RED_LIMIT_DYNAMIC: PERCENTAGE_625 - ? - PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]] - TM_UC_Q_ID: [8,9] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_CELLS_STATIC: 0 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - DYNAMIC_GROUP: MID_PRI_GROUP - RESUME_OFFSET_CELLS: 2 - COLOR_SPECIFIC_LIMITS: 0 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 - YELLOW_LIMIT_CELLS_STATIC: 0 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_CELLS_STATIC: 0 - RED_LIMIT_DYNAMIC: PERCENTAGE_625 ? PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]] TM_UC_Q_ID: [3,4] @@ -2778,7 +2733,7 @@ device: RESUME_OFFSET_CELLS: 2 ? PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351] - TM_MC_Q_ID: [0,1] + TM_MC_Q_ID: [0,3] SHARED_LIMIT_DYNAMIC: ALPHA_2 : SHARED_LIMITS: 1 @@ -3119,3 +3074,4 @@ device: TRAFFIC_CLASS: OBM_TC_LOSSLESS0 ... + From 61081e89a9ec80095222452574eaacf6498c2270 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Tue, 29 Oct 2024 22:06:41 +0800 Subject: [PATCH 2/3] Revert useless change Signed-off-by: Ze Gan --- .../th5-a7060x6-64pe.config.bcm | 50 +++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm index 9378be1cc25d..0b53d9e1442d 100644 --- a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm @@ -1907,14 +1907,25 @@ bcm_device: 0: global: ftem_mem_entries: 65536 + sai_stats_support_mask: 0 + global_flexctr_ing_action_num_reserved: 20 + global_flexctr_ing_pool_num_reserved: 8 + global_flexctr_ing_op_profile_num_reserved: 20 + global_flexctr_ing_group_num_reserved: 2 + global_flexctr_egr_action_num_reserved: 8 + global_flexctr_egr_pool_num_reserved: 5 + global_flexctr_egr_op_profile_num_reserved: 10 + global_flexctr_egr_group_num_reserved: 1 ... --- device: 0: # Per pipe flex counter configuration CTR_EFLEX_CONFIG: - CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 0 - CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 0 + CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 1 + CTR_ING_EFLEX_OPERMODE_PIPE_INSTANCE_UNIQUE: 1 + CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 1 + CTR_EGR_EFLEX_OPERMODE_PIPE_INSTANCE_UNIQUE: 1 # IFP mode FP_CONFIG: @@ -2665,6 +2676,23 @@ device: YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 RED_LIMIT_CELLS_STATIC: 0 RED_LIMIT_DYNAMIC: PERCENTAGE_625 + ? + PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]] + TM_UC_Q_ID: [8,9] + : + MIN_GUARANTEE_CELLS: 0 + SHARED_LIMITS: 1 + DYNAMIC_SHARED_LIMITS: 1 + SHARED_LIMIT_CELLS_STATIC: 0 + SHARED_LIMIT_DYNAMIC: ALPHA_1 + DYNAMIC_GROUP: MID_PRI_GROUP + RESUME_OFFSET_CELLS: 2 + COLOR_SPECIFIC_LIMITS: 0 + COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 + YELLOW_LIMIT_CELLS_STATIC: 0 + YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 + RED_LIMIT_CELLS_STATIC: 0 + RED_LIMIT_DYNAMIC: PERCENTAGE_625 ? PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]] TM_UC_Q_ID: [3,4] @@ -2696,6 +2724,23 @@ device: YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 RED_LIMIT_CELLS_STATIC: 0 RED_LIMIT_DYNAMIC: PERCENTAGE_625 + ? + PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]] + TM_UC_Q_ID: [8,9] + : + MIN_GUARANTEE_CELLS: 0 + SHARED_LIMITS: 1 + DYNAMIC_SHARED_LIMITS: 1 + SHARED_LIMIT_CELLS_STATIC: 0 + SHARED_LIMIT_DYNAMIC: ALPHA_1 + DYNAMIC_GROUP: MID_PRI_GROUP + RESUME_OFFSET_CELLS: 2 + COLOR_SPECIFIC_LIMITS: 0 + COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 + YELLOW_LIMIT_CELLS_STATIC: 0 + YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 + RED_LIMIT_CELLS_STATIC: 0 + RED_LIMIT_DYNAMIC: PERCENTAGE_625 ? PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]] TM_UC_Q_ID: [3,4] @@ -3074,4 +3119,3 @@ device: TRAFFIC_CLASS: OBM_TC_LOSSLESS0 ... - From d40b56d30244d84c99ae7dcaa73a38c3e9b12d18 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Wed, 30 Oct 2024 08:32:49 +0800 Subject: [PATCH 3/3] fix comments Signed-off-by: Ze Gan --- .../th5-a7060x6-64pe.config.bcm | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm index 0b53d9e1442d..f9dc4cea1df0 100644 --- a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm @@ -2676,23 +2676,6 @@ device: YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 RED_LIMIT_CELLS_STATIC: 0 RED_LIMIT_DYNAMIC: PERCENTAGE_625 - ? - PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]] - TM_UC_Q_ID: [8,9] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_CELLS_STATIC: 0 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - DYNAMIC_GROUP: MID_PRI_GROUP - RESUME_OFFSET_CELLS: 2 - COLOR_SPECIFIC_LIMITS: 0 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 - YELLOW_LIMIT_CELLS_STATIC: 0 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_CELLS_STATIC: 0 - RED_LIMIT_DYNAMIC: PERCENTAGE_625 ? PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]] TM_UC_Q_ID: [3,4] @@ -2724,23 +2707,6 @@ device: YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 RED_LIMIT_CELLS_STATIC: 0 RED_LIMIT_DYNAMIC: PERCENTAGE_625 - ? - PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]] - TM_UC_Q_ID: [8,9] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_CELLS_STATIC: 0 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - DYNAMIC_GROUP: MID_PRI_GROUP - RESUME_OFFSET_CELLS: 2 - COLOR_SPECIFIC_LIMITS: 0 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 - YELLOW_LIMIT_CELLS_STATIC: 0 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_CELLS_STATIC: 0 - RED_LIMIT_DYNAMIC: PERCENTAGE_625 ? PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]] TM_UC_Q_ID: [3,4]