| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 14 Dec 2021 13:39:46 +0800
From: Shawn Guo <shawnguo@...nel.org>
To: Li Yang <leoyang.li@....com>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Hou Zhiqiang <Zhiqiang.Hou@....com>
Subject: Re: [PATCH v2 05/10] arm64: dts: lx2160a: update PCIe nodes to match
rev2 silicon
On Fri, Dec 03, 2021 at 05:54:41PM -0600, Li Yang wrote:
> The original dts was created based on the non-production rev1 silicon
> which was only used for evaluation. Update the PCIe nodes to align with
> the different controller used in production rev2 silicon.
>
> Signed-off-by: Li Yang <leoyang.li@....com>
> Reviewed-by: Hou Zhiqiang <Zhiqiang.Hou@....com>
> ---
> .../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 96 +++++++++----------
> 1 file changed, 48 insertions(+), 48 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> index fcde09f36018..de680521e1d1 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
> @@ -1088,10 +1088,10 @@ sata3: sata@...0000 {
> };
>
> pcie1: pcie@...0000 {
> - compatible = "fsl,lx2160a-pcie";
Drop lx2160a specific compatible for lx2160a SoC?
Shawn
> - reg = <0x00 0x03400000 0x0 0x00100000>, /* controller registers */
> - <0x80 0x00000000 0x0 0x00002000>; /* configuration space */
> - reg-names = "csr_axi_slave", "config_axi_slave";
> + compatible = "fsl,ls2088a-pcie";
> + reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */
> + 0x80 0x00000000 0x0 0x00002000>; /* configuration space */
> + reg-names = "regs", "config";
> interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
> <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
> <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1100,26 +1100,26 @@ pcie1: pcie@...0000 {
> #size-cells = <2>;
> device_type = "pci";
> dma-coherent;
> - apio-wins = <8>;
> - ppio-wins = <8>;
> + num-viewport = <8>;
> bus-range = <0x0 0xff>;
> - ranges = <0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> + ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000
> + 0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> msi-parent = <&its>;
> + iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 2 &gic 0 0 GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 3 &gic 0 0 GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 4 &gic 0 0 GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
> - iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
> status = "disabled";
> };
>
> pcie2: pcie@...0000 {
> - compatible = "fsl,lx2160a-pcie";
> - reg = <0x00 0x03500000 0x0 0x00100000>, /* controller registers */
> - <0x88 0x00000000 0x0 0x00002000>; /* configuration space */
> - reg-names = "csr_axi_slave", "config_axi_slave";
> + compatible = "fsl,ls2088a-pcie";
> + reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */
> + 0x88 0x00000000 0x0 0x00002000>; /* configuration space */
> + reg-names = "regs", "config";
> interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
> <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
> <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1128,26 +1128,26 @@ pcie2: pcie@...0000 {
> #size-cells = <2>;
> device_type = "pci";
> dma-coherent;
> - apio-wins = <8>;
> - ppio-wins = <8>;
> + num-viewport = <8>;
> bus-range = <0x0 0xff>;
> - ranges = <0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> + ranges = <0x81000000 0x0 0x00000000 0x88 0x00010000 0x0 0x00010000
> + 0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> msi-parent = <&its>;
> + iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 2 &gic 0 0 GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 3 &gic 0 0 GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 4 &gic 0 0 GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
> - iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
> status = "disabled";
> };
>
> pcie3: pcie@...0000 {
> - compatible = "fsl,lx2160a-pcie";
> - reg = <0x00 0x03600000 0x0 0x00100000>, /* controller registers */
> - <0x90 0x00000000 0x0 0x00002000>; /* configuration space */
> - reg-names = "csr_axi_slave", "config_axi_slave";
> + compatible = "fsl,ls2088a-pcie";
> + reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */
> + 0x90 0x00000000 0x0 0x00002000>; /* configuration space */
> + reg-names = "regs", "config";
> interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
> <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
> <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1156,26 +1156,26 @@ pcie3: pcie@...0000 {
> #size-cells = <2>;
> device_type = "pci";
> dma-coherent;
> - apio-wins = <256>;
> - ppio-wins = <24>;
> + num-viewport = <256>;
> bus-range = <0x0 0xff>;
> - ranges = <0x82000000 0x0 0x40000000 0x90 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> + ranges = <0x81000000 0x0 0x00000000 0x90 0x00010000 0x0 0x00010000
> + 0x82000000 0x0 0x40000000 0x90 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> msi-parent = <&its>;
> + iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 2 &gic 0 0 GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 3 &gic 0 0 GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 4 &gic 0 0 GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
> - iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
> status = "disabled";
> };
>
> pcie4: pcie@...0000 {
> - compatible = "fsl,lx2160a-pcie";
> - reg = <0x00 0x03700000 0x0 0x00100000>, /* controller registers */
> - <0x98 0x00000000 0x0 0x00002000>; /* configuration space */
> - reg-names = "csr_axi_slave", "config_axi_slave";
> + compatible = "fsl,ls2088a-pcie";
> + reg = <0x00 0x03700000 0x0 0x00100000 /* controller registers */
> + 0x98 0x00000000 0x0 0x00002000>; /* configuration space */
> + reg-names = "regs", "config";
> interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
> <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
> <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1184,26 +1184,26 @@ pcie4: pcie@...0000 {
> #size-cells = <2>;
> device_type = "pci";
> dma-coherent;
> - apio-wins = <8>;
> - ppio-wins = <8>;
> + num-viewport = <8>;
> bus-range = <0x0 0xff>;
> - ranges = <0x82000000 0x0 0x40000000 0x98 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> + ranges = <0x81000000 0x0 0x00000000 0x98 0x00010000 0x0 0x00010000
> + 0x82000000 0x0 0x40000000 0x98 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> msi-parent = <&its>;
> + iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 2 &gic 0 0 GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 3 &gic 0 0 GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 4 &gic 0 0 GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
> - iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
> status = "disabled";
> };
>
> pcie5: pcie@...0000 {
> - compatible = "fsl,lx2160a-pcie";
> - reg = <0x00 0x03800000 0x0 0x00100000>, /* controller registers */
> - <0xa0 0x00000000 0x0 0x00002000>; /* configuration space */
> - reg-names = "csr_axi_slave", "config_axi_slave";
> + compatible = "fsl,ls2088a-pcie";
> + reg = <0x00 0x03800000 0x0 0x00100000 /* controller registers */
> + 0xa0 0x00000000 0x0 0x00002000>; /* configuration space */
> + reg-names = "regs", "config";
> interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
> <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
> <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1212,26 +1212,26 @@ pcie5: pcie@...0000 {
> #size-cells = <2>;
> device_type = "pci";
> dma-coherent;
> - apio-wins = <256>;
> - ppio-wins = <24>;
> + num-viewport = <256>;
> bus-range = <0x0 0xff>;
> - ranges = <0x82000000 0x0 0x40000000 0xa0 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> + ranges = <0x81000000 0x0 0x00000000 0xa0 0x00010000 0x0 0x00010000
> + 0x82000000 0x0 0x40000000 0xa0 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> msi-parent = <&its>;
> + iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 2 &gic 0 0 GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 3 &gic 0 0 GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 4 &gic 0 0 GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
> - iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
> status = "disabled";
> };
>
> pcie6: pcie@...0000 {
> - compatible = "fsl,lx2160a-pcie";
> - reg = <0x00 0x03900000 0x0 0x00100000>, /* controller registers */
> - <0xa8 0x00000000 0x0 0x00002000>; /* configuration space */
> - reg-names = "csr_axi_slave", "config_axi_slave";
> + compatible = "fsl,ls2088a-pcie";
> + reg = <0x00 0x03900000 0x0 0x00100000 /* controller registers */
> + 0xa8 0x00000000 0x0 0x00002000>; /* configuration space */
> + reg-names = "regs", "config";
> interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* AER interrupt */
> <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
> <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> @@ -1240,18 +1240,18 @@ pcie6: pcie@...0000 {
> #size-cells = <2>;
> device_type = "pci";
> dma-coherent;
> - apio-wins = <8>;
> - ppio-wins = <8>;
> + num-viewport = <8>;
> bus-range = <0x0 0xff>;
> - ranges = <0x82000000 0x0 0x40000000 0xa8 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> + ranges = <0x81000000 0x0 0x00000000 0xa8 0x00010000 0x0 0x00010000
> + 0x82000000 0x0 0x40000000 0xa8 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
> msi-parent = <&its>;
> + iommu-map = <0 &smmu 0 1>; /* This is fixed-up by u-boot */
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 2 &gic 0 0 GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 3 &gic 0 0 GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
> <0000 0 0 4 &gic 0 0 GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
> - iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
> status = "disabled";
> };
>
> --
> 2.25.1
>
Powered by blists - more mailing lists