4 files changed, 170 insertions, 1 deletions

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index c20445b867ae..d892f3efcd76 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -204,4 +204,13 @@ config FPGA_DFL_PCI
 
           To compile this as a module, choose M here.
 
+config FPGA_MGR_ZYNQMP_FPGA
+        tristate "Xilinx ZynqMP FPGA"
+        depends on ARCH_ZYNQMP || COMPILE_TEST
+        help
+          FPGA manager driver support for Xilinx ZynqMP FPGAs.
+          This driver uses the processor configuration port(PCAP)
+          to configure the programmable logic(PL) through PS
+          on ZynqMP SoC.
+
 endif # FPGA
diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
index c0dd4c82fbdb..312b9371742f 100644
--- a/drivers/fpga/Makefile
+++ b/drivers/fpga/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC)	+= stratix10-soc.o
 obj-$(CONFIG_FPGA_MGR_TS73XX)           += ts73xx-fpga.o
 obj-$(CONFIG_FPGA_MGR_XILINX_SPI)       += xilinx-spi.o
 obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA)        += zynq-fpga.o
+obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA)      += zynqmp-fpga.o
 obj-$(CONFIG_ALTERA_PR_IP_CORE)         += altera-pr-ip-core.o
 obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT)    += altera-pr-ip-core-plat.o
 
diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
index e18a786fc943..c438722bf4e1 100644
--- a/drivers/fpga/dfl-afu-dma-region.c
+++ b/drivers/fpga/dfl-afu-dma-region.c
@@ -102,7 +102,7 @@ static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata,
                 goto unlock_vm;
         }
 
-        pinned = get_user_pages_fast(region->user_addr, npages, 1,
+        pinned = get_user_pages_fast(region->user_addr, npages, FOLL_WRITE,
                                      region->pages);
         if (pinned < 0) {
                 ret = pinned;
diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c
new file mode 100644
index 000000000000..f7cbaadf49ab
--- /dev/null
+++ b/drivers/fpga/zynqmp-fpga.c
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Xilinx, Inc.
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/fpga/fpga-mgr.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/string.h>
+#include <linux/firmware/xlnx-zynqmp.h>
+
+/* Constant Definitions */
+#define IXR_FPGA_DONE_MASK      BIT(3)
+
+/**
+ * struct zynqmp_fpga_priv - Private data structure
+ * @dev:        Device data structure
+ * @flags:      flags which is used to identify the bitfile type
+ */
+struct zynqmp_fpga_priv {
+        struct device *dev;
+        u32 flags;
+};
+
+static int zynqmp_fpga_ops_write_init(struct fpga_manager *mgr,
+                                      struct fpga_image_info *info,
+                                      const char *buf, size_t size)
+{
+        struct zynqmp_fpga_priv *priv;
+
+        priv = mgr->priv;
+        priv->flags = info->flags;
+
+        return 0;
+}
+
+static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
+                                 const char *buf, size_t size)
+{
+        const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
+        struct zynqmp_fpga_priv *priv;
+        dma_addr_t dma_addr;
+        u32 eemi_flags = 0;
+        char *kbuf;
+        int ret;
+
+        if (!eemi_ops || !eemi_ops->fpga_load)
+                return -ENXIO;
+
+        priv = mgr->priv;
+
+        kbuf = dma_alloc_coherent(priv->dev, size, &dma_addr, GFP_KERNEL);
+        if (!kbuf)
+                return -ENOMEM;
+
+        memcpy(kbuf, buf, size);
+
+        wmb(); /* ensure all writes are done before initiate FW call */
+
+        if (priv->flags & FPGA_MGR_PARTIAL_RECONFIG)
+                eemi_flags |= XILINX_ZYNQMP_PM_FPGA_PARTIAL;
+
+        ret = eemi_ops->fpga_load(dma_addr, size, eemi_flags);
+
+        dma_free_coherent(priv->dev, size, kbuf, dma_addr);
+
+        return ret;
+}
+
+static int zynqmp_fpga_ops_write_complete(struct fpga_manager *mgr,
+                                          struct fpga_image_info *info)
+{
+        return 0;
+}
+
+static enum fpga_mgr_states zynqmp_fpga_ops_state(struct fpga_manager *mgr)
+{
+        const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
+        u32 status;
+
+        if (!eemi_ops || !eemi_ops->fpga_get_status)
+                return FPGA_MGR_STATE_UNKNOWN;
+
+        eemi_ops->fpga_get_status(&status);
+        if (status & IXR_FPGA_DONE_MASK)
+                return FPGA_MGR_STATE_OPERATING;
+
+        return FPGA_MGR_STATE_UNKNOWN;
+}
+
+static const struct fpga_manager_ops zynqmp_fpga_ops = {
+        .state = zynqmp_fpga_ops_state,
+        .write_init = zynqmp_fpga_ops_write_init,
+        .write = zynqmp_fpga_ops_write,
+        .write_complete = zynqmp_fpga_ops_write_complete,
+};
+
+static int zynqmp_fpga_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct zynqmp_fpga_priv *priv;
+        struct fpga_manager *mgr;
+        int ret;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->dev = dev;
+
+        mgr = devm_fpga_mgr_create(dev, "Xilinx ZynqMP FPGA Manager",
+                                   &zynqmp_fpga_ops, priv);
+        if (!mgr)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, mgr);
+
+        ret = fpga_mgr_register(mgr);
+        if (ret) {
+                dev_err(dev, "unable to register FPGA manager");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int zynqmp_fpga_remove(struct platform_device *pdev)
+{
+        struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+        fpga_mgr_unregister(mgr);
+
+        return 0;
+}
+
+static const struct of_device_id zynqmp_fpga_of_match[] = {
+        { .compatible = "xlnx,zynqmp-pcap-fpga", },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, zynqmp_fpga_of_match);
+
+static struct platform_driver zynqmp_fpga_driver = {
+        .probe = zynqmp_fpga_probe,
+        .remove = zynqmp_fpga_remove,
+        .driver = {
+                .name = "zynqmp_fpga_manager",
+                .of_match_table = of_match_ptr(zynqmp_fpga_of_match),
+        },
+};
+
+module_platform_driver(zynqmp_fpga_driver);
+
+MODULE_AUTHOR("Nava kishore Manne <navam@xilinx.com>");
+MODULE_DESCRIPTION("Xilinx ZynqMp FPGA Manager");
+MODULE_LICENSE("GPL");