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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion platform/broadcom/sai-modules.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Broadcom SAI modules

BRCM_OPENNSL_KERNEL_VERSION = 8.4.0.2
BRCM_OPENNSL_KERNEL_VERSION = 10.1.0.0

BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
Expand Down
Empty file.
Empty file.
2 changes: 2 additions & 0 deletions platform/broadcom/saibcm-modules/GLOG
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CMD = [/projects/csg_sonic2/sk411346/repos/SAI/6.5.29/ocp_sai/sdk-src/hsdk-6.5.29/xgs-sdk-6.5.29-gpl-modules/, gtags --single-update systems/linux/kernel/modules/bcm-knet/bcm-knet.c]
CMD = [/projects/csg_sonic2/sk411346/repos/SAI/6.5.29/ocp_sai/sdk-src/hsdk-6.5.29/xgs-sdk-6.5.29-gpl-modules/, gtags --single-update systems/linux/kernel/modules/knet-cb/knet-cb.c]
Empty file.
Empty file.
Empty file.
6 changes: 6 additions & 0 deletions platform/broadcom/saibcm-modules/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opennsl (10.1.0.0) unstable; urgency=medium

* Update to Broadcom SAI 10.1.0.0

-- Ziting Guo <zitingguo@microsoft.com> Mon Jun 17 05:18:47 2024 +0000

opennsl (8.4.0.2) unstable; urgency=medium

* Update to Broadcom SAI 8.4.0.2
Expand Down
11 changes: 4 additions & 7 deletions platform/broadcom/saibcm-modules/include/ibde.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
* $Id: ibde.h,v 1.27 Broadcom SDK $
* $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
Expand All @@ -22,12 +23,8 @@
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: ibde.h,v 1.27 Broadcom SDK $
* $Copyright: (c) 2005 Broadcom Corp.
* All Rights Reserved.$
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
*
*/

#ifndef __IBDE_H__
Expand Down
14 changes: 5 additions & 9 deletions platform/broadcom/saibcm-modules/include/kcom.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
* $Id: kcom.h,v 1.9 Broadcom SDK $
* $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
Expand All @@ -22,12 +23,8 @@
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: kcom.h,v 1.9 Broadcom SDK $
* $Copyright: (c) 2005 Broadcom Corp.
* All Rights Reserved.$
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
*
*
* File: kcom.h
* Purpose: User/Kernel message definitions
Expand Down Expand Up @@ -147,8 +144,7 @@ typedef struct kcom_netif_s {
uint8 type;
uint8 flags;
uint32 cb_user_data;
uint8 port;
uint8 reserved;
uint16 port;
uint16 vlan;
uint16 qnum;
uint8 macaddr[6];
Expand Down
11 changes: 4 additions & 7 deletions platform/broadcom/saibcm-modules/include/sal/core/sync.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
* $Id: sync.h,v 1.1 Broadcom SDK $
* $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
Expand All @@ -22,12 +23,8 @@
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: sync.h,v 1.1 Broadcom SDK $
* $Copyright: (c) 2005 Broadcom Corp.
* All Rights Reserved.$
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
*
*/

#ifndef _SAL_SYNC_H
Expand Down
11 changes: 4 additions & 7 deletions platform/broadcom/saibcm-modules/include/sal/core/thread.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
* $Id: thread.h,v 1.1 Broadcom SDK $
* $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
Expand All @@ -22,12 +23,8 @@
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: thread.h,v 1.1 Broadcom SDK $
* $Copyright: (c) 2005 Broadcom Corp.
* All Rights Reserved.$
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
*
*/

#ifndef _SAL_THREAD_H
Expand Down
11 changes: 4 additions & 7 deletions platform/broadcom/saibcm-modules/include/sal/types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
* $Id: types.h,v 1.3 Broadcom SDK $
* $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
Expand All @@ -22,12 +23,8 @@
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: types.h,v 1.3 Broadcom SDK $
* $Copyright: (c) 2005 Broadcom Corp.
* All Rights Reserved.$
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
*
*
* File: types.h
* Purpose: SAL type definitions
Expand Down
11 changes: 4 additions & 7 deletions platform/broadcom/saibcm-modules/include/sdk_config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
* $Id: sdk_config.h,v 1.5 Broadcom SDK $
* $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
Expand All @@ -22,12 +23,8 @@
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: sdk_config.h,v 1.5 Broadcom SDK $
* $Copyright: (c) 2006 Broadcom Corp.
* All Rights Reserved.$
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
*
*
*
*/
Expand Down
Loading
Loading