Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Knet driver] Upgrade Broadcom xgs saibcm-modules to 10.1 #19327

Merged
merged 20 commits into from
Aug 28, 2024

Conversation

Gfrom2016
Copy link
Contributor

@Gfrom2016 Gfrom2016 commented Jun 17, 2024

Why I did it

Upgrade xgs saibcm-modules to 10.1.

Work item tracking
  • Microsoft ADO (number only): 28240459

How I did it

Generate diff patch from SAI SDK 10.1 repo and apply to platform/broadcom/saibcm-modules/.

How to verify it

Build a master image and run SONiC test with it.
TH2 7260cx3: Test plan 66b460e40fde6eb55e3ad994: TfsGit_Manual_PR_None_BUILD_614424_JOB_7260cx3.t1.202311.NightlyTest_by_Elastictest - Elastictest (elastictest.org)
TD3 7050cx3: Pipelines - Run SAI_RELEASE_PRE_TEST_PRE_TEST_FOR_SAI_RELEASE_internal_591881_20240710.1 (azure.com)
TH 7060cx: Test plan 66b999b8e664a2241593dccf: upgrade_saibcm_10.1_7060cx.t1.202311.NightlyTest_by_Elastictest - Elastictest (elastictest.org)

Signed-off-by: zitingguo-ms zitingguo@microsoft.com

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305
  • 202311
  • 202405

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo <zitingguo@microsoft.com>
@Gfrom2016 Gfrom2016 force-pushed the upgrade_saibcm_modules_10.1 branch from 90a931f to 3aa1b75 Compare July 4, 2024 03:49
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
@Gfrom2016 Gfrom2016 changed the title [Build Only]Upgrade saibcm modules 10.1 [Knet driver] Upgrade saibcm modules to 10.1 Jul 11, 2024
@Gfrom2016 Gfrom2016 marked this pull request as ready for review July 11, 2024 06:22
@Gfrom2016 Gfrom2016 requested a review from lguohan as a code owner July 11, 2024 06:22
@Gfrom2016 Gfrom2016 changed the title [Knet driver] Upgrade saibcm modules to 10.1 [Knet driver] Upgrade Broadcom xgs saibcm-modules to 10.1 Jul 11, 2024
@Gfrom2016
Copy link
Contributor Author

@adyeung Could you help review this PR? Thanks!

@adyeung
Copy link
Collaborator

adyeung commented Jul 16, 2024

Adding BRCM reviewer @michaelli10 @chravikumar @rajanidadi

@Gfrom2016
Copy link
Contributor Author

@michaelli10 @chravikumar @rajanidadi Could you help review this PR? Thanks.


LIBS = $(LIBDIR)/libkern.a
ifndef DCBDIR
DCBDIR = $(SDK)/systems/linux/kernel/modules/dcb

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If possible could this change be avoided with "export DCBDIR" from top level make file.

Signed-off-by: zitingguo <zitingguo@microsoft.com>
@StormLiangMS
Copy link
Contributor

/azp run Semgrep

Copy link

No pipelines are associated with this pull request.

@StormLiangMS
Copy link
Contributor

/run Semgrep

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
@yxieca yxieca merged commit 66e141b into sonic-net:master Aug 28, 2024
10 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Aug 28, 2024
…19327)

* commit changes under sdklt/ foloder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* commit changes under saibcm-modules/ excpet sdklt/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* upgrade saibcm-modules version to 10.1

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* update changelog

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add dcb folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* move dcb to systems/linux/kernel/modules/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* try fix include error

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* remove all generated files

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add sdklt/bcmlrd/include/bcmlrd/chip/generated/ folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add bcmltd/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* Add missing folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add missing folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* Add missing folders

Signed-off-by: zitingguo <zitingguo@microsoft.com>

* Make sure 'genl-packet' is built before 'bcmgenl'

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* sending original pkt size to psample module

Signed-off-by: zitingguo <zitingguo@microsoft.com>

* try pass semgrep check

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* try bypass semgrep check

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

---------

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo <zitingguo@microsoft.com>
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #20062

mssonicbld pushed a commit that referenced this pull request Aug 28, 2024
* commit changes under sdklt/ foloder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* commit changes under saibcm-modules/ excpet sdklt/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* upgrade saibcm-modules version to 10.1

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* update changelog

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add dcb folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* move dcb to systems/linux/kernel/modules/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* try fix include error

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* remove all generated files

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add sdklt/bcmlrd/include/bcmlrd/chip/generated/ folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add bcmltd/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* Add missing folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add missing folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* Add missing folders

Signed-off-by: zitingguo <zitingguo@microsoft.com>

* Make sure 'genl-packet' is built before 'bcmgenl'

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* sending original pkt size to psample module

Signed-off-by: zitingguo <zitingguo@microsoft.com>

* try pass semgrep check

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* try bypass semgrep check

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

---------

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo <zitingguo@microsoft.com>
vvolam pushed a commit to vvolam/sonic-buildimage that referenced this pull request Sep 12, 2024
…19327)

* commit changes under sdklt/ foloder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* commit changes under saibcm-modules/ excpet sdklt/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* upgrade saibcm-modules version to 10.1

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* update changelog

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add dcb folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* move dcb to systems/linux/kernel/modules/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* fix path

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* try fix include error

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* remove all generated files

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add sdklt/bcmlrd/include/bcmlrd/chip/generated/ folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add bcmltd/

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* Add missing folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* add missing folder

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* Add missing folders

Signed-off-by: zitingguo <zitingguo@microsoft.com>

* Make sure 'genl-packet' is built before 'bcmgenl'

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* sending original pkt size to psample module

Signed-off-by: zitingguo <zitingguo@microsoft.com>

* try pass semgrep check

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

* try bypass semgrep check

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>

---------

Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
Signed-off-by: zitingguo <zitingguo@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants