[PATCH 0/2] pci: versal: Enable AMD DW PCIe controller for Versal Premium Gen 2

[PATCH 0/2] pci: versal: Enable AMD DW PCIe controller for Versal Premium Gen 2

[Pranav Sanwal]

Enable the AMD DesignWare/MDB PCIe root complex driver for Versal
Premium Gen 2 and turn it on in the amd_versal_premium_2 config
fragment.

This series depends on:
"configs: versal: Add amd_versal_premium_2 config fragment"
https://patchwork.ozlabs.org/project/uboot/list/?series=519895

Pranav Sanwal (2):
  pci: Enable AMD DW PCIe (MDB) controller support on Versal Premium Gen
    2
  configs: versal: Enable AMD DW PCIe controller for Versal Premium Gen
    2

 configs/amd_versal_premium_2.config | 4 ++++
 drivers/pci/Kconfig                 | 4 ++--
 drivers/pci/pcie_dw_amd.c           | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.43.7

[PATCH 1/2] pci: Enable AMD DW PCIe (MDB) controller support on Versal Premium Gen 2

[Pranav Sanwal]

PCIE_DW_AMD currently only targets ARCH_VERSAL2. Versal Premium Gen 2's
PCIe root complex is built around the same DesignWare/MDB core, so
extend the Kconfig dependency to ARCH_VERSAL and update the help text
to reflect that.

Add "amd,versal2-cpm6-host" to pcie_dw_amd.c's compatible list
alongside "amd,versal2-mdb-host" so the driver binds to Versal Premium
Gen 2's PCIe devicetree node.

versal_mem_map[] in arch/arm/mach-versal/cpu.c already maps the
0x600000000 region unconditionally as normal memory, covering the
controller's DBI/ECAM window, so no mem-map changes are needed here.

Signed-off-by: Pranav Sanwal <pranav.sanwal@amd.com>
---
 drivers/pci/Kconfig       | 4 ++--
 drivers/pci/pcie_dw_amd.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 2b2ccdf4745..0a6af36e361 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -459,14 +459,14 @@ config PCIE_STARFIVE_JH7110
 
 config PCIE_DW_AMD
 	bool "AMD Versal2 DW PCIe host controller"
-	depends on ARCH_VERSAL2
+	depends on ARCH_VERSAL2 || ARCH_VERSAL
 	depends on DM_GPIO
 	select PCIE_DW_COMMON
 	select SYS_PCI_64BIT
 	help
 	  Say Y here to enable support for the AMD Versal Gen 2 PCIe
 	  host controller. This is a DesignWare-based PCIe controller
-	  used in AMD Versal Gen 2 SoCs.
+	  used in AMD Versal Gen 2 and premium gen 2 SoCs.
 
 config PCIE_DW_IMX
 	bool "i.MX DW PCIe controller support"
diff --git a/drivers/pci/pcie_dw_amd.c b/drivers/pci/pcie_dw_amd.c
index 81c6d8f2817..dbc51afa9b4 100644
--- a/drivers/pci/pcie_dw_amd.c
+++ b/drivers/pci/pcie_dw_amd.c
@@ -236,6 +236,7 @@ static const struct dm_pci_ops amd_dw_pcie_ops = {
 
 static const struct udevice_id amd_dw_pcie_ids[] = {
 	{ .compatible = "amd,versal2-mdb-host" },
+	{ .compatible = "amd,versal2-cpm6-host" },
 	{ }
 };
 
-- 
2.43.7

[PATCH 2/2] configs: versal: Enable AMD DW PCIe controller for Versal Premium Gen 2

[Pranav Sanwal]

Turn on CONFIG_PCIE_DW_AMD in the amd_versal_premium_2 fragment so it
is scoped to Premium Gen 2 hardware.

Explicitly disable CONFIG_PCIE_AMD_CPM and CONFIG_PCIE_AMD_QDMA_PL,
the legacy PCIe controller drivers already enabled in
xilinx_versal_virt_defconfig, since Premium Gen 2 uses PCIE_DW_AMD
instead.

Signed-off-by: Pranav Sanwal <pranav.sanwal@amd.com>
---
 configs/amd_versal_premium_2.config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/amd_versal_premium_2.config b/configs/amd_versal_premium_2.config
index 26c5cfa536c..1e43c0ba6b1 100644
--- a/configs/amd_versal_premium_2.config
+++ b/configs/amd_versal_premium_2.config
@@ -1,3 +1,7 @@
 CONFIG_SYS_PROMPT="versalpremium2> "
 CONFIG_TEXT_BASE=0x40000000
+CONFIG_PCI=y
+CONFIG_PCIE_DW_AMD=y
+# CONFIG_PCIE_AMD_CPM is not set
+# CONFIG_PCIE_AMD_QDMA_PL is not set
 CONFIG_XILINX_OF_BOARD_DTB_ADDR=0x1000000
-- 
2.43.7

Re: [PATCH 0/2] pci: versal: Enable AMD DW PCIe controller for Versal Premium Gen 2

[Michal Simek]

On 8/24/26 10:35, Pranav Sanwal wrote:
> Enable the AMD DesignWare/MDB PCIe root complex driver for Versal
> Premium Gen 2 and turn it on in the amd_versal_premium_2 config
> fragment.
> 
> This series depends on:
> "configs: versal: Add amd_versal_premium_2 config fragment"
> https://patchwork.ozlabs.org/project/uboot/list/?series=519895
> 
> Pranav Sanwal (2):
>    pci: Enable AMD DW PCIe (MDB) controller support on Versal Premium Gen
>      2
>    configs: versal: Enable AMD DW PCIe controller for Versal Premium Gen
>      2
> 
>   configs/amd_versal_premium_2.config | 4 ++++
>   drivers/pci/Kconfig                 | 4 ++--
>   drivers/pci/pcie_dw_amd.c           | 1 +
>   3 files changed, 7 insertions(+), 2 deletions(-)
> 

Applied.
M