| Message ID | 20230719102057.22329-1-minda.chen@starfivetech.com |
|---|---|
| Headers | show |
| Series | Refactoring Microchip PolarFire PCIe driver | expand |
Hey Minda, On Wed, Jul 19, 2023 at 06:20:52PM +0800, Minda Chen wrote: > Move Microchip specific platform codes to PLDA directory. > Including clock init, interrupt event handle and platform > init codes. > > Signed-off-by: Minda Chen <minda.chen@starfivetech.com> > --- > MAINTAINERS | 4 +- > drivers/pci/controller/Kconfig | 8 - > drivers/pci/controller/Makefile | 1 - > drivers/pci/controller/plda/Kconfig | 10 +- > drivers/pci/controller/plda/Makefile | 1 + > .../{ => plda}/pcie-microchip-host.c | 594 ++---------------- I think that you should squash this with the previous patch, rather than duplicate the code and then de-duplicate it, so that it is more obvious what is being extracted. > 6 files changed, 55 insertions(+), 563 deletions(-) > rename drivers/pci/controller/{ => plda}/pcie-microchip-host.c (50%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 3b3c4d8808ae..f02618c2bdf5 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -16503,7 +16503,7 @@ M: Daire McNamara <daire.mcnamara@microchip.com> > L: linux-pci@vger.kernel.org > S: Supported > F: Documentation/devicetree/bindings/pci/microchip* > -F: drivers/pci/controller/*microchip* > +F: drivers/pci/controller/plda/*microchip* > > PCIE DRIVER FOR QUALCOMM MSM > M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > @@ -18287,7 +18287,7 @@ F: drivers/char/hw_random/mpfs-rng.c > F: drivers/clk/microchip/clk-mpfs*.c > F: drivers/i2c/busses/i2c-microchip-corei2c.c > F: drivers/mailbox/mailbox-mpfs.c > -F: drivers/pci/controller/pcie-microchip-host.c > +F: drivers/pci/controller/plda/pcie-microchip-host.c > F: drivers/pwm/pwm-microchip-core.c > F: drivers/reset/reset-mpfs.c > F: drivers/rtc/rtc-mpfs.c > diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig > index a106dabcb8dc..107cdb69e15c 100644 > --- a/drivers/pci/controller/Kconfig > +++ b/drivers/pci/controller/Kconfig > @@ -216,14 +216,6 @@ config PCIE_MT7621 > help > This selects a driver for the MediaTek MT7621 PCIe Controller. > > -config PCIE_MICROCHIP_HOST > - bool "Microchip AXI PCIe controller" > - depends on PCI_MSI && OF > - select PCI_HOST_COMMON > - help > - Say Y here if you want kernel to support the Microchip AXI PCIe > - Host Bridge driver. > - > config PCI_HYPERV_INTERFACE > tristate "Microsoft Hyper-V PCI Interface" > depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI > diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile > index aa0a691ebcbc..93236dc97b21 100644 > --- a/drivers/pci/controller/Makefile > +++ b/drivers/pci/controller/Makefile > @@ -32,7 +32,6 @@ obj-$(CONFIG_PCIE_ROCKCHIP_EP) += pcie-rockchip-ep.o > obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o > obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o > obj-$(CONFIG_PCIE_MEDIATEK_GEN3) += pcie-mediatek-gen3.o > -obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o > obj-$(CONFIG_VMD) += vmd.o > obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o > obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o > diff --git a/drivers/pci/controller/plda/Kconfig b/drivers/pci/controller/plda/Kconfig > index 37e17326671b..fb274976b84b 100644 > --- a/drivers/pci/controller/plda/Kconfig > +++ b/drivers/pci/controller/plda/Kconfig > @@ -4,8 +4,16 @@ menu "PLDA PCIe controllers support" > depends on PCI > > config PCIE_PLDA_HOST > - bool "PLDA PCIe host controller" > + bool > depends on OF && PCI_MSI Is this okay w.r.t. unmet dependencies? IOW, if PCI_MSI is disabled, PCIE_MICROCHIP_HOST can still select PCIE_PLDA_HOST, no? > select IRQ_DOMAIN > > +config PCIE_MICROCHIP_HOST > + bool "Microchip AXI PCIe controller" > + select PCI_HOST_COMMON > + select PCIE_PLDA_HOST > + help > + Say Y here if you want kernel to support the Microchip AXI PCIe > + Host Bridge driver. > + > endmenu > diff --git a/drivers/pci/controller/plda/Makefile b/drivers/pci/controller/plda/Makefile > index 79dbae655c2b..4340ab007f44 100644 > --- a/drivers/pci/controller/plda/Makefile > +++ b/drivers/pci/controller/plda/Makefile > @@ -1,2 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0 > obj-$(CONFIG_PCIE_PLDA_HOST) += pcie-plda-host.o > +obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o
This patchset final purpose is add PCIe driver for StarFive JH7110 SoC. JH7110 using PLDA XpressRICH PCIe IP. Microchip PolarFire Using the same IP and have commit their codes, which are mixed with PLDA controller codes and Microchip platform codes. For re-use the PLDA controller codes, I request refactoring microchip codes, move PLDA common codes to PLDA files. Desigware and Cadence is good example for refactoring codes. So first step is extract the PLDA common codes from microchip, and refactoring the microchip codes.(patch1 - 4) Then add the PLDA platform codes. (patch5, 6) At last, add Starfive codes. (patch7 - 9) This patchset is base on v6.5-rc1 patch1 is add PLDA XpressRICH PCIe host common properties dt-binding docs, most are extracted from microchip,pcie-host.yaml patch2 is add plda,xpressrich-pcie-common.yaml(patch1 file) reference and remove the PLDA common properties. patch3 is extracting the PLDA common codes from microchip Polarfire PCIe codes. The change list in the commit message. patch4 is move microchip driver to PLDA directory and remove the PLDA common codes. patch5 is add PLDA Xpressrich platform driver dt-binding doc. patch6 is PLDA Xpressrich platform driver. patch7 is add StarFive JH7110 PCIe dt-binding doc. patch8 is add StarFive JH7110 Soc PCIe platform codes. patch9 is StarFive JH7110 device tree configuration. I have noticed that Daire have changed microchip's codes. https://patchwork.kernel.org/project/linux-pci/cover/20230630154859.2049521-1-daire.mcnamara@microchip.com/ I have changed patch3 and patch4 base on their commits. StarFive PCIe driver still can work. But their codes is under reviewed and maybe changing. Do not base on their changes first. I will base on their commit to change patch3 and patch4 as soon as their commits are accepted. List below is old patchset and is dropped, which is non-refractored version. https://patchwork.kernel.org/project/linux-pci/cover/20230406111142.74410-1-minda.chen@starfivetech.com/ Minda Chen (9): dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties dt-bindings: PCI: microchip: Remove the PLDA common properties PCI: PLDA: Get PLDA common codes from Microchip PolarFire host PCI: microchip: Move PCIe driver to PLDA directory dt-bindings: PLDA: Add PLDA XpressRICH PCIe host controller PCI: PLDA: Add host conroller platform driver dt-bindings: PCI: Add StarFive JH7110 PCIe controller PCI: PLDA: starfive: Add JH7110 PCIe controller riscv: dts: starfive: add PCIe dts configuration for JH7110 .../bindings/pci/microchip,pcie-host.yaml | 45 +- .../pci/plda,xpressrich-pcie-common.yaml | 72 ++ .../pci/plda,xpressrich-pcie-host.yaml | 66 ++ .../bindings/pci/starfive,jh7110-pcie.yaml | 138 ++++ MAINTAINERS | 19 +- .../jh7110-starfive-visionfive-2.dtsi | 44 ++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 88 +++ drivers/pci/controller/Kconfig | 9 +- drivers/pci/controller/Makefile | 2 +- drivers/pci/controller/plda/Kconfig | 35 + drivers/pci/controller/plda/Makefile | 5 + .../{ => plda}/pcie-microchip-host.c | 594 ++-------------- drivers/pci/controller/plda/pcie-plda-host.c | 665 ++++++++++++++++++ drivers/pci/controller/plda/pcie-plda-plat.c | 64 ++ drivers/pci/controller/plda/pcie-plda.h | 230 ++++++ drivers/pci/controller/plda/pcie-starfive.c | 415 +++++++++++ 16 files changed, 1885 insertions(+), 606 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich-pcie-common.yaml create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich-pcie-host.yaml create mode 100644 Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml create mode 100644 drivers/pci/controller/plda/Kconfig create mode 100644 drivers/pci/controller/plda/Makefile rename drivers/pci/controller/{ => plda}/pcie-microchip-host.c (50%) create mode 100644 drivers/pci/controller/plda/pcie-plda-host.c create mode 100644 drivers/pci/controller/plda/pcie-plda-plat.c create mode 100644 drivers/pci/controller/plda/pcie-plda.h create mode 100644 drivers/pci/controller/plda/pcie-starfive.c base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5