diff --git a/board/xilinx/linux_6.12.10/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch b/board/xilinx/linux_6.12.10/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch deleted file mode 100644 index e9dfee9f97..0000000000 --- a/board/xilinx/linux_6.12.10/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 333678d7b9edc29e8148411d48f70950b1b614c1 Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Mon, 2 Jun 2025 11:07:03 +0100 -Subject: [PATCH] include/uapi/linux/xlnx-ai-engine.h: fix - CONFIG_XILINX_AIE leak - -Linux Kconfig options should not be exposed to user space. This patch fixes -a Linux kernel leak of the CONFIG_XILINX_AIE option by moving the changes -implemented by the CONFIG_XILINX_AIE from the uapi header file to the local -Linux kernel header file. - -Upstream: internal AMD jira process -Signed-off-by: Neal Frager ---- - include/linux/xlnx-ai-engine.h | 37 +++++++++++++++++++++++++ - include/uapi/linux/xlnx-ai-engine.h | 42 ----------------------------- - 2 files changed, 37 insertions(+), 42 deletions(-) - -diff --git a/include/linux/xlnx-ai-engine.h b/include/linux/xlnx-ai-engine.h -index 44a1e40ef9b8..10905dc84ae9 100644 ---- a/include/linux/xlnx-ai-engine.h -+++ b/include/linux/xlnx-ai-engine.h -@@ -171,6 +171,13 @@ static inline u32 aie_get_error_category(struct aie_error *err) - return err->category; - } - -+int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); -+int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); -+bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc); -+int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc); -+int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval); -+int aie_load_cert(struct device *dev, unsigned char *elf_addr); -+ - #else - static inline bool aie_partition_is_available(struct aie_partition_req *req) - { -@@ -271,5 +278,35 @@ static inline int aie_part_rscmgr_set_static_range(struct device *dev, - return -EINVAL; - } - -+int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) -+{ -+ return -EINVAL; -+} -+ -+int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) -+{ -+ return -EINVAL; -+} -+ -+bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc) -+{ -+ return false; -+} -+ -+int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc) -+{ -+ return 0; -+} -+ -+int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval) -+{ -+ return -EINVAL; -+} -+ -+int aie_load_cert(struct device *dev, unsigned char *elf_addr) -+{ -+ return -EINVAL; -+} -+ - #endif /* CONFIG_XILINX_AIE */ - #endif -diff --git a/include/uapi/linux/xlnx-ai-engine.h b/include/uapi/linux/xlnx-ai-engine.h -index 424c5f4c4097..1680aed8ad85 100644 ---- a/include/uapi/linux/xlnx-ai-engine.h -+++ b/include/uapi/linux/xlnx-ai-engine.h -@@ -781,47 +781,5 @@ struct aie_rsc_user_stat_array { - */ - #define AIE_UPDATE_SHIMDMA_DMABUF_BD_ADDR_IOCTL _IOW(AIE_IOCTL_BASE, 0x1e, \ - struct aie_dmabuf_bd_args) --#if IS_ENABLED(CONFIG_XILINX_AIE) -- --int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); --int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data); --bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc); --int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc); --int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval); --int aie_load_cert(struct device *dev, unsigned char *elf_addr); -- --#else /* IS_ENABLED(CONFIG_XILINX_AIE) */ -- --int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) --{ -- return -EINVAL; --} -- --int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data) --{ -- return -EINVAL; --} -- --bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc) --{ -- return false; --} -- --int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc) --{ -- return 0; --} -- --int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval) --{ -- return -EINVAL; --} -- --int aie_load_cert(struct device *dev, unsigned char *elf_addr) --{ -- return -EINVAL; --} -- --#endif /* IS_ENABLED(CONFIG_XILINX_AIE) */ - - #endif --- -2.25.1 - diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash index b14fa3d7ee..994d637d50 100644 --- a/board/xilinx/patches/linux/linux.hash +++ b/board/xilinx/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 25795c354f30a3358506ab02deeac99e7f79850804c52d6c3d5539fd310f0491 xlnx_rebase_v6.12_LTS_2025.1.tar.gz sha256 ea55acf69bead3d4cf121de414cccfbe75a3c36465c93d9500cc00688d9b8d9d xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index c9d99876d5..8640d65582 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -5,14 +5,14 @@ BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12.10/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" diff --git a/configs/versal_vek280_defconfig b/configs/versal_vek280_defconfig index 4aa25f8d67..6c434199fc 100644 --- a/configs/versal_vek280_defconfig +++ b/configs/versal_vek280_defconfig @@ -5,14 +5,14 @@ BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" -BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches board/xilinx/linux_6.12.10/patches" +BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vek280-revB" diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig index 500298c2f4..c2d52d7e33 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -5,14 +5,14 @@ BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12.10/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA"