1 files changed, 24 insertions, 0 deletions

diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
index eec7c2478b0d..8942e61f0028 100644
--- a/include/linux/fpga/fpga-mgr.h
+++ b/include/linux/fpga/fpga-mgr.h
@@ -77,6 +77,7 @@ enum fpga_mgr_states {
  * @sgt: scatter/gather table containing FPGA image
  * @buf: contiguous buffer containing FPGA image
  * @count: size of buf
+ * @region_id: id of target region
  * @dev: device that owns this
  * @overlay: Device Tree overlay
  */
@@ -89,6 +90,7 @@ struct fpga_image_info {
         struct sg_table *sgt;
         const char *buf;
         size_t count;
+        int region_id;
         struct device *dev;
 #ifdef CONFIG_OF
         struct device_node *overlay;
@@ -99,6 +101,7 @@ struct fpga_image_info {
  * struct fpga_manager_ops - ops for low level fpga manager drivers
  * @initial_header_size: Maximum number of bytes that should be passed into write_init
  * @state: returns an enum value of the FPGA's state
+ * @status: returns status of the FPGA, including reconfiguration error code
  * @write_init: prepare the FPGA to receive confuration data
  * @write: write count bytes of configuration data to the FPGA
  * @write_sg: write the scatter list of configuration data to the FPGA
@@ -113,6 +116,7 @@ struct fpga_image_info {
 struct fpga_manager_ops {
         size_t initial_header_size;
         enum fpga_mgr_states (*state)(struct fpga_manager *mgr);
+        u64 (*status)(struct fpga_manager *mgr);
         int (*write_init)(struct fpga_manager *mgr,
                           struct fpga_image_info *info,
                           const char *buf, size_t count);
@@ -124,12 +128,31 @@ struct fpga_manager_ops {
         const struct attribute_group **groups;
 };
 
+/* FPGA manager status: Partial/Full Reconfiguration errors */
+#define FPGA_MGR_STATUS_OPERATION_ERR           BIT(0)
+#define FPGA_MGR_STATUS_CRC_ERR                 BIT(1)
+#define FPGA_MGR_STATUS_INCOMPATIBLE_IMAGE_ERR  BIT(2)
+#define FPGA_MGR_STATUS_IP_PROTOCOL_ERR         BIT(3)
+#define FPGA_MGR_STATUS_FIFO_OVERFLOW_ERR       BIT(4)
+
+/**
+ * struct fpga_compat_id - id for compatibility check
+ *
+ * @id_h: high 64bit of the compat_id
+ * @id_l: low 64bit of the compat_id
+ */
+struct fpga_compat_id {
+        u64 id_h;
+        u64 id_l;
+};
+
 /**
  * struct fpga_manager - fpga manager structure
  * @name: name of low level fpga manager
  * @dev: fpga manager device
  * @ref_mutex: only allows one reference to fpga manager
  * @state: state of fpga manager
+ * @compat_id: FPGA manager id for compatibility check.
  * @mops: pointer to struct of fpga manager ops
  * @priv: low level driver private date
  */
@@ -138,6 +161,7 @@ struct fpga_manager {
         struct device dev;
         struct mutex ref_mutex;
         enum fpga_mgr_states state;
+        struct fpga_compat_id *compat_id;
         const struct fpga_manager_ops *mops;
         void *priv;
 };