fpga: reorganize to subdirs
[email protected]
reviewerv4 cover fpga: reorganize to subdirs
From: Tom Rix <[email protected]>
The incoming xrt patchset has a toplevel subdir xrt/
The current fpga/ uses a single dir with filename prefixes to subdivide owners For consistency, there should be only one way to organize the fpga/ dir. Because the subdir model scales better, refactor to use it.
The discussion wrt xrt is here:
https://lore.kernel.org/linux-fpga/[email protected]/
Follow drivers/net/ethernet/ which has control configs NET_VENDOR_BLA that map to drivers/net/ethernet/bla Since fpgas do not have many vendors, drop the 'VENDOR' and use FPGA_BLA.
There are several new subdirs
altera/
dfl/
lattice/
xilinx/
Each subdir has a Kconfig that has a new/reused
if FPGA_BLA
... existing configs ...
endif FPGA_BLA
Which is sourced into the main fpga/Kconfig
Each subdir has a Makefile whose transversal is controlled in the fpga/Makefile by
obj-$(CONFIG_FPGA_BLA) += bla/
Some cleanup to arrange thing alphabetically and make fpga/Makefile's whitespace look more like net/'s
Changes from
v1
Drop renaming files
Cleanup makefiles
v2
Expand commit messages
Add SPDX to Kconfig
Expand new Kconfig variable help messages
v3
Update Documentation/fpga/dfl.rst for fpga/dfl/
Tom Rix (4):
fpga: dfl: reorganize to subdir layout
fpga: xilinx: reorganize to subdir layout
fpga: altera: reorganize to subdir layout
fpga: lattice: reorganize to subdir layout
Documentation/fpga/dfl.rst | 4 +-
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 204 +-----------------
drivers/fpga/Makefile | 47 +---
drivers/fpga/altera/Kconfig | 85 ++++++++
drivers/fpga/altera/Makefile | 12 ++
drivers/fpga/{ => altera}/altera-cvp.c | 0
drivers/fpga/{ => altera}/altera-fpga2sdram.c | 0
.../fpga/{ => altera}/altera-freeze-bridge.c | 0
drivers/fpga/{ => altera}/altera-hps2fpga.c | 0
.../{ => altera}/altera-pr-ip-core-plat.c | 0
drivers/fpga/{ => altera}/altera-pr-ip-core.c | 0
drivers/fpga/{ => altera}/altera-ps-spi.c | 0
drivers/fpga/{ => altera}/socfpga-a10.c | 0
drivers/fpga/{ => altera}/socfpga.c | 0
drivers/fpga/{ => altera}/stratix10-soc.c | 0
drivers/fpga/{ => altera}/ts73xx-fpga.c | 0
drivers/fpga/dfl/Kconfig | 83 +++++++
drivers/fpga/dfl/Makefile | 16 ++
drivers/fpga/{ => dfl}/dfl-afu-dma-region.c | 0
drivers/fpga/{ => dfl}/dfl-afu-error.c | 0
drivers/fpga/{ => dfl}/dfl-afu-main.c | 0
drivers/fpga/{ => dfl}/dfl-afu-region.c | 0
drivers/fpga/{ => dfl}/dfl-afu.h | 0
drivers/fpga/{ => dfl}/dfl-fme-br.c | 0
drivers/fpga/{ => dfl}/dfl-fme-error.c | 0
drivers/fpga/{ => dfl}/dfl-fme-main.c | 0
drivers/fpga/{ => dfl}/dfl-fme-mgr.c | 0
drivers/fpga/{ => dfl}/dfl-fme-perf.c | 0
drivers/fpga/{ => dfl}/dfl-fme-pr.c | 0
drivers/fpga/{ => dfl}/dfl-fme-pr.h | 0
drivers/fpga/{ => dfl}/dfl-fme-region.c | 0
drivers/fpga/{ => dfl}/dfl-fme.h | 0
drivers/fpga/{ => dfl}/dfl-n3000-nios.c | 0
drivers/fpga/{ => dfl}/dfl-pci.c | 0
drivers/fpga/{ => dfl}/dfl.c | 0
drivers/fpga/{ => dfl}/dfl.h | 0
drivers/fpga/lattice/Kconfig | 29 +++
drivers/fpga/lattice/Makefile | 4 +
drivers/fpga/{ => lattice}/ice40-spi.c | 0
drivers/fpga/{ => lattice}/machxo2-spi.c | 0
drivers/fpga/xilinx/Kconfig | 55 +++++
drivers/fpga/xilinx/Makefile | 6 +
.../fpga/{ => xilinx}/xilinx-pr-decoupler.c | 0
drivers/fpga/{ => xilinx}/xilinx-spi.c | 0
drivers/fpga/{ => xilinx}/zynq-fpga.c | 0
drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0
47 files changed, 305 insertions(+), 242 deletions(-)
create mode 100644 drivers/fpga/altera/Kconfig
create mode 100644 drivers/fpga/altera/Makefile
rename drivers/fpga/{ => altera}/altera-cvp.c (100%)
rename drivers/fpga/{ => altera}/altera-fpga2sdram.c (100%)
rename drivers/fpga/{ => altera}/altera-freeze-bridge.c (100%)
rename drivers/fpga/{ => altera}/altera-hps2fpga.c (100%)
rename drivers/fpga/{ => altera}/altera-pr-ip-core-plat.c (100%)
rename drivers/fpga/{ => altera}/altera-pr-ip-core.c (100%)
rename drivers/fpga/{ => altera}/altera-ps-spi.c (100%)
rename drivers/fpga/{ => altera}/socfpga-a10.c (100%)
rename drivers/fpga/{ => altera}/socfpga.c (100%)
rename drivers/fpga/{ => altera}/stratix10-soc.c (100%)
rename drivers/fpga/{ => altera}/ts73xx-fpga.c (100%)
create mode 100644 drivers/fpga/dfl/Kconfig
create mode 100644 drivers/fpga/dfl/Makefile
rename drivers/fpga/{ => dfl}/dfl-afu-dma-region.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu-error.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu-main.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu-region.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu.h (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-br.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-error.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-main.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-mgr.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-perf.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-pr.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-pr.h (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-region.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme.h (100%)
rename drivers/fpga/{ => dfl}/dfl-n3000-nios.c (100%)
rename drivers/fpga/{ => dfl}/dfl-pci.c (100%)
rename drivers/fpga/{ => dfl}/dfl.c (100%)
rename drivers/fpga/{ => dfl}/dfl.h (100%)
create mode 100644 drivers/fpga/lattice/Kconfig
create mode 100644 drivers/fpga/lattice/Makefile
rename drivers/fpga/{ => lattice}/ice40-spi.c (100%)
rename drivers/fpga/{ => lattice}/machxo2-spi.c (100%)
create mode 100644 drivers/fpga/xilinx/Kconfig
create mode 100644 drivers/fpga/xilinx/Makefile
rename drivers/fpga/{ => xilinx}/xilinx-pr-decoupler.c (100%)
rename drivers/fpga/{ => xilinx}/xilinx-spi.c (100%)
rename drivers/fpga/{ => xilinx}/zynq-fpga.c (100%)
rename drivers/fpga/{ => xilinx}/zynqmp-fpga.c (100%)Signature · 1 line
2.26.3
[email protected]
reviewerPATCH v4 1/4 fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow drivers/net/ethernet/ which has control configs NET_VENDOR_BLA that map to drivers/net/ethernet/bla Since fpgas do not have many vendors, drop the 'VENDOR' and use FPGA_BLA.
There are several new subdirs
altera/
dfl/
lattice/
xilinx/
Each subdir has a Kconfig that has a new/reused
if FPGA_BLA
... existing configs ...
endif FPGA_BLA
Which is sourced into the main fpga/Kconfig
Each subdir has a Makefile whose transversal is controlled in the fpga/Makefile by
obj-$(CONFIG_FPGA_BLA) += bla/
This is the dfl/ subdir part.
Create a dfl/ subdir
Move dfl-* files to it.
Add a Kconfig and Makefile
Because FPGA_DFL is now used in dfl/Kconfig in a if/endif block, all the other configs in dfl/Kconfig implicitly depend on FPGA_DFL. So the explicit dependence can be removed. Also since FPGA_DFL depends on HAS_IOMEM, it can be removed from the other configs.
---
Documentation/fpga/dfl.rst | 4 +-
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 80 +-------------------
drivers/fpga/Makefile | 18 +----
drivers/fpga/dfl/Kconfig | 83 +++++++++++++++++++++
drivers/fpga/dfl/Makefile | 16 ++++
drivers/fpga/{ => dfl}/dfl-afu-dma-region.c | 0
drivers/fpga/{ => dfl}/dfl-afu-error.c | 0
drivers/fpga/{ => dfl}/dfl-afu-main.c | 0
drivers/fpga/{ => dfl}/dfl-afu-region.c | 0
drivers/fpga/{ => dfl}/dfl-afu.h | 0
drivers/fpga/{ => dfl}/dfl-fme-br.c | 0
drivers/fpga/{ => dfl}/dfl-fme-error.c | 0
drivers/fpga/{ => dfl}/dfl-fme-main.c | 0
drivers/fpga/{ => dfl}/dfl-fme-mgr.c | 0
drivers/fpga/{ => dfl}/dfl-fme-perf.c | 0
drivers/fpga/{ => dfl}/dfl-fme-pr.c | 0
drivers/fpga/{ => dfl}/dfl-fme-pr.h | 0
drivers/fpga/{ => dfl}/dfl-fme-region.c | 0
drivers/fpga/{ => dfl}/dfl-fme.h | 0
drivers/fpga/{ => dfl}/dfl-n3000-nios.c | 0
drivers/fpga/{ => dfl}/dfl-pci.c | 0
drivers/fpga/{ => dfl}/dfl.c | 0
drivers/fpga/{ => dfl}/dfl.h | 0
24 files changed, 104 insertions(+), 99 deletions(-)
create mode 100644 drivers/fpga/dfl/Kconfig
create mode 100644 drivers/fpga/dfl/Makefile
rename drivers/fpga/{ => dfl}/dfl-afu-dma-region.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu-error.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu-main.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu-region.c (100%)
rename drivers/fpga/{ => dfl}/dfl-afu.h (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-br.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-error.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-main.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-mgr.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-perf.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-pr.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-pr.h (100%)
rename drivers/fpga/{ => dfl}/dfl-fme-region.c (100%)
rename drivers/fpga/{ => dfl}/dfl-fme.h (100%)
rename drivers/fpga/{ => dfl}/dfl-n3000-nios.c (100%)
rename drivers/fpga/{ => dfl}/dfl-pci.c (100%)
rename drivers/fpga/{ => dfl}/dfl.c (100%)
rename drivers/fpga/{ => dfl}/dfl.h (100%)Documentation/fpga/dfl.rst +2 -2
@@ -210,7 +210,7 @@ device and etc. Its driver module is always loaded first once the device is created by the system. This driver plays an infrastructural role in the driver architecture. It locates the DFLs in the device memory, handles them and related resources to common interfaces from DFL framework for enumeration. -(Please refer to drivers/fpga/dfl.c for detailed enumeration APIs). +(Please refer to drivers/fpga/dfl/dfl.c for detailed enumeration APIs). The FPGA Management Engine (FME) driver is a platform driver which is loaded automatically after FME platform device creation from the DFL device module. It
@@ -499,7 +499,7 @@ In some cases, we may need to add some new private features to existing FIUs framework, as each private feature will be parsed automatically and related mmio resources can be found under FIU platform device created by DFL framework. Developer only needs to provide a sub feature driver with matched feature id. -FME Partial Reconfiguration Sub Feature driver (see drivers/fpga/dfl-fme-pr.c) +FME Partial Reconfiguration Sub Feature driver (see drivers/fpga/dfl/dfl-fme-pr.c) could be a reference. Location of DFLs on a PCI Device
MAINTAINERS +1 -1
@@ -7229,7 +7229,7 @@ L: [email protected] S: Maintained F: Documentation/ABI/testing/sysfs-bus-dfl* F: Documentation/fpga/dfl.rst -F: drivers/fpga/dfl* +F: drivers/fpga/dfl/ F: drivers/uio/uio_dfl.c F: include/linux/dfl.h F: include/uapi/linux/fpga-dfl.h
drivers/fpga/Kconfig +1 -79
86 lines not on this page · raw message
drivers/fpga/Makefile +1 -17
@@ -31,20 +31,4 @@ obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o obj-$(CONFIG_FPGA_REGION) += fpga-region.o obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o -# FPGA Device Feature List Support -obj-$(CONFIG_FPGA_DFL) += dfl.o -obj-$(CONFIG_FPGA_DFL_FME) += dfl-fme.o -obj-$(CONFIG_FPGA_DFL_FME_MGR) += dfl-fme-mgr.o -obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += dfl-fme-br.o -obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o -obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o - -dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o -dfl-fme-objs += dfl-fme-perf.o -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 - -# Drivers for FPGAs which implement DFL -obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o +obj-$(CONFIG_FPGA_DFL) += dfl/
drivers/fpga/dfl/Kconfig new file +83 -0
83 lines not on this page · raw message
drivers/fpga/dfl/Makefile new file +16 -0
@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# FPGA Device Feature List (DFL) Support +obj-$(CONFIG_FPGA_DFL) += dfl.o +obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o +obj-$(CONFIG_FPGA_DFL_FME) += dfl-fme.o +obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += dfl-fme-br.o +obj-$(CONFIG_FPGA_DFL_FME_MGR) += dfl-fme-mgr.o +obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o +obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o +obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o + +dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o \ + dfl-fme-perf.o +dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o \ + dfl-afu-error.o
drivers/fpga/dfl/dfl-afu-dma-region.c renamed from drivers/fpga/dfl-afu-dma-region.c +0 -0
drivers/fpga/dfl/dfl-afu-error.c renamed from drivers/fpga/dfl-afu-error.c +0 -0
drivers/fpga/dfl/dfl-afu-main.c renamed from drivers/fpga/dfl-afu-main.c +0 -0
drivers/fpga/dfl/dfl-afu-region.c renamed from drivers/fpga/dfl-afu-region.c +0 -0
drivers/fpga/dfl/dfl-afu.h renamed from drivers/fpga/dfl-afu.h +0 -0
drivers/fpga/dfl/dfl-fme-br.c renamed from drivers/fpga/dfl-fme-br.c +0 -0
drivers/fpga/dfl/dfl-fme-error.c renamed from drivers/fpga/dfl-fme-error.c +0 -0
drivers/fpga/dfl/dfl-fme-main.c renamed from drivers/fpga/dfl-fme-main.c +0 -0
drivers/fpga/dfl/dfl-fme-mgr.c renamed from drivers/fpga/dfl-fme-mgr.c +0 -0
drivers/fpga/dfl/dfl-fme-perf.c renamed from drivers/fpga/dfl-fme-perf.c +0 -0
drivers/fpga/dfl/dfl-fme-pr.c renamed from drivers/fpga/dfl-fme-pr.c +0 -0
drivers/fpga/dfl/dfl-fme-pr.h renamed from drivers/fpga/dfl-fme-pr.h +0 -0
drivers/fpga/dfl/dfl-fme-region.c renamed from drivers/fpga/dfl-fme-region.c +0 -0
drivers/fpga/dfl/dfl-fme.h renamed from drivers/fpga/dfl-fme.h +0 -0
drivers/fpga/dfl/dfl-n3000-nios.c renamed from drivers/fpga/dfl-n3000-nios.c +0 -0
drivers/fpga/dfl/dfl-pci.c renamed from drivers/fpga/dfl-pci.c +0 -0
drivers/fpga/dfl/dfl.c renamed from drivers/fpga/dfl.c +0 -0
drivers/fpga/dfl/dfl.h renamed from drivers/fpga/dfl.h +0 -0
Signature · 1 line
2.26.3
RE: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 8 lines
Subject: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.
Hi Tom,
Thanks for this patch. : )
DFL is not a vendor, but something can be shared/reused. It's possible that other vendors reuse the same concepts and the drivers of DFL. If vendor drivers need to be moved inside sub folders, then maybe it's better to leave DFL in the parent folder?
Quoted 26 lines
There are several new subdirs
altera/
dfl/
lattice/
xilinx/Each subdir has a
Kconfigthat has a new/reusedif
FPGA_BLA
... existing configs ...
endifFPGA_BLAWhich is sourced into the main fpga/Kconfig
Each subdir has a
Makefilewhose transversal is controlled in the fpga/Makefile byobj-$(CONFIG_FPGA_BLA) += bla/
This is the dfl/ subdir part.
Create a dfl/ subdir
Move dfl-* files to it.
Add aKconfigandMakefile
Quoted 5 lines
Because
FPGA_DFLis now used in dfl/Kconfig in a if/endif block, all the other configs in dfl/Kconfig implicitly depend onFPGA_DFL. So the explicit dependence can be removed. Also sinceFPGA_DFLdepends onHAS_IOMEM, it can be removed from the other configs.
Hm.. sounds like this change (remove HAS_IOMEM) is better to be split into another patch. How do you think?
Thanks
Hao
Tom Rix
reviewerRe: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 8 lines · Hao
Quoted 8 lines
Subject: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.
Quoted 8 lines
Hi Tom,
Thanks for this patch. : )
DFL is not a vendor, but something can be shared/reused. It's possible that other vendors reuse the same concepts and the drivers of DFL. If vendor drivers need to be moved inside sub folders, then maybe it's better to leave DFL in the parent folder?
xrt is also not a vendor, more a subdevice framework like dfl.
I am not sure what you mean by other dfl vendors can you give an example ?
Quoted 25 lines
Quoted 25 lines
There are several new subdirs
altera/
dfl/
lattice/
xilinx/Each subdir has a
Kconfigthat has a new/reusedif
FPGA_BLA
... existing configs ...
endifFPGA_BLAWhich is sourced into the main fpga/Kconfig
Each subdir has a
Makefilewhose transversal is controlled in the fpga/Makefile byobj-$(CONFIG_FPGA_BLA) += bla/
This is the dfl/ subdir part.
Create a dfl/ subdir
Move dfl-* files to it.
Add aKconfigandMakefile
Quoted 7 lines
Quoted 5 lines
Because
FPGA_DFLis now used in dfl/Kconfig in a if/endif block, all the other configs in dfl/Kconfig implicitly depend onFPGA_DFL. So the explicit dependence can be removed. Also sinceFPGA_DFLdepends onHAS_IOMEM, it can be removed from the other configs.Hm.. sounds like this change (remove
HAS_IOMEM) is better to be split into another patch. How do you think?
I'll drop this from the patchset so this so patchset does the one thing of moving stuff around and do the HAS_IOMEM change after stuff settles.
Tom
Quoted 4 lines
Thanks
Hao
RE: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 13 lines · Hao
Quoted 12 lines
Quoted 8 lines
Subject: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.Hi Tom,
Thanks for this patch. : )
Quoted 8 lines
Quoted 4 lines
DFL is not a vendor, but something can be shared/reused. It's possible that other vendors reuse the same concepts and the drivers of DFL. If vendor drivers need to be moved inside sub folders, then maybe it's better to leave DFL in the parent folder?
xrt is also not a vendor, more a subdevice framework like dfl.
I am not sure what you mean by other dfl vendors can you give an example ?
It's fine, but the description here is a little confusing on vendor/framework handling. No other vendor so far, but it's possible, DFL can be used in non-intel device, and related drivers can be reused as well. Then a fpga mgr driver depends on DFL, should be put inside dfl folder or new vendor's subfolder?
Hao
Moritz Fischer
maintainerRe: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 22 lines · Hao
Quoted 13 lines · Hao
Quoted 12 lines
Quoted 8 lines
Subject: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.Hi Tom,
Thanks for this patch. : )
Quoted 8 lines
Quoted 4 lines
DFL is not a vendor, but something can be shared/reused. It's possible that other vendors reuse the same concepts and the drivers of DFL. If vendor drivers need to be moved inside sub folders, then maybe it's better to leave DFL in the parent folder?
xrt is also not a vendor, more a subdevice framework like dfl.
I am not sure what you mean by other dfl vendors can you give an example ?
Quoted 8 lines
It's fine, but the description here is a little confusing on vendor/framework handling. No other vendor so far, but it's possible, DFL can be used in non-intel device, and related drivers can be reused as well. Then a fpga mgr driver depends on DFL, should be put inside dfl folder or new vendor's subfolder?
Hao
I'm somewhat neutral on this. If someone non-intel starts using DFL we could also move the common parts back ...
That being said, I'm not super convinced we have to move stuff in the first place.
- Moritz
RE: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 29 lines · Hao
Quoted 28 lines
Quoted 13 lines · Hao
Quoted 12 lines
Quoted 8 lines
Subject: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.Hi Tom,
Thanks for this patch. : )
Quoted 8 lines
Quoted 4 lines
DFL is not a vendor, but something can be shared/reused. It's possible that other vendors reuse the same concepts and the drivers of DFL. If vendor drivers need to be moved inside sub folders, then maybe it's better to leave DFL in the parent folder?
xrt is also not a vendor, more a subdevice framework like dfl.
I am not sure what you mean by other dfl vendors can you give an example ?
It's fine, but the description here is a little confusing on vendor/framework handling. No other vendor so far, but it's possible, DFL can be used in non-intel device, and related drivers can be reused as well. Then a fpga mgr driver depends on DFL, should be put inside dfl folder or new vendor's subfolder?
Quoted 6 lines
Quoted 2 lines
Hao
I'm somewhat neutral on this. If someone non-intel starts using DFL we could also
move the common parts back ...
That's fine.
Quoted 3 lines
That being said, I'm not super convinced we have to move stuff in the first place.
I remember that the first submission of our code is having everything inside a sub folder, but was suggested that to have everything moved out, this is why we have dfl files here now. To be honest, I have the similar feeling as you, I didn't see any strong reason to make this something we must do, but both solutions should be fine. : )
Thanks
Hao
Quoted 2 lines
- Moritz
Tom Rix
reviewerRe: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 34 lines · Hao
Quoted 27 lines · Hao
Quoted 26 lines
Quoted 13 lines · Hao
Quoted 12 lines
Quoted 8 lines
Subject: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.Hi Tom,
Thanks for this patch. : )
Quoted 7 lines
Quoted 4 lines
DFL is not a vendor, but something can be shared/reused. It's possible that other vendors reuse the same concepts and the drivers of DFL. If vendor drivers need to be moved inside sub folders, then maybe it's better to leave DFL in the parent folder?
xrt is also not a vendor, more a subdevice framework like dfl.
I am not sure what you mean by other dfl vendors can you give an example ?
It's fine, but the description here is a little confusing on vendor/framework handling. No other vendor so far, but it's possible, DFL can be used in non-intel device, and related drivers can be reused as well. Then a fpga mgr driver depends on DFL, should be put inside dfl folder or new vendor's subfolder?
Quoted 5 lines
Quoted 2 lines
Hao
I'm somewhat neutral on this. If someone non-intel starts using DFL we could also
move the common parts back ...That's fine.
Quoted 7 lines
Quoted 2 lines
That being said, I'm not super convinced we have to move stuff in the first place.
I remember that the first submission of our code is having everything inside a sub folder, but was suggested that to have everything moved out, this is why we have dfl files here now. To be honest, I have the similar feeling as you, I didn't see any strong reason to make this something we must do, but both solutions should be fine. : )
xrt is bringing in the subdir xrt/
Even after the likely move of xrt subdevices to other subsystems, there will be about as many files in fpga/xrt/ as in fpga/
If both of you are fine with a mixed files and subdir organization, then I'll drop this patchset.
If you want only files, then xrt needs to refactor, so let them know.
Tom
Quoted 4 lines
Thanks
HaoQuoted 1 line
- Moritz
Moritz Fischer
maintainerRe: [PATCH v4 1/4] fpga: dfl: reorganize to subdir layout
Quoted 1 line · Tom Rix
xrt is bringing in the subdir xrt/
That alone I don't mind too much.
Quoted 5 lines
Even after the likely move of xrt subdevices to other subsystems, there will be about as many files in fpga/xrt/ as in fpga/
If both of you are fine with a mixed files and subdir organization, then I'll drop this patchset.
You've done most of the work for this already, so we might as well finish what you started :)
Thanks,
Moritz
[email protected]
reviewerPATCH v4 2/4 fpga: xilinx: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
Follow drivers/net/ethernet/ which has control configs NET_VENDOR_BLA that map to drivers/net/ethernet/bla Since fpgas do not have many vendors, drop the 'VENDOR' and use FPGA_BLA.
There are several new subdirs
altera/
dfl/
lattice/
xilinx/
Each subdir has a Kconfig that has a new/reused
if FPGA_BLA
... existing configs ...
endif FPGA_BLA
Which is sourced into the main fpga/Kconfig
Each subdir has a Makefile whose transversal is controlled in the fpga/Makefile by
obj-$(CONFIG_FPGA_BLA) += bla/
This is the xilinx/ subdir part
Create a xilinx/ subdir
Move xilinx-* and zynq* files to it.
Add a Kconfig and Makefile
---
drivers/fpga/Kconfig | 40 +-------------
drivers/fpga/Makefile | 5 +-
drivers/fpga/xilinx/Kconfig | 55 +++++++++++++++++++
drivers/fpga/xilinx/Makefile | 6 ++
.../fpga/{ => xilinx}/xilinx-pr-decoupler.c | 0
drivers/fpga/{ => xilinx}/xilinx-spi.c | 0
drivers/fpga/{ => xilinx}/zynq-fpga.c | 0
drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0
8 files changed, 63 insertions(+), 43 deletions(-)
create mode 100644 drivers/fpga/xilinx/Kconfig
create mode 100644 drivers/fpga/xilinx/Makefile
rename drivers/fpga/{ => xilinx}/xilinx-pr-decoupler.c (100%)
rename drivers/fpga/{ => xilinx}/xilinx-spi.c (100%)
rename drivers/fpga/{ => xilinx}/zynq-fpga.c (100%)
rename drivers/fpga/{ => xilinx}/zynqmp-fpga.c (100%)drivers/fpga/Kconfig +1 -39
@@ -52,25 +52,12 @@ config FPGA_MGR_ALTERA_CVP FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. -config FPGA_MGR_ZYNQ_FPGA - tristate "Xilinx Zynq FPGA" - depends on ARCH_ZYNQ || COMPILE_TEST - help - FPGA manager driver support for Xilinx Zynq FPGAs. - config FPGA_MGR_STRATIX10_SOC tristate "Intel Stratix10 SoC FPGA Manager" depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) help FPGA manager driver support for the Intel Stratix10 SoC. -config FPGA_MGR_XILINX_SPI - tristate "Xilinx Configuration over Slave Serial (SPI)" - depends on SPI - help - FPGA manager driver support for Xilinx FPGA configuration - over slave serial interface. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI
@@ -113,23 +100,6 @@ 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 - or Xilinx Dynamic Function eXchnage AIX Shutdown Manager. - 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. - The Dynamic Function eXchange AXI shutdown manager prevents - AXI traffic from passing through the bridge. The controller - safely handles AXI4MM and AXI4-Lite interfaces on a - Reconfigurable Partition when it is undergoing dynamic - reconfiguration, preventing the system deadlock that can - occur if AXI transactions are interrupted by DFX. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE
@@ -146,14 +116,6 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/dfl/Kconfig" - -config FPGA_MGR_ZYNQMP_FPGA - tristate "Xilinx ZynqMP FPGA" - depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) - help - FPGA manager driver support for Xilinx ZynqMP FPGAs. - This driver uses the processor configuration port(PCAP) - to configure the programmable logic(PL) through PS - on ZynqMP SoC. +source "drivers/fpga/xilinx/Kconfig" endif # FPGA
drivers/fpga/Makefile +1 -4
@@ -15,9 +15,6 @@ obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o -obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o -obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o -obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o
@@ -25,10 +22,10 @@ obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.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 obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_XILINX) += xilinx/
drivers/fpga/xilinx/Kconfig new file +55 -0
55 lines not on this page · raw message
drivers/fpga/xilinx/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o +obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o +obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o +obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o
drivers/fpga/xilinx/xilinx-pr-decoupler.c renamed from drivers/fpga/xilinx-pr-decoupler.c +0 -0
drivers/fpga/xilinx/xilinx-spi.c renamed from drivers/fpga/xilinx-spi.c +0 -0
drivers/fpga/xilinx/zynq-fpga.c renamed from drivers/fpga/zynq-fpga.c +0 -0
drivers/fpga/xilinx/zynqmp-fpga.c renamed from drivers/fpga/zynqmp-fpga.c +0 -0
Signature · 1 line
2.26.3
Re: [PATCH v4 2/4] fpga: xilinx: reorganize to subdir layout
Quoted 152 lines · On Mon, Jun 14, 2021 at 01:16:46PM -0700, [email protected] wrote:
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.There are several new subdirs
altera/
dfl/
lattice/
xilinx/Each subdir has a
Kconfigthat has a new/reusedif
FPGA_BLA
... existing configs ...
endifFPGA_BLAWhich is sourced into the main fpga/Kconfig
Each subdir has a
Makefilewhose transversal is controlled in the fpga/Makefile byobj-$(CONFIG_FPGA_BLA) += bla/
This is the xilinx/ subdir part
Create a xilinx/ subdir
Move xilinx-* and zynq* files to it.
Add aKconfigandMakefileSigned-off-by Tom Rix <[email protected]>--- drivers/fpga/Kconfig | 40 +------------- drivers/fpga/Makefile | 5 +- drivers/fpga/xilinx/Kconfig | 55 +++++++++++++++++++ drivers/fpga/xilinx/Makefile | 6 ++ .../fpga/{ => xilinx}/xilinx-pr-decoupler.c | 0 drivers/fpga/{ => xilinx}/xilinx-spi.c | 0 drivers/fpga/{ => xilinx}/zynq-fpga.c | 0 drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0 8 files changed, 63 insertions(+), 43 deletions(-) create mode 100644 drivers/fpga/xilinx/Kconfig create mode 100644 drivers/fpga/xilinx/Makefile rename drivers/fpga/{ => xilinx}/xilinx-pr-decoupler.c (100%) rename drivers/fpga/{ => xilinx}/xilinx-spi.c (100%) rename drivers/fpga/{ => xilinx}/zynq-fpga.c (100%) rename drivers/fpga/{ => xilinx}/zynqmp-fpga.c (100%)drivers/fpga/Kconfig +1
-39@@ -52,25 +52,12 @@ config FPGA_MGR_ALTERA_CVP FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. -config FPGA_MGR_ZYNQ_FPGA - tristate "Xilinx Zynq FPGA" - depends on ARCH_ZYNQ || COMPILE_TEST - help - FPGA manager driver support for Xilinx Zynq FPGAs. - config FPGA_MGR_STRATIX10_SOC tristate "Intel Stratix10 SoC FPGA Manager" depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) help FPGA manager driver support for the Intel Stratix10 SoC. -config FPGA_MGR_XILINX_SPI - tristate "Xilinx Configuration over Slave Serial (SPI)" - depends on SPI - help - FPGA manager driver support for Xilinx FPGA configuration - over slave serial interface. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI@@ -113,23 +100,6 @@ 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 - or Xilinx Dynamic Function eXchnage AIX Shutdown Manager. - 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. - The Dynamic Function eXchange AXI shutdown manager prevents - AXI traffic from passing through the bridge. The controller - safely handles AXI4MM and AXI4-Lite interfaces on a - Reconfigurable Partition when it is undergoing dynamic - reconfiguration, preventing the system deadlock that can - occur if AXI transactions are interrupted by DFX. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE@@ -146,14 +116,6 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/dfl/Kconfig" - -config FPGA_MGR_ZYNQMP_FPGA - tristate "Xilinx ZynqMP FPGA" - depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) - help - FPGA manager driver support for Xilinx ZynqMP FPGAs. - This driver uses the processor configuration port(PCAP) - to configure the programmable logic(PL) through PS - on ZynqMP SoC. +source "drivers/fpga/xilinx/Kconfig" endif # FPGAdrivers/fpga/Makefile +1
-4@@ -15,9 +15,6 @@ obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o -obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o -obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o -obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o@@ -25,10 +22,10 @@ obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.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 obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_XILINX) += xilinx/drivers/fpga/xilinx/Kconfig new file +0
-0
drivers/fpga/xilinx/Kconfig line 4
Quoted 4 lines
drivers/fpga/xilinx/Kconfig new file +4
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config FPGA_XILINX + bool "Xilinx FPGAs"
"Xilinx FPGA drivers"
drivers/fpga/xilinx/Kconfig line 7
Quoted 3 lines
drivers/fpga/xilinx/Kconfig new file +3
-0+ default y + help + If you have a xilinx fpga, say Y.
"Xilix FPGA"
But how about being a bit more descriptive here:
"Select this option if you want to enable support for Xilinx FPGA drivers"
drivers/fpga/xilinx/Kconfig line 12
Quoted 4 lines
drivers/fpga/xilinx/Kconfig new file +4
-0+ Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about xilinx fpgas. If you say Y, you will be asked + for your specific device in the following questions.
Why this "note"? Do networking drivers have this type of description?
Same for the other patches in this series.
thanks,
greg k-h
Tom Rix
reviewerRe: [PATCH v4 2/4] fpga: xilinx: reorganize to subdir layout
Quoted 159 lines · Greg KH
Quoted 152 lines · On Mon, Jun 14, 2021 at 01:16:46PM -0700, [email protected] wrote:
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.There are several new subdirs
altera/
dfl/
lattice/
xilinx/Each subdir has a
Kconfigthat has a new/reusedif
FPGA_BLA
... existing configs ...
endifFPGA_BLAWhich is sourced into the main fpga/Kconfig
Each subdir has a
Makefilewhose transversal is controlled in the fpga/Makefile byobj-$(CONFIG_FPGA_BLA) += bla/
This is the xilinx/ subdir part
Create a xilinx/ subdir
Move xilinx-* and zynq* files to it.
Add aKconfigandMakefileSigned-off-by Tom Rix <[email protected]>--- drivers/fpga/Kconfig | 40 +------------- drivers/fpga/Makefile | 5 +- drivers/fpga/xilinx/Kconfig | 55 +++++++++++++++++++ drivers/fpga/xilinx/Makefile | 6 ++ .../fpga/{ => xilinx}/xilinx-pr-decoupler.c | 0 drivers/fpga/{ => xilinx}/xilinx-spi.c | 0 drivers/fpga/{ => xilinx}/zynq-fpga.c | 0 drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0 8 files changed, 63 insertions(+), 43 deletions(-)create mode 100644
drivers/fpga/xilinx/Kconfigcreate mode 100644drivers/fpga/xilinx/Makefilerenamedrivers/fpga/{=>xilinx}/xilinx-pr-decoupler.c(100%) renamedrivers/fpga/{=>xilinx}/xilinx-spi.c(100%) renamedrivers/fpga/{=>xilinx}/zynq-fpga.c(100%) renamedrivers/fpga/{=>xilinx}/zynqmp-fpga.c(100%)drivers/fpga/Kconfig +1
-39@@ -52,25 +52,12 @@ config FPGA_MGR_ALTERA_CVP FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. -config FPGA_MGR_ZYNQ_FPGA - tristate "Xilinx Zynq FPGA" - depends on ARCH_ZYNQ || COMPILE_TEST - help - FPGA manager driver support for Xilinx Zynq FPGAs. - config FPGA_MGR_STRATIX10_SOC tristate "Intel Stratix10 SoC FPGA Manager" depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) help FPGA manager driver support for the Intel Stratix10 SoC. -config FPGA_MGR_XILINX_SPI - tristate "Xilinx Configuration over Slave Serial (SPI)" - depends on SPI - help - FPGA manager driver support for Xilinx FPGA configuration - over slave serial interface. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI@@ -113,23 +100,6 @@ 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 - or Xilinx Dynamic Function eXchnage AIX Shutdown Manager. - 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. - The Dynamic Function eXchange AXI shutdown manager prevents - AXI traffic from passing through the bridge. The controller - safely handles AXI4MM and AXI4-Lite interfaces on a - Reconfigurable Partition when it is undergoing dynamic - reconfiguration, preventing the system deadlock that can - occur if AXI transactions are interrupted by DFX. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE@@ -146,14 +116,6 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/dfl/Kconfig" - -config FPGA_MGR_ZYNQMP_FPGA - tristate "Xilinx ZynqMP FPGA" - depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) - help - FPGA manager driver support for Xilinx ZynqMP FPGAs. - This driver uses the processor configuration port(PCAP) - to configure the programmable logic(PL) through PS - on ZynqMP SoC. +source "drivers/fpga/xilinx/Kconfig" endif # FPGAdrivers/fpga/Makefile +1
-4@@ -15,9 +15,6 @@ obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o -obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o -obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o -obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o@@ -25,10 +22,10 @@ obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.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 obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_XILINX) += xilinx/drivers/fpga/xilinx/Kconfig new file +0
-0drivers/fpga/xilinx/Kconfig line 4
Quoted 4 lines
drivers/fpga/xilinx/Kconfig new file +4
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config FPGA_XILINX + bool "Xilinx FPGAs""Xilinx FPGA drivers"
Quoted 4 lines
drivers/fpga/xilinx/Kconfig line 7
Quoted 3 lines
drivers/fpga/xilinx/Kconfig new file +3
-0+ default y + help + If you have a xilinx fpga, say Y."Xilix FPGA"
Ok.
Quoted 4 lines
But how about being a bit more descriptive here:
"Select this option if you want to enable support for Xilinx FPGA drivers"
ok
Quoted 6 lines
drivers/fpga/xilinx/Kconfig line 12
Quoted 5 lines
drivers/fpga/xilinx/Kconfig new file +4
-0+ Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about xilinx fpgas. If you say Y, you will be asked + for your specific device in the following questions.Why this "note"? Do networking drivers have this type of description?
Yes, the NET_VENDOR_* configs all have this boilerplate.
Tom
Quoted 5 lines
Same for the other patches in this series.
thanks,greg k-h
Re: [PATCH v4 2/4] fpga: xilinx: reorganize to subdir layout
Quoted 164 lines · Tom Rix
Quoted 151 lines · Greg KH
Quoted 144 lines · On Mon, Jun 14, 2021 at 01:16:46PM -0700, [email protected] wrote:
From: Tom Rix <[email protected]>
Follow
drivers/net/ethernet/which has control configsNET_VENDOR_BLAthat map todrivers/net/ethernet/blaSince fpgas do not have many vendors, drop the 'VENDOR' and useFPGA_BLA.There are several new subdirs
altera/
dfl/
lattice/
xilinx/Each subdir has a
Kconfigthat has a new/reusedif
FPGA_BLA
... existing configs ...
endifFPGA_BLAWhich is sourced into the main fpga/Kconfig
Each subdir has a
Makefilewhose transversal is controlled in the fpga/Makefile byobj-$(CONFIG_FPGA_BLA) += bla/
This is the xilinx/ subdir part
Create a xilinx/ subdir
Move xilinx-* and zynq* files to it.
Add aKconfigandMakefileSigned-off-by Tom Rix <[email protected]>--- drivers/fpga/Kconfig | 40 +------------- drivers/fpga/Makefile | 5 +- drivers/fpga/xilinx/Kconfig | 55 +++++++++++++++++++ drivers/fpga/xilinx/Makefile | 6 ++ .../fpga/{ => xilinx}/xilinx-pr-decoupler.c | 0 drivers/fpga/{ => xilinx}/xilinx-spi.c | 0 drivers/fpga/{ => xilinx}/zynq-fpga.c | 0 drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0 8 files changed, 63 insertions(+), 43 deletions(-)create mode 100644
drivers/fpga/xilinx/Kconfigcreate mode 100644drivers/fpga/xilinx/Makefilerenamedrivers/fpga/{=>xilinx}/xilinx-pr-decoupler.c(100%) renamedrivers/fpga/{=>xilinx}/xilinx-spi.c(100%) renamedrivers/fpga/{=>xilinx}/zynq-fpga.c(100%) renamedrivers/fpga/{=>xilinx}/zynqmp-fpga.c(100%)drivers/fpga/Kconfig +1
-39@@ -52,25 +52,12 @@ config FPGA_MGR_ALTERA_CVP FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. -config FPGA_MGR_ZYNQ_FPGA - tristate "Xilinx Zynq FPGA" - depends on ARCH_ZYNQ || COMPILE_TEST - help - FPGA manager driver support for Xilinx Zynq FPGAs. - config FPGA_MGR_STRATIX10_SOC tristate "Intel Stratix10 SoC FPGA Manager" depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) help FPGA manager driver support for the Intel Stratix10 SoC. -config FPGA_MGR_XILINX_SPI - tristate "Xilinx Configuration over Slave Serial (SPI)" - depends on SPI - help - FPGA manager driver support for Xilinx FPGA configuration - over slave serial interface. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI@@ -113,23 +100,6 @@ 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 - or Xilinx Dynamic Function eXchnage AIX Shutdown Manager. - 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. - The Dynamic Function eXchange AXI shutdown manager prevents - AXI traffic from passing through the bridge. The controller - safely handles AXI4MM and AXI4-Lite interfaces on a - Reconfigurable Partition when it is undergoing dynamic - reconfiguration, preventing the system deadlock that can - occur if AXI transactions are interrupted by DFX. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE@@ -146,14 +116,6 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/dfl/Kconfig" - -config FPGA_MGR_ZYNQMP_FPGA - tristate "Xilinx ZynqMP FPGA" - depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) - help - FPGA manager driver support for Xilinx ZynqMP FPGAs. - This driver uses the processor configuration port(PCAP) - to configure the programmable logic(PL) through PS - on ZynqMP SoC. +source "drivers/fpga/xilinx/Kconfig" endif # FPGAdrivers/fpga/Makefile +1
-4@@ -15,9 +15,6 @@ obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o -obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o -obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o -obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o@@ -25,10 +22,10 @@ obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.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 obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_XILINX) += xilinx/drivers/fpga/xilinx/Kconfig new file +0
-0drivers/fpga/xilinx/Kconfig line 4
Quoted 4 lines
drivers/fpga/xilinx/Kconfig new file +4
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config FPGA_XILINX + bool "Xilinx FPGAs""Xilinx FPGA drivers"
Quoted 4 lines
drivers/fpga/xilinx/Kconfig line 7
Quoted 3 lines
drivers/fpga/xilinx/Kconfig new file +3
-0+ default y + help + If you have a xilinx fpga, say Y."Xilix FPGA"
Ok.
Quoted 4 lines
But how about being a bit more descriptive here:
"Select this option if you want to enable support for Xilinx FPGA drivers"
ok
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
drivers/fpga/xilinx/Kconfig line 12
Quoted 4 lines
drivers/fpga/xilinx/Kconfig new file +4
-0+ Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about xilinx fpgas. If you say Y, you will be asked + for your specific device in the following questions.Why this "note"? Do networking drivers have this type of description?
Yes, the NET_VENDOR_* configs all have this boilerplate.
The first example I found drivers/net/ethernet/cavium/Kconfig, did not. But you are right, others do.
But fix the case issues in this text please. Vendors get mad enough when we use their names, we should at least get the case correct when using them.
thanks,
greg k-h
[email protected]
reviewerPATCH v4 3/4 fpga: altera: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
Follow drivers/net/ethernet/ which has control configs NET_VENDOR_BLA that map to drivers/net/ethernet/bla Since fpgas do not have many vendors, drop the 'VENDOR' and use FPGA_BLA.
There are several new subdirs
altera/
dfl/
lattice/
xilinx/
Each subdir has a Kconfig that has a new/reused
if FPGA_BLA
... existing configs ...
endif FPGA_BLA
Which is sourced into the main fpga/Kconfig
Each subdir has a Makefile whose transversal is controlled in the fpga/Makefile by
obj-$(CONFIG_FPGA_BLA) += bla/
This is the altera/ subdir part.
Create a altera/ subdir
Move altera-* and soc* ts73xx* files to it.
Add a Kconfig and Makefile
---
drivers/fpga/Kconfig | 70 +--------------
drivers/fpga/Makefile | 11 +--
drivers/fpga/altera/Kconfig | 85 +++++++++++++++++++
drivers/fpga/altera/Makefile | 12 +++
drivers/fpga/{ => altera}/altera-cvp.c | 0
drivers/fpga/{ => altera}/altera-fpga2sdram.c | 0
.../fpga/{ => altera}/altera-freeze-bridge.c | 0
drivers/fpga/{ => altera}/altera-hps2fpga.c | 0
.../{ => altera}/altera-pr-ip-core-plat.c | 0
drivers/fpga/{ => altera}/altera-pr-ip-core.c | 0
drivers/fpga/{ => altera}/altera-ps-spi.c | 0
drivers/fpga/{ => altera}/socfpga-a10.c | 0
drivers/fpga/{ => altera}/socfpga.c | 0
drivers/fpga/{ => altera}/stratix10-soc.c | 0
drivers/fpga/{ => altera}/ts73xx-fpga.c | 0
15 files changed, 99 insertions(+), 79 deletions(-)
create mode 100644 drivers/fpga/altera/Kconfig
create mode 100644 drivers/fpga/altera/Makefile
rename drivers/fpga/{ => altera}/altera-cvp.c (100%)
rename drivers/fpga/{ => altera}/altera-fpga2sdram.c (100%)
rename drivers/fpga/{ => altera}/altera-freeze-bridge.c (100%)
rename drivers/fpga/{ => altera}/altera-hps2fpga.c (100%)
rename drivers/fpga/{ => altera}/altera-pr-ip-core-plat.c (100%)
rename drivers/fpga/{ => altera}/altera-pr-ip-core.c (100%)
rename drivers/fpga/{ => altera}/altera-ps-spi.c (100%)
rename drivers/fpga/{ => altera}/socfpga-a10.c (100%)
rename drivers/fpga/{ => altera}/socfpga.c (100%)
rename drivers/fpga/{ => altera}/stratix10-soc.c (100%)
rename drivers/fpga/{ => altera}/ts73xx-fpga.c (100%)drivers/fpga/Kconfig +1 -69
@@ -12,52 +12,6 @@ menuconfig FPGA if FPGA -config FPGA_MGR_SOCFPGA - tristate "Altera SOCFPGA FPGA Manager" - depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST - help - FPGA manager driver support for Altera SOCFPGA. - -config FPGA_MGR_SOCFPGA_A10 - tristate "Altera SoCFPGA Arria10" - depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST - select REGMAP_MMIO - help - FPGA manager driver support for Altera Arria10 SoCFPGA. - -config ALTERA_PR_IP_CORE - tristate "Altera Partial Reconfiguration IP Core" - help - Core driver support for Altera Partial Reconfiguration IP component - -config ALTERA_PR_IP_CORE_PLAT - tristate "Platform support of Altera Partial Reconfiguration IP Core" - depends on ALTERA_PR_IP_CORE && OF && HAS_IOMEM - help - Platform driver support for Altera Partial Reconfiguration IP - component - -config FPGA_MGR_ALTERA_PS_SPI - tristate "Altera FPGA Passive Serial over SPI" - depends on SPI - select BITREVERSE - help - FPGA manager driver support for Altera Arria/Cyclone/Stratix - using the passive serial interface over SPI. - -config FPGA_MGR_ALTERA_CVP - tristate "Altera CvP FPGA Manager" - depends on PCI - help - FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, - Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. - -config FPGA_MGR_STRATIX10_SOC - tristate "Intel Stratix10 SoC FPGA Manager" - depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) - help - FPGA manager driver support for the Intel Stratix10 SoC. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI
@@ -71,35 +25,12 @@ config FPGA_MGR_MACHXO2_SPI FPGA manager driver support for Lattice MachXO2 configuration over slave SPI interface. -config FPGA_MGR_TS73XX - tristate "Technologic Systems TS-73xx SBC FPGA Manager" - depends on ARCH_EP93XX && MACH_TS72XX - help - FPGA manager driver support for the Altera Cyclone II FPGA - present on the TS-73xx SBC boards. - config FPGA_BRIDGE tristate "FPGA Bridge Framework" help Say Y here if you want to support bridges connected between host processors and FPGAs or between FPGAs. -config SOCFPGA_FPGA_BRIDGE - tristate "Altera SoCFPGA FPGA Bridges" - depends on ARCH_INTEL_SOCFPGA && FPGA_BRIDGE - help - Say Y to enable drivers for FPGA bridges for Altera SOCFPGA - devices. - -config ALTERA_FREEZE_BRIDGE - tristate "Altera FPGA Freeze Bridge" - depends on FPGA_BRIDGE && HAS_IOMEM - help - Say Y to enable drivers for Altera FPGA Freeze bridges. A - freeze bridge is a bridge that exists in the FPGA fabric to - isolate one region of the FPGA from the busses while that - region is being reprogrammed. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE
@@ -115,6 +46,7 @@ config OF_FPGA_REGION Support for loading FPGA images by applying a Device Tree overlay. +source "drivers/fpga/altera/Kconfig" source "drivers/fpga/dfl/Kconfig" source "drivers/fpga/xilinx/Kconfig"
drivers/fpga/Makefile +1 -10
@@ -7,25 +7,16 @@ obj-$(CONFIG_FPGA) += fpga-mgr.o # FPGA Manager Drivers -obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o -obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-spi.o -obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o -obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o -obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o -obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o -obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o -obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o # FPGA Bridge Drivers 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 # High Level Interfaces obj-$(CONFIG_FPGA_REGION) += fpga-region.o obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o +obj-$(CONFIG_FPGA_ALTERA) += altera/ obj-$(CONFIG_FPGA_DFL) += dfl/ obj-$(CONFIG_FPGA_XILINX) += xilinx/
drivers/fpga/altera/Kconfig new file +85 -0
85 lines not on this page · raw message
drivers/fpga/altera/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o +obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o +obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o +obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o +obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o +obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o +obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o +obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o +obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o +obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o
drivers/fpga/altera/altera-cvp.c renamed from drivers/fpga/altera-cvp.c +0 -0
drivers/fpga/altera/altera-fpga2sdram.c renamed from drivers/fpga/altera-fpga2sdram.c +0 -0
drivers/fpga/altera/altera-freeze-bridge.c renamed from drivers/fpga/altera-freeze-bridge.c +0 -0
drivers/fpga/altera/altera-hps2fpga.c renamed from drivers/fpga/altera-hps2fpga.c +0 -0
drivers/fpga/altera/altera-pr-ip-core-plat.c renamed from drivers/fpga/altera-pr-ip-core-plat.c +0 -0
drivers/fpga/altera/altera-pr-ip-core.c renamed from drivers/fpga/altera-pr-ip-core.c +0 -0
drivers/fpga/altera/altera-ps-spi.c renamed from drivers/fpga/altera-ps-spi.c +0 -0
drivers/fpga/altera/socfpga-a10.c renamed from drivers/fpga/socfpga-a10.c +0 -0
drivers/fpga/altera/socfpga.c renamed from drivers/fpga/socfpga.c +0 -0
drivers/fpga/altera/stratix10-soc.c renamed from drivers/fpga/stratix10-soc.c +0 -0
drivers/fpga/altera/ts73xx-fpga.c renamed from drivers/fpga/ts73xx-fpga.c +0 -0
Signature · 1 line
2.26.3
[email protected]
reviewerPATCH v4 4/4 fpga: lattice: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
Follow drivers/net/ethernet/ which has control configs NET_VENDOR_BLA that map to drivers/net/ethernet/bla Since fpgas do not have many vendors, drop the 'VENDOR' and use FPGA_BLA.
There are several new subdirs
altera/
dfl/
lattice/
xilinx/
Each subdir has a Kconfig that has a new/reused
if FPGA_BLA
... existing configs ...
endif FPGA_BLA
Which is sourced into the main fpga/Kconfig
Each subdir has a Makefile whose transversal is controlled in the fpga/Makefile by
obj-$(CONFIG_FPGA_BLA) += bla/
This is the lattice/ subdir part.
Create a lattice/ subdir
Move ice40* and machxo2* files to it.
Add a Kconfig and Makefile
---
drivers/fpga/Kconfig | 14 +-----------
drivers/fpga/Makefile | 13 ++++-------
drivers/fpga/lattice/Kconfig | 29 ++++++++++++++++++++++++
drivers/fpga/lattice/Makefile | 4 ++++
drivers/fpga/{ => lattice}/ice40-spi.c | 0
drivers/fpga/{ => lattice}/machxo2-spi.c | 0
6 files changed, 39 insertions(+), 21 deletions(-)
create mode 100644 drivers/fpga/lattice/Kconfig
create mode 100644 drivers/fpga/lattice/Makefile
rename drivers/fpga/{ => lattice}/ice40-spi.c (100%)
rename drivers/fpga/{ => lattice}/machxo2-spi.c (100%)drivers/fpga/Kconfig +1 -13
@@ -12,19 +12,6 @@ menuconfig FPGA if FPGA -config FPGA_MGR_ICE40_SPI - tristate "Lattice iCE40 SPI" - depends on OF && SPI - help - FPGA manager driver support for Lattice iCE40 FPGAs over SPI. - -config FPGA_MGR_MACHXO2_SPI - tristate "Lattice MachXO2 SPI" - depends on SPI - help - FPGA manager driver support for Lattice MachXO2 configuration - over slave SPI interface. - config FPGA_BRIDGE tristate "FPGA Bridge Framework" help
@@ -48,6 +35,7 @@ config OF_FPGA_REGION source "drivers/fpga/altera/Kconfig" source "drivers/fpga/dfl/Kconfig" +source "drivers/fpga/lattice/Kconfig" source "drivers/fpga/xilinx/Kconfig" endif # FPGA
drivers/fpga/Makefile +5 -8
@@ -4,19 +4,16 @@ # # Core FPGA Manager Framework -obj-$(CONFIG_FPGA) += fpga-mgr.o - -# FPGA Manager Drivers -obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o -obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-spi.o +obj-$(CONFIG_FPGA) += fpga-mgr.o # FPGA Bridge Drivers -obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o +obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o # High Level Interfaces -obj-$(CONFIG_FPGA_REGION) += fpga-region.o -obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o +obj-$(CONFIG_FPGA_REGION) += fpga-region.o +obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_ALTERA) += altera/ obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_LATTICE) += lattice/ obj-$(CONFIG_FPGA_XILINX) += xilinx/
drivers/fpga/lattice/Kconfig new file +29 -0
@@ -0,0 +1,29 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config FPGA_LATTICE + bool "Lattice FPGAs" + default y + help + If you have a lattice fpga, say Y. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about lattice fpgas. If you say Y, you will be asked + for your specific device in the following questions. + +if FPGA_LATTICE + +config FPGA_MGR_ICE40_SPI + tristate "Lattice iCE40 SPI" + depends on OF && SPI + help + FPGA manager driver support for Lattice iCE40 FPGAs over SPI. + +config FPGA_MGR_MACHXO2_SPI + tristate "Lattice MachXO2 SPI" + depends on SPI + help + FPGA manager driver support for Lattice MachXO2 configuration + over slave SPI interface. + +endif #FPGA_LATTICE
drivers/fpga/lattice/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o +obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-spi.o
drivers/fpga/lattice/ice40-spi.c renamed from drivers/fpga/ice40-spi.c +0 -0
drivers/fpga/lattice/machxo2-spi.c renamed from drivers/fpga/machxo2-spi.c +0 -0
Signature · 1 line
2.26.3