* [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files
@ 2021-06-08 16:25 trix
2021-06-09 9:59 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: trix @ 2021-06-08 16:25 UTC (permalink / raw)
To: mdf, michal.simek, nava.manne, gregkh, luca
Cc: linux-fpga, linux-arm-kernel, linux-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
It is not necessary to have a xilinx- prefix on a file
when the file is in a xilinx/ subdir.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/xilinx/Makefile | 4 ++--
drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} | 0
drivers/fpga/xilinx/{xilinx-spi.c => spi.c} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} (100%)
rename drivers/fpga/xilinx/{xilinx-spi.c => spi.c} (100%)
diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile
index 7bb7543412790..4ac727d03e140 100644
--- a/drivers/fpga/xilinx/Makefile
+++ b/drivers/fpga/xilinx/Makefile
@@ -1,7 +1,7 @@
# 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_XILINX_PR_DECOUPLER) += pr-decoupler.o
+obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += spi.o
obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o
obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o
diff --git a/drivers/fpga/xilinx/xilinx-pr-decoupler.c b/drivers/fpga/xilinx/pr-decoupler.c
similarity index 100%
rename from drivers/fpga/xilinx/xilinx-pr-decoupler.c
rename to drivers/fpga/xilinx/pr-decoupler.c
diff --git a/drivers/fpga/xilinx/xilinx-spi.c b/drivers/fpga/xilinx/spi.c
similarity index 100%
rename from drivers/fpga/xilinx/xilinx-spi.c
rename to drivers/fpga/xilinx/spi.c
--
2.26.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files
2021-06-08 16:25 [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files trix
@ 2021-06-09 9:59 ` Greg KH
2021-06-09 13:27 ` Tom Rix
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2021-06-09 9:59 UTC (permalink / raw)
To: trix
Cc: mdf, michal.simek, nava.manne, luca, linux-fpga,
linux-arm-kernel, linux-kernel
On Tue, Jun 08, 2021 at 09:25:51AM -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> It is not necessary to have a xilinx- prefix on a file
> when the file is in a xilinx/ subdir.
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> drivers/fpga/xilinx/Makefile | 4 ++--
> drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} | 0
> drivers/fpga/xilinx/{xilinx-spi.c => spi.c} | 0
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} (100%)
> rename drivers/fpga/xilinx/{xilinx-spi.c => spi.c} (100%)
>
> diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile
> index 7bb7543412790..4ac727d03e140 100644
> --- a/drivers/fpga/xilinx/Makefile
> +++ b/drivers/fpga/xilinx/Makefile
> @@ -1,7 +1,7 @@
> # 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_XILINX_PR_DECOUPLER) += pr-decoupler.o
> +obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += spi.o
You just renamed the module to be called "spi.ko"????
Did you test this thing? You can not rename modules without good
reasons, and calling a device specific kernel module "spi.ko" is not ok.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files
2021-06-09 9:59 ` Greg KH
@ 2021-06-09 13:27 ` Tom Rix
2021-06-09 14:57 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rix @ 2021-06-09 13:27 UTC (permalink / raw)
To: Greg KH
Cc: mdf, michal.simek, nava.manne, luca, linux-fpga,
linux-arm-kernel, linux-kernel
On 6/9/21 2:59 AM, Greg KH wrote:
> On Tue, Jun 08, 2021 at 09:25:51AM -0700, trix@redhat.com wrote:
>> From: Tom Rix <trix@redhat.com>
>>
>> It is not necessary to have a xilinx- prefix on a file
>> when the file is in a xilinx/ subdir.
>>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>> drivers/fpga/xilinx/Makefile | 4 ++--
>> drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} | 0
>> drivers/fpga/xilinx/{xilinx-spi.c => spi.c} | 0
>> 3 files changed, 2 insertions(+), 2 deletions(-)
>> rename drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} (100%)
>> rename drivers/fpga/xilinx/{xilinx-spi.c => spi.c} (100%)
>>
>> diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile
>> index 7bb7543412790..4ac727d03e140 100644
>> --- a/drivers/fpga/xilinx/Makefile
>> +++ b/drivers/fpga/xilinx/Makefile
>> @@ -1,7 +1,7 @@
>> # 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_XILINX_PR_DECOUPLER) += pr-decoupler.o
>> +obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += spi.o
> You just renamed the module to be called "spi.ko"????
>
> Did you test this thing? You can not rename modules without good
> reasons, and calling a device specific kernel module "spi.ko" is not ok.
yes, this is a problem, I will drop the renaming patches.
Tom
> greg k-h
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files
2021-06-09 13:27 ` Tom Rix
@ 2021-06-09 14:57 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2021-06-09 14:57 UTC (permalink / raw)
To: Tom Rix
Cc: mdf, michal.simek, nava.manne, luca, linux-fpga,
linux-arm-kernel, linux-kernel
On Wed, Jun 09, 2021 at 06:27:05AM -0700, Tom Rix wrote:
>
> On 6/9/21 2:59 AM, Greg KH wrote:
> > On Tue, Jun 08, 2021 at 09:25:51AM -0700, trix@redhat.com wrote:
> > > From: Tom Rix <trix@redhat.com>
> > >
> > > It is not necessary to have a xilinx- prefix on a file
> > > when the file is in a xilinx/ subdir.
> > >
> > > Signed-off-by: Tom Rix <trix@redhat.com>
> > > ---
> > > drivers/fpga/xilinx/Makefile | 4 ++--
> > > drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} | 0
> > > drivers/fpga/xilinx/{xilinx-spi.c => spi.c} | 0
> > > 3 files changed, 2 insertions(+), 2 deletions(-)
> > > rename drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} (100%)
> > > rename drivers/fpga/xilinx/{xilinx-spi.c => spi.c} (100%)
> > >
> > > diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile
> > > index 7bb7543412790..4ac727d03e140 100644
> > > --- a/drivers/fpga/xilinx/Makefile
> > > +++ b/drivers/fpga/xilinx/Makefile
> > > @@ -1,7 +1,7 @@
> > > # 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_XILINX_PR_DECOUPLER) += pr-decoupler.o
> > > +obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += spi.o
> > You just renamed the module to be called "spi.ko"????
> >
> > Did you test this thing? You can not rename modules without good
> > reasons, and calling a device specific kernel module "spi.ko" is not ok.
>
> yes, this is a problem, I will drop the renaming patches.
So you didn't test these?
Again, why is this file movement necessary?
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 0/7] fpga: reorganize to subdirs
@ 2021-06-09 13:21 trix
2021-06-09 13:21 ` [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files trix
0 siblings, 1 reply; 5+ messages in thread
From: trix @ 2021-06-09 13:21 UTC (permalink / raw)
To: hao.wu, mdf, corbet, michal.simek
Cc: linux-fpga, linux-doc, linux-kernel, linux-arm-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
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/68e85a4f-4a10-1ff9-0443-aa565878c855@redhat.com/
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%)
--
2.26.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files
2021-06-09 13:21 [PATCH 0/7] fpga: reorganize to subdirs trix
@ 2021-06-09 13:21 ` trix
0 siblings, 0 replies; 5+ messages in thread
From: trix @ 2021-06-09 13:21 UTC (permalink / raw)
To: hao.wu, mdf, corbet, michal.simek
Cc: linux-fpga, linux-doc, linux-kernel, linux-arm-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
It is not necessary to have a xilinx- prefix on a file
when the file is in a xilinx/ subdir.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/xilinx/Makefile | 4 ++--
drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} | 0
drivers/fpga/xilinx/{xilinx-spi.c => spi.c} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} (100%)
rename drivers/fpga/xilinx/{xilinx-spi.c => spi.c} (100%)
diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile
index 7bb7543412790..4ac727d03e140 100644
--- a/drivers/fpga/xilinx/Makefile
+++ b/drivers/fpga/xilinx/Makefile
@@ -1,7 +1,7 @@
# 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_XILINX_PR_DECOUPLER) += pr-decoupler.o
+obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += spi.o
obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o
obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o
diff --git a/drivers/fpga/xilinx/xilinx-pr-decoupler.c b/drivers/fpga/xilinx/pr-decoupler.c
similarity index 100%
rename from drivers/fpga/xilinx/xilinx-pr-decoupler.c
rename to drivers/fpga/xilinx/pr-decoupler.c
diff --git a/drivers/fpga/xilinx/xilinx-spi.c b/drivers/fpga/xilinx/spi.c
similarity index 100%
rename from drivers/fpga/xilinx/xilinx-spi.c
rename to drivers/fpga/xilinx/spi.c
--
2.26.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-09 14:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 16:25 [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files trix
2021-06-09 9:59 ` Greg KH
2021-06-09 13:27 ` Tom Rix
2021-06-09 14:57 ` Greg KH
2021-06-09 13:21 [PATCH 0/7] fpga: reorganize to subdirs trix
2021-06-09 13:21 ` [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files trix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).