Skip to content

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

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

Merged
merged 1 commit into from
Nov 3, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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

@Keshavg-marvell Keshavg-marvell Oct 18, 2023

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

@saiarcot895 saiarcot895 Oct 19, 2023

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

@Keshavg-marvell Keshavg-marvell Oct 25, 2023

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

@saiarcot895 saiarcot895 Oct 26, 2023

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

@Keshavg-marvell Keshavg-marvell Oct 26, 2023

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.

fi
fi

Expand Down
2 changes: 1 addition & 1 deletion platform/marvell-arm64/mrvl-prestera
Open in desktop
Submodule mrvl-prestera updated 1 files
+28 −1 drivers/generic/cpssEnabler/linuxNoKernelModule/drivers/ethDriver.c
5 changes: 2 additions & 3 deletions platform/marvell-arm64/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk
include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk
include $(PLATFORM_PATH)/libsaithrift-dev.mk
include $(PLATFORM_PATH)/one-image.mk
# TODO: update for bookworm
#include $(PLATFORM_PATH)/mrvl-prestera.mk
#include $(PLATFORM_PATH)/platform-nokia.mk
include $(PLATFORM_PATH)/mrvl-prestera.mk
include $(PLATFORM_PATH)/platform-nokia.mk

SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_FPM) \
Expand Down
4 changes: 2 additions & 2 deletions platform/marvell-arm64/sonic-platform-nokia/7215/modules/nokia_7215_ixs_a1_cpld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,12 +591,12 @@ static int nokia_7215_ixs_a1_cpld_probe(struct i2c_client *client,
return status;
}

static int nokia_7215_ixs_a1_cpld_remove(struct i2c_client *client)
static void nokia_7215_ixs_a1_cpld_remove(struct i2c_client *client)
{
struct cpld_data *data = i2c_get_clientdata(client);
sysfs_remove_group(&client->dev.kobj, &nokia_7215_ixs_a1_cpld_group);
kfree(data);
return 0;
return;
}

static const struct of_device_id nokia_7215_ixs_a1_cpld_of_ids[] = {
Expand Down
2 changes: 1 addition & 1 deletion platform/marvell-arm64/sonic_fit.its
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
};
fdt_ac5x {
description = "Flattened Device Tree blob for AC5x";
data = /incbin/("/usr/lib/linux-image-5.10.0-23-2-arm64/marvell/ac5-98dx35xx-rd.dtb");
data = /incbin/("/usr/lib/linux-image-6.1.0-11-2-arm64/marvell/ac5-98dx35xx-rd.dtb");
type = "flat_dt";
arch = "arm64";
compression = "none";
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-linux-kernel
Open in desktop
Submodule sonic-linux-kernel updated 25 files
+0 −0 patch/0001-armhf_secondary_boot_online.patch
+0 −80 patch/0001-dt-bindings-marvell-Document-the-AC5-AC5X-compatible.patch
+0 −0 patch/0002-arm64-dts-Update-cache-properties-for-marvell.patch
+0 −30 patch/0002-dt-bindings-net-mvneta-Add-marvell-armada-ac5-neta.patch
+0 −467 patch/0003-arm64-dts-marvell-Add-Armada-98DX2530-SoC-and-RD-AC5.patch
+62 −0 patch/0003-dt-bindings-ac5-Add-mmc-and-usb-properties.patch
+0 −57 patch/0004-arm64-dts-marvell-Add-UART1-3-for-AC5-AC5X.patch
+0 −0 patch/0004-dts-ac5-marvell-Add-switching-mmc-watchdog-node.patch
+0 −0 patch/0005-ac5-marvell-Add-watchdog-support.patch
+0 −43 patch/0005-arm64-dts-marvell-98dx25xx-Fix-i2c-gpios-property.patch
+76 −0 patch/0006-ac5-marvell-Add-support-for-emmc.patch
+0 −29 patch/0007-arm64-dts-marvell-AC5-AC5X-Fix-address-for-UART1.patch
+0 −0 patch/0007-usb-ehci-Add-support-for-ac5.patch
+0 −44 patch/0008-mtd-rawnand-marvell-Add-missing-layouts.patch
+21 −21 patch/0008-mv6xxx-Fix-i2c-lock-due-to-arb-loss.patch
+0 −0 patch/0009-dt-bindings-marvell-Add-ARMADA-7K-properties.patch
+0 −313 patch/0009-pinctrl-mvebu-Add-driver-for-98DX2530-SoC.patch
+0 −36 patch/0010-arm64-marvell-Enable-the-98DX2530-pinctrl-driver.patch
+8 −8 patch/0010-dts-marvell-Add-support-for-7020-comexpress.patch
+6 −7 patch/0011-arm64-dts-marvell-Add-Nokia-7215-IXS-A1-board.patch
+0 −69 patch/0011-net-mvneta-Add-support-for-98DX2530-Ethernet-port.patch
+0 −41 patch/0012-spi-a3700-Support-big-endianness-for-AC5-SPI-driver.patch
+0 −72 patch/0013-dt-bindings-ac5-Add-mmc-and-usb-properties.patch
+0 −61 patch/0016-ac5-marvell-Add-support-for-emmc.patch
+12 −23 patch/series