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

[marvell-arm64]: Enable SDK module for bookworm #16909

Merged
merged 1 commit into from
Nov 3, 2023

Conversation

Keshavg-marvell
Copy link
Contributor

This patch enables compiling of Marvell platform
module and fixes sonic-platform-nokia compilation
issues for bookworm.

Why I did it

For enabling bookworm build on Marvell-arm64 and fixing #16734

Work item tracking
  • Microsoft ADO (number only):

How I did it

Port Marvell SDK driver for bookworm 6.1 kernel.
Port Nokia CPLD driver for bookworm 6.1 kernel

How to verify it

Built image from bookworm branch and installed on Marvell platform to
verify "show interface status".

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

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

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)

@Keshavg-marvell
Copy link
Contributor Author

@Pavan-Nokia please review

@@ -747,8 +747,7 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then
sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
elif [[ $CONFIGURED_ARCH == arm64 ]]; then
sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
# TODO: fix for bookworm, probably needs arm64 patches in sonic-linux-kernel to be updated
#sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
Copy link
Contributor

@saiarcot895 saiarcot895 Oct 18, 2023

Choose a reason for hiding this comment

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

This command is failing with FATAL ERROR: Couldn't open "/usr/lib/linux-image-5.10.0-23-2-arm64/marvell/ac5-98dx35xx-rd.dtb": No such file or directory. I think some patches in sonic-linux-kernel need to be updated/enabled first?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

looks like below line is missed in your last commit of changing the kernel version.

https://github.com/sonic-net/sonic-buildimage/blob/bookworm/platform/marvell-arm64/sonic_fit.its#L23

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, would you be able to make that change here?

Also, I see that you have also opened sonic-net/sonic-linux-kernel#352. That would probably fix the dtb file error.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@saiarcot895 I was on leave from last 6days hence the delay in response.

I have taken care this "https://github.com/sonic-net/sonic-buildimage/blob/bookworm/platform/marvell-arm64/sonic_fit.its#L23" change and updated the PR.

yes, sonic-net/sonic-linux-kernel#352 would take care of dtb file errors.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you include the sonic-linux-kernel submodule update in this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks Saikrishna for looking into this PR. I have updated sonic-linux-kernel submodule to this PR.

This patch enables compiling of Marvell platform
module and fixes sonic-platform-nokia compilation
issues for bookworm.
@Keshavg-marvell
Copy link
Contributor Author

I believe it is good to merge now. Let us know if anything is needed from our side to merge these changes.

@saiarcot895
Copy link
Contributor

@Keshavg-marvell Can armhf be enabled as well?

@Keshavg-marvell
Copy link
Contributor Author

@saiarcot895 armhf we are planning to address with separate PR.

@saiarcot895
Copy link
Contributor

Got it, is there an ETA for that PR?

@Keshavg-marvell
Copy link
Contributor Author

Got it, is there an ETA for that PR?

ETA which we are internally tracking is 7th Nov.

@saiarcot895
Copy link
Contributor

/azpw run Azure.sonic-buildimage

1 similar comment
@zhangyanzhao
Copy link
Collaborator

/azpw run Azure.sonic-buildimage

@zhangyanzhao
Copy link
Collaborator

/azpw run "Azure.sonic-buildimage"

@liushilongbuaa
Copy link
Contributor

liushilongbuaa commented Nov 2, 2023

@saiarcot895 , please try again. I tried on my PR, it works now.

@saiarcot895
Copy link
Contributor

/azpw run Azure.sonic-buildimage

@saiarcot895
Copy link
Contributor

New pipeline manually run here, where all checks pass.

@yxieca yxieca merged commit 26326fb into sonic-net:bookworm Nov 3, 2023
11 of 16 checks passed
@liushilongbuaa
Copy link
Contributor

liushilongbuaa commented Nov 3, 2023

@saiarcot895 , Comment only works for Keshavg-marvell, the PR owner.
It is by design. I didn't noticed that.

saiarcot895 pushed a commit to saiarcot895/sonic-buildimage that referenced this pull request Nov 7, 2023
This patch enables compiling of Marvell platform
module and fixes sonic-platform-nokia compilation
issues for bookworm.
saiarcot895 pushed a commit to saiarcot895/sonic-buildimage that referenced this pull request Nov 21, 2023
This patch enables compiling of Marvell platform
module and fixes sonic-platform-nokia compilation
issues for bookworm.
yxieca pushed a commit that referenced this pull request Nov 22, 2023
This patch enables compiling of Marvell platform
module and fixes sonic-platform-nokia compilation
issues for bookworm.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants