powerpc/85xx: Added SEC-5.0 device tree.
PATCH 1/8 powerpc/85xx: Added SEC-5.0 device tree.
From: Vakul Garg <[email protected]>
Add device tree for SEC (crypto engine) version 5.0 used on T4240.
--- arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi | 109 +++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi
arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi new file +109 -0
@@ -0,0 +1,109 @@ +/* + * QorIQ Sec/Crypto 5.0 device tree stub [ controller @ offset 0x300000 ] + * + * Copyright 2012 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +crypto: crypto@300000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x300000 0x10000>; + ranges = <0 0x300000 0x10000>; + interrupts = <92 2 0 0>; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = <88 2 0 0>; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = <89 2 0 0>; + }; + + sec_jr2: jr@3000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = <90 2 0 0>; + }; + + sec_jr3: jr@4000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x4000 0x1000>; + interrupts = <91 2 0 0>; + }; + + rtic@6000 { + compatible = "fsl,sec-v5.0-rtic", + "fsl,sec-v4.0-rtic"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x6000 0x100>; + ranges = <0x0 0x6100 0xe00>; + + rtic_a: rtic-a@0 { + compatible = "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x00 0x20 0x100 0x80>; + }; + + rtic_b: rtic-b@20 { + compatible = "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x20 0x20 0x200 0x80>; + }; + + rtic_c: rtic-c@40 { + compatible = "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x40 0x20 0x300 0x80>; + }; + + rtic_d: rtic-d@60 { + compatible = "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x60 0x20 0x500 0x80>; + }; + }; +}; + +sec_mon: sec_mon@314000 { + compatible = "fsl,sec-v5.0-mon", "fsl,sec-v4.0-mon"; + reg = <0x314000 0x1000>; + interrupts = <93 2 0 0>; +};
Signature · 1 line
1.7.9.7
PATCH 2/8 powerpc/85xx: Add support for FSL PCIe controller v3.0
From: Roy ZANG <[email protected]>
The T4240 utilizes a new PCIe controller block that has some minor programming model differences from previous versions.
The major one that impacts initialization is how we determine the link state. On the 3.x controllers we have a memory mapped SoC register instead of a PCI config register that reports the link state.
--- arch/powerpc/sysdev/fsl_pci.c | 29 ++++++++++++++++++++++++++--- arch/powerpc/sysdev/fsl_pci.h | 11 +++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)
arch/powerpc/sysdev/fsl_pci.c +26 -3
@@ -54,13 +54,35 @@ static void quirk_fsl_pcie_header(struct pci_dev *dev)return ; } -static int __init fsl_pcie_check_link (struct pci_controller *hose) +static int __init fsl_pcie_check_link (struct pci_controller *hose, +struct resource *rsrc) { +struct ccsr_pci __iomem *pci =NULL ;u32 val; +/* for PCIe IP rev 3.0 or greater use CSR0 for link state */ +if (rsrc) { +pr_debug ("PCI memory map start 0x%016llx, size 0x%016llx\n" , + (u64 )rsrc->start, (u64 )rsrc->end - (u64 )rsrc->start +1 ); + pci =ioremap (rsrc->start, rsrc->end - rsrc->start +1 ); +if (!pci) { +dev_err (hose->parent,"Unable to map PCIe registers\n" ); +return -ENOMEM ; + } +if (in_be32 (&pci->block_rev1) >=PCIE_IP_REV_3_0 ) { + val = (in_be32 (&pci->pex_csr0) &PEX_CSR0_LTSSM_MASK ) + >>PEX_CSR0_LTSSM_SHIFT ; +if (val !=PEX_CSR0_LTSSM_L0 ) +return 1 ; +iounmap (pci); +return 0 ; + } +iounmap (pci); + }early_read_config_dword (hose,0 ,0 ,PCIE_LTSSM , &val);if (val <PCIE_LTSSM_L0 )return 1 ; +return 0 ; }
@@ -483,7 +505,7 @@ int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)if (early_find_capability (hose,0 ,0 ,PCI_CAP_ID_EXP )) { hose->indirect_type |=PPC_INDIRECT_TYPE_EXT_REG |PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS ; -if (fsl_pcie_check_link (hose)) +if (fsl_pcie_check_link (hose, &rsrc)) hose->indirect_type |=PPC_INDIRECT_TYPE_NO_PCIE_LINK ; }
@@ -685,7 +707,7 @@ static int __init mpc83xx_pcie_setup(struct pci_controller *hose,out_le32 (pcie->cfg_type0 +PEX_OUTWIN0_TAH ,0 );out_le32 (pcie->cfg_type0 +PEX_OUTWIN0_TAL ,0 ); -if (fsl_pcie_check_link (hose)) +if (fsl_pcie_check_link (hose,NULL )) hose->indirect_type |=PPC_INDIRECT_TYPE_NO_PCIE_LINK ;return 0 ;
@@ -836,6 +858,7 @@ static const struct of_device_id pci_ids[] = { { .compatible = "fsl,qoriq-pcie-v2.2", }, { .compatible = "fsl,qoriq-pcie-v2.3", }, { .compatible = "fsl,qoriq-pcie-v2.4", }, + { .compatible = "fsl,qoriq-pcie-v3.0", }, /* * The following entries are for compatibility with older device
arch/powerpc/sysdev/fsl_pci.h +11 -0
@@ -17,6 +17,7 @@#define PCIE_LTSSM 0x0404/* PCIE Link Training and Status */ #define PCIE_LTSSM_L0 0x16/* L0 state */ #define PCIE_IP_REV_2_2 0x02080202/* PCIE IP block version Rev2.2 */ +#define PCIE_IP_REV_3_0 0x02080300/* PCIE IP block version Rev3.0 */ #define PIWAR_EN 0x80000000/* Enable */ #define PIWAR_PF 0x20000000/* prefetch */ #define PIWAR_TGI_LOCAL 0x00f00000/* target - local memory */
@@ -89,6 +90,16 @@ struct ccsr_pci {__be32 pex_err_cap_r1;/* 0x.e2c - PCIE error capture register 0 */ __be32 pex_err_cap_r2;/* 0x.e30 - PCIE error capture register 0 */ __be32 pex_err_cap_r3;/* 0x.e34 - PCIE error capture register 0 */ +u8 res_e38[200 ]; +__be32 pdb_stat;/* 0x.f00 - PCIE Debug Status */ +u8 res_f04[16 ]; +__be32 pex_csr0;/* 0x.f14 - PEX Control/Status register 0*/ +#define PEX_CSR0_LTSSM_MASK 0xFC +#define PEX_CSR0_LTSSM_SHIFT 2 +#define PEX_CSR0_LTSSM_L0 0x11 +__be32 pex_csr1;/* 0x.f18 - PEX Control/Status register 1*/ +u8 res_f1c[228 ]; + };extern int fsl_add_bridge (struct platform_device *pdev,int is_primary);
Signature · 1 line
1.7.9.7
PATCH 3/8 powerpc/fsl-booke: Support detection of page sizes on
The e6500 core used on T4240 and B4860 SoCs from FSL implements MMUv2 of the Power Book-E Architecture. However there are some minor differences between it and other Book-E implementations.
Add support to parse SPRN_TLB1PS for the variable page sizes supported. In the future this should be expanded for more page sizes supported on e6500 as well as other MMU features.
This patch is based on code from Scott Wood.
--- arch/powerpc/mm/tlb_nohash.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/powerpc/mm/tlb_nohash.c +16 -2
@@ -414,9 +414,9 @@ static void setup_page_sizes(void)#ifdef CONFIG_PPC_FSL_BOOK3E unsigned int mmucfg =mfspr (SPRN_MMUCFG ); +int fsl_mmu =mmu_has_feature (MMU_FTR_TYPE_FSL_E ); -if (((mmucfg &MMUCFG_MAVN ) ==MMUCFG_MAVN_V1 ) && - (mmu_has_feature (MMU_FTR_TYPE_FSL_E ))) { +if (fsl_mmu && (mmucfg &MMUCFG_MAVN ) ==MMUCFG_MAVN_V1 ) {unsigned int tlb1cfg =mfspr (SPRN_TLB1CFG );unsigned int min_pg, max_pg;
@@ -442,6 +442,20 @@ static void setup_page_sizes(void) goto no_indirect; } + +if (fsl_mmu && (mmucfg &MMUCFG_MAVN ) ==MMUCFG_MAVN_V2 ) { +u32 tlb1ps =mfspr (SPRN_TLB1PS ); + +for (psize =0 ; psize <MMU_PAGE_COUNT ; ++psize) { +struct mmu_psize_def *def = &mmu_psize_defs[psize]; + +if (tlb1ps & (1U << (def->shift -10 ))) { + def->flags |=MMU_PAGE_SIZE_DIRECT ; + } + } + + goto no_indirect; + }#endif tlb0cfg =mfspr (SPRN_TLB0CFG );
Signature · 1 line
1.7.9.7
PATCH 4/8 powerpc/85xx: Add AltiVec support for e6500
The e6500 core adds support for AltiVec on a Book-E class processor. Connect up all the various exception handling code and build config mechanisms to allow user spaces apps to utilize AltiVec.
--- arch/powerpc/include/asm/cputable.h | 2 +- arch/powerpc/include/asm/kvm_asm.h | 4 +++ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 14 +++++++++ arch/powerpc/kernel/cputable.c | 9 ++++-- arch/powerpc/kernel/exceptions-64e.S | 47 +++++++++++++++++++++++++++++ arch/powerpc/platforms/Kconfig.cputype | 2 +- 6 files changed, 73 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/cputable.h +1 -1
@@ -374,7 +374,7 @@ extern const char *powerpc_base_platform;#define CPU_FTRS_E6500 (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \ CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \ CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \ - CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV) + CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV | CPU_FTR_ALTIVEC_COMP)#define CPU_FTRS_GENERIC_32 (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)/* 64-bit CPUs */
arch/powerpc/include/asm/kvm_asm.h +4 -0
@@ -67,6 +67,10 @@#define BOOKE_INTERRUPT_HV_SYSCALL 40#define BOOKE_INTERRUPT_HV_PRIV 41 +/* altivec */ +#define BOOKE_INTERRUPT_ALTIVEC_UNAVAIL 42 +#define BOOKE_INTERRUPT_ALTIVEC_ASSIST 43 +/* book3s */ #define BOOK3S_INTERRUPT_SYSTEM_RESET 0x100
arch/powerpc/kernel/cpu_setup_fsl_booke.S +14 -0
@@ -53,6 +53,13 @@ _GLOBAL(__e500_dcache_setup) isync blr +_GLOBAL(__setup_cpu_e6500) + mflr r6 + bl .setup_altivec_ivors + bl __setup_cpu_e5500 + mtlr r6 + blr + #ifdef CONFIG_PPC32 _GLOBAL(__setup_cpu_e200) /* enable dedicated debug exception handling resources (Debug APU) */
@@ -107,6 +114,13 @@ _GLOBAL(__setup_cpu_e5500) #endif #ifdef CONFIG_PPC_BOOK3E_64 +_GLOBAL(__restore_cpu_e6500) + mflr r5 + bl .setup_altivec_ivors + bl __restore_cpu_e5500 + mtlr r5 + blr + _GLOBAL(__restore_cpu_e5500) mflr r4 bl __e500_icache_setup
arch/powerpc/kernel/cputable.c +6 -3
@@ -74,7 +74,9 @@ extern void __restore_cpu_a2(void);#endif /* CONFIG_PPC64 */ #if defined(CONFIG_E500 )extern void __setup_cpu_e5500 (unsigned long offset,struct cpu_spec * spec); +extern void __setup_cpu_e6500 (unsigned long offset,struct cpu_spec * spec);extern void __restore_cpu_e5500 (void ); +extern void __restore_cpu_e6500 (void );#endif /* CONFIG_E500 */ /* This table only contains "desktop" CPUs, it need to be filled with embedded
@@ -2065,7 +2067,8 @@ static struct cpu_spec __initdata cpu_specs[] = { .pvr_value = 0x80400000, .cpu_name = "e6500", .cpu_features = CPU_FTRS_E6500, - .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .cpu_user_features =COMMON_USER_BOOKE |PPC_FEATURE_HAS_FPU | + PPC_FEATURE_HAS_ALTIVEC_COMP, .mmu_features =MMU_FTR_TYPE_FSL_E |MMU_FTR_BIG_PHYS | MMU_FTR_USE_TLBILX, .icache_bsize = 64,
@@ -2073,9 +2076,9 @@ static struct cpu_spec __initdata cpu_specs[] = { .num_pmcs = 4, .oprofile_cpu_type = "ppc/e6500", .oprofile_type = PPC_OPROFILE_FSL_EMB, - .cpu_setup = __setup_cpu_e5500, + .cpu_setup = __setup_cpu_e6500, #ifndef CONFIG_PPC32 - .cpu_restore = __restore_cpu_e5500, + .cpu_restore = __restore_cpu_e6500, #endif .machine_check = machine_check_e500mc, .platform = "ppce6500",
arch/powerpc/kernel/exceptions-64e.S +47 -0
71 lines not on this page · raw message
arch/powerpc/platforms/Kconfig.cputype +1 -1
@@ -232,7 +232,7 @@ config PHYS_64BIT config ALTIVEC bool "AltiVec Support" - depends on 6xx || POWER4 + depends on 6xx || POWER4 || (PPC_E500MC && PPC64) ---help--- This option enables kernel support for the Altivec extensions to the PowerPC processor. The kernel currently supports saving and restoring
Signature · 1 line
1.7.9.7
PATCH 5/8 powerpc/fsl-booke: Add initial silicon device tree for
Enable a baseline T4240 SoC to boot. There are several things missing from the device trees for T4240:
* Thread support on e6500
* Proper PAMU topology information
* DPAA related nodes (Qman, Bman, Fman, Rman, DCE)
* Prefetch Manager
* Thermal monitor unit
* Interlaken
--- arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi | 41 ++++ arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi | 41 ++++ arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi | 41 ++++ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 311 +++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 129 +++++++++++ 5 files changed, 563 insertions(+) create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi new file +41 -0
@@ -0,0 +1,41 @@ +/* + * QorIQ GPIO device tree stub [ controller @ offset 0x131000 ] + * + * Copyright 2013 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +gpio1: gpio@131000 { + compatible = "fsl,qoriq-gpio"; + reg = <0x131000 0x1000>; + interrupts = <54 2 0 0>; + #gpio-cells = <2>; + gpio-controller; +};
arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi new file +41 -0
41 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi new file +41 -0
41 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi new file +311 -0
311 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi new file +129 -0
129 lines not on this page · raw message
Signature · 1 line
1.7.9.7
PATCH 6/8 powerpc/fsl-booke: Add initial T4240QDS board device
--- arch/powerpc/boot/dts/t4240qds.dts | 220 ++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 arch/powerpc/boot/dts/t4240qds.dts
arch/powerpc/boot/dts/t4240qds.dts new file +220 -0
@@ -0,0 +1,220 @@ +/* + * T4240QDS Device Tree Source + * + * Copyright 2012 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/include/ "fsl/t4240si-pre.dtsi" + +/ { + model = "fsl,T4240QDS"; + compatible = "fsl,T4240QDS"; + #address-cells = <2>; + #size-cells = <2>; + interrupt-parent = <&mpic>; + + ifc: localbus@ffe124000 { + reg = <0xf 0xfe124000 0 0x2000>; + ranges = <0 0 0xf 0xe8000000 0x08000000 + 2 0 0xf 0xff800000 0x00010000 + 3 0 0xf 0xffdf0000 0x00008000>; + + nor@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x0 0x0 0x8000000>; + + bank-width = <2>; + device-width = <1>; + }; + + nand@2,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,ifc-nand"; + reg = <0x2 0x0 0x10000>; + + partition@0 { + /* This location must not be altered */ + /* 1MB for u-boot Bootloader Image */ + reg = <0x0 0x00100000>; + label = "NAND U-Boot Image"; + read-only; + }; + + partition@100000 { + /* 1MB for DTB Image */ + reg = <0x00100000 0x00100000>; + label = "NAND DTB Image"; + }; + + partition@200000 { + /* 10MB for Linux Kernel Image */ + reg = <0x00200000 0x00A00000>; + label = "NAND Linux Kernel Image"; + }; + + partition@C00000 { + /* 500MB for Root file System Image */ + reg = <0x00c00000 0x1F400000>; + label = "NAND RFS Image"; + }; + }; + + board-control@3,0 { + compatible = "fsl,t4240qds-fpga", "fsl,fpga-qixis"; + reg = <3 0 0x300>; + }; + }; + + memory { + device_type = "memory"; + }; + + soc: soc@ffe000000 { + ranges = <0x00000000 0xf 0xfe000000 0x1000000>; + reg = <0xf 0xfe000000 0 0x00001000>; + spi@110000 { + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "sst,sst25wf040"; + reg = <0>; + spi-max-frequency = <40000000>; /* input clock */ + }; + }; + + i2c@118000 { + eeprom@51 { + compatible = "at24,24c256"; + reg = <0x51>; + }; + eeprom@52 { + compatible = "at24,24c256"; + reg = <0x52>; + }; + eeprom@53 { + compatible = "at24,24c256"; + reg = <0x53>; + }; + eeprom@54 { + compatible = "at24,24c256"; + reg = <0x54>; + }; + eeprom@55 { + compatible = "at24,24c256"; + reg = <0x55>; + }; + eeprom@56 { + compatible = "at24,24c256"; + reg = <0x56>; + }; + rtc@68 { + compatible = "dallas,ds3232"; + reg = <0x68>; + interrupts = <0x1 0x1 0 0>; + }; + }; + }; + + pci0: pcie@ffe240000 { + reg = <0xf 0xfe240000 0 0x10000>; + ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 + 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; + + pci1: pcie@ffe250000 { + reg = <0xf 0xfe250000 0 0x10000>; + ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 + 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; + + pci2: pcie@ffe260000 { + reg = <0xf 0xfe260000 0 0x1000>; + ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 + 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; + + pci3: pcie@ffe270000 { + reg = <0xf 0xfe270000 0 0x10000>; + ranges = <0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000 + 0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; + rio: rapidio@ffe0c0000 { + reg = <0xf 0xfe0c0000 0 0x11000>; + + port1 { + ranges = <0 0 0xc 0x20000000 0 0x10000000>; + }; + port2 { + ranges = <0 0 0xc 0x30000000 0 0x10000000>; + }; + }; +}; + +/include/ "fsl/t4240si-post.dtsi"
Signature · 1 line
1.7.9.7
PATCH 7/8 powerpc/fsl-booke: Add initial T4240QDS board support
Some minor changes to the common corenet_ds.c code are needed to support the T4240QDS:
* Add support for "fsl,qoriq-pcie-v3.0" controller
* Bump max # of IRQs to 512 (T4240 supports more interrupts than previous SoCs).
--- arch/powerpc/platforms/85xx/Kconfig | 17 ++++++ arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/corenet_ds.c | 5 +- arch/powerpc/platforms/85xx/t4240_qds.c | 98 ++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 arch/powerpc/platforms/85xx/t4240_qds.c
arch/powerpc/platforms/85xx/Kconfig +17 -0
@@ -305,6 +305,23 @@ config PPC_QEMU_E500 unset based on the emulated CPU (or actual host CPU in the case of KVM). +if PPC64 + +config T4240_QDS + bool "Freescale T4240 QDS" + select DEFAULT_UIMAGE + select E500 + select PPC_E500MC + select PHYS_64BIT + select SWIOTLB + select ARCH_REQUIRE_GPIOLIB + select GPIO_MPC8XXX + select HAS_RAPIDIO + select PPC_EPAPR_HV_PIC + help + This option enables support for the T4240 QDS board + +endif endif # FSL_SOC_BOOKE config TQM85xx
arch/powerpc/platforms/85xx/Makefile +1 -0
@@ -22,6 +22,7 @@ obj-$(CONFIG_P3041_DS) += p3041_ds.o corenet_ds.o obj-$(CONFIG_P4080_DS) += p4080_ds.o corenet_ds.o obj-$(CONFIG_P5020_DS) += p5020_ds.o corenet_ds.o obj-$(CONFIG_P5040_DS) += p5040_ds.o corenet_ds.o +obj-$(CONFIG_T4240_QDS) += t4240_qds.o corenet_ds.o obj-$(CONFIG_STX_GP3) += stx_gp3.o obj-$(CONFIG_TQM85xx) += tqm85xx.o obj-$(CONFIG_SBC8548) += sbc8548.o
arch/powerpc/platforms/85xx/corenet_ds.c +4 -1
@@ -40,7 +40,7 @@ void __init corenet_ds_pic_init(void)if (ppc_md.get_irq == mpic_get_coreint_irq) flags |=MPIC_ENABLE_COREINT ; - mpic =mpic_alloc (NULL ,0 , flags,0 ,256 ," OpenPIC " ); + mpic =mpic_alloc (NULL ,0 , flags,0 ,512 ," OpenPIC " );BUG_ON (mpic ==NULL );mpic_init (mpic);
@@ -83,6 +83,9 @@ static const struct of_device_id of_device_ids[] = { { .compatible = "fsl,qoriq-pcie-v2.4", }, + { + .compatible = "fsl,qoriq-pcie-v3.0", + }, /* The following two are for the Freescale hypervisor */ { .name = "hypervisor",
arch/powerpc/platforms/85xx/t4240_qds.c new file +98 -0
98 lines not on this page · raw message
Signature · 1 line
1.7.9.7
PATCH 8/8 powerpc/85xx: Update corenet64_smp_defconfig for T4240
* Add support for up to 24 cores on T4240 (includes threads)
* Enable AltiVec support (on T4240)
* Add T4240QDS board into build
* Other changes are due to general kernel update of defconfig
--- arch/powerpc/configs/corenet64_smp_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/powerpc/configs/corenet64_smp_defconfig +4 -5
@@ -1,14 +1,13 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3E_64=y -# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set +CONFIG_ALTIVEC=y CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_EXPERIMENTAL=y +CONFIG_NR_CPUS=24 CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BSD_PROCESS_ACCT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14
@@ -24,6 +23,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_P5020_DS=y CONFIG_P5040_DS=y +CONFIG_T4240_QDS=y # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set CONFIG_BINFMT_MISC=m CONFIG_PCIEPORTBUS=y
@@ -140,6 +140,5 @@ CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y
Signature · 1 line
1.7.9.7
Kumar Gala
AppliedRe: [PATCH 8/8] powerpc/85xx: Update corenet64_smp_defconfig for T4240
Quoted 9 lines · Kumar Gala
* Add support for up to 24 cores on T4240 (includes threads)
* Enable AltiVec support (on T4240)
* Add T4240QDS board into build
* Other changes are due to general kernel update of defconfigSigned-off-by Kumar Gala <[email protected]>---
arch/powerpc/configs/corenet64_smp_defconfig| 9 ++++-----1 file changed, 4 insertions(+), 5 deletions(-)
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 7/8] powerpc/fsl-booke: Add initial T4240QDS board support
In reply to Kumar GalaQuoted 1 line · Kumar Gala
Some minor changes to the common
corenet_ds.ccode are needed to =
support
Quoted 11 lines
the T4240QDS:
* Add support for "fsl,qoriq-pcie-v3.0" controller
* Bump max # of IRQs to 512 (T4240 supports more interrupts than previous SoCs).
=20Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/platforms/85xx/Kconfig | 17 ++++++ arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/corenet_ds.c | 5 +- arch/powerpc/platforms/85xx/t4240_qds.c | 98 =
++++++++++++++++++++++++++++++
Quoted 2 lines
4 files changed, 120 insertions(+), 1 deletion(-)create mode 100644
arch/powerpc/platforms/85xx/t4240_qds.c
applied to next
- k=
Kumar Gala
AppliedRe: [PATCH 6/8] powerpc/fsl-booke: Add initial T4240QDS board device
In reply to Kumar GalaQuoted 10 lines · Kumar Gala
Signed-off-by Minghuan Lian <[email protected]>Signed-off-by Roy Zang <[email protected]>Signed-off-by Prabhakar Kushwaha <[email protected]>Signed-off-by Andy Fleming <[email protected]>Signed-off-by Shaohui Xie <[email protected]>Signed-off-by Prabhakar Kushwaha <[email protected]>Signed-off-by Scott Wood <[email protected]>Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/boot/dts/t4240qds.dts| 220 =
++++++++++++++++++++++++++++++++++++
Quoted 2 lines
1 file changed, 220 insertions(+)create mode 100644
arch/powerpc/boot/dts/t4240qds.dts
applied to next
- k=
Re: [PATCH 5/8] powerpc/fsl-booke: Add initial silicon device tree for
In reply to Kumar GalaQuoted 4 lines · Kumar Gala
Enable a baseline T4240 SoC to boot. There are several things missing from the device trees for T4240:
=20
* Thread support on e6500
Why did threads get removed from the device tree? It's supposed to =20 describe hardware, not what Linux currently supports.
Quoted 5 lines
* Proper PAMU topology information
* DPAA related nodes (Qman, Bman, Fman, Rman, DCE)
* Prefetch Manager
* Thermal monitor unit
* Interlaken
The dts should be marked preliminary somehow -- we really should get =20 out of the habit of letting device nodes trickle in as drivers get =20 added.
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
Quoted 3 lines
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi new file +3
-0+/* controller at 0x240000 */ +&pci0 { + compatible =3D "fsl,t4240-pcie", "fsl,qoriq-pcie-v3.0";
We have a version register -- do we really need to keep sticking the =20 version number in the compatible? Note that we've had device trees =20 that specified the version incorrectly in the past.
Review
Quoted 5 lines
(quoted diff) +5
-0+ device_type =3D "pci"; + #size-cells =3D <2>; + #address-cells =3D <3>; + bus-range =3D <0x0 0xff>; + clock-frequency =3D <33333333>;
This clock-frequency is not correct (I doubt it's needed at all).
Quoted 11 lines
(quoted diff) +11
-0+ PowerPC,e6500@1 { + device_type =3D "cpu"; + reg =3D <2>; + next-level-cache =3D <&L2_1>; + }; + PowerPC,e6500@2 { + device_type =3D "cpu"; + reg =3D <4>; + next-level-cache =3D <&L2_1>; + }; + PowerPC,e6500@3 {
Review
Quoted 10 lines
(quoted diff) +10
-0+ device_type =3D "cpu"; + reg =3D <6>; + next-level-cache =3D <&L2_1>; + }; + + PowerPC,e6500@4 { + device_type =3D "cpu"; + reg =3D <8>; + next-level-cache =3D <&L2_2>; + };
Inconsistent whitespace.
As usual, the pre/post split is unnecessary. Everything in it can go =20 in post.
-Scott=
Re: [PATCH 5/8] powerpc/fsl-booke: Add initial silicon device tree for
Quoted 2 lines · Scott Wood
Quoted 1 line · Kumar Gala
Enable a baseline T4240 SoC to boot. There are several things =
missing
Quoted 4 lines
Quoted 2 lines
from the device trees for T4240:
* Thread support on e6500=20
Why did threads get removed from the device tree? It's supposed to =
describe hardware, not what Linux currently supports.
will fix, was concerned if we'd be able to boot if they exited
Quoted 8 lines
=20
Quoted 5 lines
* Proper PAMU topology information
* DPAA related nodes (Qman, Bman, Fman, Rman, DCE)
* Prefetch Manager
* Thermal monitor unit
* Interlaken=20
The dts should be marked preliminary somehow -- we really should get =
out of the habit of letting device nodes trickle in as drivers get = added.
agreed but forward progress always gets in the way
Quoted 6 lines
=20
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
Quoted 3 lines
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi new file +3
-0+/* controller at 0x240000 */ +&pci0 { + compatible =3D "fsl,t4240-pcie", "fsl,qoriq-pcie-v3.0";=20
We have a version register -- do we really need to keep sticking the =
version number in the compatible? Note that we've had device trees that = specified the version incorrectly in the past.
Quoted 8 lines
=20
Review
Quoted 5 lines
(quoted diff) +5
-0+ device_type =3D "pci"; + #size-cells =3D <2>; + #address-cells =3D <3>; + bus-range =3D <0x0 0xff>; + clock-frequency =3D <33333333>;=20
This clock-frequency is not correct (I doubt it's needed at all).
I can zero the field, but its spec'd by pci binding
Quoted 16 lines
=20
Quoted 15 lines
(quoted diff) +15
-0+ PowerPC,e6500@1 { + device_type =3D "cpu"; + reg =3D <2>; + next-level-cache =3D <&L2_1>; + }; + PowerPC,e6500@2 { + device_type =3D "cpu"; + reg =3D <4>; + next-level-cache =3D <&L2_1>; + }; + PowerPC,e6500@3 { + device_type =3D "cpu"; + reg =3D <6>; + next-level-cache =3D <&L2_1>; + };
Quoted 8 lines
arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi line 91
Quoted 6 lines
arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi new file +6
-0+ + PowerPC,e6500@4 { + device_type =3D "cpu"; + reg =3D <8>; + next-level-cache =3D <&L2_2>; + };=20
Inconsistent whitespace.
will kill the whitespace.
Quoted 1 line
As usual, the pre/post split is unnecessary. Everything in it can go =
in post.
Quoted 2 lines
=20
-Scott
Re: [PATCH 5/8] powerpc/fsl-booke: Add initial silicon device tree for
Quoted 5 lines · Kumar Gala
=20
On Mar 5, 2013, at 6:15 PM, Scott Wood wrote:
=20Quoted 2 lines · Kumar Gala
Quoted 1 line
Enable a baseline T4240 SoC to boot. There are several things =20
Quoted 8 lines
missing
Quoted 4 lines
Quoted 2 lines
from the device trees for T4240:
* Thread support on e6500Why did threads get removed from the device tree? It's supposed to =20
describe hardware, not what Linux currently supports. =20
will fix, was concerned if we'd be able to boot if they exited
I don't think it'd be a problem (and if it is, then fix Linux).
Quoted 9 lines
Quoted 7 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ device_type =3D "pci"; + #size-cells =3D <2>; + #address-cells =3D <3>; + bus-range =3D <0x0 0xff>; + clock-frequency =3D <33333333>;This clock-frequency is not correct (I doubt it's needed at all).
=20
I can zero the field, but its spec'd by pci binding
If we aren't going to put a correct value in, is zero better than =20 omitting it entirely?
There are other properties in the PCI binding that we don't have, such =20 as slot-names. I don't see any language in the PCI binding that says =20 one is required but the other isn't.
And shouldn't we be using the PCI express binding (device_type =3D =20 "pciex", or just get rid of it since this isn't real OF)?
-Scott=
Re: [PATCH 5/8] powerpc/fsl-booke: Add initial silicon device tree for
Quoted 4 lines · Scott Wood
Quoted 3 lines · Kumar Gala
Quoted 2 lines · Scott Wood
Quoted 1 line · Kumar Gala
Enable a baseline T4240 SoC to boot. There are several things =
missing
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
from the device trees for T4240:
* Thread support on e6500Why did threads get removed from the device tree? It's supposed to =
describe hardware, not what Linux currently supports.
Quoted 3 lines
Quoted 1 line
will fix, was concerned if we'd be able to boot if they exited
=20
I don't think it'd be a problem (and if it is, then fix Linux).
looks fine, so I'll add them in v2 patch.
Quoted 11 lines
=20
Quoted 8 lines
Quoted 7 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ device_type =3D "pci"; + #size-cells =3D <2>; + #address-cells =3D <3>; + bus-range =3D <0x0 0xff>; + clock-frequency =3D <33333333>;This clock-frequency is not correct (I doubt it's needed at all).
I can zero the field, but its spec'd by pci binding
=20
If we aren't going to put a correct value in, is zero better than =
omitting it entirely?
Quoted 2 lines
=20
There are other properties in the PCI binding that we don't have, such =
as slot-names. I don't see any language in the PCI binding that says = one is required but the other isn't.
Quoted 2 lines
=20
And shouldn't we be using the PCI express binding (device_type=3D =
"pciex", or just get rid of it since this isn't real OF)?
I'll drop clock-frequency since we dont use it.
- k
Re: [PATCH 5/8] powerpc/fsl-booke: Add initial silicon device tree for
In reply to Kumar GalaQuoted 7 lines · Kumar Gala
* Thread support on e6500
* Proper PAMU topology information
* DPAA related nodes (Qman, Bman, Fman, Rman, DCE)
* Prefetch Manager
* Thermal monitor unit
* Interlaken
Quoted 12 lines
Signed-off-by Roy Zang<[email protected]>Signed-off-by Minghuan Lian<[email protected]>Signed-off-by Haiying Wang<[email protected]>Signed-off-by Andy Fleming<[email protected]>Signed-off-by Prabhakar Kushwaha<[email protected]>Signed-off-by York Sun<[email protected]>Signed-off-by Vakul Garg<[email protected]>Signed-off-by Tang Yuantian<[email protected]>Signed-off-by Zhao Chenhui<[email protected]>Signed-off-by Li Yang<[email protected]>Signed-off-by Ramneek Mehresh<[email protected]>Signed-off-by Haiying Wang<[email protected]>
Haiying is doubled.
Roy
Kumar Gala
AppliedRe: [PATCH 3/8] powerpc/fsl-booke: Support detection of page sizes on
In reply to Kumar GalaQuoted 8 lines · Kumar Gala
The e6500 core used on T4240 and B4860 SoCs from FSL implements MMUv2 of the Power Book-E Architecture. However there are some minor differences between it and other Book-E implementations.
Add support to parse
SPRN_TLB1PSfor the variable page sizes supported. In the future this should be expanded for more page sizes supported on e6500 as well as other MMU features.
Quoted 6 lines
This patch is based on code from Scott Wood.
Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/mm/tlb_nohash.c| 18 ++++++++++++++++--1 file changed, 16 insertions(+), 2 deletions(-)
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 2/8] powerpc/85xx: Add support for FSL PCIe controller v3.0
In reply to Kumar GalaQuoted 9 lines · Kumar Gala
From: Roy ZANG <[email protected]>
The T4240 utilizes a new PCIe controller block that has some minor programming model differences from previous versions.
The major one that impacts initialization is how we determine the link state. On the 3.x controllers we have a memory mapped SoC register instead of a PCI config register that reports the link state.
Quoted 7 lines
Signed-off-by Roy Zang <[email protected]>Signed-off-by Andy Fleming <[email protected]>Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/sysdev/fsl_pci.c | 29 ++++++++++++++++++++++++++--- arch/powerpc/sysdev/fsl_pci.h | 11 +++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)
applied to next
- k
Kumar Gala
AppliedQuoted 9 lines · Kumar Gala
From: Vakul Garg <[email protected]>
=20
Add device tree for SEC (crypto engine) version 5.0 used on T4240. =20Signed-off-by Vakul Garg <[email protected]>Signed-off-by Andy Fleming <[email protected]>Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi| 109 =
+++++++++++++++++++++++++
Quoted 2 lines
1 file changed, 109 insertions(+)create mode 100644
arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi
applied to next
- k=