Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Remove_SKU_ACS-SN4280
Browse files Browse the repository at this point in the history
  • Loading branch information
@ram25794
ram25794 committed Feb 19, 2025
2 parents 5cf4257 + 9365cf8 commit f0e0a36
Show file tree
Hide file tree
Showing 24 changed files with 122 additions and 97 deletions.
5 changes: 5 additions & 0 deletions .azure-pipelines/docker-sonic-mgmt.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ stages:
- template: cleanup.yml
- checkout: self
clean: true
- script: |
set -x
sudo setfacl -R -b $(Agent.BuildDirectory)
displayName: 'setfacl'
- bash: |
set -xe
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
Expand Down
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
20 changes: 10 additions & 10 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -5 181753
100000 300m 0 2560 110592 -5 363506
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -5 181753
100000 1000m 0 2560 225280 -5 363506
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -5 181753
100000 2000m 0 2560 393216 -5 363506
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -5 181753
100000 80000m 0 2560 13357056 -5 363506
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -5 181753
100000 120000m 0 2560 20004864 -5 363506
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -5 1454025
20 changes: 10 additions & 10 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -5 181753
100000 300m 0 2560 110592 -5 363506
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -5 181753
100000 1000m 0 2560 225280 -5 363506
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -5 181753
100000 2000m 0 2560 393216 -5 363506
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -5 181753
100000 80000m 0 2560 13357056 -5 363506
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -5 181753
100000 120000m 0 2560 20004864 -5 363506
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
10 changes: 5 additions & 5 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -6 1454025
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -6 1454025
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -6 1454025
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -6 1454025
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -6 1454025
400000 120000m 0 2560 79900672 -5 1454025
20 changes: 10 additions & 10 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -5 181753
100000 300m 0 2560 110592 -5 363506
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -5 181753
100000 1000m 0 2560 225280 -5 363506
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -5 181753
100000 2000m 0 2560 393216 -5 363506
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -5 181753
100000 80000m 0 2560 13357056 -5 363506
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -5 181753
100000 120000m 0 2560 20004864 -5 363506
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -5 1454025
20 changes: 10 additions & 10 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 300m 0 2560 69632 -5 181753
100000 300m 0 2560 110592 -5 363506
40000 300m 0 2560 69632 -6 181753
100000 300m 0 2560 110592 -6 363506
400000 300m 0 2560 315392 -5 1454025
40000 1000m 0 2560 114688 -5 181753
100000 1000m 0 2560 225280 -5 363506
40000 1000m 0 2560 114688 -6 181753
100000 1000m 0 2560 225280 -6 363506
400000 1000m 0 2560 778240 -5 1454025
40000 2000m 0 2560 184320 -5 181753
100000 2000m 0 2560 393216 -5 363506
40000 2000m 0 2560 184320 -6 181753
100000 2000m 0 2560 393216 -6 363506
400000 2000m 0 2560 1445888 -5 1454025
40000 80000m 0 2560 5369856 -5 181753
100000 80000m 0 2560 13357056 -5 363506
40000 80000m 0 2560 5369856 -6 181753
100000 80000m 0 2560 13357056 -6 363506
400000 80000m 0 2560 53305344 -5 1454025
40000 120000m 0 2560 8028160 -5 181753
100000 120000m 0 2560 20004864 -5 363506
40000 120000m 0 2560 8028160 -6 181753
100000 120000m 0 2560 20004864 -6 363506
400000 120000m 0 2560 79900672 -5 1454025
2 changes: 1 addition & 1 deletion platform/broadcom/sai.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LIBSAIBCM_XGS_VERSION = 12.3.0.3
LIBSAIBCM_XGS_VERSION = 12.3.2.2
LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
Expand Down
10 changes: 9 additions & 1 deletion platform/broadcom/saibcm-modules/sdklt/linux/bcmgenl/bcmgenl_psample.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,15 @@ static int bcmgenl_psample_qlen = BCMGENL_PSAMPLE_QLEN_DFLT;
MODULE_PARAM(bcmgenl_psample_qlen, int, 0);
MODULE_PARM_DESC(bcmgenl_psample_qlen, "psample queue length (default 1024 buffers)");

#ifndef BCMGENL_PSAMPLE_METADATA
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0))
#define BCMGENL_PSAMPLE_METADATA 1
#else
#define BCMGENL_PSAMPLE_METADATA 0
#endif
#endif

#if BCMGENL_PSAMPLE_METADATA
static inline void
bcmgenl_sample_packet(struct psample_group *group, struct sk_buff *skb,
u32 trunc_size, int in_ifindex, int out_ifindex,
Expand All @@ -82,7 +90,7 @@ bcmgenl_sample_packet(struct psample_group *group, struct sk_buff *skb,
}
#else
#define bcmgenl_sample_packet psample_sample_packet
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0)) */
#endif /* BCMGENL_PSAMPLE_METADATA */

static bcmgenl_info_t g_bcmgenl_psample_info = {{0}};

Expand Down
10 changes: 5 additions & 5 deletions platform/mellanox/fw.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@ SIMX_VERSION = 25.1-1070

FW_FROM_URL = y

MLNX_FW_ASSETS_RELEASE_TAG = fw-2014.2164
MLNX_FW_ASSETS_RELEASE_TAG = fw-2014.2202
MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)

ifeq ($(MLNX_FW_BASE_URL), )
MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
endif

MLNX_SPC_FW_VERSION = 13.2014.2164
MLNX_SPC_FW_VERSION = 13.2014.2202
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)

MLNX_SPC2_FW_VERSION = 29.2014.2164
MLNX_SPC2_FW_VERSION = 29.2014.2202
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)

MLNX_SPC3_FW_VERSION = 30.2014.2164
MLNX_SPC3_FW_VERSION = 30.2014.2202
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)

MLNX_SPC4_FW_VERSION = 34.2014.2164
MLNX_SPC4_FW_VERSION = 34.2014.2202
MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
$(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)
Expand Down
14 changes: 12 additions & 2 deletions platform/mellanox/mlnx-platform-api/sonic_platform/thermal_updater.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#
# Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES.
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
# Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -142,7 +143,16 @@ def update_single_module(self, sfp):
)
else:
if pre_presence != presence:
hw_management_independent_mode_update.thermal_data_clean_module(0, sfp.sdk_index + 1)
# thermal control service requires to
# set value 0 to all temperature files when module is not present
hw_management_independent_mode_update.thermal_data_set_module(
0, # ASIC index always 0 for now
sfp.sdk_index + 1,
0,
0,
0,
0
)

if pre_presence != presence:
self._sfp_status[sfp.sdk_index] = presence
Expand Down
Loading

0 comments on commit f0e0a36

Please sign in to comment.