mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
board/xilinx: add xilinx_v2025.1 support
Add hashes for xilinx_v2025.1 release. xilinx_v2025.1 release includes: - atf 2.12 - linux 6.12.10 - uboot 2025.01 In addition, the xilinx_v2025.1 linux kernel release tag has a Kconfig leak of the CONFIG_XILINX_AIE option. This patch adds a patch that is specific to the Xilinx Linux 6.12.10 release which fixes the problem by moving the changes implemented by the CONFIG_XILINX_AIE option from the exposed uapi header file to the Linux internal header file. The patch has been added to the board/xilinx/linux_6.12/patches directory, so that it will only be applied when a user specifies they wish to build the xilinx_v2025.1 release or they use a defconfig that has migrated to this release. Since the header file that causes the issue is not yet mainline, this patch has been "upstreamed" to the Xilinx linux-xlnx repo via the AMD internal jira process. Upstream: internal AMD jira process Signed-off-by: Neal Frager <neal.frager@amd.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> [Julien: fix check-package errors: - remove numbering in patch subject - add "Upstream:" tag in patch ] Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
f91854dfaf
commit
93c4e7bdbf
@@ -0,0 +1,127 @@
|
||||
From 333678d7b9edc29e8148411d48f70950b1b614c1 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Frager <neal.frager@amd.com>
|
||||
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 <neal.frager@amd.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 a45390c9e1d584a389abd37ee49dce3f8d3b41718b1fd7c977608b5387a38955 xlnx_rebase_v2.10_2024.2.tar.gz
|
||||
sha256 4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d xlnx_rebase_v2.12_2025.1.tar.gz
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 b726226e8784d92049190f19768d393eccf3ad111c7a2e685bb29cfa1bdf1f70 xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz
|
||||
sha256 25795c354f30a3358506ab02deeac99e7f79850804c52d6c3d5539fd310f0491 xlnx_rebase_v6.12_LTS_2025.1.tar.gz
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 f1a86ccdbe60bac89177a24bbfd56fc6e8e67823669f0997de563c3cc0ea4dd1 xlnx_rebase_v2024.01_2024.2.tar.gz
|
||||
sha256 b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93 xlnx_rebase_v2025.01_2025.1.tar.gz
|
||||
|
||||
Reference in New Issue
Block a user