Skip to content

Commit

Permalink
Patch saibcm-module from SAI 12.3 and upgrade xgs SAI to 12.3.2.2 (so…
Browse files Browse the repository at this point in the history
…nic-net#21745)

Why I did it
Update xgs SAI to 12.3.2.2 to include following fixes:

12.3.1.2: [SAI_BRANCH rel_ocp_sai_12_3] Uplift SID KB 26755 (SDK-417338) fix to 12.3.
12.3.2.2: [CS00012377372]Enable FEC specific counters by default if FEC is enabled
Work item tracking
Microsoft ADO (number only): 31380871
How I did it
Update xgs SAI version and patch saibcm-module.

How to verify it
  • Loading branch information
Gfrom2016 authored Feb 18, 2025
1 parent bd4a27d commit 9d04b75
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion platform/broadcom/sai.mk
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
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

0 comments on commit 9d04b75

Please sign in to comment.