|
|
|
|
@ -394,10 +394,10 @@ index 0000000..53c5349
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
diff --git a/xilinx-fpga-manager.patch b/xilinx-fpga-manager.patch
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..59aa585
|
|
|
|
|
index 0000000..33daffe
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/xilinx-fpga-manager.patch
|
|
|
|
|
@@ -0,0 +1,663 @@
|
|
|
|
|
@@ -0,0 +1,676 @@
|
|
|
|
|
+# Enable user-space interface for PL programming via Linux FPGA manager
|
|
|
|
|
+# diff cherry-picked from Xilinx/linux-xilinx/tree/xlnx_rebase_v6.6_LTS
|
|
|
|
|
+# commit IDs: e61c0a9, 0a38712, dc67651, 89a24e3, 8d224b1, 2a9c05f, 4e94580
|
|
|
|
|
@ -425,7 +425,7 @@ index 0000000..59aa585
|
|
|
|
|
+ tristate "Altera SOCFPGA FPGA Manager"
|
|
|
|
|
+ depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST
|
|
|
|
|
+diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
|
|
|
|
|
+index 06651389c592..6e8c45974f28 100644
|
|
|
|
|
+index 0f4035b089a2..3aa9f5f041f6 100644
|
|
|
|
|
+--- a/drivers/fpga/fpga-mgr.c
|
|
|
|
|
++++ b/drivers/fpga/fpga-mgr.c
|
|
|
|
|
+@@ -8,6 +8,9 @@
|
|
|
|
|
@ -673,7 +673,7 @@ index 0000000..59aa585
|
|
|
|
|
+ NULL,
|
|
|
|
|
+ };
|
|
|
|
|
+ ATTRIBUTE_GROUPS(fpga_mgr);
|
|
|
|
|
+@@ -732,6 +864,106 @@ void fpga_mgr_put(struct fpga_manager *mgr)
|
|
|
|
|
+@@ -739,6 +871,106 @@ void fpga_mgr_put(struct fpga_manager *mgr)
|
|
|
|
|
+ }
|
|
|
|
|
+ EXPORT_SYMBOL_GPL(fpga_mgr_put);
|
|
|
|
|
+
|
|
|
|
|
@ -780,8 +780,8 @@ index 0000000..59aa585
|
|
|
|
|
+ /**
|
|
|
|
|
+ * fpga_mgr_lock - Lock FPGA manager for exclusive use
|
|
|
|
|
+ * @mgr: fpga manager
|
|
|
|
|
+@@ -779,6 +1011,9 @@ struct fpga_manager *
|
|
|
|
|
+ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *info)
|
|
|
|
|
+@@ -788,6 +1020,9 @@ __fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *
|
|
|
|
|
+ struct module *owner)
|
|
|
|
|
+ {
|
|
|
|
|
+ const struct fpga_manager_ops *mops = info->mops;
|
|
|
|
|
++#ifdef CONFIG_FPGA_MGR_DEBUG_FS
|
|
|
|
|
@ -790,7 +790,7 @@ index 0000000..59aa585
|
|
|
|
|
+ struct fpga_manager *mgr;
|
|
|
|
|
+ int id, ret;
|
|
|
|
|
+
|
|
|
|
|
+@@ -815,10 +1050,28 @@ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *in
|
|
|
|
|
+@@ -826,10 +1061,28 @@ __fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *
|
|
|
|
|
+ mgr->dev.of_node = parent->of_node;
|
|
|
|
|
+ mgr->dev.id = id;
|
|
|
|
|
+
|
|
|
|
|
@ -819,7 +819,7 @@ index 0000000..59aa585
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Initialize framework state by requesting low level driver read state
|
|
|
|
|
+ * from device. FPGA may be in reset mode or may have been programmed
|
|
|
|
|
+@@ -832,6 +1085,28 @@ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *in
|
|
|
|
|
+@@ -843,6 +1096,28 @@ __fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *
|
|
|
|
|
+ return ERR_PTR(ret);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
@ -848,7 +848,7 @@ index 0000000..59aa585
|
|
|
|
|
+ return mgr;
|
|
|
|
|
+
|
|
|
|
|
+ error_device:
|
|
|
|
|
+@@ -882,6 +1157,10 @@ void fpga_mgr_unregister(struct fpga_manager *mgr)
|
|
|
|
|
+@@ -894,6 +1169,10 @@ void fpga_mgr_unregister(struct fpga_manager *mgr)
|
|
|
|
|
+ {
|
|
|
|
|
+ dev_info(&mgr->dev, "%s %s\n", __func__, mgr->name);
|
|
|
|
|
+
|
|
|
|
|
@ -881,10 +881,10 @@ index 0000000..59aa585
|
|
|
|
|
+ &firmware_name)) {
|
|
|
|
|
+ info->firmware_name = devm_kstrdup(dev, firmware_name,
|
|
|
|
|
+diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c
|
|
|
|
|
+index f3434e2c487b..db923746cac5 100644
|
|
|
|
|
+index f3434e2c487b..d2434ed85eff 100644
|
|
|
|
|
+--- a/drivers/fpga/zynqmp-fpga.c
|
|
|
|
|
++++ b/drivers/fpga/zynqmp-fpga.c
|
|
|
|
|
+@@ -43,25 +43,42 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
|
|
|
|
|
+@@ -43,25 +43,47 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
|
|
|
|
|
+ struct zynqmp_fpga_priv *priv;
|
|
|
|
|
+ dma_addr_t dma_addr;
|
|
|
|
|
+ u32 eemi_flags = 0;
|
|
|
|
|
@ -915,6 +915,11 @@ index 0000000..59aa585
|
|
|
|
|
++
|
|
|
|
|
+ wmb(); /* ensure all writes are done before initiate FW call */
|
|
|
|
|
+
|
|
|
|
|
++ if (priv->flags & FPGA_MGR_DDR_MEM_AUTH_BITSTREAM)
|
|
|
|
|
++ eemi_flags |= XILINX_ZYNQMP_PM_FPGA_AUTHENTICATION_DDR;
|
|
|
|
|
++ else if (priv->flags & FPGA_MGR_SECURE_MEM_AUTH_BITSTREAM)
|
|
|
|
|
++ eemi_flags |= XILINX_ZYNQMP_PM_FPGA_AUTHENTICATION_OCM;
|
|
|
|
|
++
|
|
|
|
|
+ if (priv->flags & FPGA_MGR_PARTIAL_RECONFIG)
|
|
|
|
|
+ eemi_flags |= XILINX_ZYNQMP_PM_FPGA_PARTIAL;
|
|
|
|
|
+
|
|
|
|
|
@ -931,20 +936,22 @@ index 0000000..59aa585
|
|
|
|
|
+ return ret;
|
|
|
|
|
+ }
|
|
|
|
|
+diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
|
|
|
|
|
+index 9dda7d9898ff..edaf77160746 100644
|
|
|
|
|
+index e8b12ec8b060..ffd2dfdb6abd 100644
|
|
|
|
|
+--- a/include/linux/firmware/xlnx-zynqmp.h
|
|
|
|
|
++++ b/include/linux/firmware/xlnx-zynqmp.h
|
|
|
|
|
+@@ -70,6 +70,8 @@
|
|
|
|
|
+@@ -83,6 +83,10 @@
|
|
|
|
|
+ */
|
|
|
|
|
+ #define XILINX_ZYNQMP_PM_FPGA_FULL 0x0U
|
|
|
|
|
+ #define XILINX_ZYNQMP_PM_FPGA_PARTIAL BIT(0)
|
|
|
|
|
++#define XILINX_ZYNQMP_PM_FPGA_AUTHENTICATION_DDR BIT(1)
|
|
|
|
|
++#define XILINX_ZYNQMP_PM_FPGA_AUTHENTICATION_OCM BIT(2)
|
|
|
|
|
++#define XILINX_ZYNQMP_PM_FPGA_ENCRYPTION_USERKEY BIT(3)
|
|
|
|
|
++#define XILINX_ZYNQMP_PM_FPGA_ENCRYPTION_DEVKEY BIT(4)
|
|
|
|
|
+
|
|
|
|
|
+ /* FPGA Status Reg */
|
|
|
|
|
+ #define XILINX_ZYNQMP_PM_FPGA_CONFIG_STAT_OFFSET 7U
|
|
|
|
|
+diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
|
|
|
|
|
+index 54f63459efd6..c96a4405f909 100644
|
|
|
|
|
+index 0d4fe068f3d8..f884d268c974 100644
|
|
|
|
|
+--- a/include/linux/fpga/fpga-mgr.h
|
|
|
|
|
++++ b/include/linux/fpga/fpga-mgr.h
|
|
|
|
|
+@@ -9,8 +9,11 @@
|
|
|
|
|
@ -959,7 +966,7 @@ index 0000000..59aa585
|
|
|
|
|
+ struct fpga_manager;
|
|
|
|
|
+ struct sg_table;
|
|
|
|
|
+
|
|
|
|
|
+@@ -66,17 +69,25 @@ enum fpga_mgr_states {
|
|
|
|
|
+@@ -66,17 +69,29 @@ enum fpga_mgr_states {
|
|
|
|
|
+ *
|
|
|
|
|
+ * %FPGA_MGR_EXTERNAL_CONFIG: FPGA has been configured prior to Linux booting
|
|
|
|
|
+ *
|
|
|
|
|
@ -973,6 +980,10 @@ index 0000000..59aa585
|
|
|
|
|
++ *
|
|
|
|
|
++ * %FPGA_MGR_USERKEY_ENCRYPTED_BITSTREAM: indicates bitstream is encrypted with
|
|
|
|
|
++ * user key
|
|
|
|
|
++ * %FPGA_MGR_DDR_MEM_AUTH_BITSTREAM: do bitstream authentication using DDR
|
|
|
|
|
++ * memory if supported
|
|
|
|
|
++ * %FPGA_MGR_SECURE_MEM_AUTH_BITSTREAM: do bitstream authentication using secure
|
|
|
|
|
++ * memory if supported
|
|
|
|
|
+ */
|
|
|
|
|
+ #define FPGA_MGR_PARTIAL_RECONFIG BIT(0)
|
|
|
|
|
+ #define FPGA_MGR_EXTERNAL_CONFIG BIT(1)
|
|
|
|
|
@ -986,7 +997,7 @@ index 0000000..59aa585
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * struct fpga_image_info - information specific to an FPGA image
|
|
|
|
|
+@@ -86,6 +97,7 @@ enum fpga_mgr_states {
|
|
|
|
|
+@@ -86,6 +101,7 @@ enum fpga_mgr_states {
|
|
|
|
|
+ * @config_complete_timeout_us: maximum time for FPGA to switch to operating
|
|
|
|
|
+ * status in the write_complete op.
|
|
|
|
|
+ * @firmware_name: name of FPGA image firmware file
|
|
|
|
|
@ -994,7 +1005,7 @@ index 0000000..59aa585
|
|
|
|
|
+ * @sgt: scatter/gather table containing FPGA image
|
|
|
|
|
+ * @buf: contiguous buffer containing FPGA image
|
|
|
|
|
+ * @count: size of buf
|
|
|
|
|
+@@ -102,6 +114,7 @@ struct fpga_image_info {
|
|
|
|
|
+@@ -102,6 +118,7 @@ struct fpga_image_info {
|
|
|
|
|
+ u32 disable_timeout_us;
|
|
|
|
|
+ u32 config_complete_timeout_us;
|
|
|
|
|
+ char *firmware_name;
|
|
|
|
|
@ -1002,7 +1013,7 @@ index 0000000..59aa585
|
|
|
|
|
+ struct sg_table *sgt;
|
|
|
|
|
+ const char *buf;
|
|
|
|
|
+ size_t count;
|
|
|
|
|
+@@ -160,6 +173,7 @@ struct fpga_manager_info {
|
|
|
|
|
+@@ -160,6 +177,7 @@ struct fpga_manager_info {
|
|
|
|
|
+ * @write: write count bytes of configuration data to the FPGA
|
|
|
|
|
+ * @write_sg: write the scatter list of configuration data to the FPGA
|
|
|
|
|
+ * @write_complete: set FPGA to operating state after writing is done
|
|
|
|
|
@ -1010,7 +1021,7 @@ index 0000000..59aa585
|
|
|
|
|
+ * @fpga_remove: optional: Set FPGA into a specific state during driver remove
|
|
|
|
|
+ * @groups: optional attribute groups.
|
|
|
|
|
+ *
|
|
|
|
|
+@@ -182,6 +196,7 @@ struct fpga_manager_ops {
|
|
|
|
|
+@@ -182,6 +200,7 @@ struct fpga_manager_ops {
|
|
|
|
|
+ int (*write_sg)(struct fpga_manager *mgr, struct sg_table *sgt);
|
|
|
|
|
+ int (*write_complete)(struct fpga_manager *mgr,
|
|
|
|
|
+ struct fpga_image_info *info);
|
|
|
|
|
@ -1018,7 +1029,7 @@ index 0000000..59aa585
|
|
|
|
|
+ void (*fpga_remove)(struct fpga_manager *mgr);
|
|
|
|
|
+ const struct attribute_group **groups;
|
|
|
|
|
+ };
|
|
|
|
|
+@@ -196,21 +211,35 @@ struct fpga_manager_ops {
|
|
|
|
|
+@@ -196,23 +215,37 @@ struct fpga_manager_ops {
|
|
|
|
|
+ /**
|
|
|
|
|
+ * struct fpga_manager - fpga manager structure
|
|
|
|
|
+ * @name: name of low level fpga manager
|
|
|
|
|
@ -1031,6 +1042,7 @@ index 0000000..59aa585
|
|
|
|
|
+ * @state: state of fpga manager
|
|
|
|
|
+ * @compat_id: FPGA manager id for compatibility check.
|
|
|
|
|
+ * @mops: pointer to struct of fpga manager ops
|
|
|
|
|
+ * @mops_owner: module containing the mops
|
|
|
|
|
+ * @priv: low level driver private date
|
|
|
|
|
++ * @err: low level driver error code
|
|
|
|
|
++ * @dir: debugfs image directory
|
|
|
|
|
@ -1046,6 +1058,7 @@ index 0000000..59aa585
|
|
|
|
|
+ enum fpga_mgr_states state;
|
|
|
|
|
+ struct fpga_compat_id *compat_id;
|
|
|
|
|
+ const struct fpga_manager_ops *mops;
|
|
|
|
|
+ struct module *mops_owner;
|
|
|
|
|
+ void *priv;
|
|
|
|
|
++ int err;
|
|
|
|
|
++#ifdef CONFIG_FPGA_MGR_DEBUG_FS
|
|
|
|
|
@ -1054,21 +1067,21 @@ index 0000000..59aa585
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ #define to_fpga_manager(d) container_of(d, struct fpga_manager, dev)
|
|
|
|
|
+@@ -244,4 +273,6 @@ struct fpga_manager *
|
|
|
|
|
+ devm_fpga_mgr_register(struct device *parent, const char *name,
|
|
|
|
|
+ const struct fpga_manager_ops *mops, void *priv);
|
|
|
|
|
+@@ -258,4 +291,6 @@ __devm_fpga_mgr_register(struct device *parent, const char *name,
|
|
|
|
|
+ const struct fpga_manager_ops *mops, void *priv,
|
|
|
|
|
+ struct module *owner);
|
|
|
|
|
+
|
|
|
|
|
++#define FPGA_IOCTL_LOAD_DMA_BUFF _IOWR('R', 1, __u32)
|
|
|
|
|
++
|
|
|
|
|
+ #endif /*_LINUX_FPGA_MGR_H */
|
|
|
|
|
diff --git a/zynq_image.nix b/zynq_image.nix
|
|
|
|
|
index 9d1621e..012e50c 100644
|
|
|
|
|
index d5c5eda..7ede584 100644
|
|
|
|
|
--- a/zynq_image.nix
|
|
|
|
|
+++ b/zynq_image.nix
|
|
|
|
|
@@ -3,6 +3,16 @@
|
|
|
|
|
with lib;
|
|
|
|
|
let
|
|
|
|
|
customKernel = (pkgs.linux.override {
|
|
|
|
|
customKernel = (pkgs.linux_6_6.override {
|
|
|
|
|
+ kernelPatches = [
|
|
|
|
|
+ ({
|
|
|
|
|
+ name = "xilinx-configfs-overlays";
|
|
|
|
|
|
