* [U-Boot] [PATCH 0/3] armv8: ls1088a: add pcie support
@ 2017-09-04 2:47 Zhiqiang Hou
2017-09-04 2:47 ` [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space Zhiqiang Hou
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Zhiqiang Hou @ 2017-09-04 2:47 UTC (permalink / raw)
To: u-boot
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
This patch set depends on ls1088a platform support patchs:
http://patchwork.ozlabs.org/patch/800408/
http://patchwork.ozlabs.org/patch/800410/
http://patchwork.ozlabs.org/patch/800409/
http://patchwork.ozlabs.org/patch/803037/
http://patchwork.ozlabs.org/patch/803038/
http://patchwork.ozlabs.org/project/uboot/list/?series=792
http://patchwork.ozlabs.org/project/uboot/list/?series=797
Hou Zhiqiang (3):
armv8: ls1088a: fix the MMU table for pcie config space
armv8: ls1088a: add PCIe dts node
armv8: ls1088a: Enable PCIe in defconfigs
arch/arm/dts/fsl-ls1088a.dtsi | 48 ++++++++++++++++++++++
.../include/asm/arch-fsl-layerscape/immap_lsch3.h | 6 +++
configs/ls1088aqds_qspi_defconfig | 4 ++
configs/ls1088aqds_sdcard_qspi_defconfig | 4 ++
configs/ls1088ardb_qspi_defconfig | 4 ++
configs/ls1088ardb_sdcard_qspi_defconfig | 4 ++
include/configs/ls1088a_common.h | 4 ++
7 files changed, 74 insertions(+)
--
2.14.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space
2017-09-04 2:47 [U-Boot] [PATCH 0/3] armv8: ls1088a: add pcie support Zhiqiang Hou
@ 2017-09-04 2:47 ` Zhiqiang Hou
2017-09-13 2:36 ` York Sun
2017-09-04 2:47 ` [U-Boot] [PATCH 2/3] armv8: ls1088a: add PCIe dts node Zhiqiang Hou
2017-09-04 2:47 ` [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs Zhiqiang Hou
2 siblings, 1 reply; 9+ messages in thread
From: Zhiqiang Hou @ 2017-09-04 2:47 UTC (permalink / raw)
To: u-boot
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
The pcie config space of ls1088a is different from ls2080a.
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
index ffc5fa2636..7cae17246d 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
@@ -107,10 +107,16 @@
#define CONFIG_SYS_PCIE2_ADDR (CONFIG_SYS_IMMR + 0x2500000)
#define CONFIG_SYS_PCIE3_ADDR (CONFIG_SYS_IMMR + 0x2600000)
#define CONFIG_SYS_PCIE4_ADDR (CONFIG_SYS_IMMR + 0x2700000)
+#ifdef CONFIG_ARCH_LS1088A
+#define CONFIG_SYS_PCIE1_PHYS_ADDR 0x2000000000ULL
+#define CONFIG_SYS_PCIE2_PHYS_ADDR 0x2800000000ULL
+#define CONFIG_SYS_PCIE3_PHYS_ADDR 0x3000000000ULL
+#else
#define CONFIG_SYS_PCIE1_PHYS_ADDR 0x1000000000ULL
#define CONFIG_SYS_PCIE2_PHYS_ADDR 0x1200000000ULL
#define CONFIG_SYS_PCIE3_PHYS_ADDR 0x1400000000ULL
#define CONFIG_SYS_PCIE4_PHYS_ADDR 0x1600000000ULL
+#endif
/* Device Configuration */
#define DCFG_BASE 0x01e00000
--
2.14.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/3] armv8: ls1088a: add PCIe dts node
2017-09-04 2:47 [U-Boot] [PATCH 0/3] armv8: ls1088a: add pcie support Zhiqiang Hou
2017-09-04 2:47 ` [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space Zhiqiang Hou
@ 2017-09-04 2:47 ` Zhiqiang Hou
2017-09-13 2:36 ` York Sun
2017-09-04 2:47 ` [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs Zhiqiang Hou
2 siblings, 1 reply; 9+ messages in thread
From: Zhiqiang Hou @ 2017-09-04 2:47 UTC (permalink / raw)
To: u-boot
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
arch/arm/dts/fsl-ls1088a.dtsi | 48 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index 421d2de799..d943a9efa3 100644
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -75,4 +75,52 @@
reg-names = "QuadSPI", "QuadSPI-memory";
num-cs = <4>;
};
+
+ pcie at 3400000 {
+ compatible = "fsl,ls-pcie", "snps,dw-pcie";
+ reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */
+ 0x00 0x03480000 0x0 0x80000 /* lut registers */
+ 0x00 0x034c0000 0x0 0x40000 /* pf controls registers */
+ 0x20 0x00000000 0x0 0x20000>; /* configuration space */
+ reg-names = "dbi", "lut", "ctrl", "config";
+ #address-cells = <3>;
+ #size-cells = <2>;
+ device_type = "pci";
+ num-lanes = <4>;
+ bus-range = <0x0 0xff>;
+ ranges = <0x81000000 0x0 0x00000000 0x20 0x00020000 0x0 0x00010000 /* downstream I/O */
+ 0x82000000 0x0 0x40000000 0x20 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ };
+
+ pcie at 3500000 {
+ compatible = "fsl,ls-pcie", "snps,dw-pcie";
+ reg = <0x00 0x03500000 0x0 0x80000 /* dbi registers */
+ 0x00 0x03580000 0x0 0x80000 /* lut registers */
+ 0x00 0x035c0000 0x0 0x40000 /* pf controls registers */
+ 0x28 0x00000000 0x0 0x20000>; /* configuration space */
+ reg-names = "dbi", "lut", "ctrl", "config";
+ #address-cells = <3>;
+ #size-cells = <2>;
+ device_type = "pci";
+ num-lanes = <4>;
+ bus-range = <0x0 0xff>;
+ ranges = <0x81000000 0x0 0x00000000 0x28 0x00020000 0x0 0x00010000 /* downstream I/O */
+ 0x82000000 0x0 0x40000000 0x28 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ };
+
+ pcie at 3600000 {
+ compatible = "fsl,ls-pcie", "snps,dw-pcie";
+ reg = <0x00 0x03600000 0x0 0x80000 /* dbi registers */
+ 0x00 0x03680000 0x0 0x80000 /* lut registers */
+ 0x00 0x036c0000 0x0 0x40000 /* pf controls registers */
+ 0x30 0x00000000 0x0 0x20000>; /* configuration space */
+ reg-names = "dbi", "lut", "ctrl", "config";
+ #address-cells = <3>;
+ #size-cells = <2>;
+ device_type = "pci";
+ num-lanes = <8>;
+ bus-range = <0x0 0xff>;
+ ranges = <0x81000000 0x0 0x00000000 0x30 0x00020000 0x0 0x00010000 /* downstream I/O */
+ 0x82000000 0x0 0x40000000 0x30 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ };
};
--
2.14.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs
2017-09-04 2:47 [U-Boot] [PATCH 0/3] armv8: ls1088a: add pcie support Zhiqiang Hou
2017-09-04 2:47 ` [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space Zhiqiang Hou
2017-09-04 2:47 ` [U-Boot] [PATCH 2/3] armv8: ls1088a: add PCIe dts node Zhiqiang Hou
@ 2017-09-04 2:47 ` Zhiqiang Hou
2017-09-07 20:06 ` York Sun
2017-09-13 2:36 ` York Sun
2 siblings, 2 replies; 9+ messages in thread
From: Zhiqiang Hou @ 2017-09-04 2:47 UTC (permalink / raw)
To: u-boot
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Enabled PCIe support and PCI command feature.
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
configs/ls1088aqds_qspi_defconfig | 4 ++++
configs/ls1088aqds_sdcard_qspi_defconfig | 4 ++++
configs/ls1088ardb_qspi_defconfig | 4 ++++
configs/ls1088ardb_sdcard_qspi_defconfig | 4 ++++
include/configs/ls1088a_common.h | 4 ++++
5 files changed, 20 insertions(+)
diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig
index 6fff149fb6..4b0d604fa0 100644
--- a/configs/ls1088aqds_qspi_defconfig
+++ b/configs/ls1088aqds_qspi_defconfig
@@ -22,6 +22,10 @@ CONFIG_DM=y
CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_LAYERSCAPE=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_DSPI=y
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig
index 95d86274bd..4a8a89bba3 100644
--- a/configs/ls1088aqds_sdcard_qspi_defconfig
+++ b/configs/ls1088aqds_sdcard_qspi_defconfig
@@ -23,6 +23,10 @@ CONFIG_DM=y
CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_LAYERSCAPE=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_DSPI=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig
index 33e41247e6..2d5a134261 100644
--- a/configs/ls1088ardb_qspi_defconfig
+++ b/configs/ls1088ardb_qspi_defconfig
@@ -22,6 +22,10 @@ CONFIG_DM=y
CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_LAYERSCAPE=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_DSPI=y
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig
index c226bc1782..7d3b00be0e 100644
--- a/configs/ls1088ardb_sdcard_qspi_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_defconfig
@@ -23,6 +23,10 @@ CONFIG_DM=y
CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_LAYERSCAPE=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_DSPI=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index b79db5a3ae..16187ac386 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -50,6 +50,10 @@
*/
#define CPU_RELEASE_ADDR secondary_boot_func
+#ifdef CONFIG_PCI
+#define CONFIG_CMD_PCI
+#endif
+
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024)
--
2.14.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs
2017-09-04 2:47 ` [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs Zhiqiang Hou
@ 2017-09-07 20:06 ` York Sun
2017-09-08 3:12 ` Z.q. Hou
2017-09-13 2:36 ` York Sun
1 sibling, 1 reply; 9+ messages in thread
From: York Sun @ 2017-09-07 20:06 UTC (permalink / raw)
To: u-boot
On 09/03/2017 08:05 PM, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> Enabled PCIe support and PCI command feature.
>
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
> configs/ls1088aqds_qspi_defconfig | 4 ++++
> configs/ls1088aqds_sdcard_qspi_defconfig | 4 ++++
> configs/ls1088ardb_qspi_defconfig | 4 ++++
> configs/ls1088ardb_sdcard_qspi_defconfig | 4 ++++
> include/configs/ls1088a_common.h | 4 ++++
> 5 files changed, 20 insertions(+)
>
If the sdcard patches cannot be merged in time, I will drop those two
defconfig change and merge the rest.
York
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs
2017-09-07 20:06 ` York Sun
@ 2017-09-08 3:12 ` Z.q. Hou
0 siblings, 0 replies; 9+ messages in thread
From: Z.q. Hou @ 2017-09-08 3:12 UTC (permalink / raw)
To: u-boot
Hi York,
> -----Original Message-----
> From: York Sun
> Sent: 2017年9月8日 4:07
> To: Z.q. Hou <zhiqiang.hou@nxp.com>; u-boot at lists.denx.de; Ashish Kumar
> <ashish.kumar@nxp.com>; Prabhakar Kushwaha
> <prabhakar.kushwaha@nxp.com>; M.h. Lian <minghuan.lian@nxp.com>
> Subject: Re: [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs
>
> On 09/03/2017 08:05 PM, Zhiqiang Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > Enabled PCIe support and PCI command feature.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> > configs/ls1088aqds_qspi_defconfig | 4 ++++
> > configs/ls1088aqds_sdcard_qspi_defconfig | 4 ++++
> > configs/ls1088ardb_qspi_defconfig | 4 ++++
> > configs/ls1088ardb_sdcard_qspi_defconfig | 4 ++++
> > include/configs/ls1088a_common.h | 4 ++++
> > 5 files changed, 20 insertions(+)
> >
>
> If the sdcard patches cannot be merged in time, I will drop those two defconfig
> change and merge the rest.
Ok, I will submit them again as soon as sdcard patches are ready.
Thanks,
Zhiqiang
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space
2017-09-04 2:47 ` [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space Zhiqiang Hou
@ 2017-09-13 2:36 ` York Sun
0 siblings, 0 replies; 9+ messages in thread
From: York Sun @ 2017-09-13 2:36 UTC (permalink / raw)
To: u-boot
On 09/03/2017 08:05 PM, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> The pcie config space of ls1088a is different from ls2080a.
>
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
Applied to fsl-qoriq master. Thanks.
York
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/3] armv8: ls1088a: add PCIe dts node
2017-09-04 2:47 ` [U-Boot] [PATCH 2/3] armv8: ls1088a: add PCIe dts node Zhiqiang Hou
@ 2017-09-13 2:36 ` York Sun
0 siblings, 0 replies; 9+ messages in thread
From: York Sun @ 2017-09-13 2:36 UTC (permalink / raw)
To: u-boot
On 09/03/2017 08:05 PM, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
Applied to fsl-qoriq master. Thanks.
York
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs
2017-09-04 2:47 ` [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs Zhiqiang Hou
2017-09-07 20:06 ` York Sun
@ 2017-09-13 2:36 ` York Sun
1 sibling, 0 replies; 9+ messages in thread
From: York Sun @ 2017-09-13 2:36 UTC (permalink / raw)
To: u-boot
On 09/03/2017 08:05 PM, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> Enabled PCIe support and PCI command feature.
>
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
Applied to fsl-qoriq master. Thanks.
York
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-09-13 2:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-04 2:47 [U-Boot] [PATCH 0/3] armv8: ls1088a: add pcie support Zhiqiang Hou
2017-09-04 2:47 ` [U-Boot] [PATCH 1/3] armv8: ls1088a: fix the MMU table for pcie config space Zhiqiang Hou
2017-09-13 2:36 ` York Sun
2017-09-04 2:47 ` [U-Boot] [PATCH 2/3] armv8: ls1088a: add PCIe dts node Zhiqiang Hou
2017-09-13 2:36 ` York Sun
2017-09-04 2:47 ` [U-Boot] [PATCH 3/3] armv8: ls1088a: Enable PCIe in defconfigs Zhiqiang Hou
2017-09-07 20:06 ` York Sun
2017-09-08 3:12 ` Z.q. Hou
2017-09-13 2:36 ` York Sun
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.