| Message ID | 20210218064019.29189-19-lizhih@xilinx.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | XRT Alveo driver overview | expand |
Hi Lizhi,
I love your patch! Yet something to improve:
[auto build test ERROR on linux/master]
[also build test ERROR on linus/master v5.11 next-20210217]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Lizhi-Hou/XRT-Alveo-driver-overview/20210218-151631
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 2ab38c17aac10bf55ab3efde4c4db3893d8691d2
config: parisc-randconfig-r025-20210218 (attached as .config)
compiler: hppa64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/9069f42b5fcafe471ceb1047ee53983098b2edba
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Lizhi-Hou/XRT-Alveo-driver-overview/20210218-151631
git checkout 9069f42b5fcafe471ceb1047ee53983098b2edba
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=parisc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
drivers/fpga/xrt/lib/main.c: In function 'xleaf_register_driver':
>> drivers/fpga/xrt/lib/main.c:144:8: error: implicit declaration of function 'vzalloc'; did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
144 | map = vzalloc(sizeof(*map));
| ^~~~~~~
| kvzalloc
>> drivers/fpga/xrt/lib/main.c:144:6: warning: assignment to 'struct xrt_drv_map *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
144 | map = vzalloc(sizeof(*map));
| ^
drivers/fpga/xrt/lib/main.c: In function 'xleaf_unregister_driver':
>> drivers/fpga/xrt/lib/main.c:181:2: error: implicit declaration of function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
181 | vfree(map);
| ^~~~~
| kvfree
cc1: some warnings being treated as errors
vim +144 drivers/fpga/xrt/lib/main.c
898da78383bc51 Lizhi Hou 2021-02-17 127
898da78383bc51 Lizhi Hou 2021-02-17 128 int xleaf_register_driver(enum xrt_subdev_id id,
898da78383bc51 Lizhi Hou 2021-02-17 129 struct platform_driver *drv,
898da78383bc51 Lizhi Hou 2021-02-17 130 struct xrt_subdev_endpoints *eps)
898da78383bc51 Lizhi Hou 2021-02-17 131 {
898da78383bc51 Lizhi Hou 2021-02-17 132 struct xrt_drv_map *map;
898da78383bc51 Lizhi Hou 2021-02-17 133
898da78383bc51 Lizhi Hou 2021-02-17 134 mutex_lock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 135
898da78383bc51 Lizhi Hou 2021-02-17 136 map = xrt_drv_find_map_by_id_nolock(id);
898da78383bc51 Lizhi Hou 2021-02-17 137 if (map) {
898da78383bc51 Lizhi Hou 2021-02-17 138 mutex_unlock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 139 pr_err("Id %d already has a registered driver, 0x%p\n",
898da78383bc51 Lizhi Hou 2021-02-17 140 id, map->drv);
898da78383bc51 Lizhi Hou 2021-02-17 141 return -EEXIST;
898da78383bc51 Lizhi Hou 2021-02-17 142 }
898da78383bc51 Lizhi Hou 2021-02-17 143
898da78383bc51 Lizhi Hou 2021-02-17 @144 map = vzalloc(sizeof(*map));
898da78383bc51 Lizhi Hou 2021-02-17 145 if (!map) {
898da78383bc51 Lizhi Hou 2021-02-17 146 mutex_unlock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 147 return -ENOMEM;
898da78383bc51 Lizhi Hou 2021-02-17 148 }
898da78383bc51 Lizhi Hou 2021-02-17 149 map->id = id;
898da78383bc51 Lizhi Hou 2021-02-17 150 map->drv = drv;
898da78383bc51 Lizhi Hou 2021-02-17 151 map->eps = eps;
898da78383bc51 Lizhi Hou 2021-02-17 152
898da78383bc51 Lizhi Hou 2021-02-17 153 xrt_drv_register_driver(map);
898da78383bc51 Lizhi Hou 2021-02-17 154
898da78383bc51 Lizhi Hou 2021-02-17 155 list_add(&map->list, &xrt_drv_maps);
898da78383bc51 Lizhi Hou 2021-02-17 156
898da78383bc51 Lizhi Hou 2021-02-17 157 mutex_unlock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 158
898da78383bc51 Lizhi Hou 2021-02-17 159 return 0;
898da78383bc51 Lizhi Hou 2021-02-17 160 }
898da78383bc51 Lizhi Hou 2021-02-17 161 EXPORT_SYMBOL_GPL(xleaf_register_driver);
898da78383bc51 Lizhi Hou 2021-02-17 162
898da78383bc51 Lizhi Hou 2021-02-17 163 void xleaf_unregister_driver(enum xrt_subdev_id id)
898da78383bc51 Lizhi Hou 2021-02-17 164 {
898da78383bc51 Lizhi Hou 2021-02-17 165 struct xrt_drv_map *map;
898da78383bc51 Lizhi Hou 2021-02-17 166
898da78383bc51 Lizhi Hou 2021-02-17 167 mutex_lock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 168
898da78383bc51 Lizhi Hou 2021-02-17 169 map = xrt_drv_find_map_by_id_nolock(id);
898da78383bc51 Lizhi Hou 2021-02-17 170 if (!map) {
898da78383bc51 Lizhi Hou 2021-02-17 171 mutex_unlock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 172 pr_err("Id %d has no registered driver\n", id);
898da78383bc51 Lizhi Hou 2021-02-17 173 return;
898da78383bc51 Lizhi Hou 2021-02-17 174 }
898da78383bc51 Lizhi Hou 2021-02-17 175
898da78383bc51 Lizhi Hou 2021-02-17 176 list_del(&map->list);
898da78383bc51 Lizhi Hou 2021-02-17 177
898da78383bc51 Lizhi Hou 2021-02-17 178 mutex_unlock(&xrt_lib_lock);
898da78383bc51 Lizhi Hou 2021-02-17 179
898da78383bc51 Lizhi Hou 2021-02-17 180 xrt_drv_unregister_driver(map);
898da78383bc51 Lizhi Hou 2021-02-17 @181 vfree(map);
898da78383bc51 Lizhi Hou 2021-02-17 182 }
898da78383bc51 Lizhi Hou 2021-02-17 183 EXPORT_SYMBOL_GPL(xleaf_unregister_driver);
898da78383bc51 Lizhi Hou 2021-02-17 184
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
As I am looking through the files, I have this comment. fpga/ is currently a single directory, while files could be organized in subdirectories like dfl/pci.c instead have the possible subdir name as a prefix to the filename. dfl-pci.c For consistency, xrt/metadata/metadata.c should be xrt-metadata.c Likewise the build infra needs to integrated within the existing files fpga/Kconfig,Makefile This is a bigish refactor, so let's get a second opinion. Moritz ? On 2/17/21 10:40 PM, Lizhi Hou wrote: > Update fpga Kconfig/Makefile and add Kconfig/Makefile for new drivers. Expand the comment, there are several new configs that could use an explanation > > Signed-off-by: Sonal Santan <sonal.santan@xilinx.com> > Signed-off-by: Max Zhen <max.zhen@xilinx.com> > Signed-off-by: Lizhi Hou <lizhih@xilinx.com> > --- > MAINTAINERS | 11 +++++++++++ > drivers/Makefile | 1 + > drivers/fpga/Kconfig | 2 ++ > drivers/fpga/Makefile | 4 ++++ > drivers/fpga/xrt/Kconfig | 8 ++++++++ > drivers/fpga/xrt/lib/Kconfig | 16 ++++++++++++++++ > drivers/fpga/xrt/lib/Makefile | 30 ++++++++++++++++++++++++++++++ > drivers/fpga/xrt/metadata/Kconfig | 12 ++++++++++++ > drivers/fpga/xrt/metadata/Makefile | 16 ++++++++++++++++ > drivers/fpga/xrt/mgmt/Kconfig | 15 +++++++++++++++ > drivers/fpga/xrt/mgmt/Makefile | 19 +++++++++++++++++++ > 11 files changed, 134 insertions(+) > create mode 100644 drivers/fpga/xrt/Kconfig > create mode 100644 drivers/fpga/xrt/lib/Kconfig > create mode 100644 drivers/fpga/xrt/lib/Makefile > create mode 100644 drivers/fpga/xrt/metadata/Kconfig > create mode 100644 drivers/fpga/xrt/metadata/Makefile > create mode 100644 drivers/fpga/xrt/mgmt/Kconfig > create mode 100644 drivers/fpga/xrt/mgmt/Makefile > > diff --git a/MAINTAINERS b/MAINTAINERS > index d3e847f7f3dc..e6e147c2454c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6973,6 +6973,17 @@ F: Documentation/fpga/ > F: drivers/fpga/ > F: include/linux/fpga/ > > +FPGA XRT DRIVERS > +M: Lizhi Hou <lizhi.hou@xilinx.com> > +R: Max Zhen <max.zhen@xilinx.com> > +R: Sonal Santan <sonal.santan@xilinx.com> > +L: linux-fpga@vger.kernel.org > +S: Maintained > +W: https://github.com/Xilinx/XRT > +F: Documentation/fpga/xrt.rst > +F: drivers/fpga/xrt/ > +F: include/uapi/linux/xrt/ > + > FPU EMULATOR > M: Bill Metzenthen <billm@melbpc.org.au> > S: Maintained > diff --git a/drivers/Makefile b/drivers/Makefile > index fd11b9ac4cc3..e03912af8e48 100644 > --- a/drivers/Makefile > +++ b/drivers/Makefile > @@ -178,6 +178,7 @@ obj-$(CONFIG_STM) += hwtracing/stm/ > obj-$(CONFIG_ANDROID) += android/ > obj-$(CONFIG_NVMEM) += nvmem/ > obj-$(CONFIG_FPGA) += fpga/ > +obj-y += fpga/xrt/metadata/ This is wrong. Move metadata building to fpga/ Makefile and pick an appropriate config, not just 'obj-y' > obj-$(CONFIG_FSI) += fsi/ > obj-$(CONFIG_TEE) += tee/ > obj-$(CONFIG_MULTIPLEXER) += mux/ > diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig > index 5645226ca3ce..aeca635b1f25 100644 > --- a/drivers/fpga/Kconfig > +++ b/drivers/fpga/Kconfig > @@ -216,4 +216,6 @@ config FPGA_MGR_ZYNQMP_FPGA > to configure the programmable logic(PL) through PS > on ZynqMP SoC. > > +source "drivers/fpga/xrt/Kconfig" > + > endif # FPGA > diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile > index d8e21dfc6778..2b4453ff7c52 100644 > --- a/drivers/fpga/Makefile > +++ b/drivers/fpga/Makefile > @@ -46,3 +46,7 @@ dfl-afu-objs += dfl-afu-error.o > > # Drivers for FPGAs which implement DFL > obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o > + > +# XRT drivers for Alveo > +obj-$(CONFIG_FPGA_XRT_LIB) += xrt/lib/ > +obj-$(CONFIG_FPGA_XRT_XMGMT) += xrt/mgmt/ I don't see how mgmnt would work without lib. If that is so these configs could collapse to CONFIG_FPGA_XRT > diff --git a/drivers/fpga/xrt/Kconfig b/drivers/fpga/xrt/Kconfig > new file mode 100644 > index 000000000000..0e2c59589ddd > --- /dev/null > +++ b/drivers/fpga/xrt/Kconfig > @@ -0,0 +1,8 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# Xilinx Alveo FPGA device configuration > +# > + > +source "drivers/fpga/xrt/metadata/Kconfig" > +source "drivers/fpga/xrt/lib/Kconfig" > +source "drivers/fpga/xrt/mgmt/Kconfig" > diff --git a/drivers/fpga/xrt/lib/Kconfig b/drivers/fpga/xrt/lib/Kconfig > new file mode 100644 > index 000000000000..eed5cb73f5e2 > --- /dev/null > +++ b/drivers/fpga/xrt/lib/Kconfig > @@ -0,0 +1,16 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# XRT Alveo FPGA device configuration > +# > + > +config FPGA_XRT_LIB > + tristate "XRT Alveo Driver Library" > + depends on HWMON && PCI && HAS_IOMEM > + select FPGA_XRT_METADATA > + help > + Select this option to enable Xilinx XRT Alveo driver library. This > + library is core infrastructure of XRT Alveo FPGA drivers which > + provides functions for working with device nodes, iteration and > + lookup of platform devices, common interfaces for platform devices, > + plumbing of function call and ioctls between platform devices and > + parent partitions. > diff --git a/drivers/fpga/xrt/lib/Makefile b/drivers/fpga/xrt/lib/Makefile > new file mode 100644 > index 000000000000..5641231b2a36 > --- /dev/null > +++ b/drivers/fpga/xrt/lib/Makefile > @@ -0,0 +1,30 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > +# > +# Authors: Sonal.Santan@xilinx.com > +# > + > +FULL_XRT_PATH=$(srctree)/$(src)/.. > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > + > +obj-$(CONFIG_FPGA_XRT_LIB) += xrt-lib.o > + > +xrt-lib-objs := \ > + main.o \ > + xroot.o \ > + xclbin.o \ > + subdev.o \ > + cdev.o \ > + group.o \ > + xleaf/vsec.o \ > + xleaf/axigate.o \ > + xleaf/devctl.o \ > + xleaf/icap.o \ > + xleaf/clock.o \ > + xleaf/clkfreq.o \ > + xleaf/ucs.o \ > + xleaf/calib.o \ > + > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > + -I$(FULL_DTC_PATH) > diff --git a/drivers/fpga/xrt/metadata/Kconfig b/drivers/fpga/xrt/metadata/Kconfig > new file mode 100644 > index 000000000000..5012c9c6584d > --- /dev/null > +++ b/drivers/fpga/xrt/metadata/Kconfig > @@ -0,0 +1,12 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# XRT Alveo FPGA device configuration > +# > + > +config FPGA_XRT_METADATA > + bool "XRT Alveo Driver Metadata Parser" > + select LIBFDT > + help > + This option provides helper functions to parse Xilinx Alveo FPGA > + firmware metadata. The metadata is in device tree format and XRT and the XRT > + driver uses it to discover HW subsystems behind PCIe BAR. the HW > diff --git a/drivers/fpga/xrt/metadata/Makefile b/drivers/fpga/xrt/metadata/Makefile > new file mode 100644 > index 000000000000..14f65ef1595c > --- /dev/null > +++ b/drivers/fpga/xrt/metadata/Makefile > @@ -0,0 +1,16 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > +# > +# Authors: Sonal.Santan@xilinx.com > +# > + > +FULL_XRT_PATH=$(srctree)/$(src)/.. > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > + > +obj-$(CONFIG_FPGA_XRT_METADATA) += xrt-md.o > + > +xrt-md-objs := metadata.o > + > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > + -I$(FULL_DTC_PATH) > diff --git a/drivers/fpga/xrt/mgmt/Kconfig b/drivers/fpga/xrt/mgmt/Kconfig > new file mode 100644 > index 000000000000..2b2a2c34685c > --- /dev/null > +++ b/drivers/fpga/xrt/mgmt/Kconfig > @@ -0,0 +1,15 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# Xilinx XRT FPGA device configuration > +# > + > +config FPGA_XRT_XMGMT > + tristate "Xilinx Alveo Management Driver" > + depends on HWMON && PCI && FPGA_XRT_LIB FPGA_XRT_LIB also depends on HWMON and PCI, so this could be minimized. Tom > + select FPGA_XRT_METADATA > + select FPGA_BRIDGE > + select FPGA_REGION > + help > + Select this option to enable XRT PCIe driver for Xilinx Alveo FPGA. > + This driver provides interfaces for userspace application to access > + Alveo FPGA device. > diff --git a/drivers/fpga/xrt/mgmt/Makefile b/drivers/fpga/xrt/mgmt/Makefile > new file mode 100644 > index 000000000000..8051708c361c > --- /dev/null > +++ b/drivers/fpga/xrt/mgmt/Makefile > @@ -0,0 +1,19 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > +# > +# Authors: Sonal.Santan@xilinx.com > +# > + > +FULL_XRT_PATH=$(srctree)/$(src)/.. > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > + > +obj-$(CONFIG_FPGA_XRT_XMGMT) += xmgmt.o > + > +xmgmt-objs := root.o \ > + main.o \ > + fmgr-drv.o \ > + main-region.o > + > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > + -I$(FULL_DTC_PATH)
On Sun, Feb 21, 2021 at 06:57:31AM -0800, Tom Rix wrote: > As I am looking through the files, I have this comment. > > fpga/ is currently a single directory, while files could be organized in subdirectories like > > dfl/pci.c > > instead have the possible subdir name as a prefix to the filename. > > dfl-pci.c > > For consistency, > > xrt/metadata/metadata.c > > should be > > xrt-metadata.c Agreed. Keep the prefix. > > Likewise the build infra needs to integrated within the existing files fpga/Kconfig,Makefile > > This is a bigish refactor, so let's get a second opinion. In what sense? You mean adding a subdirectory? Maybe something like this drivers/fpga - dfl/ - xilinx/ - intel/ - lattice/ - xrt/ ... would generally make sense. We didn't have enough drivers to prioritize that yet, but we can look into it. > > Moritz ? > > On 2/17/21 10:40 PM, Lizhi Hou wrote: > > Update fpga Kconfig/Makefile and add Kconfig/Makefile for new drivers. > Expand the comment, there are several new configs that could use an explanation > > > > Signed-off-by: Sonal Santan <sonal.santan@xilinx.com> > > Signed-off-by: Max Zhen <max.zhen@xilinx.com> > > Signed-off-by: Lizhi Hou <lizhih@xilinx.com> > > --- > > MAINTAINERS | 11 +++++++++++ > > drivers/Makefile | 1 + > > drivers/fpga/Kconfig | 2 ++ > > drivers/fpga/Makefile | 4 ++++ > > drivers/fpga/xrt/Kconfig | 8 ++++++++ > > drivers/fpga/xrt/lib/Kconfig | 16 ++++++++++++++++ > > drivers/fpga/xrt/lib/Makefile | 30 ++++++++++++++++++++++++++++++ > > drivers/fpga/xrt/metadata/Kconfig | 12 ++++++++++++ > > drivers/fpga/xrt/metadata/Makefile | 16 ++++++++++++++++ > > drivers/fpga/xrt/mgmt/Kconfig | 15 +++++++++++++++ > > drivers/fpga/xrt/mgmt/Makefile | 19 +++++++++++++++++++ > > 11 files changed, 134 insertions(+) > > create mode 100644 drivers/fpga/xrt/Kconfig > > create mode 100644 drivers/fpga/xrt/lib/Kconfig > > create mode 100644 drivers/fpga/xrt/lib/Makefile > > create mode 100644 drivers/fpga/xrt/metadata/Kconfig > > create mode 100644 drivers/fpga/xrt/metadata/Makefile > > create mode 100644 drivers/fpga/xrt/mgmt/Kconfig > > create mode 100644 drivers/fpga/xrt/mgmt/Makefile > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index d3e847f7f3dc..e6e147c2454c 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -6973,6 +6973,17 @@ F: Documentation/fpga/ > > F: drivers/fpga/ > > F: include/linux/fpga/ > > > > +FPGA XRT DRIVERS > > +M: Lizhi Hou <lizhi.hou@xilinx.com> > > +R: Max Zhen <max.zhen@xilinx.com> > > +R: Sonal Santan <sonal.santan@xilinx.com> > > +L: linux-fpga@vger.kernel.org > > +S: Maintained > > +W: https://github.com/Xilinx/XRT > > +F: Documentation/fpga/xrt.rst > > +F: drivers/fpga/xrt/ > > +F: include/uapi/linux/xrt/ > > + > > FPU EMULATOR > > M: Bill Metzenthen <billm@melbpc.org.au> > > S: Maintained > > diff --git a/drivers/Makefile b/drivers/Makefile > > index fd11b9ac4cc3..e03912af8e48 100644 > > --- a/drivers/Makefile > > +++ b/drivers/Makefile > > @@ -178,6 +178,7 @@ obj-$(CONFIG_STM) += hwtracing/stm/ > > obj-$(CONFIG_ANDROID) += android/ > > obj-$(CONFIG_NVMEM) += nvmem/ > > obj-$(CONFIG_FPGA) += fpga/ > > +obj-y += fpga/xrt/metadata/ > > This is wrong. > > Move metadata building to fpga/ Makefile and pick an appropriate config, not just 'obj-y' > > > obj-$(CONFIG_FSI) += fsi/ > > obj-$(CONFIG_TEE) += tee/ > > obj-$(CONFIG_MULTIPLEXER) += mux/ > > diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig > > index 5645226ca3ce..aeca635b1f25 100644 > > --- a/drivers/fpga/Kconfig > > +++ b/drivers/fpga/Kconfig > > @@ -216,4 +216,6 @@ config FPGA_MGR_ZYNQMP_FPGA > > to configure the programmable logic(PL) through PS > > on ZynqMP SoC. > > > > +source "drivers/fpga/xrt/Kconfig" > > + > > endif # FPGA > > diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile > > index d8e21dfc6778..2b4453ff7c52 100644 > > --- a/drivers/fpga/Makefile > > +++ b/drivers/fpga/Makefile > > @@ -46,3 +46,7 @@ dfl-afu-objs += dfl-afu-error.o > > > > # Drivers for FPGAs which implement DFL > > obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o > > + > > +# XRT drivers for Alveo > > +obj-$(CONFIG_FPGA_XRT_LIB) += xrt/lib/ > > +obj-$(CONFIG_FPGA_XRT_XMGMT) += xrt/mgmt/ > > I don't see how mgmnt would work without lib. If that is so > > these configs could collapse to CONFIG_FPGA_XRT > > > diff --git a/drivers/fpga/xrt/Kconfig b/drivers/fpga/xrt/Kconfig > > new file mode 100644 > > index 000000000000..0e2c59589ddd > > --- /dev/null > > +++ b/drivers/fpga/xrt/Kconfig > > @@ -0,0 +1,8 @@ > > +# SPDX-License-Identifier: GPL-2.0-only > > +# > > +# Xilinx Alveo FPGA device configuration > > +# > > + > > +source "drivers/fpga/xrt/metadata/Kconfig" > > +source "drivers/fpga/xrt/lib/Kconfig" > > +source "drivers/fpga/xrt/mgmt/Kconfig" > > diff --git a/drivers/fpga/xrt/lib/Kconfig b/drivers/fpga/xrt/lib/Kconfig > > new file mode 100644 > > index 000000000000..eed5cb73f5e2 > > --- /dev/null > > +++ b/drivers/fpga/xrt/lib/Kconfig > > @@ -0,0 +1,16 @@ > > +# SPDX-License-Identifier: GPL-2.0-only > > +# > > +# XRT Alveo FPGA device configuration > > +# > > + > > +config FPGA_XRT_LIB > > + tristate "XRT Alveo Driver Library" > > + depends on HWMON && PCI && HAS_IOMEM > > + select FPGA_XRT_METADATA > > + help > > + Select this option to enable Xilinx XRT Alveo driver library. This > > + library is core infrastructure of XRT Alveo FPGA drivers which > > + provides functions for working with device nodes, iteration and > > + lookup of platform devices, common interfaces for platform devices, > > + plumbing of function call and ioctls between platform devices and > > + parent partitions. > > diff --git a/drivers/fpga/xrt/lib/Makefile b/drivers/fpga/xrt/lib/Makefile > > new file mode 100644 > > index 000000000000..5641231b2a36 > > --- /dev/null > > +++ b/drivers/fpga/xrt/lib/Makefile > > @@ -0,0 +1,30 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +# > > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > > +# > > +# Authors: Sonal.Santan@xilinx.com > > +# > > + > > +FULL_XRT_PATH=$(srctree)/$(src)/.. > > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > > + > > +obj-$(CONFIG_FPGA_XRT_LIB) += xrt-lib.o > > + > > +xrt-lib-objs := \ > > + main.o \ > > + xroot.o \ > > + xclbin.o \ > > + subdev.o \ > > + cdev.o \ > > + group.o \ > > + xleaf/vsec.o \ > > + xleaf/axigate.o \ > > + xleaf/devctl.o \ > > + xleaf/icap.o \ > > + xleaf/clock.o \ > > + xleaf/clkfreq.o \ > > + xleaf/ucs.o \ > > + xleaf/calib.o \ > > + > > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > > + -I$(FULL_DTC_PATH) > > diff --git a/drivers/fpga/xrt/metadata/Kconfig b/drivers/fpga/xrt/metadata/Kconfig > > new file mode 100644 > > index 000000000000..5012c9c6584d > > --- /dev/null > > +++ b/drivers/fpga/xrt/metadata/Kconfig > > @@ -0,0 +1,12 @@ > > +# SPDX-License-Identifier: GPL-2.0-only > > +# > > +# XRT Alveo FPGA device configuration > > +# > > + > > +config FPGA_XRT_METADATA > > + bool "XRT Alveo Driver Metadata Parser" > > + select LIBFDT > > + help > > + This option provides helper functions to parse Xilinx Alveo FPGA > > + firmware metadata. The metadata is in device tree format and XRT > and the XRT > > + driver uses it to discover HW subsystems behind PCIe BAR. > the HW > > diff --git a/drivers/fpga/xrt/metadata/Makefile b/drivers/fpga/xrt/metadata/Makefile > > new file mode 100644 > > index 000000000000..14f65ef1595c > > --- /dev/null > > +++ b/drivers/fpga/xrt/metadata/Makefile > > @@ -0,0 +1,16 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +# > > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > > +# > > +# Authors: Sonal.Santan@xilinx.com > > +# > > + > > +FULL_XRT_PATH=$(srctree)/$(src)/.. > > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > > + > > +obj-$(CONFIG_FPGA_XRT_METADATA) += xrt-md.o > > + > > +xrt-md-objs := metadata.o > > + > > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > > + -I$(FULL_DTC_PATH) > > diff --git a/drivers/fpga/xrt/mgmt/Kconfig b/drivers/fpga/xrt/mgmt/Kconfig > > new file mode 100644 > > index 000000000000..2b2a2c34685c > > --- /dev/null > > +++ b/drivers/fpga/xrt/mgmt/Kconfig > > @@ -0,0 +1,15 @@ > > +# SPDX-License-Identifier: GPL-2.0-only > > +# > > +# Xilinx XRT FPGA device configuration > > +# > > + > > +config FPGA_XRT_XMGMT > > + tristate "Xilinx Alveo Management Driver" > > + depends on HWMON && PCI && FPGA_XRT_LIB > > FPGA_XRT_LIB also depends on HWMON and PCI, so this could be minimized. > > Tom > > > + select FPGA_XRT_METADATA > > + select FPGA_BRIDGE > > + select FPGA_REGION > > + help > > + Select this option to enable XRT PCIe driver for Xilinx Alveo FPGA. > > + This driver provides interfaces for userspace application to access > > + Alveo FPGA device. > > diff --git a/drivers/fpga/xrt/mgmt/Makefile b/drivers/fpga/xrt/mgmt/Makefile > > new file mode 100644 > > index 000000000000..8051708c361c > > --- /dev/null > > +++ b/drivers/fpga/xrt/mgmt/Makefile > > @@ -0,0 +1,19 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +# > > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > > +# > > +# Authors: Sonal.Santan@xilinx.com > > +# > > + > > +FULL_XRT_PATH=$(srctree)/$(src)/.. > > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > > + > > +obj-$(CONFIG_FPGA_XRT_XMGMT) += xmgmt.o > > + > > +xmgmt-objs := root.o \ > > + main.o \ > > + fmgr-drv.o \ > > + main-region.o > > + > > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > > + -I$(FULL_DTC_PATH) > - Moritz
Hello Moritz, > -----Original Message----- > From: Moritz Fischer <mdf@kernel.org> > Sent: Sunday, February 21, 2021 10:40 AM > To: Tom Rix <trix@redhat.com> > Cc: Lizhi Hou <lizhih@xilinx.com>; linux-kernel@vger.kernel.org; > mdf@kernel.org; Lizhi Hou <lizhih@xilinx.com>; linux-fpga@vger.kernel.org; > Max Zhen <maxz@xilinx.com>; Sonal Santan <sonals@xilinx.com>; Michal > Simek <michals@xilinx.com>; Stefano Stabellini <stefanos@xilinx.com>; > devicetree@vger.kernel.org; robh@kernel.org; Max Zhen <maxz@xilinx.com> > Subject: Re: [PATCH V3 XRT Alveo 18/18] fpga: xrt: Kconfig and Makefile > updates for XRT drivers > > On Sun, Feb 21, 2021 at 06:57:31AM -0800, Tom Rix wrote: > > As I am looking through the files, I have this comment. > > > > fpga/ is currently a single directory, while files could be organized > > in subdirectories like > > > > dfl/pci.c > > > > instead have the possible subdir name as a prefix to the filename. > > > > dfl-pci.c > > > > For consistency, > > > > xrt/metadata/metadata.c > > > > should be > > > > xrt-metadata.c > > Agreed. Keep the prefix. > > > > Likewise the build infra needs to integrated within the existing files > > fpga/Kconfig,Makefile > > > > This is a bigish refactor, so let's get a second opinion. > > In what sense? You mean adding a subdirectory? Maybe something like this > > drivers/fpga > - dfl/ > - xilinx/ > - intel/ > - lattice/ > - xrt/ > ... > > would generally make sense. > > We didn't have enough drivers to prioritize that yet, but we can look into it. If longer term we would like to reorganize the drivers/fpga directory structure should we keep the current directory structure for XRT as in the patch series? > > > > Moritz ? > > > > On 2/17/21 10:40 PM, Lizhi Hou wrote: > > > Update fpga Kconfig/Makefile and add Kconfig/Makefile for new drivers. > > Expand the comment, there are several new configs that could use an > > explanation > > > > > > Signed-off-by: Sonal Santan <sonal.santan@xilinx.com> > > > Signed-off-by: Max Zhen <max.zhen@xilinx.com> > > > Signed-off-by: Lizhi Hou <lizhih@xilinx.com> > > > --- > > > MAINTAINERS | 11 +++++++++++ > > > drivers/Makefile | 1 + > > > drivers/fpga/Kconfig | 2 ++ > > > drivers/fpga/Makefile | 4 ++++ > > > drivers/fpga/xrt/Kconfig | 8 ++++++++ > > > drivers/fpga/xrt/lib/Kconfig | 16 ++++++++++++++++ > > > drivers/fpga/xrt/lib/Makefile | 30 ++++++++++++++++++++++++++++++ > > > drivers/fpga/xrt/metadata/Kconfig | 12 ++++++++++++ > > > drivers/fpga/xrt/metadata/Makefile | 16 ++++++++++++++++ > > > drivers/fpga/xrt/mgmt/Kconfig | 15 +++++++++++++++ > > > drivers/fpga/xrt/mgmt/Makefile | 19 +++++++++++++++++++ > > > 11 files changed, 134 insertions(+) create mode 100644 > > > drivers/fpga/xrt/Kconfig create mode 100644 > > > drivers/fpga/xrt/lib/Kconfig create mode 100644 > > > drivers/fpga/xrt/lib/Makefile create mode 100644 > > > drivers/fpga/xrt/metadata/Kconfig create mode 100644 > > > drivers/fpga/xrt/metadata/Makefile > > > create mode 100644 drivers/fpga/xrt/mgmt/Kconfig create mode > > > 100644 drivers/fpga/xrt/mgmt/Makefile > > > > > > diff --git a/MAINTAINERS b/MAINTAINERS index > > > d3e847f7f3dc..e6e147c2454c 100644 > > > --- a/MAINTAINERS > > > +++ b/MAINTAINERS > > > @@ -6973,6 +6973,17 @@ F: Documentation/fpga/ > > > F: drivers/fpga/ > > > F: include/linux/fpga/ > > > > > > +FPGA XRT DRIVERS > > > +M: Lizhi Hou <lizhi.hou@xilinx.com> > > > +R: Max Zhen <max.zhen@xilinx.com> > > > +R: Sonal Santan <sonal.santan@xilinx.com> > > > +L: linux-fpga@vger.kernel.org > > > +S: Maintained > > > +W: https://github.com/Xilinx/XRT > > > +F: Documentation/fpga/xrt.rst > > > +F: drivers/fpga/xrt/ > > > +F: include/uapi/linux/xrt/ > > > + > > > FPU EMULATOR > > > M: Bill Metzenthen <billm@melbpc.org.au> > > > S: Maintained > > > diff --git a/drivers/Makefile b/drivers/Makefile index > > > fd11b9ac4cc3..e03912af8e48 100644 > > > --- a/drivers/Makefile > > > +++ b/drivers/Makefile > > > @@ -178,6 +178,7 @@ obj-$(CONFIG_STM) += hwtracing/stm/ > > > obj-$(CONFIG_ANDROID) += android/ > > > obj-$(CONFIG_NVMEM) += nvmem/ > > > obj-$(CONFIG_FPGA) += fpga/ > > > +obj-y += fpga/xrt/metadata/ > > > > This is wrong. > > > > Move metadata building to fpga/ Makefile and pick an appropriate config, > not just 'obj-y' Will update. > > > > > obj-$(CONFIG_FSI) += fsi/ > > > obj-$(CONFIG_TEE) += tee/ > > > obj-$(CONFIG_MULTIPLEXER) += mux/ > > > diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index > > > 5645226ca3ce..aeca635b1f25 100644 > > > --- a/drivers/fpga/Kconfig > > > +++ b/drivers/fpga/Kconfig > > > @@ -216,4 +216,6 @@ config FPGA_MGR_ZYNQMP_FPGA > > > to configure the programmable logic(PL) through PS > > > on ZynqMP SoC. > > > > > > +source "drivers/fpga/xrt/Kconfig" > > > + > > > endif # FPGA > > > diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index > > > d8e21dfc6778..2b4453ff7c52 100644 > > > --- a/drivers/fpga/Makefile > > > +++ b/drivers/fpga/Makefile > > > @@ -46,3 +46,7 @@ dfl-afu-objs += dfl-afu-error.o > > > > > > # Drivers for FPGAs which implement DFL > > > obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o > > > + > > > +# XRT drivers for Alveo > > > +obj-$(CONFIG_FPGA_XRT_LIB) += xrt/lib/ > > > +obj-$(CONFIG_FPGA_XRT_XMGMT) += xrt/mgmt/ > > > > I don't see how mgmnt would work without lib. If that is so > > > > these configs could collapse to CONFIG_FPGA_XRT > > > > > diff --git a/drivers/fpga/xrt/Kconfig b/drivers/fpga/xrt/Kconfig new > > > file mode 100644 index 000000000000..0e2c59589ddd > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/Kconfig > > > @@ -0,0 +1,8 @@ > > > +# SPDX-License-Identifier: GPL-2.0-only # # Xilinx Alveo FPGA > > > +device configuration # > > > + > > > +source "drivers/fpga/xrt/metadata/Kconfig" > > > +source "drivers/fpga/xrt/lib/Kconfig" > > > +source "drivers/fpga/xrt/mgmt/Kconfig" > > > diff --git a/drivers/fpga/xrt/lib/Kconfig > > > b/drivers/fpga/xrt/lib/Kconfig new file mode 100644 index > > > 000000000000..eed5cb73f5e2 > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/lib/Kconfig > > > @@ -0,0 +1,16 @@ > > > +# SPDX-License-Identifier: GPL-2.0-only # # XRT Alveo FPGA device > > > +configuration # > > > + > > > +config FPGA_XRT_LIB > > > + tristate "XRT Alveo Driver Library" > > > + depends on HWMON && PCI && HAS_IOMEM > > > + select FPGA_XRT_METADATA > > > + help > > > + Select this option to enable Xilinx XRT Alveo driver library. This > > > + library is core infrastructure of XRT Alveo FPGA drivers which > > > + provides functions for working with device nodes, iteration and > > > + lookup of platform devices, common interfaces for platform devices, > > > + plumbing of function call and ioctls between platform devices and > > > + parent partitions. > > > diff --git a/drivers/fpga/xrt/lib/Makefile > > > b/drivers/fpga/xrt/lib/Makefile new file mode 100644 index > > > 000000000000..5641231b2a36 > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/lib/Makefile > > > @@ -0,0 +1,30 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# > > > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > > > +# > > > +# Authors: Sonal.Santan@xilinx.com > > > +# > > > + > > > +FULL_XRT_PATH=$(srctree)/$(src)/.. > > > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > > > + > > > +obj-$(CONFIG_FPGA_XRT_LIB) += xrt-lib.o > > > + > > > +xrt-lib-objs := \ > > > + main.o \ > > > + xroot.o \ > > > + xclbin.o \ > > > + subdev.o \ > > > + cdev.o \ > > > + group.o \ > > > + xleaf/vsec.o \ > > > + xleaf/axigate.o \ > > > + xleaf/devctl.o \ > > > + xleaf/icap.o \ > > > + xleaf/clock.o \ > > > + xleaf/clkfreq.o \ > > > + xleaf/ucs.o \ > > > + xleaf/calib.o \ > > > + > > > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > > > + -I$(FULL_DTC_PATH) > > > diff --git a/drivers/fpga/xrt/metadata/Kconfig > > > b/drivers/fpga/xrt/metadata/Kconfig > > > new file mode 100644 > > > index 000000000000..5012c9c6584d > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/metadata/Kconfig > > > @@ -0,0 +1,12 @@ > > > +# SPDX-License-Identifier: GPL-2.0-only # # XRT Alveo FPGA device > > > +configuration # > > > + > > > +config FPGA_XRT_METADATA > > > + bool "XRT Alveo Driver Metadata Parser" > > > + select LIBFDT > > > + help > > > + This option provides helper functions to parse Xilinx Alveo FPGA > > > + firmware metadata. The metadata is in device tree format and XRT > > and the XRT > > > + driver uses it to discover HW subsystems behind PCIe BAR. > > the HW > > > diff --git a/drivers/fpga/xrt/metadata/Makefile > > > b/drivers/fpga/xrt/metadata/Makefile > > > new file mode 100644 > > > index 000000000000..14f65ef1595c > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/metadata/Makefile > > > @@ -0,0 +1,16 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# > > > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > > > +# > > > +# Authors: Sonal.Santan@xilinx.com > > > +# > > > + > > > +FULL_XRT_PATH=$(srctree)/$(src)/.. > > > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > > > + > > > +obj-$(CONFIG_FPGA_XRT_METADATA) += xrt-md.o > > > + > > > +xrt-md-objs := metadata.o > > > + > > > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > > > + -I$(FULL_DTC_PATH) > > > diff --git a/drivers/fpga/xrt/mgmt/Kconfig > > > b/drivers/fpga/xrt/mgmt/Kconfig new file mode 100644 index > > > 000000000000..2b2a2c34685c > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/mgmt/Kconfig > > > @@ -0,0 +1,15 @@ > > > +# SPDX-License-Identifier: GPL-2.0-only # # Xilinx XRT FPGA device > > > +configuration # > > > + > > > +config FPGA_XRT_XMGMT > > > + tristate "Xilinx Alveo Management Driver" > > > + depends on HWMON && PCI && FPGA_XRT_LIB > > > > FPGA_XRT_LIB also depends on HWMON and PCI, so this could be minimized. > > > > Tom > > > > > + select FPGA_XRT_METADATA > > > + select FPGA_BRIDGE > > > + select FPGA_REGION > > > + help > > > + Select this option to enable XRT PCIe driver for Xilinx Alveo FPGA. > > > + This driver provides interfaces for userspace application to access > > > + Alveo FPGA device. > > > diff --git a/drivers/fpga/xrt/mgmt/Makefile > > > b/drivers/fpga/xrt/mgmt/Makefile new file mode 100644 index > > > 000000000000..8051708c361c > > > --- /dev/null > > > +++ b/drivers/fpga/xrt/mgmt/Makefile > > > @@ -0,0 +1,19 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# > > > +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. > > > +# > > > +# Authors: Sonal.Santan@xilinx.com > > > +# > > > + > > > +FULL_XRT_PATH=$(srctree)/$(src)/.. > > > +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt > > > + > > > +obj-$(CONFIG_FPGA_XRT_XMGMT) += xmgmt.o > > > + > > > +xmgmt-objs := root.o \ > > > + main.o \ > > > + fmgr-drv.o \ > > > + main-region.o > > > + > > > +ccflags-y := -I$(FULL_XRT_PATH)/include \ > > > + -I$(FULL_DTC_PATH) > > > > - Moritz -Sonal
diff --git a/MAINTAINERS b/MAINTAINERS index d3e847f7f3dc..e6e147c2454c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6973,6 +6973,17 @@ F: Documentation/fpga/ F: drivers/fpga/ F: include/linux/fpga/ +FPGA XRT DRIVERS +M: Lizhi Hou <lizhi.hou@xilinx.com> +R: Max Zhen <max.zhen@xilinx.com> +R: Sonal Santan <sonal.santan@xilinx.com> +L: linux-fpga@vger.kernel.org +S: Maintained +W: https://github.com/Xilinx/XRT +F: Documentation/fpga/xrt.rst +F: drivers/fpga/xrt/ +F: include/uapi/linux/xrt/ + FPU EMULATOR M: Bill Metzenthen <billm@melbpc.org.au> S: Maintained diff --git a/drivers/Makefile b/drivers/Makefile index fd11b9ac4cc3..e03912af8e48 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -178,6 +178,7 @@ obj-$(CONFIG_STM) += hwtracing/stm/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ +obj-y += fpga/xrt/metadata/ obj-$(CONFIG_FSI) += fsi/ obj-$(CONFIG_TEE) += tee/ obj-$(CONFIG_MULTIPLEXER) += mux/ diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 5645226ca3ce..aeca635b1f25 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -216,4 +216,6 @@ config FPGA_MGR_ZYNQMP_FPGA to configure the programmable logic(PL) through PS on ZynqMP SoC. +source "drivers/fpga/xrt/Kconfig" + endif # FPGA diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index d8e21dfc6778..2b4453ff7c52 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -46,3 +46,7 @@ dfl-afu-objs += dfl-afu-error.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o + +# XRT drivers for Alveo +obj-$(CONFIG_FPGA_XRT_LIB) += xrt/lib/ +obj-$(CONFIG_FPGA_XRT_XMGMT) += xrt/mgmt/ diff --git a/drivers/fpga/xrt/Kconfig b/drivers/fpga/xrt/Kconfig new file mode 100644 index 000000000000..0e2c59589ddd --- /dev/null +++ b/drivers/fpga/xrt/Kconfig @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Xilinx Alveo FPGA device configuration +# + +source "drivers/fpga/xrt/metadata/Kconfig" +source "drivers/fpga/xrt/lib/Kconfig" +source "drivers/fpga/xrt/mgmt/Kconfig" diff --git a/drivers/fpga/xrt/lib/Kconfig b/drivers/fpga/xrt/lib/Kconfig new file mode 100644 index 000000000000..eed5cb73f5e2 --- /dev/null +++ b/drivers/fpga/xrt/lib/Kconfig @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# XRT Alveo FPGA device configuration +# + +config FPGA_XRT_LIB + tristate "XRT Alveo Driver Library" + depends on HWMON && PCI && HAS_IOMEM + select FPGA_XRT_METADATA + help + Select this option to enable Xilinx XRT Alveo driver library. This + library is core infrastructure of XRT Alveo FPGA drivers which + provides functions for working with device nodes, iteration and + lookup of platform devices, common interfaces for platform devices, + plumbing of function call and ioctls between platform devices and + parent partitions. diff --git a/drivers/fpga/xrt/lib/Makefile b/drivers/fpga/xrt/lib/Makefile new file mode 100644 index 000000000000..5641231b2a36 --- /dev/null +++ b/drivers/fpga/xrt/lib/Makefile @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. +# +# Authors: Sonal.Santan@xilinx.com +# + +FULL_XRT_PATH=$(srctree)/$(src)/.. +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt + +obj-$(CONFIG_FPGA_XRT_LIB) += xrt-lib.o + +xrt-lib-objs := \ + main.o \ + xroot.o \ + xclbin.o \ + subdev.o \ + cdev.o \ + group.o \ + xleaf/vsec.o \ + xleaf/axigate.o \ + xleaf/devctl.o \ + xleaf/icap.o \ + xleaf/clock.o \ + xleaf/clkfreq.o \ + xleaf/ucs.o \ + xleaf/calib.o \ + +ccflags-y := -I$(FULL_XRT_PATH)/include \ + -I$(FULL_DTC_PATH) diff --git a/drivers/fpga/xrt/metadata/Kconfig b/drivers/fpga/xrt/metadata/Kconfig new file mode 100644 index 000000000000..5012c9c6584d --- /dev/null +++ b/drivers/fpga/xrt/metadata/Kconfig @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# XRT Alveo FPGA device configuration +# + +config FPGA_XRT_METADATA + bool "XRT Alveo Driver Metadata Parser" + select LIBFDT + help + This option provides helper functions to parse Xilinx Alveo FPGA + firmware metadata. The metadata is in device tree format and XRT + driver uses it to discover HW subsystems behind PCIe BAR. diff --git a/drivers/fpga/xrt/metadata/Makefile b/drivers/fpga/xrt/metadata/Makefile new file mode 100644 index 000000000000..14f65ef1595c --- /dev/null +++ b/drivers/fpga/xrt/metadata/Makefile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. +# +# Authors: Sonal.Santan@xilinx.com +# + +FULL_XRT_PATH=$(srctree)/$(src)/.. +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt + +obj-$(CONFIG_FPGA_XRT_METADATA) += xrt-md.o + +xrt-md-objs := metadata.o + +ccflags-y := -I$(FULL_XRT_PATH)/include \ + -I$(FULL_DTC_PATH) diff --git a/drivers/fpga/xrt/mgmt/Kconfig b/drivers/fpga/xrt/mgmt/Kconfig new file mode 100644 index 000000000000..2b2a2c34685c --- /dev/null +++ b/drivers/fpga/xrt/mgmt/Kconfig @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Xilinx XRT FPGA device configuration +# + +config FPGA_XRT_XMGMT + tristate "Xilinx Alveo Management Driver" + depends on HWMON && PCI && FPGA_XRT_LIB + select FPGA_XRT_METADATA + select FPGA_BRIDGE + select FPGA_REGION + help + Select this option to enable XRT PCIe driver for Xilinx Alveo FPGA. + This driver provides interfaces for userspace application to access + Alveo FPGA device. diff --git a/drivers/fpga/xrt/mgmt/Makefile b/drivers/fpga/xrt/mgmt/Makefile new file mode 100644 index 000000000000..8051708c361c --- /dev/null +++ b/drivers/fpga/xrt/mgmt/Makefile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2020-2021 Xilinx, Inc. All rights reserved. +# +# Authors: Sonal.Santan@xilinx.com +# + +FULL_XRT_PATH=$(srctree)/$(src)/.. +FULL_DTC_PATH=$(srctree)/scripts/dtc/libfdt + +obj-$(CONFIG_FPGA_XRT_XMGMT) += xmgmt.o + +xmgmt-objs := root.o \ + main.o \ + fmgr-drv.o \ + main-region.o + +ccflags-y := -I$(FULL_XRT_PATH)/include \ + -I$(FULL_DTC_PATH)