From: Minda Chen <minda.chen@starfivetech.com> To: "Conor Dooley" <conor@kernel.org>, "Krzysztof Wilczyński" <kw@linux.com>, "Rob Herring" <robh+dt@kernel.org>, "Bjorn Helgaas" <bhelgaas@google.com>, "Lorenzo Pieralisi" <lpieralisi@kernel.org>, "Daire McNamara" <daire.mcnamara@microchip.com>, "Emil Renner Berthing" <emil.renner.berthing@canonical.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-pci@vger.kernel.org, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Philipp Zabel <p.zabel@pengutronix.de>, Mason Huo <mason.huo@starfivetech.com>, Leyfoon Tan <leyfoon.tan@starfivetech.com>, Kevin Xie <kevin.xie@starfivetech.com>, Minda Chen <minda.chen@starfivetech.com> Subject: [PATCH v14 02/22] PCI: microchip: Move pcie-microchip-host.c to plda directory Date: Mon, 8 Jan 2024 19:05:52 +0800 [thread overview] Message-ID: <20240108110612.19048-3-minda.chen@starfivetech.com> (raw) In-Reply-To: <20240108110612.19048-1-minda.chen@starfivetech.com> For Microchip Polarfire PCIe host is PLDA XpressRich IP, move to plda directory. Prepare for refactoring the codes. Signed-off-by: Minda Chen <minda.chen@starfivetech.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> --- MAINTAINERS | 4 ++-- drivers/pci/controller/Kconfig | 9 +-------- drivers/pci/controller/Makefile | 2 +- drivers/pci/controller/plda/Kconfig | 14 ++++++++++++++ drivers/pci/controller/plda/Makefile | 2 ++ .../controller/{ => plda}/pcie-microchip-host.c | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) 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 (99%) diff --git a/MAINTAINERS b/MAINTAINERS index a7c4cf8201e0..1a2a4d2fab74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16789,7 +16789,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> @@ -18587,7 +18587,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 e534c02ee34f..4d2c188f5835 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -215,14 +215,6 @@ config PCIE_MT7621 help This selects a driver for the MediaTek MT7621 PCIe Controller. -config PCIE_MICROCHIP_HOST - tristate "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 @@ -356,4 +348,5 @@ config PCIE_XILINX_CPM source "drivers/pci/controller/cadence/Kconfig" source "drivers/pci/controller/dwc/Kconfig" source "drivers/pci/controller/mobiveil/Kconfig" +source "drivers/pci/controller/plda/Kconfig" endmenu diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile index f2b19e6174af..038ccbd9e3ba 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -33,7 +33,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 @@ -44,6 +43,7 @@ obj-$(CONFIG_PCIE_MT7621) += pcie-mt7621.o # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW obj-y += dwc/ obj-y += mobiveil/ +obj-y += plda/ # The following drivers are for devices that use the generic ACPI diff --git a/drivers/pci/controller/plda/Kconfig b/drivers/pci/controller/plda/Kconfig new file mode 100644 index 000000000000..5cb3be4fc98c --- /dev/null +++ b/drivers/pci/controller/plda/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0 + +menu "PLDA-based PCIe controllers" + depends on PCI + +config PCIE_MICROCHIP_HOST + tristate "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. + +endmenu diff --git a/drivers/pci/controller/plda/Makefile b/drivers/pci/controller/plda/Makefile new file mode 100644 index 000000000000..e1a265cbf91c --- /dev/null +++ b/drivers/pci/controller/plda/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c similarity index 99% rename from drivers/pci/controller/pcie-microchip-host.c rename to drivers/pci/controller/plda/pcie-microchip-host.c index 137fb8570ba2..cb09a8137e25 100644 --- a/drivers/pci/controller/pcie-microchip-host.c +++ b/drivers/pci/controller/plda/pcie-microchip-host.c @@ -18,7 +18,7 @@ #include <linux/pci-ecam.h> #include <linux/platform_device.h> -#include "../pci.h" +#include "../../pci.h" /* Number of MSI IRQs */ #define MC_MAX_NUM_MSI_IRQS 32 -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Minda Chen <minda.chen@starfivetech.com> To: "Conor Dooley" <conor@kernel.org>, "Krzysztof Wilczyński" <kw@linux.com>, "Rob Herring" <robh+dt@kernel.org>, "Bjorn Helgaas" <bhelgaas@google.com>, "Lorenzo Pieralisi" <lpieralisi@kernel.org>, "Daire McNamara" <daire.mcnamara@microchip.com>, "Emil Renner Berthing" <emil.renner.berthing@canonical.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-pci@vger.kernel.org, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Philipp Zabel <p.zabel@pengutronix.de>, Mason Huo <mason.huo@starfivetech.com>, Leyfoon Tan <leyfoon.tan@starfivetech.com>, Kevin Xie <kevin.xie@starfivetech.com>, Minda Chen <minda.chen@starfivetech.com> Subject: [PATCH v14 02/22] PCI: microchip: Move pcie-microchip-host.c to plda directory Date: Mon, 8 Jan 2024 19:05:52 +0800 [thread overview] Message-ID: <20240108110612.19048-3-minda.chen@starfivetech.com> (raw) In-Reply-To: <20240108110612.19048-1-minda.chen@starfivetech.com> For Microchip Polarfire PCIe host is PLDA XpressRich IP, move to plda directory. Prepare for refactoring the codes. Signed-off-by: Minda Chen <minda.chen@starfivetech.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> --- MAINTAINERS | 4 ++-- drivers/pci/controller/Kconfig | 9 +-------- drivers/pci/controller/Makefile | 2 +- drivers/pci/controller/plda/Kconfig | 14 ++++++++++++++ drivers/pci/controller/plda/Makefile | 2 ++ .../controller/{ => plda}/pcie-microchip-host.c | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) 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 (99%) diff --git a/MAINTAINERS b/MAINTAINERS index a7c4cf8201e0..1a2a4d2fab74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16789,7 +16789,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> @@ -18587,7 +18587,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 e534c02ee34f..4d2c188f5835 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -215,14 +215,6 @@ config PCIE_MT7621 help This selects a driver for the MediaTek MT7621 PCIe Controller. -config PCIE_MICROCHIP_HOST - tristate "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 @@ -356,4 +348,5 @@ config PCIE_XILINX_CPM source "drivers/pci/controller/cadence/Kconfig" source "drivers/pci/controller/dwc/Kconfig" source "drivers/pci/controller/mobiveil/Kconfig" +source "drivers/pci/controller/plda/Kconfig" endmenu diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile index f2b19e6174af..038ccbd9e3ba 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -33,7 +33,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 @@ -44,6 +43,7 @@ obj-$(CONFIG_PCIE_MT7621) += pcie-mt7621.o # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW obj-y += dwc/ obj-y += mobiveil/ +obj-y += plda/ # The following drivers are for devices that use the generic ACPI diff --git a/drivers/pci/controller/plda/Kconfig b/drivers/pci/controller/plda/Kconfig new file mode 100644 index 000000000000..5cb3be4fc98c --- /dev/null +++ b/drivers/pci/controller/plda/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0 + +menu "PLDA-based PCIe controllers" + depends on PCI + +config PCIE_MICROCHIP_HOST + tristate "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. + +endmenu diff --git a/drivers/pci/controller/plda/Makefile b/drivers/pci/controller/plda/Makefile new file mode 100644 index 000000000000..e1a265cbf91c --- /dev/null +++ b/drivers/pci/controller/plda/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c similarity index 99% rename from drivers/pci/controller/pcie-microchip-host.c rename to drivers/pci/controller/plda/pcie-microchip-host.c index 137fb8570ba2..cb09a8137e25 100644 --- a/drivers/pci/controller/pcie-microchip-host.c +++ b/drivers/pci/controller/plda/pcie-microchip-host.c @@ -18,7 +18,7 @@ #include <linux/pci-ecam.h> #include <linux/platform_device.h> -#include "../pci.h" +#include "../../pci.h" /* Number of MSI IRQs */ #define MC_MAX_NUM_MSI_IRQS 32 -- 2.17.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2024-01-08 11:06 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-01-08 11:05 [PATCH v14 0/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 01/22] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:21 ` 回复: " Minda Chen 2024-01-08 11:21 ` Minda Chen 2024-01-08 11:05 ` Minda Chen [this message] 2024-01-08 11:05 ` [PATCH v14 02/22] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen 2024-01-08 11:05 ` [PATCH v14 03/22] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 04/22] PCI: microchip: Add bridge_addr field to struct mc_pcie Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 05/22] PCI: microchip: Rename two PCIe data structures Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 06/22] PCI: microchip: Move PCIe host data structures to plda-pcie.h Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 07/22] PCI: microchip: Rename two setup functions Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 08/22] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:05 ` [PATCH v14 09/22] PCI: microchip: Move setup functions to pcie-plda-host.c Minda Chen 2024-01-08 11:05 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 10/22] PCI: microchip: Rename interrupt related functions Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 11/22] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 12/22] PCI: microchip: Add request_event_irq() callback function Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 13/22] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 14/22] PCI: microchip: Add get_events() callback and add PLDA get_event() Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:15 ` 回复: " Minda Chen 2024-01-08 11:15 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 15/22] PCI: microchip: Add event irqchip field to host port and add PLDA irqchip Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:17 ` 回复: " Minda Chen 2024-01-08 11:17 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 16/22] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 17/22] pci: plda: Add event bitmap field to struct plda_pcie_rp Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 18/22] PCI: plda: Add host init/deinit and map bus functions Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 19/22] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 20/22] PCI: Add PCIE_RESET_CONFIG_DEVICE_WAIT_MS waiting time value Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 21/22] PCI: starfive: Add JH7110 PCIe controller Minda Chen 2024-01-08 11:06 ` Minda Chen 2024-01-08 11:06 ` [PATCH v14 22/22] riscv: dts: starfive: add PCIe dts configuration for JH7110 Minda Chen 2024-01-08 11:06 ` Minda Chen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240108110612.19048-3-minda.chen@starfivetech.com \ --to=minda.chen@starfivetech.com \ --cc=aou@eecs.berkeley.edu \ --cc=bhelgaas@google.com \ --cc=conor@kernel.org \ --cc=daire.mcnamara@microchip.com \ --cc=devicetree@vger.kernel.org \ --cc=emil.renner.berthing@canonical.com \ --cc=kevin.xie@starfivetech.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=kw@linux.com \ --cc=leyfoon.tan@starfivetech.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=lpieralisi@kernel.org \ --cc=mason.huo@starfivetech.com \ --cc=p.zabel@pengutronix.de \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.