From 8a7c1300c24aa6446dc062918a00ce6f9a04bbe8 Mon Sep 17 00:00:00 2001 From: byu343 Date: Thu, 21 Nov 2019 16:21:08 -0800 Subject: [PATCH] [devices]: Fix the clock setting on arista 7280 (#3788) * Fix serdes setting for B0/B1 revision chip on 7280 --- .../jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm | 12 ++++++++---- .../jr2-a7280cr3-32p4-40x100G.config.bcm | 12 ++++++++---- src/sonic-device-data/tests/config_checker | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm index 3c0a0ee443..3d89e2b41b 100644 --- a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm +++ b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm @@ -277,11 +277,15 @@ bcm_stat_interval.BCM8869X=1000 mem_cache_enable_ecc.BCM8869X=1 mem_cache_enable_parity.BCM8869X=1 -serdes_nif_clk_freq_in.BCM8869X=2 -serdes_nif_clk_freq_out.BCM8869X=1 +serdes_nif_clk_freq_in.BCM8869X_A0=2 +serdes_nif_clk_freq_out.BCM8869X_A0=1 +serdes_fabric_clk_freq_in.BCM8869X_A0=2 +serdes_fabric_clk_freq_out.BCM8869X_A0=1 -serdes_fabric_clk_freq_in.BCM8869X=2 -serdes_fabric_clk_freq_out.BCM8869X=1 +serdes_nif_clk_freq_in.BCM8869X=1 +serdes_nif_clk_freq_out.BCM8869X=bypass +serdes_fabric_clk_freq_in.BCM8869X=1 +serdes_fabric_clk_freq_out.BCM8869X=bypass dram_phy_tune_mode_on_init.BCM8869X=RUN_TUNE diff --git a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm index 4787dc7db7..654a4d8f15 100644 --- a/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm +++ b/device/arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm @@ -281,11 +281,15 @@ bcm_stat_interval.BCM8869X=1000 mem_cache_enable_ecc.BCM8869X=1 mem_cache_enable_parity.BCM8869X=1 -serdes_nif_clk_freq_in.BCM8869X=2 -serdes_nif_clk_freq_out.BCM8869X=1 +serdes_nif_clk_freq_in.BCM8869X_A0=2 +serdes_nif_clk_freq_out.BCM8869X_A0=1 +serdes_fabric_clk_freq_in.BCM8869X_A0=2 +serdes_fabric_clk_freq_out.BCM8869X_A0=1 -serdes_fabric_clk_freq_in.BCM8869X=2 -serdes_fabric_clk_freq_out.BCM8869X=1 +serdes_nif_clk_freq_in.BCM8869X=1 +serdes_nif_clk_freq_out.BCM8869X=bypass +serdes_fabric_clk_freq_in.BCM8869X=1 +serdes_fabric_clk_freq_out.BCM8869X=bypass dram_phy_tune_mode_on_init.BCM8869X=RUN_TUNE diff --git a/src/sonic-device-data/tests/config_checker b/src/sonic-device-data/tests/config_checker index 6d95c13efc..6cb4d029be 100755 --- a/src/sonic-device-data/tests/config_checker +++ b/src/sonic-device-data/tests/config_checker @@ -31,7 +31,7 @@ def check_file(file_name): p = line.split("=", 1)[0] # Remove trailing chip name "bcm8869x" - p = re.sub(r"\.bcm8869x(_adapter)?$", "", p) + p = re.sub(r"\.bcm8869x(_adapter|_[a-z]\d)?$", "", p) # Remove trailing unit ".$" p = re.sub(r"\.[0-9]+$", '', p) # Remove trailing port name