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.

Sign up for GitHub

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

Jump to bottom

Adding vpp platform #1424

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+27 −0
Open

Adding vpp platform #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19a7e9d
changes for platform vpp
yue-fred-gao Sep 26, 2024
dfe6075
Undo mistaken changes
yue-fred-gao Sep 26, 2024
e265b2d
Merge branch 'master' into platform-vpp
yue-fred-gao Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions debian/libsaimetadata-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
meta/sai*.h usr/include/sai
meta/Sai*.h usr/include/sai
meta/Meta.h usr/include/sai
meta/AttrKeyMap.h usr/include/sai
meta/MetaKeyHasher.h usr/include/sai
meta/OidRefCounter.h usr/include/sai
meta/PortRelatedSet.h usr/include/sai
meta/Notification*.h usr/include/sai
meta/Globals.h usr/include/sai
Comment on lines +3 to +9
Copy link
Collaborator

Choose a reason for hiding this comment

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

not sure if this is good idea to make those headers part of this package

Copy link
Collaborator

Choose a reason for hiding this comment

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

why you need those headers be present here ?

Copy link
Author

Choose a reason for hiding this comment

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

sonic-vpp is morphed from sonic-vs. Similar to vs, it uses classes from sonic-sairedis/meta so we need to export the header files from libsaimetata-dev.

Copy link
Collaborator

Choose a reason for hiding this comment

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

ok, let see how it will go

Copy link
Author

Choose a reason for hiding this comment

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

Thanks. What's the next step for this PR?

Copy link
Collaborator

Choose a reason for hiding this comment

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

i signed off

Copy link
Author

Choose a reason for hiding this comment

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

Thanks!

SAI/meta/sai*.h usr/include/sai
usr/lib/*/libsaimetadata.so
usr/lib/*/libsaimeta.so
20 changes: 20 additions & 0 deletions syncd/scripts/syncd_init_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,24 @@ config_syncd_vs()
CMD_ARGS+=" -l -p $HWSKU_DIR/sai.profile"
}

vpp_api_check()
{
VPP_API_SOCK=$1
while true
do
[ -S "$VPP_API_SOCK" ] && vpp_api_test socket-name $VPP_API_SOCK <<< "show_version" 2>/dev/null | grep "version:" && break
sleep 1
done
}

config_syncd_vpp()
{
CMD_ARGS+=" -p $HWSKU_DIR/sai.profile"
vpp_api_check "/run/vpp/api.sock"
source /etc/sonic/vpp/syncd_vpp_env
export NO_LINUX_NL
}

config_syncd_soda()
{
# Add support for SAI bulk operations
Expand Down Expand Up @@ -469,6 +487,8 @@ config_syncd()
config_syncd_nephos
elif [ "$SONIC_ASIC_TYPE" == "vs" ]; then
config_syncd_vs
elif [ "$SONIC_ASIC_TYPE" == "vpp" ]; then
config_syncd_vpp
elif [ "$SONIC_ASIC_TYPE" == "innovium" ]; then
config_syncd_innovium
elif [ "$SONIC_ASIC_TYPE" == "soda" ]; then
Expand Down
Loading