UIO support for dfl devices
Subsystems (3)
Xu Yilun
maintainerv3 cover UIO support for dfl devices
This patchset supports some dfl device drivers written in userspace.
In the patchset v1, the "driver_override" interface should be used to bind the DFL UIO driver to DFL devices. But there is concern that the "driver_override" interface is not OK itself. So in v2, we use a new matching algorithem. The "driver_override" interface is abandoned, the DFL UIO driver matches any DFL device which could not be handled by other DFL drivers. So the DFL UIO driver could be used for new DFL devices which are not supported by kernel, also it will not impact the devices which are already got supported.
Main changes from v1:
- switch to the new matching algorithem. It matches DFL devices which could not be handled by other DFL drivers.
- refacor the code about device resources filling.
- add the documentation.
Main changes from v2:
- split the match ops changes in dfl.c to an independent patch.
- move the declarations needed for dfl-uio-pdev from include/linux/dfl.h to driver/fpga/dfl.h
- some minor fixes.
Xu Yilun (3):
fpga: dfl: add the match() ops for dfl driver
fpga: dfl: add the userspace I/O device support for DFL devices
Documentation: fpga: dfl: Add description for DFL UIO support
Documentation/fpga/dfl.rst | 27 +++++++++++ drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ drivers/fpga/dfl.c | 22 +++++++-- drivers/fpga/dfl.h | 5 ++ include/linux/dfl.h | 3 ++ 7 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 drivers/fpga/dfl-uio-pdev.c
Signature · 1 line
2.7.4
Xu Yilun
maintainerPATCH v3 1/3 fpga: dfl: add the match() ops for dfl driver
The match ops allows dfl drivers have their own matching algorithem instead of the standard id_table matching.
This is to support the DFL UIO driver. It intends to match any DFL device which could not be handled by other DFL drivers.
---
v3: this patch is splited out from DFL UIO patch.
move the declarations of exported symbols from include/linux/dfl.h
to driver/fpga/dfl.h
fix some comments.
--- drivers/fpga/dfl.c | 22 +++++++++++++++++----- drivers/fpga/dfl.h | 5 +++++ include/linux/dfl.h | 3 +++ 3 files changed, 25 insertions(+), 5 deletions(-)
drivers/fpga/dfl.c +17 -5
@@ -256,12 +256,13 @@ dfl_match_one_device(const struct dfl_device_id *id, struct dfl_device *ddev)return NULL ; } -static int dfl_bus_match (struct device *dev,struct device_driver *drv) +int dfl_match_device (struct dfl_device *ddev,struct dfl_driver *ddrv) { -struct dfl_device *ddev =to_dfl_dev (dev); -struct dfl_driver *ddrv =to_dfl_drv (drv);const struct dfl_device_id *id_entry; +if (ddrv->match) +return ddrv->match (ddev); + id_entry = ddrv->id_table;if (id_entry) {while (id_entry->feature_id) {
@@ -275,6 +276,15 @@ static int dfl_bus_match(struct device *dev, struct device_driver *drv)return 0 ; } +EXPORT_SYMBOL_GPL (dfl_match_device); + +static int dfl_bus_match (struct device *dev,struct device_driver *drv) +{ +struct dfl_device *ddev =to_dfl_dev (dev); +struct dfl_driver *ddrv =to_dfl_drv (drv); + +return dfl_match_device (ddev, ddrv); +}static int dfl_bus_probe (struct device *dev) {
@@ -328,7 +338,7 @@ static struct attribute *dfl_dev_attrs[] = { };ATTRIBUTE_GROUPS (dfl_dev); -static struct bus_type dfl_bus_type = { +struct bus_type dfl_bus_type = { .name ="dfl" , .match = dfl_bus_match, .probe = dfl_bus_probe,
@@ -336,6 +346,7 @@ static struct bus_type dfl_bus_type = { .uevent = dfl_bus_uevent, .dev_groups = dfl_dev_groups, }; +EXPORT_SYMBOL_GPL (dfl_bus_type);static void release_dfl_dev (struct device *dev) {
@@ -469,7 +480,8 @@ static int dfl_devs_add(struct dfl_feature_platform_data *pdata)int __dfl_driver_register (struct dfl_driver *dfl_drv,struct module *owner) { -if (!dfl_drv || !dfl_drv->probe || !dfl_drv->id_table) +if (!dfl_drv || !dfl_drv->probe || + (!dfl_drv->id_table && !dfl_drv->match))return -EINVAL ; dfl_drv->drv.owner = owner;
drivers/fpga/dfl.h +5 -0
@@ -17,6 +17,7 @@#include <linux/bitfield.h> #include <linux/cdev.h> #include <linux/delay.h> +#include <linux/dfl.h> #include <linux/eventfd.h> #include <linux/fs.h> #include <linux/interrupt.h>
@@ -517,4 +518,8 @@ long dfl_feature_ioctl_set_irq(struct platform_device *pdev,struct dfl_feature *feature, unsigned long arg); +extern struct bus_type dfl_bus_type; + +int dfl_match_device (struct dfl_device *ddev,struct dfl_driver *ddrv); +#endif /* __FPGA_DFL_H */
include/linux/dfl.h +3 -0
@@ -51,6 +51,8 @@ struct dfl_device {* @drv: driver model structure. * @id_table: pointer to table of device IDs the driver is interested in. * { } member terminated. +* @match: returns one if given device can be handled by the driver and zero +* otherwise. If NULL, matching is based on id_table. * @probe: mandatory callback for device binding. * @remove: callback for device unbinding. */
@@ -58,6 +60,7 @@ struct dfl_driver {struct device_driver drv;const struct dfl_device_id *id_table; +int (*match)(struct dfl_device *dfl_dev);int (*probe)(struct dfl_device *dfl_dev);void (*remove)(struct dfl_device *dfl_dev); };
Signature · 1 line
2.7.4
Re: [PATCH v3 1/3] fpga: dfl: add the match() ops for dfl driver
Quoted 7 lines · Xu Yilun
The match ops allows dfl drivers have their own matching algorithem instead of the standard
id_tablematching.This is to support the DFL UIO driver. It intends to match any DFL device which could not be handled by other DFL drivers.
Signed-off-by Xu Yilun <[email protected]>
This looks fine.
Quoted 117 lines
---
v3: this patch is splited out from DFL UIO patch.
move the declarations of exported symbols frominclude/linux/dfl.h
todriver/fpga/dfl.h
fix some comments.--- drivers/fpga/dfl.c | 22 +++++++++++++++++----- drivers/fpga/dfl.h | 5 +++++ include/linux/dfl.h | 3 +++ 3 files changed, 25 insertions(+), 5 deletions(-)drivers/fpga/dfl.c +17
-5@@ -256,12 +256,13 @@ dfl_match_one_device(const struct dfl_device_id *id, struct dfl_device *ddev)return NULL ; } -static int dfl_bus_match (struct device *dev,struct device_driver *drv) +int dfl_match_device (struct dfl_device *ddev,struct dfl_driver *ddrv) { -struct dfl_device *ddev =to_dfl_dev (dev); -struct dfl_driver *ddrv =to_dfl_drv (drv);const struct dfl_device_id *id_entry; +if (ddrv->match) +return ddrv->match (ddev); + id_entry = ddrv->id_table;if (id_entry) {while (id_entry->feature_id) {@@ -275,6 +276,15 @@ static int dfl_bus_match(struct device *dev, struct device_driver *drv)return 0 ; } +EXPORT_SYMBOL_GPL (dfl_match_device); + +static int dfl_bus_match (struct device *dev,struct device_driver *drv) +{ +struct dfl_device *ddev =to_dfl_dev (dev); +struct dfl_driver *ddrv =to_dfl_drv (drv); + +return dfl_match_device (ddev, ddrv); +}static int dfl_bus_probe (struct device *dev) {@@ -328,7 +338,7 @@ static struct attribute *dfl_dev_attrs[] = { };ATTRIBUTE_GROUPS (dfl_dev); -static struct bus_type dfl_bus_type = { +struct bus_type dfl_bus_type = { .name ="dfl" , .match = dfl_bus_match, .probe = dfl_bus_probe,@@ -336,6 +346,7 @@ static struct bus_type dfl_bus_type = { .uevent = dfl_bus_uevent, .dev_groups = dfl_dev_groups, }; +EXPORT_SYMBOL_GPL (dfl_bus_type);static void release_dfl_dev (struct device *dev) {@@ -469,7 +480,8 @@ static int dfl_devs_add(struct dfl_feature_platform_data *pdata)int __dfl_driver_register (struct dfl_driver *dfl_drv,struct module *owner) { -if (!dfl_drv || !dfl_drv->probe || !dfl_drv->id_table) +if (!dfl_drv || !dfl_drv->probe || + (!dfl_drv->id_table && !dfl_drv->match))return -EINVAL ; dfl_drv->drv.owner = owner;drivers/fpga/dfl.h +5
-0@@ -17,6 +17,7 @@#include <linux/bitfield.h> #include <linux/cdev.h> #include <linux/delay.h> +#include <linux/dfl.h> #include <linux/eventfd.h> #include <linux/fs.h> #include <linux/interrupt.h> @@ -517,4 +518,8 @@ long dfl_feature_ioctl_set_irq(struct platform_device *pdev,struct dfl_feature *feature, unsigned long arg); +extern struct bus_type dfl_bus_type; + +int dfl_match_device (struct dfl_device *ddev,struct dfl_driver *ddrv); +#endif /* __FPGA_DFL_H */ include/linux/dfl.h +3
-0@@ -51,6 +51,8 @@ struct dfl_device {* @drv: driver model structure. * @id_table: pointer to table of device IDs the driver is interested in. * { } member terminated. +* @match: returns one if given device can be handled by the driver and zero +* otherwise. If NULL, matching is based on id_table. * @probe: mandatory callback for device binding. * @remove: callback for device unbinding. */ @@ -58,6 +60,7 @@ struct dfl_driver {struct device_driver drv;const struct dfl_device_id *id_table; +int (*match)(struct dfl_device *dfl_dev);int (*probe)(struct dfl_device *dfl_dev);void (*remove)(struct dfl_device *dfl_dev); };
Xu Yilun
maintainerPATCH v3 2/3 fpga: dfl: add the userspace I/O device support for DFL devices
In reply to Xu YilunThis patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
The driver leverages the uio_pdrv_genirq, it adds the uio_pdrv_genirq platform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.
The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
---
v2: switch to the new matching algorithem. It matches DFL devices which
could not be handled by other DFL drivers.
refacor the code about device resources filling.
fix some comments.
v3: split the dfl.c changes out of this patch.
some minor fixes
--- drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 drivers/fpga/dfl-uio-pdev.c
drivers/fpga/Kconfig +10 -0
@@ -202,6 +202,16 @@ config FPGA_DFL_NIOS_INTEL_PAC_N3000 the card. It also instantiates the SPI master (spi-altera) for the card's BMC (Board Management Controller). +config FPGA_DFL_UIO_PDEV + tristate "FPGA DFL Driver for Userspace I/O platform devices" + depends on FPGA_DFL && UIO_PDRV_GENIRQ + help + Enable this to allow some DFL drivers be written in userspace. It + adds the uio_pdrv_genirq platform device with the DFL feature's + resources, and lets the generic UIO platform device driver provide + support for userspace access to kernel interrupts and memory + locations. + config FPGA_DFL_PCI tristate "FPGA DFL PCIe Device Driver" depends on PCI && FPGA_DFL
drivers/fpga/Makefile +1 -0
@@ -45,6 +45,7 @@ dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o dfl-afu-objs += dfl-afu-error.o obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o +obj-$(CONFIG_FPGA_DFL_UIO_PDEV) += dfl-uio-pdev.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o
drivers/fpga/dfl-uio-pdev.c new file +110 -0
110 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
Quoted 11 lines · Xu Yilun
This patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
The driver leverages the
uio_pdrv_genirq, it adds theuio_pdrv_genirqplatform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
Thanks for splitting out the match part, this looks fine.
Quoted 164 lines
Signed-off-by Xu Yilun <[email protected]>---
v2: switch to the new matching algorithem. It matches DFL devices which
could not be handled by other DFL drivers.
refacor the code about device resources filling.
fix some comments.
v3: split thedfl.cchanges out of this patch.
some minor fixes--- drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 drivers/fpga/dfl-uio-pdev.cdrivers/fpga/Kconfig +10
-0@@ -202,6 +202,16 @@ config FPGA_DFL_NIOS_INTEL_PAC_N3000 the card. It also instantiates the SPI master (spi-altera) for the card's BMC (Board Management Controller). +config FPGA_DFL_UIO_PDEV + tristate "FPGA DFL Driver for Userspace I/O platform devices" + depends on FPGA_DFL && UIO_PDRV_GENIRQ + help + Enable this to allow some DFL drivers be written in userspace. It + adds the uio_pdrv_genirq platform device with the DFL feature's + resources, and lets the generic UIO platform device driver provide + support for userspace access to kernel interrupts and memory + locations. + config FPGA_DFL_PCI tristate "FPGA DFL PCIe Device Driver" depends on PCI && FPGA_DFLdrivers/fpga/Makefile +1
-0@@ -45,6 +45,7 @@ dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o dfl-afu-objs += dfl-afu-error.o obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o +obj-$(CONFIG_FPGA_DFL_UIO_PDEV) += dfl-uio-pdev.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.odrivers/fpga/dfl-uio-pdev.c new file +110
-0@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* DFL driver for Userspace I/O platform devices +* +* Copyright (C) 2020 Intel Corporation, Inc. +*/ +#include <linux/dfl.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/uio_driver.h> + +#include "dfl.h" + +#define DRIVER_NAME "dfl-uio-pdev" + +static struct dfl_driver dfl_uio_pdev_driver; + +static int check_for_other_drv_match (struct device_driver *drv,void *data) +{ +struct dfl_driver *ddrv =to_dfl_drv (drv); +struct dfl_device *ddev = data; + +/* skip myself */ +if (ddrv == &dfl_uio_pdev_driver) +return 0 ; + +return dfl_match_device (ddev, ddrv); +} + +static int dfl_uio_pdev_match (struct dfl_device *ddev) +{ +/* +* If any other driver wants the device, leave the device to this other +* driver. +*/ +if (bus_for_each_drv (&dfl_bus_type,NULL , ddev, check_for_other_drv_match)) +return 0 ; + +return 1 ; +} + +static int dfl_uio_pdev_probe (struct dfl_device *ddev) +{ +struct device *dev = &ddev->dev; +struct platform_device_info pdevinfo = {0 }; +struct uio_info uio_pdata = {0 }; +struct platform_device *uio_pdev; +struct resource *res; +int i; + + pdevinfo.name ="uio_pdrv_genirq" ; + + res =kcalloc (ddev->num_irqs +1 ,sizeof (*res),GFP_KERNEL ); +if (!res) +return -ENOMEM ; + + res[0 ].parent = &ddev->mmio_res; + res[0 ].flags =IORESOURCE_MEM ; + res[0 ].start = ddev->mmio_res.start; + res[0 ].end = ddev->mmio_res.end; + +/* then add irq resource */ +for (i =0 ; i < ddev->num_irqs; i++) { + res[i +1 ].flags =IORESOURCE_IRQ ; + res[i +1 ].start = ddev->irqs[i]; + res[i +1 ].end = ddev->irqs[i]; + } + + uio_pdata.name =DRIVER_NAME ; + uio_pdata.version ="0" ; + + pdevinfo.res = res; + pdevinfo.num_res = ddev->num_irqs +1 ; + pdevinfo.parent = &ddev->dev; + pdevinfo.id =PLATFORM_DEVID_AUTO ; + pdevinfo.data = &uio_pdata; + pdevinfo.size_data =sizeof (uio_pdata); + + uio_pdev =platform_device_register_full (&pdevinfo); +if (!IS_ERR (uio_pdev)) +dev_set_drvdata (dev, uio_pdev); + +kfree (res); + +return PTR_ERR_OR_ZERO (uio_pdev); +} + +static void dfl_uio_pdev_remove (struct dfl_device *ddev) +{ +struct platform_device *uio_pdev =dev_get_drvdata (&ddev->dev); + +platform_device_unregister (uio_pdev); +} + +static struct dfl_driver dfl_uio_pdev_driver = { + .drv = { + .name =DRIVER_NAME , + }, + .match = dfl_uio_pdev_match, + .probe = dfl_uio_pdev_probe, + .remove = dfl_uio_pdev_remove, +}; +module_dfl_driver (dfl_uio_pdev_driver); + +MODULE_DESCRIPTION ("DFL driver for Userspace I/O platform devices" ); +MODULE_AUTHOR ("Intel Corporation" ); +MODULE_LICENSE ("GPL v2" );
RE: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
In reply to Xu YilunQuoted 6 lines
Subject: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
This patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
Quoted 8 lines
The driver leverages the
uio_pdrv_genirq, it adds theuio_pdrv_genirqplatform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
Looks like we want to build UIO driver as the default/generic driver for DFL, it seems fine but my concern is that UIO has its own limitation, if some day, dfl device is extended, but UIO has limitation, then we may need to select another one as the default driver.. or we can just match them using id_table as we know UIO meets the requirement for those DFL devices?
Quoted 24 lines
Signed-off-by Xu Yilun <[email protected]>---
v2: switch to the new matching algorithem. It matches DFL devices which
could not be handled by other DFL drivers.
refacor the code about device resources filling.
fix some comments.
v3: split thedfl.cchanges out of this patch.
some minor fixes--- drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 drivers/fpga/dfl-uio-pdev.cdrivers/fpga/Kconfig +0
-0@@ -202,6 +202,16 @@ config FPGA_DFL_NIOS_INTEL_PAC_N3000 the card. It also instantiates the SPI master (spi-altera) for the card's BMC (Board Management Controller).
drivers/fpga/Kconfig config FPGA_DFL_NIOS_INTEL_PAC_N3000 · line 213
Quoted 10 lines
drivers/fpga/Kconfig +9
-0+config FPGA_DFL_UIO_PDEV + tristate "FPGA DFL Driver for Userspace I/O platform devices" + depends on FPGA_DFL && UIO_PDRV_GENIRQ + help + Enable this to allow some DFL drivers be written in userspace. It + adds the uio_pdrv_genirq platform device with the DFL feature's + resources, and lets the generic UIO platform device driver provide + support for userspace access to kernel interrupts and memory + locations.
If we consider this as a default driver for everybody in DFL, then we could consider build it into the core, otherwise it always requires to be loaded manually, right?
Quoted 84 lines
drivers/fpga/Kconfig +1
-0+ config FPGA_DFL_PCI tristate "FPGA DFL PCIe Device Driver" depends on PCI && FPGA_DFLdrivers/fpga/Makefile +0
-0@@ -45,6 +45,7 @@ dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o
dfl-afu-objs += dfl-afu-error.oobj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o
drivers/fpga/Makefile +1
-0+obj-$(CONFIG_FPGA_DFL_UIO_PDEV) += dfl-uio-pdev.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.odrivers/fpga/dfl-uio-pdev.c new file +39
-0@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* DFL driver for Userspace I/O platform devices +* +* Copyright (C) 2020 Intel Corporation, Inc. +*/ +#include <linux/dfl.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/uio_driver.h> + +#include "dfl.h" + +#define DRIVER_NAME "dfl-uio-pdev" + +static struct dfl_driver dfl_uio_pdev_driver; + +static int check_for_other_drv_match (struct device_driver *drv,void *data) +{ +struct dfl_driver *ddrv =to_dfl_drv (drv); +struct dfl_device *ddev = data; + +/* skip myself */ +if (ddrv == &dfl_uio_pdev_driver) +return 0 ; + +return dfl_match_device (ddev, ddrv); +} + +static int dfl_uio_pdev_match (struct dfl_device *ddev) +{ +/* +* If any other driver wants the device, leave the device to this other +* driver. +*/ + if (bus_for_each_drv(&dfl_bus_type, NULL, ddev,
check_for_other_drv_match))drivers/fpga/dfl-uio-pdev.c new file +21
-0+return 0 ; + +return 1 ; +} + +static int dfl_uio_pdev_probe (struct dfl_device *ddev) +{ +struct device *dev = &ddev->dev; +struct platform_device_info pdevinfo = {0 }; +struct uio_info uio_pdata = {0 }; +struct platform_device *uio_pdev; +struct resource *res; +int i; + + pdevinfo.name ="uio_pdrv_genirq" ; + + res =kcalloc (ddev->num_irqs +1 ,sizeof (*res),GFP_KERNEL ); +if (!res) +return -ENOMEM ; + + res[0 ].parent = &ddev->mmio_res;
drivers/fpga/dfl-uio-pdev.c line 70
Quoted 10 lines
drivers/fpga/dfl-uio-pdev.c new file +10
-0+ res[0 ].flags =IORESOURCE_MEM ; + res[0 ].start = ddev->mmio_res.start; + res[0 ].end = ddev->mmio_res.end; + +/* then add irq resource */ +for (i =0 ; i < ddev->num_irqs; i++) { + res[i +1 ].flags =IORESOURCE_IRQ ; + res[i +1 ].start = ddev->irqs[i]; + res[i +1 ].end = ddev->irqs[i]; + }
How many interrupts UIO could support? or we need some warning or just even return error here?
Thanks
Hao
Quoted 42 lines
drivers/fpga/dfl-uio-pdev.c new file +40
-1+ + uio_pdata.name =DRIVER_NAME ; + uio_pdata.version ="0" ; + + pdevinfo.res = res; + pdevinfo.num_res = ddev->num_irqs +1 ; + pdevinfo.parent = &ddev->dev; + pdevinfo.id =PLATFORM_DEVID_AUTO ; + pdevinfo.data = &uio_pdata; + pdevinfo.size_data =sizeof (uio_pdata); + + uio_pdev =platform_device_register_full (&pdevinfo); +if (!IS_ERR (uio_pdev)) +dev_set_drvdata (dev, uio_pdev); + +kfree (res); + +return PTR_ERR_OR_ZERO (uio_pdev); +} + +static void dfl_uio_pdev_remove (struct dfl_device *ddev) +{ +struct platform_device *uio_pdev =dev_get_drvdata (&ddev->dev); + +platform_device_unregister (uio_pdev); +} + +static struct dfl_driver dfl_uio_pdev_driver = { + .drv = { + .name =DRIVER_NAME , + }, + .match = dfl_uio_pdev_match, + .probe = dfl_uio_pdev_probe, + .remove = dfl_uio_pdev_remove, +}; +module_dfl_driver (dfl_uio_pdev_driver); + +MODULE_DESCRIPTION ("DFL driver for Userspace I/O platform devices" ); +MODULE_AUTHOR ("Intel Corporation" ); +MODULE_LICENSE ("GPL v2" ); --2.7.4
Tom Rix
reviewerRe: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
Quoted 11 lines · Hao
Quoted 11 lines
Subject: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
This patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
The driver leverages the
uio_pdrv_genirq, it adds theuio_pdrv_genirqplatform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.
Quoted 8 lines
Quoted 3 lines
The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
Looks like we want to build UIO driver as the default/generic driver for DFL, it seems fine but my concern is that UIO has its own limitation, if some day, dfl device is extended, but UIO has limitation, then we may need to select another one as the default driver.. or we can just match them using
id_tableas we know UIO meets the requirement for those DFL devices?
When we have multiple defaults, could this be handled in the configury ?
Tom
Quoted 180 lines
Quoted 24 lines
Signed-off-by Xu Yilun <[email protected]>---
v2: switch to the new matching algorithem. It matches DFL devices which
could not be handled by other DFL drivers.
refacor the code about device resources filling.
fix some comments.
v3: split thedfl.cchanges out of this patch.
some minor fixes--- drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 drivers/fpga/dfl-uio-pdev.cdrivers/fpga/Kconfig +0
-0@@ -202,6 +202,16 @@ config FPGA_DFL_NIOS_INTEL_PAC_N3000 the card. It also instantiates the SPI master (spi-altera) for the card's BMC (Board Management Controller).drivers/fpga/Kconfig config FPGA_DFL_NIOS_INTEL_PAC_N3000 · line 213
Quoted 10 lines
drivers/fpga/Kconfig +9
-0+config FPGA_DFL_UIO_PDEV + tristate "FPGA DFL Driver for Userspace I/O platform devices" + depends on FPGA_DFL && UIO_PDRV_GENIRQ + help + Enable this to allow some DFL drivers be written in userspace. It + adds the uio_pdrv_genirq platform device with the DFL feature's + resources, and lets the generic UIO platform device driver provide + support for userspace access to kernel interrupts and memory + locations.If we consider this as a default driver for everybody in DFL, then we could consider build it into the core, otherwise it always requires to be loaded manually, right?
Quoted 84 lines
drivers/fpga/Kconfig +1
-0+ config FPGA_DFL_PCI tristate "FPGA DFL PCIe Device Driver" depends on PCI && FPGA_DFLdrivers/fpga/Makefile +0
-0@@ -45,6 +45,7 @@ dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o
dfl-afu-objs += dfl-afu-error.oobj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o
drivers/fpga/Makefile +1
-0+obj-$(CONFIG_FPGA_DFL_UIO_PDEV) += dfl-uio-pdev.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.odrivers/fpga/dfl-uio-pdev.c new file +39
-0@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* DFL driver for Userspace I/O platform devices +* +* Copyright (C) 2020 Intel Corporation, Inc. +*/ +#include <linux/dfl.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/uio_driver.h> + +#include "dfl.h" + +#define DRIVER_NAME "dfl-uio-pdev" + +static struct dfl_driver dfl_uio_pdev_driver; + +static int check_for_other_drv_match (struct device_driver *drv,void *data) +{ +struct dfl_driver *ddrv =to_dfl_drv (drv); +struct dfl_device *ddev = data; + +/* skip myself */ +if (ddrv == &dfl_uio_pdev_driver) +return 0 ; + +return dfl_match_device (ddev, ddrv); +} + +static int dfl_uio_pdev_match (struct dfl_device *ddev) +{ +/* +* If any other driver wants the device, leave the device to this other +* driver. +*/ + if (bus_for_each_drv(&dfl_bus_type, NULL, ddev,
check_for_other_drv_match))drivers/fpga/dfl-uio-pdev.c new file +21
-0+return 0 ; + +return 1 ; +} + +static int dfl_uio_pdev_probe (struct dfl_device *ddev) +{ +struct device *dev = &ddev->dev; +struct platform_device_info pdevinfo = {0 }; +struct uio_info uio_pdata = {0 }; +struct platform_device *uio_pdev; +struct resource *res; +int i; + + pdevinfo.name ="uio_pdrv_genirq" ; + + res =kcalloc (ddev->num_irqs +1 ,sizeof (*res),GFP_KERNEL ); +if (!res) +return -ENOMEM ; + + res[0 ].parent = &ddev->mmio_res;drivers/fpga/dfl-uio-pdev.c line 70
Quoted 10 lines
drivers/fpga/dfl-uio-pdev.c new file +10
-0+ res[0 ].flags =IORESOURCE_MEM ; + res[0 ].start = ddev->mmio_res.start; + res[0 ].end = ddev->mmio_res.end; + +/* then add irq resource */ +for (i =0 ; i < ddev->num_irqs; i++) { + res[i +1 ].flags =IORESOURCE_IRQ ; + res[i +1 ].start = ddev->irqs[i]; + res[i +1 ].end = ddev->irqs[i]; + }How many interrupts UIO could support? or we need some warning or just even return error here?
Thanks
HaoQuoted 42 lines
drivers/fpga/dfl-uio-pdev.c new file +40
-1+ + uio_pdata.name =DRIVER_NAME ; + uio_pdata.version ="0" ; + + pdevinfo.res = res; + pdevinfo.num_res = ddev->num_irqs +1 ; + pdevinfo.parent = &ddev->dev; + pdevinfo.id =PLATFORM_DEVID_AUTO ; + pdevinfo.data = &uio_pdata; + pdevinfo.size_data =sizeof (uio_pdata); + + uio_pdev =platform_device_register_full (&pdevinfo); +if (!IS_ERR (uio_pdev)) +dev_set_drvdata (dev, uio_pdev); + +kfree (res); + +return PTR_ERR_OR_ZERO (uio_pdev); +} + +static void dfl_uio_pdev_remove (struct dfl_device *ddev) +{ +struct platform_device *uio_pdev =dev_get_drvdata (&ddev->dev); + +platform_device_unregister (uio_pdev); +} + +static struct dfl_driver dfl_uio_pdev_driver = { + .drv = { + .name =DRIVER_NAME , + }, + .match = dfl_uio_pdev_match, + .probe = dfl_uio_pdev_probe, + .remove = dfl_uio_pdev_remove, +}; +module_dfl_driver (dfl_uio_pdev_driver); + +MODULE_DESCRIPTION ("DFL driver for Userspace I/O platform devices" ); +MODULE_AUTHOR ("Intel Corporation" ); +MODULE_LICENSE ("GPL v2" ); --2.7.4
RE: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
Quoted 20 lines
Subject: Re: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
Quoted 1 line · Hao
Quoted 1 line
Subject: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support
for
Quoted 13 lines
Quoted 13 lines
DFL devices
This patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
The driver leverages the
uio_pdrv_genirq, it adds theuio_pdrv_genirqplatform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
Quoted 7 lines
Quoted 5 lines
Looks like we want to build UIO driver as the default/generic driver for DFL, it seems fine but my concern is that UIO has its own limitation, if some day, dfl device is extended, but UIO has limitation, then we may need to select another one as the default driver.. or we can just match them using
id_tableas we know UIO meets the requirement for those DFL devices?When we have multiple defaults, could this be handled in the configury ?
Do you mean select it using configuration options? But if people have already created the software stack on the old one, then it's a valid requirement that we need both old and new defaults working at the same time... it's hard to ask everybody to switch to the new one.
Hao
Quoted 3 lines
Tom
Xu Yilun
maintainerRe: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
In reply to Tom RixQuoted 13 lines · Tom Rix
Quoted 11 lines · Hao
Quoted 11 lines
Subject: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
This patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
The driver leverages the
uio_pdrv_genirq, it adds theuio_pdrv_genirqplatform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
Looks like we want to build UIO driver as the default/generic driver for DFL,
I'm not going to make UIO as the default driver for DFL devs, the driver module will not be autoloaded. I want to provide a choice to operate on the unhandled devs in userspace. Insmod it if it helps otherwise leave it.
Quoted 3 lines
Quoted 3 lines
it seems fine but my concern is that UIO has its own limitation, if some day, dfl device is extended, but UIO has limitation, then we may need to select another one as the default driver.. or we can just match them using
I think we may not have to select a "default" driver, if we have a better way for userspace accessing, we could load that module, leave UIO.
Quoted 1 line
Quoted 1 line
id_tableas we know UIO meets the requirement for those DFL devices?
As we discussed, the drawback is that we should always change the code to support a new dfl device for user accessing. But it is OK to me if the generic UIO match rule is not considered proper.
Quoted 2 lines
When we have multiple defaults, could this be handled in the configury ?
I think we don't have to select a "default".
Quoted 40 lines
Tom
Quoted 37 lines
Quoted 24 lines
Signed-off-by Xu Yilun <[email protected]>---
v2: switch to the new matching algorithem. It matches DFL devices which
could not be handled by other DFL drivers.
refacor the code about device resources filling.
fix some comments.
v3: split thedfl.cchanges out of this patch.
some minor fixes--- drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 drivers/fpga/dfl-uio-pdev.cdrivers/fpga/Kconfig +0
-0@@ -202,6 +202,16 @@ config FPGA_DFL_NIOS_INTEL_PAC_N3000 the card. It also instantiates the SPI master (spi-altera) for the card's BMC (Board Management Controller).drivers/fpga/Kconfig config FPGA_DFL_NIOS_INTEL_PAC_N3000 · line 213
Quoted 10 lines
drivers/fpga/Kconfig +9
-0+config FPGA_DFL_UIO_PDEV + tristate "FPGA DFL Driver for Userspace I/O platform devices" + depends on FPGA_DFL && UIO_PDRV_GENIRQ + help + Enable this to allow some DFL drivers be written in userspace. It + adds the uio_pdrv_genirq platform device with the DFL feature's + resources, and lets the generic UIO platform device driver provide + support for userspace access to kernel interrupts and memory + locations.If we consider this as a default driver for everybody in DFL, then we could consider build it into the core, otherwise it always requires to be loaded manually, right?
It should be loaded manually. I don't want to make this as default.
Quoted 89 lines
Quoted 89 lines
Quoted 89 lines
drivers/fpga/Kconfig +1
-0+ config FPGA_DFL_PCI tristate "FPGA DFL PCIe Device Driver" depends on PCI && FPGA_DFLdrivers/fpga/Makefile +0
-0@@ -45,6 +45,7 @@ dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o
dfl-afu-objs += dfl-afu-error.oobj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o
drivers/fpga/Makefile +1
-0+obj-$(CONFIG_FPGA_DFL_UIO_PDEV) += dfl-uio-pdev.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.odrivers/fpga/dfl-uio-pdev.c new file +39
-0@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* DFL driver for Userspace I/O platform devices +* +* Copyright (C) 2020 Intel Corporation, Inc. +*/ +#include <linux/dfl.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/uio_driver.h> + +#include "dfl.h" + +#define DRIVER_NAME "dfl-uio-pdev" + +static struct dfl_driver dfl_uio_pdev_driver; + +static int check_for_other_drv_match (struct device_driver *drv,void *data) +{ +struct dfl_driver *ddrv =to_dfl_drv (drv); +struct dfl_device *ddev = data; + +/* skip myself */ +if (ddrv == &dfl_uio_pdev_driver) +return 0 ; + +return dfl_match_device (ddev, ddrv); +} + +static int dfl_uio_pdev_match (struct dfl_device *ddev) +{ +/* +* If any other driver wants the device, leave the device to this other +* driver. +*/ + if (bus_for_each_drv(&dfl_bus_type, NULL, ddev,
check_for_other_drv_match))drivers/fpga/dfl-uio-pdev.c new file +25
-0+return 0 ; + +return 1 ; +} + +static int dfl_uio_pdev_probe (struct dfl_device *ddev) +{ +struct device *dev = &ddev->dev; +struct platform_device_info pdevinfo = {0 }; +struct uio_info uio_pdata = {0 }; +struct platform_device *uio_pdev; +struct resource *res; +int i; + + pdevinfo.name ="uio_pdrv_genirq" ; + + res =kcalloc (ddev->num_irqs +1 ,sizeof (*res),GFP_KERNEL ); +if (!res) +return -ENOMEM ; + + res[0 ].parent = &ddev->mmio_res; + res[0 ].flags =IORESOURCE_MEM ; + res[0 ].start = ddev->mmio_res.start; + res[0 ].end = ddev->mmio_res.end; +
Quoted 8 lines
Quoted 8 lines
drivers/fpga/dfl-uio-pdev.c line 70
Quoted 6 lines
drivers/fpga/dfl-uio-pdev.c new file +6
-0+/* then add irq resource */ +for (i =0 ; i < ddev->num_irqs; i++) { + res[i +1 ].flags =IORESOURCE_IRQ ; + res[i +1 ].start = ddev->irqs[i]; + res[i +1 ].end = ddev->irqs[i]; + }How many interrupts UIO could support? or we need some warning or just even return error here?
Yes, I can add some warning here.
Thanks,
Yilun
RE: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
Quoted 21 lines
Subject: Re: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support for DFL devices
Quoted 3 lines · Tom Rix
Quoted 1 line · Hao
Quoted 1 line
Subject: [PATCH v3 2/3] fpga: dfl: add the userspace I/O device support
for
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
DFL devices
This patch supports the DFL drivers be written in userspace. This is realized by exposing the userspace I/O device interfaces.
The driver leverages the
uio_pdrv_genirq, it adds theuio_pdrv_genirqplatform device with the DFL device's resources, and let the generic UIO platform device driver provide support to userspace access to kernel interrupts and memory locations.The driver matches DFL devices in a different way. It has no device id table, instead it matches any DFL device which could not be handled by other DFL drivers.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Looks like we want to build UIO driver as the default/generic driver for
DFL,
I'm not going to make UIO as the default driver for DFL devs, the driver module will not be autoloaded. I want to provide a choice to operate on the unhandled devs in userspace. Insmod it if it helps otherwise leave it.
But once it's loaded, then it will bind with all dfl devices which doesn't have a matched driver yet.
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines
it seems fine but my concern is that UIO has its own limitation, if some
day,
Quoted 2 lines
Quoted 2 lines
dfl device is extended, but UIO has limitation, then we may need to select another one as the default driver.. or we can just match them using
I think we may not have to select a "default" driver, if we have a better way for userspace accessing, we could load that module, leave UIO.
It would not be an easy decision, it may impact users who have already built upper layer software on top of UIO, and ask new users to use new one too. Users may not be happy with this.
Quoted 11 lines
Quoted 2 lines
Quoted 2 lines
id_tableas we know UIO meets the requirement for those DFL devices?As we discussed, the drawback is that we should always change the code to support a new dfl device for user accessing. But it is OK to me if the generic UIO match rule is not considered proper.
Quoted 2 lines
When we have multiple defaults, could this be handled in the configury ?
I think we don't have to select a "default".
Actually I am fine with the idea of using a default / generic driver for DFL device, and my only concern is UIO may not be good enough for us per my understanding. Maybe we can have a more extendable one as the generic driver, but if we don't have that yet, then using id table may be able to avoid some problems I think.
Hao
Quoted 149 lines
Quoted 41 lines
Tom
Quoted 37 lines
Quoted 24 lines
Signed-off-by Xu Yilun <[email protected]>---
v2: switch to the new matching algorithem. It matches DFL devices which
could not be handled by other DFL drivers.
refacor the code about device resources filling.
fix some comments.
v3: split thedfl.cchanges out of this patch.
some minor fixes--- drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 drivers/fpga/dfl-uio-pdev.cdrivers/fpga/Kconfig +0
-0@@ -202,6 +202,16 @@ config FPGA_DFL_NIOS_INTEL_PAC_N3000 the card. It also instantiates the SPI master (spi-altera) for the card's BMC (Board Management Controller).drivers/fpga/Kconfig config FPGA_DFL_NIOS_INTEL_PAC_N3000 · line 213
Quoted 10 lines
drivers/fpga/Kconfig +9
-0+config FPGA_DFL_UIO_PDEV + tristate "FPGA DFL Driver for Userspace I/O platform devices" + depends on FPGA_DFL && UIO_PDRV_GENIRQ + help + Enable this to allow some DFL drivers be written in userspace. It + adds the uio_pdrv_genirq platform device with the DFL feature's + resources, and lets the generic UIO platform device driver provide + support for userspace access to kernel interrupts and memory + locations.If we consider this as a default driver for everybody in DFL, then we could consider build it into the core, otherwise it always requires to be loaded manually, right?
It should be loaded manually. I don't want to make this as default.
Quoted 10 lines
Quoted 10 lines
drivers/fpga/Makefile dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-
Quoted 10 lines
drivers/fpga/Kconfig +1
-0+ config FPGA_DFL_PCI tristate "FPGA DFL PCIe Device Driver" depends on PCI && FPGA_DFLdrivers/fpga/Makefile +0
-0@@ -45,6 +45,7 @@ dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
dma-region.o
dfl-afu-objs += dfl-afu-error.oobj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-
nios.o
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
drivers/fpga/Makefile +1
-0+obj-$(CONFIG_FPGA_DFL_UIO_PDEV) += dfl-uio-pdev.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.odrivers/fpga/dfl-uio-pdev.c new file +13
-0@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* DFL driver for Userspace I/O platform devices +* +* Copyright (C) 2020 Intel Corporation, Inc. +*/ +#include <linux/dfl.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/uio_driver.h> Quoted 8 lines
Quoted 8 lines
drivers/fpga/dfl-uio-pdev.c
Quoted 8 lines
drivers/fpga/dfl-uio-pdev.c new file +8
-0+ +#include "dfl.h" + +#define DRIVER_NAME "dfl-uio-pdev" + +static struct dfl_driver dfl_uio_pdev_driver; + +static int check_for_other_drv_match(struct device_driver *drv, void*data)
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
drivers/fpga/dfl-uio-pdev.c new file +18
-0+{ +struct dfl_driver *ddrv =to_dfl_drv (drv); +struct dfl_device *ddev = data; + +/* skip myself */ +if (ddrv == &dfl_uio_pdev_driver) +return 0 ; + +return dfl_match_device (ddev, ddrv); +} + +static int dfl_uio_pdev_match (struct dfl_device *ddev) +{ +/* +* If any other driver wants the device, leave the device to this other +* driver. +*/ + if (bus_for_each_drv(&dfl_bus_type, NULL, ddev,
check_for_other_drv_match))drivers/fpga/dfl-uio-pdev.c new file +25
-0+return 0 ; + +return 1 ; +} + +static int dfl_uio_pdev_probe (struct dfl_device *ddev) +{ +struct device *dev = &ddev->dev; +struct platform_device_info pdevinfo = {0 }; +struct uio_info uio_pdata = {0 }; +struct platform_device *uio_pdev; +struct resource *res; +int i; + + pdevinfo.name ="uio_pdrv_genirq" ; + + res =kcalloc (ddev->num_irqs +1 ,sizeof (*res),GFP_KERNEL ); +if (!res) +return -ENOMEM ; + + res[0 ].parent = &ddev->mmio_res; + res[0 ].flags =IORESOURCE_MEM ; + res[0 ].start = ddev->mmio_res.start; + res[0 ].end = ddev->mmio_res.end; +Quoted 8 lines
Quoted 8 lines
drivers/fpga/dfl-uio-pdev.c line 70
Quoted 6 lines
drivers/fpga/dfl-uio-pdev.c new file +6
-0+/* then add irq resource */ +for (i =0 ; i < ddev->num_irqs; i++) { + res[i +1 ].flags =IORESOURCE_IRQ ; + res[i +1 ].start = ddev->irqs[i]; + res[i +1 ].end = ddev->irqs[i]; + }How many interrupts UIO could support? or we need some warning or just even return error here?
Yes, I can add some warning here.
Thanks,
Yilun
Xu Yilun
maintainerPATCH v3 3/3 Documentation: fpga: dfl: Add description for DFL UIO support
In reply to Xu YilunThis patch adds description for UIO support for dfl devices on DFL bus.
---
v2: no doc in v1, add it for v2.
v3: some documentation fixes.
--- Documentation/fpga/dfl.rst | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
Documentation/fpga/dfl.rst +27 -0
@@ -7,6 +7,7 @@ Authors: - Enno Luebbers <[email protected]> - Xiao Guangrong <[email protected]> - Wu Hao <[email protected]> +- Xu Yilun <[email protected]> The Device Feature List (DFL) FPGA framework (and drivers according to this framework) hides the very details of low layer hardwares and provides
@@ -502,6 +503,32 @@ FME Partial Reconfiguration Sub Feature driver (see drivers/fpga/dfl-fme-pr.c) could be a reference. +UIO support for DFL devices +=========================== +The purpose of an FPGA is to be reprogrammed with newly developed hardware +components. New hardware can instantiate a new private feature in the DFL, and +then get a DFL device in their system. In some cases users may need a userspace +driver for the DFL device: + +* Users may need to run some diagnostic test for their hardwares. +* Users may prototype the kernel driver in user space. +* Some hardware is designed for specific purposes and does not fit into one of + the standard kernel subsystems. + +This requires the direct access to the MMIO space and interrupt handling in +userspace. The dfl-uio-pdev module exposes the UIO device interfaces for this +purpose. It adds the uio_pdrv_genirq platform device with the resources of +the DFL feature, and lets the generic UIO platform device driver provide UIO +support to userspace. + +FPGA_DFL_UIO_PDEV should be selected to enable this feature. + +The DFL UIO driver has a special matching algorithem. It will match any DFL +device which could not be handled by other DFL drivers. In this way, it will +not impact the functionality of the features which are already supported by the +system. + + Open discussion =============== FME driver exports one ioctl (DFL_FPGA_FME_PORT_PR) for partial reconfiguration
Signature · 1 line
2.7.4
Re: [PATCH v3 3/3] Documentation: fpga: dfl: Add description for DFL UIO support
Quoted 2 lines · Xu Yilun
This patch adds description for UIO support for dfl devices on DFL bus.
Thanks for the changes.
Quoted 53 lines
Signed-off-by Xu Yilun <[email protected]>---
v2: no doc in v1, add it for v2.
v3: some documentation fixes.--- Documentation/fpga/dfl.rst | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)Documentation/fpga/dfl.rst +27
-0@@ -7,6 +7,7 @@ Authors: - Enno Luebbers <[email protected]> - Xiao Guangrong <[email protected]> - Wu Hao <[email protected]> +- Xu Yilun <[email protected]> The Device Feature List (DFL) FPGA framework (and drivers according to this framework) hides the very details of low layer hardwares and provides@@ -502,6 +503,32 @@ FME Partial Reconfiguration Sub Feature driver (see drivers/fpga/dfl-fme-pr.c) could be a reference. +UIO support for DFL devices +=========================== +The purpose of an FPGA is to be reprogrammed with newly developed hardware +components. New hardware can instantiate a new private feature in the DFL, and +then get a DFL device in their system. In some cases users may need a userspace +driver for the DFL device: + +* Users may need to run some diagnostic test for their hardwares. +* Users may prototype the kernel driver in user space. +* Some hardware is designed for specific purposes and does not fit into one of + the standard kernel subsystems. + +This requires the direct access to the MMIO space and interrupt handling in +userspace. The dfl-uio-pdev module exposes the UIO device interfaces for this +purpose. It adds the uio_pdrv_genirq platform device with the resources of +the DFL feature, and lets the generic UIO platform device driver provide UIO +support to userspace. + +FPGA_DFL_UIO_PDEV should be selected to enable this feature. + +The DFL UIO driver has a special matching algorithem. It will match any DFL +device which could not be handled by other DFL drivers. In this way, it will +not impact the functionality of the features which are already supported by the +system. + + Open discussion =============== FME driver exports one ioctl (DFL_FPGA_FME_PORT_PR) for partial reconfiguration
Tom Rix
reviewerQuoted 10 lines · Xu Yilun
This patchset supports some dfl device drivers written in userspace.
In the patchset v1, the "
driver_override" interface should be used to bind the DFL UIO driver to DFL devices. But there is concern that the "driver_override" interface is not OK itself. So in v2, we use a new matching algorithem. The "driver_override" interface is abandoned, the DFL UIO driver matches any DFL device which could not be handled by other DFL drivers. So the DFL UIO driver could be used for new DFL devices which are not supported by kernel, also it will not impact the devices which are already got supported.
This set looks good to me.
Moritz,
Is it possible to get this into 5.11 ?
Tom
Quoted 29 lines
Main changes from v1:
- switch to the new matching algorithem. It matches DFL devices which could not be handled by other DFL drivers.
- refacor the code about device resources filling.
- add the documentation.Main changes from v2:
- split the match ops changes indfl.cto an independent patch.
- move the declarations needed for dfl-uio-pdev frominclude/linux/dfl.htodriver/fpga/dfl.h
- some minor fixes.Xu Yilun (3):
fpga: dfl: add thematch()ops for dfl driver
fpga: dfl: add the userspace I/O device support for DFL devices
Documentation: fpga: dfl: Add description for DFL UIO supportDocumentation/fpga/dfl.rst | 27 +++++++++++ drivers/fpga/Kconfig | 10 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-uio-pdev.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ drivers/fpga/dfl.c | 22 +++++++-- drivers/fpga/dfl.h | 5 ++ include/linux/dfl.h | 3 ++ 7 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 drivers/fpga/dfl-uio-pdev.c
Quoted 13 lines · Tom Rix
Quoted 10 lines · Xu Yilun
This patchset supports some dfl device drivers written in userspace.
In the patchset v1, the "
driver_override" interface should be used to bind the DFL UIO driver to DFL devices. But there is concern that the "driver_override" interface is not OK itself. So in v2, we use a new matching algorithem. The "driver_override" interface is abandoned, the DFL UIO driver matches any DFL device which could not be handled by other DFL drivers. So the DFL UIO driver could be used for new DFL devices which are not supported by kernel, also it will not impact the devices which are already got supported.
Quoted 5 lines
This set looks good to me.
Moritz,
Is it possible to get this into 5.11 ?
How would that be possible?
New features have to be in linux-next successfully, _BEFORE_ the merge window opens. Please read Documentation/process/ for how we do all of this...
thanks,
greg k-h