pci: pci_mvebu: Add support for Kirkwood PCIe controllers
Subsystems (3)
PATCH 1/1 pci: pci_mvebu: Add support for Kirkwood PCIe controllers
Kirkwood uses macros KW_DEFADR_PCI_MEM and KW_DEFADR_PCI_IO for base address of PCIe mappings. Size of PCIe windows is not defined in any macro yet, so export them in new KW_DEFADR_PCI_MEM_SIZE and KW_DEFADR_PCI_IO_SIZE macros.
Kirkwood arch code already maps mbus windows for io and mem, so avoid calling mvebu_mbus_add_window_by_id() function which would try to do duplicate window mapping.
Kirkwood PCIe controllers already use "marvell,kirkwood-pcie" DT compatible string, so mark pci_mvebu.c driver as compatible for it.
---
This patch depends on series "mvebu: Move PCIe code from serdes to PCIe driver":
https://patchwork.ozlabs.org/project/uboot/list/?series=277906&state=*
Tony, could you please test it in Kirwood hardware?
--- arch/arm/mach-kirkwood/cpu.c | 4 ++-- arch/arm/mach-kirkwood/include/mach/cpu.h | 3 +++ drivers/pci/Kconfig | 6 +++--- drivers/pci/pci_mvebu.c | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-)
arch/arm/mach-kirkwood/cpu.c +2 -2
@@ -54,11 +54,11 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)static struct mbus_win windows[] = {/* Window 0: PCIE MEM address space */ - {KW_DEFADR_PCI_MEM ,1024 *1024 *256 , + {KW_DEFADR_PCI_MEM ,KW_DEFADR_PCI_MEM_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_MEM },/* Window 1: PCIE IO address space */ - {KW_DEFADR_PCI_IO ,1024 *64 , + {KW_DEFADR_PCI_IO ,KW_DEFADR_PCI_IO_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_IO },/* Window 2: NAND Flash address space */
arch/arm/mach-kirkwood/include/mach/cpu.h +3 -0
@@ -68,6 +68,9 @@ enum kwcpu_attrib {#define KW_DEFADR_SPIF 0xE8000000#define KW_DEFADR_BOOTROM 0xF8000000 +#define KW_DEFADR_PCI_MEM_SIZE (1024 * 1024 * 256) +#define KW_DEFADR_PCI_IO_SIZE (1024 * 64) +struct mbus_win {u32 base;u32 size;
drivers/pci/Kconfig +3 -3
@@ -262,13 +262,13 @@ config PCIE_IPROC Say Y here if you want to enable Broadcom iProc PCIe controller, config PCI_MVEBU - bool "Enable Armada XP/38x PCIe driver" - depends on ARCH_MVEBU + bool "Enable Kirkwood / Armada 370/XP/375/38x PCIe driver" + depends on (ARCH_KIRKWOOD || ARCH_MVEBU) select MISC select DM_RESET help Say Y here if you want to enable PCIe controller support on - Armada XP/38x SoCs. + Kirkwood and Armada 370/XP/375/38x SoCs. config PCIE_DW_COMMON bool
drivers/pci/pci_mvebu.c +16 -0
@@ -498,6 +498,13 @@ static int mvebu_pcie_probe(struct udevice *dev)mvebu_pcie_set_local_bus_nr (pcie,0 );mvebu_pcie_set_local_dev_nr (pcie,1 ); +/* +* Kirkwood arch code already maps mbus windows for PCIe IO and MEM. +* So skip calling mvebu_mbus_add_window_by_id() function as it would +* fail on error "conflicts with another window" which means conflict +* with existing PCIe window mappings. +*/ +#ifndef CONFIG_ARCH_KIRKWOOD if (resource_size(&pcie->mem) && mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr, (phys_addr_t)pcie->mem.start,
@@ -519,6 +526,7 @@ static int mvebu_pcie_probe(struct udevice *dev) pcie->io.start =0 ; pcie->io.end = -1; } +#endif /* Setup windows and configure host bridge */ mvebu_pcie_setup_wins (pcie);
@@ -725,10 +733,17 @@ static int mvebu_pcie_bind(struct udevice *parent) } ports_count =0 ; +#ifdef CONFIG_ARCH_KIRKWOOD + mem.start =KW_DEFADR_PCI_MEM ; + mem.end =KW_DEFADR_PCI_MEM +KW_DEFADR_PCI_MEM_SIZE -1 ; + io.start =KW_DEFADR_PCI_IO ; + io.end =KW_DEFADR_PCI_IO +KW_DEFADR_PCI_IO_SIZE -1 ; +#else mem.start =MBUS_PCI_MEM_BASE ; mem.end =MBUS_PCI_MEM_BASE +MBUS_PCI_MEM_SIZE -1 ; io.start =MBUS_PCI_IO_BASE ; io.end =MBUS_PCI_IO_BASE +MBUS_PCI_IO_SIZE -1 ; +#endif /* First phase: Fill mvebu_pcie struct for each port */ ofnode_for_each_subnode (subnode,dev_ofnode (parent)) {
@@ -809,6 +824,7 @@ static int mvebu_pcie_bind(struct udevice *parent)static const struct udevice_id mvebu_pcie_ids[] = { { .compatible ="marvell,armada-xp-pcie" }, { .compatible ="marvell,armada-370-pcie" }, + { .compatible ="marvell,kirkwood-pcie" }, { } };
Signature · 1 line
2.20.1
Hi Pali,
Quoted 13 lines · Pali Rohár
Kirkwood uses macros
KW_DEFADR_PCI_MEMandKW_DEFADR_PCI_IOfor base address of PCIe mappings. Size of PCIe windows is not defined in any macro yet, so export them in newKW_DEFADR_PCI_MEM_SIZEandKW_DEFADR_PCI_IO_SIZEmacros.Kirkwood arch code already maps mbus windows for io and mem, so avoid calling
mvebu_mbus_add_window_by_id()function which would try to do duplicate window mapping.Kirkwood PCIe controllers already use "marvell,kirkwood-pcie" DT compatible string, so mark
pci_mvebu.cdriver as compatible for it.
Quoted 6 lines
Signed-off-by Pali Rohár <[email protected]>---
This patch depends on series "mvebu: Move PCIe code from serdes to PCIe driver":
https://patchwork.ozlabs.org/project/uboot/list/?series=277906&state=*Tony, could you please test it in Kirwood hardware?
Thanks for sending in this patch. I'll run some tests and let you know.
Tony
Quoted 115 lines
--- arch/arm/mach-kirkwood/cpu.c | 4 ++-- arch/arm/mach-kirkwood/include/mach/cpu.h | 3 +++ drivers/pci/Kconfig | 6 +++--- drivers/pci/pci_mvebu.c | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-)arch/arm/mach-kirkwood/cpu.c +2
-2@@ -54,11 +54,11 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)static struct mbus_win windows[] = {/* Window 0: PCIE MEM address space */ - {KW_DEFADR_PCI_MEM ,1024 *1024 *256 , + {KW_DEFADR_PCI_MEM ,KW_DEFADR_PCI_MEM_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_MEM },/* Window 1: PCIE IO address space */ - {KW_DEFADR_PCI_IO ,1024 *64 , + {KW_DEFADR_PCI_IO ,KW_DEFADR_PCI_IO_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_IO },/* Window 2: NAND Flash address space */ arch/arm/mach-kirkwood/include/mach/cpu.h +3
-0@@ -68,6 +68,9 @@ enum kwcpu_attrib {#define KW_DEFADR_SPIF 0xE8000000#define KW_DEFADR_BOOTROM 0xF8000000 +#define KW_DEFADR_PCI_MEM_SIZE (1024 * 1024 * 256) +#define KW_DEFADR_PCI_IO_SIZE (1024 * 64) +struct mbus_win {u32 base;u32 size;drivers/pci/Kconfig +3
-3@@ -262,13 +262,13 @@ config PCIE_IPROC Say Y here if you want to enable Broadcom iProc PCIe controller, config PCI_MVEBU - bool "Enable Armada XP/38x PCIe driver" - depends on ARCH_MVEBU + bool "Enable Kirkwood / Armada 370/XP/375/38x PCIe driver" + depends on (ARCH_KIRKWOOD || ARCH_MVEBU) select MISC select DM_RESET help Say Y here if you want to enable PCIe controller support on - Armada XP/38x SoCs. + Kirkwood and Armada 370/XP/375/38x SoCs. config PCIE_DW_COMMON booldrivers/pci/pci_mvebu.c +16
-1@@ -498,6 +498,13 @@ static int mvebu_pcie_probe(struct udevice *dev)mvebu_pcie_set_local_bus_nr (pcie,0 );mvebu_pcie_set_local_dev_nr (pcie,1 ); +/* +* Kirkwood arch code already maps mbus windows for PCIe IO and MEM. +* So skip calling mvebu_mbus_add_window_by_id() function as it would +* fail on error "conflicts with another window" which means conflict +* with existing PCIe window mappings. +*/ +#ifndef CONFIG_ARCH_KIRKWOOD if (resource_size(&pcie->mem) && mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr, (phys_addr_t)pcie->mem.start,@@ -519,6 +526,7 @@ static int mvebu_pcie_probe(struct udevice *dev) pcie->io.start =0 ; pcie->io.end = -1; } +#endif /* Setup windows and configure host bridge */ mvebu_pcie_setup_wins (pcie);@@ -725,10 +733,17 @@ static int mvebu_pcie_bind(struct udevice *parent) } ports_count =0 ; +#ifdef CONFIG_ARCH_KIRKWOOD + mem.start =KW_DEFADR_PCI_MEM ; + mem.end =KW_DEFADR_PCI_MEM +KW_DEFADR_PCI_MEM_SIZE -1 ; + io.start =KW_DEFADR_PCI_IO ; + io.end =KW_DEFADR_PCI_IO +KW_DEFADR_PCI_IO_SIZE -1 ; +#else mem.start =MBUS_PCI_MEM_BASE ; mem.end =MBUS_PCI_MEM_BASE +MBUS_PCI_MEM_SIZE -1 ; io.start =MBUS_PCI_IO_BASE ; io.end =MBUS_PCI_IO_BASE +MBUS_PCI_IO_SIZE -1 ; +#endif /* First phase: Fill mvebu_pcie struct for each port */ ofnode_for_each_subnode (subnode,dev_ofnode (parent)) {@@ -809,6 +824,7 @@ static int mvebu_pcie_bind(struct udevice *parent)static const struct udevice_id mvebu_pcie_ids[] = { { .compatible ="marvell,armada-xp-pcie" }, { .compatible ="marvell,armada-370-pcie" }, + { .compatible ="marvell,kirkwood-pcie" }, { } }; --2.20.1
Tony Dinh
Tested-byHi Pali,
Quoted 23 lines · Tony Dinh
Hi Pali,
Quoted 19 lines · Pali Rohár
Kirkwood uses macros
KW_DEFADR_PCI_MEMandKW_DEFADR_PCI_IOfor base address of PCIe mappings. Size of PCIe windows is not defined in any macro yet, so export them in newKW_DEFADR_PCI_MEM_SIZEandKW_DEFADR_PCI_IO_SIZEmacros.Kirkwood arch code already maps mbus windows for io and mem, so avoid calling
mvebu_mbus_add_window_by_id()function which would try to do duplicate window mapping.Kirkwood PCIe controllers already use "marvell,kirkwood-pcie" DT compatible string, so mark
pci_mvebu.cdriver as compatible for it.Signed-off-by Pali Rohár <[email protected]>---
This patch depends on series "mvebu: Move PCIe code from serdes to PCIe driver":
https://patchwork.ozlabs.org/project/uboot/list/?series=277906&state=*Tony, could you please test it in Kirwood hardware?
Everything seems to be working fine. I've run 2 tests. For the Pogoplug V4, tested with a USB 3.0 thumb drive (PCIe is the host bus), For the Iomega iConnect, I don't have the Wifi Card or mSATA card (could not found one in my pile yet), so the test is just for MVEBU PCIe framework.
1st Test: Pogoplug V4 (Kirkwood 88F6192)
<BEGIN log>
U-Boot 2022.01-00458-ge120ef9f5f-dirty (Jan 14 2022 - 15:59:48 -0800) Pogoplug V4
<snip>
pcie0.0: Link up Net: eth0: ethernet-controller@72000 Hit any key to stop autoboot: 0
Pogo_V4> usb start
starting USB...
Bus ehci@50000: USB EHCI 1.00
Bus xhci_pci: Register 400081f NbrPorts 4
Starting the controller
USB XHCI 1.00
scanning bus ehci@50000 for devices... 1 USB Device(s) found scanning bus xhci_pci for devices... 2 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
Pogo_V4> pci info
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x11ab 0x6281 Bridge device 0x04
Pogo_V4> pci region
# Bus start Phys start Size Flags 0 0x0000000090000000 0x0000000090000000 0x0000000008000000 mem 1 0x0000000090000000 0x0000000090000000 0x0000000008000000 mem 2 0x00000000c0000000 0x00000000c0000000 0x0000000000010000 io io
Pogo_V4> usb tree
USB device tree:
1 Hub (480 Mb/s, 0mA)
u-boot EHCI Host Controller
1 Hub (5 Gb/s, 0mA)
| U-Boot XHCI Host Controller
|
+-2 Mass Storage (5 Gb/s, 100mA)
SanDisk Extreme AA010214142232182984
<END log>
2nd test: Iomega iConnect (Kirkwood 88F6281)
<BEGIN log>
U-Boot 2022.01-00489-g9b72d934c2-dirty (Jan 14 2022 - 18:32:35 -0800) Iomega iConnect
<snip>
pcie0.0: Link down
Net: egiga0
Error: egiga0 address not set.
Hit any key to stop autoboot: 0
iconnect => pci init
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x11ab 0x6281 Bridge device 0x04
iconnect => pci region
# Bus start Phys start Size Flags 0 0x0000000090000000 0x0000000090000000 0x0000000008000000 mem 1 0x0000000090000000 0x0000000090000000 0x0000000008000000 mem 2 0x00000000c0000000 0x00000000c0000000 0x0000000000010000 io io
<END log>
Thanks for the great work!
Tony
Quoted 5 lines · Pali Rohár
Kirkwood uses macros
KW_DEFADR_PCI_MEMandKW_DEFADR_PCI_IOfor base address of PCIe mappings. Size of PCIe windows is not defined in any macro yet, so export them in newKW_DEFADR_PCI_MEM_SIZEandKW_DEFADR_PCI_IO_SIZEmacros.
Quoted 8 lines
Kirkwood arch code already maps mbus windows for io and mem, so avoid calling
mvebu_mbus_add_window_by_id()function which would try to do duplicate window mapping.Kirkwood PCIe controllers already use "marvell,kirkwood-pcie" DT compatible string, so mark
pci_mvebu.cdriver as compatible for it.Signed-off-by Pali Rohár <[email protected]>
Thanks,
Stefan
Quoted 111 lines
---
This patch depends on series "mvebu: Move PCIe code from serdes to PCIe driver":
https://patchwork.ozlabs.org/project/uboot/list/?series=277906&state=*Tony, could you please test it in Kirwood hardware?
--- arch/arm/mach-kirkwood/cpu.c | 4 ++-- arch/arm/mach-kirkwood/include/mach/cpu.h | 3 +++ drivers/pci/Kconfig | 6 +++--- drivers/pci/pci_mvebu.c | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-)arch/arm/mach-kirkwood/cpu.c +2
-2@@ -54,11 +54,11 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)static struct mbus_win windows[] = {/* Window 0: PCIE MEM address space */ - {KW_DEFADR_PCI_MEM ,1024 *1024 *256 , + {KW_DEFADR_PCI_MEM ,KW_DEFADR_PCI_MEM_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_MEM },/* Window 1: PCIE IO address space */ - {KW_DEFADR_PCI_IO ,1024 *64 , + {KW_DEFADR_PCI_IO ,KW_DEFADR_PCI_IO_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_IO },/* Window 2: NAND Flash address space */ arch/arm/mach-kirkwood/include/mach/cpu.h +3
-0@@ -68,6 +68,9 @@ enum kwcpu_attrib {#define KW_DEFADR_SPIF 0xE8000000#define KW_DEFADR_BOOTROM 0xF8000000 +#define KW_DEFADR_PCI_MEM_SIZE (1024 * 1024 * 256) +#define KW_DEFADR_PCI_IO_SIZE (1024 * 64) +struct mbus_win {u32 base;u32 size;drivers/pci/Kconfig +3
-3@@ -262,13 +262,13 @@ config PCIE_IPROC Say Y here if you want to enable Broadcom iProc PCIe controller, config PCI_MVEBU - bool "Enable Armada XP/38x PCIe driver" - depends on ARCH_MVEBU + bool "Enable Kirkwood / Armada 370/XP/375/38x PCIe driver" + depends on (ARCH_KIRKWOOD || ARCH_MVEBU) select MISC select DM_RESET help Say Y here if you want to enable PCIe controller support on - Armada XP/38x SoCs. + Kirkwood and Armada 370/XP/375/38x SoCs. config PCIE_DW_COMMON booldrivers/pci/pci_mvebu.c +15
-0@@ -498,6 +498,13 @@ static int mvebu_pcie_probe(struct udevice *dev)mvebu_pcie_set_local_bus_nr (pcie,0 );mvebu_pcie_set_local_dev_nr (pcie,1 ); +/* +* Kirkwood arch code already maps mbus windows for PCIe IO and MEM. +* So skip calling mvebu_mbus_add_window_by_id() function as it would +* fail on error "conflicts with another window" which means conflict +* with existing PCIe window mappings. +*/ +#ifndef CONFIG_ARCH_KIRKWOOD if (resource_size(&pcie->mem) && mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr, (phys_addr_t)pcie->mem.start,@@ -519,6 +526,7 @@ static int mvebu_pcie_probe(struct udevice *dev) pcie->io.start =0 ; pcie->io.end = -1; } +#endif /* Setup windows and configure host bridge */ mvebu_pcie_setup_wins (pcie);@@ -725,10 +733,17 @@ static int mvebu_pcie_bind(struct udevice *parent) } ports_count =0 ; +#ifdef CONFIG_ARCH_KIRKWOOD + mem.start =KW_DEFADR_PCI_MEM ; + mem.end =KW_DEFADR_PCI_MEM +KW_DEFADR_PCI_MEM_SIZE -1 ; + io.start =KW_DEFADR_PCI_IO ; + io.end =KW_DEFADR_PCI_IO +KW_DEFADR_PCI_IO_SIZE -1 ; +#else mem.start =MBUS_PCI_MEM_BASE ; mem.end =MBUS_PCI_MEM_BASE +MBUS_PCI_MEM_SIZE -1 ; io.start =MBUS_PCI_IO_BASE ; io.end =MBUS_PCI_IO_BASE +MBUS_PCI_IO_SIZE -1 ; +#endif /* First phase: Fill mvebu_pcie struct for each port */ ofnode_for_each_subnode (subnode,dev_ofnode (parent)) {
drivers/pci/pci_mvebu.c static int mvebu_pcie_bind(struct udevice *parent) · line 830
Quoted 7 lines
drivers/pci/pci_mvebu.c +1
-0@@ -809,6 +824,7 @@ static int mvebu_pcie_bind(struct udevice *parent)static const struct udevice_id mvebu_pcie_ids[] = { { .compatible ="marvell,armada-xp-pcie" }, { .compatible ="marvell,armada-370-pcie" }, + { .compatible ="marvell,kirkwood-pcie" }, { } };
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Quoted 5 lines · Pali Rohár
Kirkwood uses macros
KW_DEFADR_PCI_MEMandKW_DEFADR_PCI_IOfor base address of PCIe mappings. Size of PCIe windows is not defined in any macro yet, so export them in newKW_DEFADR_PCI_MEM_SIZEandKW_DEFADR_PCI_IO_SIZEmacros.
Quoted 8 lines
Kirkwood arch code already maps mbus windows for io and mem, so avoid calling
mvebu_mbus_add_window_by_id()function which would try to do duplicate window mapping.Kirkwood PCIe controllers already use "marvell,kirkwood-pcie" DT compatible string, so mark
pci_mvebu.cdriver as compatible for it.Signed-off-by Pali Rohár <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 111 lines
---
This patch depends on series "mvebu: Move PCIe code from serdes to PCIe driver":
https://patchwork.ozlabs.org/project/uboot/list/?series=277906&state=*Tony, could you please test it in Kirwood hardware?
--- arch/arm/mach-kirkwood/cpu.c | 4 ++-- arch/arm/mach-kirkwood/include/mach/cpu.h | 3 +++ drivers/pci/Kconfig | 6 +++--- drivers/pci/pci_mvebu.c | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-)arch/arm/mach-kirkwood/cpu.c +2
-2@@ -54,11 +54,11 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)static struct mbus_win windows[] = {/* Window 0: PCIE MEM address space */ - {KW_DEFADR_PCI_MEM ,1024 *1024 *256 , + {KW_DEFADR_PCI_MEM ,KW_DEFADR_PCI_MEM_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_MEM },/* Window 1: PCIE IO address space */ - {KW_DEFADR_PCI_IO ,1024 *64 , + {KW_DEFADR_PCI_IO ,KW_DEFADR_PCI_IO_SIZE ,KWCPU_TARGET_PCIE ,KWCPU_ATTR_PCIE_IO },/* Window 2: NAND Flash address space */ arch/arm/mach-kirkwood/include/mach/cpu.h +3
-0@@ -68,6 +68,9 @@ enum kwcpu_attrib {#define KW_DEFADR_SPIF 0xE8000000#define KW_DEFADR_BOOTROM 0xF8000000 +#define KW_DEFADR_PCI_MEM_SIZE (1024 * 1024 * 256) +#define KW_DEFADR_PCI_IO_SIZE (1024 * 64) +struct mbus_win {u32 base;u32 size;drivers/pci/Kconfig +3
-3@@ -262,13 +262,13 @@ config PCIE_IPROC Say Y here if you want to enable Broadcom iProc PCIe controller, config PCI_MVEBU - bool "Enable Armada XP/38x PCIe driver" - depends on ARCH_MVEBU + bool "Enable Kirkwood / Armada 370/XP/375/38x PCIe driver" + depends on (ARCH_KIRKWOOD || ARCH_MVEBU) select MISC select DM_RESET help Say Y here if you want to enable PCIe controller support on - Armada XP/38x SoCs. + Kirkwood and Armada 370/XP/375/38x SoCs. config PCIE_DW_COMMON booldrivers/pci/pci_mvebu.c +15
-0@@ -498,6 +498,13 @@ static int mvebu_pcie_probe(struct udevice *dev)mvebu_pcie_set_local_bus_nr (pcie,0 );mvebu_pcie_set_local_dev_nr (pcie,1 ); +/* +* Kirkwood arch code already maps mbus windows for PCIe IO and MEM. +* So skip calling mvebu_mbus_add_window_by_id() function as it would +* fail on error "conflicts with another window" which means conflict +* with existing PCIe window mappings. +*/ +#ifndef CONFIG_ARCH_KIRKWOOD if (resource_size(&pcie->mem) && mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr, (phys_addr_t)pcie->mem.start,@@ -519,6 +526,7 @@ static int mvebu_pcie_probe(struct udevice *dev) pcie->io.start =0 ; pcie->io.end = -1; } +#endif /* Setup windows and configure host bridge */ mvebu_pcie_setup_wins (pcie);@@ -725,10 +733,17 @@ static int mvebu_pcie_bind(struct udevice *parent) } ports_count =0 ; +#ifdef CONFIG_ARCH_KIRKWOOD + mem.start =KW_DEFADR_PCI_MEM ; + mem.end =KW_DEFADR_PCI_MEM +KW_DEFADR_PCI_MEM_SIZE -1 ; + io.start =KW_DEFADR_PCI_IO ; + io.end =KW_DEFADR_PCI_IO +KW_DEFADR_PCI_IO_SIZE -1 ; +#else mem.start =MBUS_PCI_MEM_BASE ; mem.end =MBUS_PCI_MEM_BASE +MBUS_PCI_MEM_SIZE -1 ; io.start =MBUS_PCI_IO_BASE ; io.end =MBUS_PCI_IO_BASE +MBUS_PCI_IO_SIZE -1 ; +#endif /* First phase: Fill mvebu_pcie struct for each port */ ofnode_for_each_subnode (subnode,dev_ofnode (parent)) {
drivers/pci/pci_mvebu.c static int mvebu_pcie_bind(struct udevice *parent) · line 830
Quoted 7 lines
drivers/pci/pci_mvebu.c +1
-0@@ -809,6 +824,7 @@ static int mvebu_pcie_bind(struct udevice *parent)static const struct udevice_id mvebu_pcie_ids[] = { { .compatible ="marvell,armada-xp-pcie" }, { .compatible ="marvell,armada-370-pcie" }, + { .compatible ="marvell,kirkwood-pcie" }, { } };
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]