doc: Add bindings document for Xilinx LogiCore PR Decoupler
Subsystems (3)
Moritz Fischer
maintainerPATCH v4 1/2 doc: Add bindings document for Xilinx LogiCore PR Decoupler
This adds the binding documentation for the Xilinx LogiCORE PR Decoupler soft core.
---
Changes from v3:
- Addressed Michal's comments
- Addressed Alan's Comments
- Added Alan's Acked-by
Changes from v2:
- Added refence to generic fpga-region bindings
- Fixed up reg property in example
- Added fallback to "xlnx,pr-decoupler" without version
Changes from v1:
- Added clock names & clock to example
- Merged some of the description from Michal's version
--- .../bindings/fpga/xilinx-pr-decoupler.txt | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt
Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt new file +35 -0
@@ -0,0 +1,35 @@ +Xilinx LogiCORE Partial Reconfig Decoupler Softcore + +The Xilinx LogiCORE Partial Reconfig Decoupler manages one or more +decouplers / fpga bridges. +The controller can decouple/disable the bridges which prevents signal +changes from passing through the bridge. The controller can also +couple / enable the bridges which allows traffic to pass through the +bridge normally. + +The Driver supports only MMIO handling. A PR region can have multiple +PR Decouplers which can be handled independently or chained via decouple/ +decouple_status signals. + +Required properties: +- compatible : Should contain "xlnx,pr-decoupler-1.00" or "xlnx,pr-decoupler" +- regs : base address and size for decoupler module +- clocks : input clock to IP +- clock-names : should contain "aclk" + +Optional properties: +- bridge-enable : 0 if driver should disable bridge at startup + 1 if driver should enable bridge at startup + Default is to leave bridge in current state. + +See Documentation/devicetree/bindings/fpga/fpga-region.txt for generic bindings. + +Example: + fpga-bridge@100000450 { + compatible = "xlnx,pr-decoupler-1.00", + "xlnx-pr-decoupler"; + regs = <0x10000045 0x10>; + clocks = <&clkc 15>; + clock-names = "aclk"; + bridge-enable = <0>; + };
Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Moritz Fischer
maintainerPATCH v4 2/2 fpga: Add support for Xilinx LogiCORE PR Decoupler
This adds support for the Xilinx LogiCORE PR Decoupler soft-ip that does decoupling of PR regions in the FPGA fabric during partial reconfiguration.
---
Changes from v3:
- Adressed build bot issues
Changes from v2:
- Added Michal's Signed-off-by
- Added "xlnx,pr-decoupler" unversioned fallback
Changes from v1:
- Added Michal as Co-Author since I pulled in some of his code
- Reworked clk handling in _remove()
- Pulled in Michal's version of show_enable(), ditched priv->enabled
--- drivers/fpga/Kconfig | 10 +++ drivers/fpga/Makefile | 1 + drivers/fpga/xilinx-pr-decoupler.c | 161 +++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+) create mode 100644 drivers/fpga/xilinx-pr-decoupler.c
drivers/fpga/Kconfig +10 -0
@@ -63,6 +63,16 @@ config ALTERA_FREEZE_BRIDGE isolate one region of the FPGA from the busses while that region is being reprogrammed. +config XILINX_PR_DECOUPLER + tristate "Xilinx LogiCORE PR Decoupler" + depends on FPGA_BRIDGE + depends on HAS_IOMEM + help + Say Y to enable drivers for Xilinx LogiCORE PR Decoupler. + The PR Decoupler exists in the FPGA fabric to isolate one + region of the FPGA from the busses while that region is + being reprogrammed during partial reconfig. + endif # FPGA endmenu
drivers/fpga/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o +obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o # High Level Interfaces obj-$(CONFIG_FPGA_REGION) += fpga-region.o
drivers/fpga/xilinx-pr-decoupler.c new file +161 -0
161 lines not on this page · raw message
Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 2/2] fpga: Add support for Xilinx LogiCORE PR Decoupler
Quoted 6 lines · Moritz Fischer
This adds support for the Xilinx LogiCORE PR Decoupler soft-ip that does decoupling of PR regions in the FPGA fabric during partial reconfiguration.
Signed-off-by Moritz Fischer <[email protected]>Signed-off-by Michal Simek <[email protected]>
Quoted 226 lines
---
Changes from v3:
- Adressed build bot issuesChanges from v2:
- Added Michal's Signed-off-by
- Added "xlnx,pr-decoupler" unversioned fallbackChanges from v1:
- Added Michal as Co-Author since I pulled in some of his code
- Reworked clk handling in_remove()
- Pulled in Michal's version ofshow_enable(), ditchedpriv->enabled--- drivers/fpga/Kconfig | 10 +++ drivers/fpga/Makefile | 1 + drivers/fpga/xilinx-pr-decoupler.c | 161 +++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+) create mode 100644 drivers/fpga/xilinx-pr-decoupler.cdrivers/fpga/Kconfig +10
-0@@ -63,6 +63,16 @@ config ALTERA_FREEZE_BRIDGE isolate one region of the FPGA from the busses while that region is being reprogrammed. +config XILINX_PR_DECOUPLER + tristate "Xilinx LogiCORE PR Decoupler" + depends on FPGA_BRIDGE + depends on HAS_IOMEM + help + Say Y to enable drivers for Xilinx LogiCORE PR Decoupler. + The PR Decoupler exists in the FPGA fabric to isolate one + region of the FPGA from the busses while that region is + being reprogrammed during partial reconfig. + endif # FPGA endmenudrivers/fpga/Makefile +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o +obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o # High Level Interfaces obj-$(CONFIG_FPGA_REGION) += fpga-region.odrivers/fpga/xilinx-pr-decoupler.c new file +161
-1@@ -0,0 +1,161 @@ +/* +* Copyright (c) 2017, National Instruments Corp. +* Copyright (c) 2017, Xilix Inc +* +* FPGA Bridge Driver for the Xilinx LogiCORE Partial Reconfiguration +* Decoupler IP Core. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/of_device.h> +#include <linux/module.h> +#include <linux/fpga/fpga-bridge.h> + +#define CTRL_CMD_DECOUPLE BIT(0) +#define CTRL_CMD_COUPLE 0 +#define CTRL_OFFSET 0 + +struct xlnx_pr_decoupler_data { +void __iomem *io_base; +struct clk *clk; +}; + +static inline void xlnx_pr_decoupler_write (struct xlnx_pr_decoupler_data *d, +u32 offset,u32 val) +{ +writel (val, d->io_base + offset); +} + +static inline u32 xlnx_pr_decouple_read (const struct xlnx_pr_decoupler_data *d, +u32 offset) +{ +return readl (d->io_base + offset); +} + +static int xlnx_pr_decoupler_enable_set (struct fpga_bridge *bridge,bool enable) +{ +int err; +struct xlnx_pr_decoupler_data *priv = bridge->priv; + + err =clk_enable (priv->clk); +if (err) +return err; + +if (enable) +xlnx_pr_decoupler_write (priv,CTRL_OFFSET ,CTRL_CMD_COUPLE ); +else +xlnx_pr_decoupler_write (priv,CTRL_OFFSET ,CTRL_CMD_DECOUPLE ); + +clk_disable (priv->clk); + +return 0 ; +} + +static int xlnx_pr_decoupler_enable_show (struct fpga_bridge *bridge) +{ +const struct xlnx_pr_decoupler_data *priv = bridge->priv; +u32 status; +int err; + + err =clk_enable (priv->clk); +if (err) +return err; + + status =readl (priv->io_base); + +clk_disable (priv->clk); + +return !status; +} + +static struct fpga_bridge_ops xlnx_pr_decoupler_br_ops = { + .enable_set = xlnx_pr_decoupler_enable_set, + .enable_show = xlnx_pr_decoupler_enable_show, +}; + +static const struct of_device_id xlnx_pr_decoupler_of_match[] = { + { .compatible ="xlnx,pr-decoupler-1.00" , }, + { .compatible ="xlnx,pr-decoupler" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, xlnx_pr_decoupler_of_match); + +static int xlnx_pr_decoupler_probe (struct platform_device *pdev) +{ +struct xlnx_pr_decoupler_data *priv; +int err; +struct resource *res; + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + priv->io_base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->io_base)) +return PTR_ERR (priv->io_base); + + priv->clk =devm_clk_get (&pdev->dev,"aclk" ); +if (IS_ERR (priv->clk)) { +dev_err (&pdev->dev,"input clock not found\n" ); +return PTR_ERR (priv->clk); + } + + err =clk_prepare_enable (priv->clk); +if (err) { +dev_err (&pdev->dev,"unable to enable clock\n" ); +return err; + } + +clk_disable (priv->clk); + + err =fpga_bridge_register (&pdev->dev,"Xilinx PR Decoupler" , + &xlnx_pr_decoupler_br_ops, priv); + +if (err) { +dev_err (&pdev->dev,"unable to register Xilinx PR Decoupler" ); +clk_unprepare (priv->clk); +return err; + } + +return 0 ; +} + +static int xlnx_pr_decoupler_remove (struct platform_device *pdev) +{ +struct fpga_bridge *bridge =platform_get_drvdata (pdev); +struct xlnx_pr_decoupler_data *p = bridge->priv; + +fpga_bridge_unregister (&pdev->dev); + +clk_unprepare (p->clk); + +return 0 ; +} + +static struct platform_driver xlnx_pr_decoupler_driver = { + .probe = xlnx_pr_decoupler_probe, + .remove = xlnx_pr_decoupler_remove, + .driver = { + .name ="xlnx_pr_decoupler" , + .of_match_table =of_match_ptr (xlnx_pr_decoupler_of_match), + }, +}; + +module_platform_driver (xlnx_pr_decoupler_driver); + +MODULE_DESCRIPTION ("Xilinx Partial Reconfiguration Decoupler" ); +MODULE_AUTHOR ("Moritz Fischer <[email protected]>" ); +MODULE_AUTHOR ("Michal Simek <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); --2.7.4