Merge tag 'fpga-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf...

[platform/kernel/linux-starfive.git] / drivers / fpga / stratix10-soc.c

diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 215d337..44b7c56 100644 (file)
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -154,11 +154,11 @@ static void s10_receive_callback(struct stratix10_svc_client *client,
         * Here we set status bits as we receive them.  Elsewhere, we always use
         * test_and_clear_bit() to check status in priv->status
         */
-       for (i = 0; i <= SVC_STATUS_RECONFIG_ERROR; i++)
+       for (i = 0; i <= SVC_STATUS_ERROR; i++)
                if (status & (1 << i))
                        set_bit(i, &priv->status);
 
-       if (status & BIT(SVC_STATUS_RECONFIG_BUFFER_DONE)) {
+       if (status & BIT(SVC_STATUS_BUFFER_DONE)) {
                s10_unlock_bufs(priv, data->kaddr1);
                s10_unlock_bufs(priv, data->kaddr2);
                s10_unlock_bufs(priv, data->kaddr3);
@@ -209,8 +209,7 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
        }
 
        ret = 0;
-       if (!test_and_clear_bit(SVC_STATUS_RECONFIG_REQUEST_OK,
-                               &priv->status)) {
+       if (!test_and_clear_bit(SVC_STATUS_OK, &priv->status)) {
                ret = -ETIMEDOUT;
                goto init_done;
        }
@@ -323,17 +322,15 @@ static int s10_ops_write(struct fpga_manager *mgr, const char *buf,
                                &priv->status_return_completion,
                                S10_BUFFER_TIMEOUT);
 
-               if (test_and_clear_bit(SVC_STATUS_RECONFIG_BUFFER_DONE,
-                                      &priv->status) ||
-                   test_and_clear_bit(SVC_STATUS_RECONFIG_BUFFER_SUBMITTED,
+               if (test_and_clear_bit(SVC_STATUS_BUFFER_DONE, &priv->status) ||
+                   test_and_clear_bit(SVC_STATUS_BUFFER_SUBMITTED,
                                       &priv->status)) {
                        ret = 0;
                        continue;
                }
 
-               if (test_and_clear_bit(SVC_STATUS_RECONFIG_ERROR,
-                                      &priv->status)) {
-                       dev_err(dev, "ERROR - giving up - SVC_STATUS_RECONFIG_ERROR\n");
+               if (test_and_clear_bit(SVC_STATUS_ERROR, &priv->status)) {
+                       dev_err(dev, "ERROR - giving up - SVC_STATUS_ERROR\n");
                        ret = -EFAULT;
                        break;
                }
@@ -393,13 +390,11 @@ static int s10_ops_write_complete(struct fpga_manager *mgr,
                timeout = ret;
                ret = 0;
 
-               if (test_and_clear_bit(SVC_STATUS_RECONFIG_COMPLETED,
-                                      &priv->status))
+               if (test_and_clear_bit(SVC_STATUS_COMPLETED, &priv->status))
                        break;
 
-               if (test_and_clear_bit(SVC_STATUS_RECONFIG_ERROR,
-                                      &priv->status)) {
-                       dev_err(dev, "ERROR - giving up - SVC_STATUS_RECONFIG_ERROR\n");
+               if (test_and_clear_bit(SVC_STATUS_ERROR, &priv->status)) {
+                       dev_err(dev, "ERROR - giving up - SVC_STATUS_ERROR\n");
                        ret = -EFAULT;
                        break;
                }
@@ -482,7 +477,8 @@ static int s10_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id s10_of_match[] = {
-       { .compatible = "intel,stratix10-soc-fpga-mgr", },
+       {.compatible = "intel,stratix10-soc-fpga-mgr"},
+       {.compatible = "intel,agilex-soc-fpga-mgr"},
        {},
 };