fpga: reorganize to subdirs
[email protected]
reviewercover 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/
For many of the moved files, they had a prefix bla-* that matched their new subdir dir name bla/. Those filename are overspecified. So they were simplified by removing the 'bla-' prefix. If they were *.h files their guards were also changed.
Some cleanup to arrange thing alphabetically and make fpga/Makefile's whitespace look more like net/'s
Tom Rix (7):
fpga: dfl: reorganize to subdir layout
fpga: xilinx: reorganize to subdir layout
fpga: altera: reorganize to subdir layout
fpga: lattice: reorganize to subdir layout
fpga: dfl: remove dfl- prefix on files
fpga: xilinx: remove xilinx- prefix on files
fpga: altera: remove altera- prefix on files
Documentation/fpga/dfl.rst | 4 +-
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 204 +-----------------
drivers/fpga/Makefile | 47 +---
drivers/fpga/altera/Kconfig | 79 +++++++
drivers/fpga/altera/Makefile | 12 ++
drivers/fpga/{altera-cvp.c => altera/cvp.c} | 0
.../fpga2sdram.c} | 0
.../freeze-bridge.c} | 0
.../{altera-hps2fpga.c => altera/hps2fpga.c} | 0
.../pr-ip-core-plat.c} | 0
.../pr-ip-core.c} | 0
.../fpga/{altera-ps-spi.c => 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 | 80 +++++++
drivers/fpga/dfl/Makefile | 17 ++
.../afu-dma-region.c} | 2 +-
.../fpga/{dfl-afu-error.c => dfl/afu-error.c} | 2 +-
.../fpga/{dfl-afu-main.c => dfl/afu-main.c} | 2 +-
.../{dfl-afu-region.c => dfl/afu-region.c} | 2 +-
drivers/fpga/{dfl-afu.h => dfl/afu.h} | 6 +-
drivers/fpga/{ => dfl}/dfl.c | 0
drivers/fpga/{ => dfl}/dfl.h | 0
drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} | 2 +-
.../fpga/{dfl-fme-error.c => dfl/fme-error.c} | 2 +-
.../fpga/{dfl-fme-main.c => dfl/fme-main.c} | 2 +-
drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} | 2 +-
.../fpga/{dfl-fme-perf.c => dfl/fme-perf.c} | 2 +-
drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} | 4 +-
drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} | 6 +-
.../{dfl-fme-region.c => dfl/fme-region.c} | 2 +-
drivers/fpga/{dfl-fme.h => dfl/fme.h} | 6 +-
.../{dfl-n3000-nios.c => dfl/n3000-nios.c} | 0
drivers/fpga/{dfl-pci.c => dfl/pci.c} | 0
drivers/fpga/lattice/Kconfig | 22 ++
drivers/fpga/lattice/Makefile | 4 +
drivers/fpga/{ => lattice}/ice40-spi.c | 0
drivers/fpga/{ => lattice}/machxo2-spi.c | 0
drivers/fpga/xilinx/Kconfig | 48 +++++
drivers/fpga/xilinx/Makefile | 8 +
.../pr-decoupler.c} | 0
drivers/fpga/{xilinx-spi.c => xilinx/spi.c} | 0
drivers/fpga/{ => xilinx}/zynq-fpga.c | 0
drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0
47 files changed, 306 insertions(+), 263 deletions(-)
create mode 100644 drivers/fpga/altera/Kconfig
create mode 100644 drivers/fpga/altera/Makefile
rename drivers/fpga/{altera-cvp.c => altera/cvp.c} (100%)
rename drivers/fpga/{altera-fpga2sdram.c => altera/fpga2sdram.c} (100%)
rename drivers/fpga/{altera-freeze-bridge.c => altera/freeze-bridge.c} (100%)
rename drivers/fpga/{altera-hps2fpga.c => altera/hps2fpga.c} (100%)
rename drivers/fpga/{altera-pr-ip-core-plat.c => altera/pr-ip-core-plat.c} (100%)
rename drivers/fpga/{altera-pr-ip-core.c => altera/pr-ip-core.c} (100%)
rename drivers/fpga/{altera-ps-spi.c => 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-afu-dma-region.c => dfl/afu-dma-region.c} (99%)
rename drivers/fpga/{dfl-afu-error.c => dfl/afu-error.c} (99%)
rename drivers/fpga/{dfl-afu-main.c => dfl/afu-main.c} (99%)
rename drivers/fpga/{dfl-afu-region.c => dfl/afu-region.c} (99%)
rename drivers/fpga/{dfl-afu.h => dfl/afu.h} (98%)
rename drivers/fpga/{ => dfl}/dfl.c (100%)
rename drivers/fpga/{ => dfl}/dfl.h (100%)
rename drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} (99%)
rename drivers/fpga/{dfl-fme-error.c => dfl/fme-error.c} (99%)
rename drivers/fpga/{dfl-fme-main.c => dfl/fme-main.c} (99%)
rename drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} (99%)
rename drivers/fpga/{dfl-fme-perf.c => dfl/fme-perf.c} (99%)
rename drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} (99%)
rename drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} (96%)
rename drivers/fpga/{dfl-fme-region.c => dfl/fme-region.c} (98%)
rename drivers/fpga/{dfl-fme.h => dfl/fme.h} (95%)
rename drivers/fpga/{dfl-n3000-nios.c => dfl/n3000-nios.c} (100%)
rename drivers/fpga/{dfl-pci.c => dfl/pci.c} (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-pr-decoupler.c => xilinx/pr-decoupler.c} (100%)
rename drivers/fpga/{xilinx-spi.c => 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]
reviewercover 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/
For many of the moved files, they had a prefix bla-* that matched their new subdir dir name bla/. Those filename are overspecified. So they were simplified by removing the 'bla-' prefix. If they were *.h files their guards were also changed.
Some cleanup to arrange thing alphabetically and make fpga/Makefile's whitespace look more like net/'s
Tom Rix (7):
fpga: dfl: reorganize to subdir layout
fpga: xilinx: reorganize to subdir layout
fpga: altera: reorganize to subdir layout
fpga: lattice: reorganize to subdir layout
fpga: dfl: remove dfl- prefix on files
fpga: xilinx: remove xilinx- prefix on files
fpga: altera: remove altera- prefix on files
Documentation/fpga/dfl.rst | 4 +-
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 204 +-----------------
drivers/fpga/Makefile | 47 +---
drivers/fpga/altera/Kconfig | 79 +++++++
drivers/fpga/altera/Makefile | 12 ++
drivers/fpga/{altera-cvp.c => altera/cvp.c} | 0
.../fpga2sdram.c} | 0
.../freeze-bridge.c} | 0
.../{altera-hps2fpga.c => altera/hps2fpga.c} | 0
.../pr-ip-core-plat.c} | 0
.../pr-ip-core.c} | 0
.../fpga/{altera-ps-spi.c => 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 | 80 +++++++
drivers/fpga/dfl/Makefile | 17 ++
.../afu-dma-region.c} | 2 +-
.../fpga/{dfl-afu-error.c => dfl/afu-error.c} | 2 +-
.../fpga/{dfl-afu-main.c => dfl/afu-main.c} | 2 +-
.../{dfl-afu-region.c => dfl/afu-region.c} | 2 +-
drivers/fpga/{dfl-afu.h => dfl/afu.h} | 6 +-
drivers/fpga/{ => dfl}/dfl.c | 0
drivers/fpga/{ => dfl}/dfl.h | 0
drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} | 2 +-
.../fpga/{dfl-fme-error.c => dfl/fme-error.c} | 2 +-
.../fpga/{dfl-fme-main.c => dfl/fme-main.c} | 2 +-
drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} | 2 +-
.../fpga/{dfl-fme-perf.c => dfl/fme-perf.c} | 2 +-
drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} | 4 +-
drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} | 6 +-
.../{dfl-fme-region.c => dfl/fme-region.c} | 2 +-
drivers/fpga/{dfl-fme.h => dfl/fme.h} | 6 +-
.../{dfl-n3000-nios.c => dfl/n3000-nios.c} | 0
drivers/fpga/{dfl-pci.c => dfl/pci.c} | 0
drivers/fpga/lattice/Kconfig | 22 ++
drivers/fpga/lattice/Makefile | 4 +
drivers/fpga/{ => lattice}/ice40-spi.c | 0
drivers/fpga/{ => lattice}/machxo2-spi.c | 0
drivers/fpga/xilinx/Kconfig | 48 +++++
drivers/fpga/xilinx/Makefile | 8 +
.../pr-decoupler.c} | 0
drivers/fpga/{xilinx-spi.c => xilinx/spi.c} | 0
drivers/fpga/{ => xilinx}/zynq-fpga.c | 0
drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0
47 files changed, 306 insertions(+), 263 deletions(-)
create mode 100644 drivers/fpga/altera/Kconfig
create mode 100644 drivers/fpga/altera/Makefile
rename drivers/fpga/{altera-cvp.c => altera/cvp.c} (100%)
rename drivers/fpga/{altera-fpga2sdram.c => altera/fpga2sdram.c} (100%)
rename drivers/fpga/{altera-freeze-bridge.c => altera/freeze-bridge.c} (100%)
rename drivers/fpga/{altera-hps2fpga.c => altera/hps2fpga.c} (100%)
rename drivers/fpga/{altera-pr-ip-core-plat.c => altera/pr-ip-core-plat.c} (100%)
rename drivers/fpga/{altera-pr-ip-core.c => altera/pr-ip-core.c} (100%)
rename drivers/fpga/{altera-ps-spi.c => 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-afu-dma-region.c => dfl/afu-dma-region.c} (99%)
rename drivers/fpga/{dfl-afu-error.c => dfl/afu-error.c} (99%)
rename drivers/fpga/{dfl-afu-main.c => dfl/afu-main.c} (99%)
rename drivers/fpga/{dfl-afu-region.c => dfl/afu-region.c} (99%)
rename drivers/fpga/{dfl-afu.h => dfl/afu.h} (98%)
rename drivers/fpga/{ => dfl}/dfl.c (100%)
rename drivers/fpga/{ => dfl}/dfl.h (100%)
rename drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} (99%)
rename drivers/fpga/{dfl-fme-error.c => dfl/fme-error.c} (99%)
rename drivers/fpga/{dfl-fme-main.c => dfl/fme-main.c} (99%)
rename drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} (99%)
rename drivers/fpga/{dfl-fme-perf.c => dfl/fme-perf.c} (99%)
rename drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} (99%)
rename drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} (96%)
rename drivers/fpga/{dfl-fme-region.c => dfl/fme-region.c} (98%)
rename drivers/fpga/{dfl-fme.h => dfl/fme.h} (95%)
rename drivers/fpga/{dfl-n3000-nios.c => dfl/n3000-nios.c} (100%)
rename drivers/fpga/{dfl-pci.c => dfl/pci.c} (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-pr-decoupler.c => xilinx/pr-decoupler.c} (100%)
rename drivers/fpga/{xilinx-spi.c => 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
Quoted 9 lines · On Tue, Jun 08, 2021 at 09:23:33AM -0700, [email protected] wrote:
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]/
Quoted 4 lines
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.
Why did we get two 0/7 emails?
confused,
greg k-h
Tom Rix
reviewerQuoted 10 lines · Greg KH
Quoted 9 lines · On Tue, Jun 08, 2021 at 09:23:33AM -0700, [email protected] wrote:
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]/
Quoted 5 lines
Quoted 4 lines
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.Why did we get two 0/7 emails?
Errr.. no clue,
I'll resend the set.
Tom
Quoted 4 lines
confused,
greg k-h
[email protected]
reviewerPATCH 1/7 fpga: dfl: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
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 explict dependence can be removed. Also since FPGA_DFL depends on HAS_IOMEM, it can be removed from the other configs.
---
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 80 +-------------------
drivers/fpga/Makefile | 18 +----
drivers/fpga/dfl/Kconfig | 81 +++++++++++++++++++++
drivers/fpga/dfl/Makefile | 19 +++++
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
23 files changed, 103 insertions(+), 97 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%)MAINTAINERS +1 -1
@@ -7201,7 +7201,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 +81 -0
81 lines not on this page · raw message
drivers/fpga/dfl/Makefile new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# 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
[email protected]
reviewerPATCH 2/7 fpga: xilinx: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
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 | 48 +++++++++++++++++++
drivers/fpga/xilinx/Makefile | 8 ++++
.../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, 58 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 +48 -0
48 lines not on this page · raw message
drivers/fpga/xilinx/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 + +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
[email protected]
reviewerPATCH 3/7 fpga: altera: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
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 | 79 +++++++++++++++++++
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, 93 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 +79 -0
79 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 + +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 4/7 fpga: lattice: reorganize to subdir layout
In reply to [email protected]From: Tom Rix <[email protected]>
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 | 22 ++++++++++++++++++++++
drivers/fpga/lattice/Makefile | 4 ++++
drivers/fpga/{ => lattice}/ice40-spi.c | 0
drivers/fpga/{ => lattice}/machxo2-spi.c | 0
6 files changed, 32 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
@@ -47,6 +34,7 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/altera/Kconfig" +source "drivers/fpga/lattice/Kconfig" source "drivers/fpga/dfl/Kconfig" source "drivers/fpga/xilinx/Kconfig"
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 +22 -0
@@ -0,0 +1,22 @@ +config FPGA_LATTICE + bool "Lattice Devices" + default y + help + If you have a lattic fpga, say Y. + +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 + +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
[email protected]
reviewerPATCH 5/7 fpga: dfl: remove dfl- prefix on files
In reply to [email protected]From: Tom Rix <[email protected]>
It is not necessary to have a dfl- prefix on a file when the file is in a dfl/ subdir.
---
Documentation/fpga/dfl.rst | 4 ++--
drivers/fpga/dfl/Makefile | 21 +++++++------------
...{dfl-afu-dma-region.c => afu-dma-region.c} | 2 +-
.../fpga/dfl/{dfl-afu-error.c => afu-error.c} | 2 +-
.../fpga/dfl/{dfl-afu-main.c => afu-main.c} | 2 +-
.../dfl/{dfl-afu-region.c => afu-region.c} | 2 +-
drivers/fpga/dfl/{dfl-afu.h => afu.h} | 6 +++---
drivers/fpga/dfl/{dfl-fme-br.c => fme-br.c} | 2 +-
.../fpga/dfl/{dfl-fme-error.c => fme-error.c} | 2 +-
.../fpga/dfl/{dfl-fme-main.c => fme-main.c} | 2 +-
drivers/fpga/dfl/{dfl-fme-mgr.c => fme-mgr.c} | 2 +-
.../fpga/dfl/{dfl-fme-perf.c => fme-perf.c} | 2 +-
drivers/fpga/dfl/{dfl-fme-pr.c => fme-pr.c} | 4 ++--
drivers/fpga/dfl/{dfl-fme-pr.h => fme-pr.h} | 6 +++---
.../dfl/{dfl-fme-region.c => fme-region.c} | 2 +-
drivers/fpga/dfl/{dfl-fme.h => fme.h} | 6 +++---
.../dfl/{dfl-n3000-nios.c => n3000-nios.c} | 0
drivers/fpga/dfl/{dfl-pci.c => pci.c} | 0
18 files changed, 31 insertions(+), 36 deletions(-)
rename drivers/fpga/dfl/{dfl-afu-dma-region.c => afu-dma-region.c} (99%)
rename drivers/fpga/dfl/{dfl-afu-error.c => afu-error.c} (99%)
rename drivers/fpga/dfl/{dfl-afu-main.c => afu-main.c} (99%)
rename drivers/fpga/dfl/{dfl-afu-region.c => afu-region.c} (99%)
rename drivers/fpga/dfl/{dfl-afu.h => afu.h} (98%)
rename drivers/fpga/dfl/{dfl-fme-br.c => fme-br.c} (99%)
rename drivers/fpga/dfl/{dfl-fme-error.c => fme-error.c} (99%)
rename drivers/fpga/dfl/{dfl-fme-main.c => fme-main.c} (99%)
rename drivers/fpga/dfl/{dfl-fme-mgr.c => fme-mgr.c} (99%)
rename drivers/fpga/dfl/{dfl-fme-perf.c => fme-perf.c} (99%)
rename drivers/fpga/dfl/{dfl-fme-pr.c => fme-pr.c} (99%)
rename drivers/fpga/dfl/{dfl-fme-pr.h => fme-pr.h} (96%)
rename drivers/fpga/dfl/{dfl-fme-region.c => fme-region.c} (98%)
rename drivers/fpga/dfl/{dfl-fme.h => fme.h} (95%)
rename drivers/fpga/dfl/{dfl-n3000-nios.c => n3000-nios.c} (100%)
rename drivers/fpga/dfl/{dfl-pci.c => pci.c} (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/fme-pr.c) could be a reference. Location of DFLs on a PCI Device
drivers/fpga/dfl/Makefile +8 -13
@@ -4,16 +4,11 @@ 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 - - - +obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += fme-br.o +obj-$(CONFIG_FPGA_DFL_FME_MGR) += fme-mgr.o +obj-$(CONFIG_FPGA_DFL_FME_REGION) += fme-region.o +obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += n3000-nios.o +obj-$(CONFIG_FPGA_DFL_PCI) += pci.o + +dfl-fme-objs := fme-main.o fme-pr.o fme-error.o fme-perf.o +dfl-afu-objs := afu-main.o afu-region.o afu-dma-region.o afu-error.o
drivers/fpga/dfl/afu-dma-region.c renamed from drivers/fpga/dfl/dfl-afu-dma-region.c +1 -1
@@ -14,7 +14,7 @@#include <linux/uaccess.h> #include <linux/mm.h> -#include "dfl-afu.h" +#include "afu.h" void afu_dma_region_init (struct dfl_feature_platform_data *pdata) {
drivers/fpga/dfl/afu-error.c renamed from drivers/fpga/dfl/dfl-afu-error.c +1 -1
@@ -17,7 +17,7 @@#include <linux/fpga-dfl.h> #include <linux/uaccess.h> -#include "dfl-afu.h" +#include "afu.h" #define PORT_ERROR_MASK 0x8#define PORT_ERROR 0x10
drivers/fpga/dfl/afu-main.c renamed from drivers/fpga/dfl/dfl-afu-main.c +1 -1
@@ -19,7 +19,7 @@#include <linux/uaccess.h> #include <linux/fpga-dfl.h> -#include "dfl-afu.h" +#include "afu.h" #define RST_POLL_INVL 10/* us */ #define RST_POLL_TIMEOUT 1000/* us */
drivers/fpga/dfl/afu-region.c renamed from drivers/fpga/dfl/dfl-afu-region.c +1 -1
@@ -8,7 +8,7 @@* Wu Hao <[email protected]> * Xiao Guangrong <[email protected]> */ -#include "dfl-afu.h" +#include "afu.h" /** * afu_mmio_region_init - init function for afu mmio region support
drivers/fpga/dfl/afu.h renamed from drivers/fpga/dfl/dfl-afu.h +3 -3
@@ -14,8 +14,8 @@* Henry Mitchel <[email protected]> */ -#ifndef __DFL_AFU_H -#define __DFL_AFU_H +#ifndef __AFU_H +#define __AFU_H#include <linux/mm.h>
@@ -106,4 +106,4 @@ extern const struct dfl_feature_ops port_err_ops;extern const struct dfl_feature_id port_err_id_table[];extern const struct attribute_group port_err_group; -#endif /* __DFL_AFU_H */ +#endif /* __AFU_H */
drivers/fpga/dfl/fme-br.c renamed from drivers/fpga/dfl/dfl-fme-br.c +1 -1
@@ -17,7 +17,7 @@#include <linux/fpga/fpga-bridge.h> #include "dfl.h" -#include "dfl-fme-pr.h" +#include "fme-pr.h" struct fme_br_priv {struct dfl_fme_br_pdata *pdata;
drivers/fpga/dfl/fme-error.c renamed from drivers/fpga/dfl/dfl-fme-error.c +1 -1
@@ -19,7 +19,7 @@#include <linux/uaccess.h> #include "dfl.h" -#include "dfl-fme.h" +#include "fme.h" #define FME_ERROR_MASK 0x8#define FME_ERROR 0x10
drivers/fpga/dfl/fme-main.c renamed from drivers/fpga/dfl/dfl-fme-main.c +1 -1
@@ -22,7 +22,7 @@#include <linux/fpga-dfl.h> #include "dfl.h" -#include "dfl-fme.h" +#include "fme.h" static ssize_t ports_num_show (struct device *dev,struct device_attribute *attr,char *buf)
drivers/fpga/dfl/fme-mgr.c renamed from drivers/fpga/dfl/dfl-fme-mgr.c +1 -1
@@ -22,7 +22,7 @@#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/fpga/fpga-mgr.h> -#include "dfl-fme-pr.h" +#include "fme-pr.h" /* FME Partial Reconfiguration Sub Feature Register Set */ #define FME_PR_DFH 0x0
drivers/fpga/dfl/fme-perf.c renamed from drivers/fpga/dfl/dfl-fme-perf.c +1 -1
@@ -18,7 +18,7 @@#include <linux/perf_event.h> #include "dfl.h" -#include "dfl-fme.h" +#include "fme.h" /* * Performance Counter Registers for Cache.
drivers/fpga/dfl/fme-pr.c renamed from drivers/fpga/dfl/dfl-fme-pr.c +2 -2
@@ -26,8 +26,8 @@#include <linux/fpga-dfl.h> #include "dfl.h" -#include "dfl-fme.h" -#include "dfl-fme-pr.h" +#include "fme.h" +#include "fme-pr.h" static struct dfl_fme_region *dfl_fme_region_find_by_port_id (struct dfl_fme *fme,int port_id)
drivers/fpga/dfl/fme-pr.h renamed from drivers/fpga/dfl/dfl-fme-pr.h +3 -3
@@ -15,8 +15,8 @@* Henry Mitchel <[email protected]> */ -#ifndef __DFL_FME_PR_H -#define __DFL_FME_PR_H +#ifndef __FME_PR_H +#define __FME_PR_H#include <linux/platform_device.h>
@@ -81,4 +81,4 @@ struct dfl_fme_mgr_pdata {#define DFL_FPGA_FME_BRIDGE "dfl-fme-bridge"#define DFL_FPGA_FME_REGION "dfl-fme-region" -#endif /* __DFL_FME_PR_H */ +#endif /* __FME_PR_H */
drivers/fpga/dfl/fme-region.c renamed from drivers/fpga/dfl/dfl-fme-region.c +1 -1
@@ -17,7 +17,7 @@#include <linux/fpga/fpga-mgr.h> #include <linux/fpga/fpga-region.h> -#include "dfl-fme-pr.h" +#include "fme-pr.h" static int fme_region_get_bridges (struct fpga_region *region) {
drivers/fpga/dfl/fme.h renamed from drivers/fpga/dfl/dfl-fme.h +3 -3
@@ -15,8 +15,8 @@* Henry Mitchel <[email protected]> */ -#ifndef __DFL_FME_H -#define __DFL_FME_H +#ifndef __FME_H +#define __FME_H/** * struct dfl_fme - dfl fme private data
@@ -41,4 +41,4 @@ extern const struct attribute_group fme_global_err_group;extern const struct dfl_feature_ops fme_perf_ops;extern const struct dfl_feature_id fme_perf_id_table[]; -#endif /* __DFL_FME_H */ +#endif /* __FME_H */
drivers/fpga/dfl/n3000-nios.c renamed from drivers/fpga/dfl/dfl-n3000-nios.c +0 -0
drivers/fpga/dfl/pci.c renamed from drivers/fpga/dfl/dfl-pci.c +0 -0
Signature · 1 line
2.26.3
Quoted 8 lines · On Tue, Jun 08, 2021 at 09:23:32AM -0700, [email protected] wrote:
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]/
Your series was odd, patches 6 and 7 were not threaded properly.
Please fix up your emailer and resend so that tools can correctly pick them up automatically.
thanks,
greg k-h