Re: [PATCHv2] fpga: stratix10-soc: remove the pre-set reconfiguration condition

From: Russ Weight
Date: Fri May 29 2020 - 12:18:27 EST


Minor comment below.

- Russ

On 5/29/20 6:15 AM, Richard Gong wrote:
Hi Moritz,

Sorry for asking.

When you get chance, can you review my version 2 patch submitted on 05/15/20?

Regards,
Richard

On 5/15/20 9:35 AM, richard.gong@xxxxxxxxxxxxxxx wrote:
From: Richard Gong <richard.gong@xxxxxxxxx>

The reconfiguration mode is pre-set by driver as the full reconfiguration.
As a result, user have to change code and recompile the drivers if he or
she wants to perform a partial reconfiguration. Removing the pre-set
reconfiguration condition so that user can select full or partial
reconfiguration via overlay device tree without recompiling the drivers.

Also add an error message if the configuration request is failure.
s/is failure/fails/

Signed-off-by: Richard Gong <richard.gong@xxxxxxxxx>
---
v2: define and use constant values
---
 drivers/fpga/stratix10-soc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 44b7c56..4d52a80 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -14,9 +14,13 @@
 /*
ÂÂ * FPGA programming requires a higher level of privilege (EL3), per the SoC
ÂÂ * design.
+ * SoC firmware supports full and partial reconfiguration.
ÂÂ */
 #define NUM_SVC_BUFS 4
 #define SVC_BUF_SIZE SZ_512K
+#define FULL_RECONFIG_FLAGÂÂÂ 0
+#define PARTIAL_RECONFIG_FLAGÂÂÂ 1
+
  /* Indicates buffer is in use if set */
 #define SVC_BUF_LOCK 0
@@ -182,12 +186,12 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
ÂÂÂÂÂ uint i;
ÂÂÂÂÂ int ret;
 - ctype.flags = 0;
ÂÂÂÂÂ if (info->flags & FPGA_MGR_PARTIAL_RECONFIG) {
ÂÂÂÂÂÂÂÂÂ dev_dbg(dev, "Requesting partial reconfiguration.\n");
-ÂÂÂÂÂÂÂ ctype.flags |= BIT(COMMAND_RECONFIG_FLAG_PARTIAL);
+ÂÂÂÂÂÂÂ ctype.flags = PARTIAL_RECONFIG_FLAG;
ÂÂÂÂÂ } else {
ÂÂÂÂÂÂÂÂÂ dev_dbg(dev, "Requesting full reconfiguration.\n");
+ÂÂÂÂÂÂÂ ctype.flags = FULL_RECONFIG_FLAG;
ÂÂÂÂÂ }
reinit_completion(&priv->status_return_completion);
@@ -210,6 +214,7 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
 Â ret = 0;
ÂÂÂÂÂ if (!test_and_clear_bit(SVC_STATUS_OK, &priv->status)) {
+ÂÂÂÂÂÂÂ dev_err(dev, "RECONFIG_REQUEST failed\n");
ÂÂÂÂÂÂÂÂÂ ret = -ETIMEDOUT;
ÂÂÂÂÂÂÂÂÂ goto init_done;
ÂÂÂÂÂ }