fpga-mgr: add fpga image information struct

This patch adds a minor change in the FPGA Manager API
to hold information that is specific to an FPGA image
file.  This change is expected to bring little, if any,
pain.  The socfpga and zynq drivers are fixed up in
this patch.

An FPGA image file will have particulars that affect how the
image is programmed to the FPGA.  One example is that
current 'flags' currently has one bit which shows whether the
FPGA image was built for full reconfiguration or partial
reconfiguration.  Another example is timeout values for
enabling or disabling the bridges in the FPGA.  As the
complexity of the FPGA design increases, the bridges in the
FPGA may take longer times to enable or disable.

This patch adds a new 'struct fpga_image_info', moves the
current 'u32 flags' to it.  Two other image-specific u32's
are added for the bridge enable/disable timeouts.  The FPGA
Manager API functions are changed, replacing the 'u32 flag'
parameter with a pointer to struct fpga_image_info.
Subsequent patches fix the existing low level FPGA manager
drivers.

Signed-off-by: Alan Tull <atull@opensource.altera.com>
Acked-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index c2fb4120bd62..249682e92502 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -175,7 +175,8 @@ static irqreturn_t zynq_fpga_isr(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
+static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
+                                    struct fpga_image_info *info,
                                     const char *buf, size_t count)
 {
         struct zynq_fpga_priv *priv;
@@ -189,7 +190,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
                 return err;
 
         /* don't globally reset PL if we're doing partial reconfig */
-        if (!(flags & FPGA_MGR_PARTIAL_RECONFIG)) {
+        if (!(info->flags & FPGA_MGR_PARTIAL_RECONFIG)) {
                 /* assert AXI interface resets */
                 regmap_write(priv->slcr, SLCR_FPGA_RST_CTRL_OFFSET,
                              FPGA_RST_ALL_MASK);
@@ -343,7 +344,8 @@ out_free:
         return err;
 }
 
-static int zynq_fpga_ops_write_complete(struct fpga_manager *mgr, u32 flags)
+static int zynq_fpga_ops_write_complete(struct fpga_manager *mgr,
+                                        struct fpga_image_info *info)
 {
         struct zynq_fpga_priv *priv = mgr->priv;
         int err;
@@ -364,7 +366,7 @@ static int zynq_fpga_ops_write_complete(struct fpga_manager *mgr, u32 flags)
                 return err;
 
         /* for the partial reconfig case we didn't touch the level shifters */
-        if (!(flags & FPGA_MGR_PARTIAL_RECONFIG)) {
+        if (!(info->flags & FPGA_MGR_PARTIAL_RECONFIG)) {
                 /* enable level shifters from PL to PS */
                 regmap_write(priv->slcr, SLCR_LVL_SHFTR_EN_OFFSET,
                              LVL_SHFTR_ENABLE_PL_TO_PS);