powerpc/476fpe: Add 476fpe SoC code

Based on original work by David 'Shaggy' Kleikamp.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Josh Boyer <jwboyer@gmail.com>

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 559da199edb59699e3a252fedb77fa497f1d043b..7fdc2c0b7fa057bd1f9391e93d0332b9f8ccebb8 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -951,6 +951,7 @@
 #define PVR_403GCX     0x00201400
 #define PVR_405GP      0x40110000
 #define PVR_476                0x11a52000
+#define PVR_476FPE     0x7ff50000
 #define PVR_STB03XXX   0x40310000
 #define PVR_NP405H     0x41410000
 #define PVR_NP405L     0x41610000

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index ce59693835c77301a68baad1e7a7474664603111..81db9e2a8a203e50b204bfec76cb2adef5f538f1 100644 (file)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1843,6 +1843,20 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .machine_check          = machine_check_47x,
                .platform               = "ppc470",
        },
+       { /* 476fpe */
+               .pvr_mask               = 0xffff0000,
+               .pvr_value              = 0x7ff50000,
+               .cpu_name               = "476fpe",
+               .cpu_features           = CPU_FTRS_47X | CPU_FTR_476_DD2,
+               .cpu_user_features      = COMMON_USER_BOOKE |
+                       PPC_FEATURE_HAS_FPU,
+               .mmu_features           = MMU_FTR_TYPE_47x |
+                       MMU_FTR_USE_TLBIVAX_BCAST | MMU_FTR_LOCK_BCAST_INVAL,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 128,
+               .machine_check          = machine_check_47x,
+               .platform               = "ppc470",
+       },
        { /* 476 iss */
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x00050000,

diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index b725dab0f88a01eae1e085e094310e21d898e605..bb7a9c7a4c05c93889f74b2583c3358f2ad9ec13 100644 (file)
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -732,6 +732,8 @@ _GLOBAL(init_cpu_state)
        /* We use the PVR to differenciate 44x cores from 476 */
        mfspr   r3,SPRN_PVR
        srwi    r3,r3,16
+       cmplwi  cr0,r3,PVR_476FPE@h
+       beq     head_start_47x
        cmplwi  cr0,r3,PVR_476@h
        beq     head_start_47x
        cmplwi  cr0,r3,PVR_476_ISS@h

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 762322ce24a9712345d5905d67e0ccec764d1c68..f0be6e0b164d8e7ba9218b0762aa716eb731677a 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -308,6 +308,10 @@ config 460SX
        select IBM_EMAC_ZMII
        select IBM_EMAC_TAH
 
+config 476FPE
+       bool
+       select PPC_FPU
+
 config APM821xx
        bool
        select PPC_FPU

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index 472d2b840f10fd994aff5a36ec79644a91ea4fce..4f05f75423462f7be3b7774cc87ef98cf17023a6 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -1296,6 +1296,52 @@ static struct ppc4xx_pciex_hwops ppc405ex_pcie_hwops __initdata =
 
 #endif /* CONFIG_40x */
 
+#ifdef CONFIG_476FPE
+static int __init ppc_476fpe_pciex_core_init(struct device_node *np)
+{
+       return 4;
+}
+
+static void __init ppc_476fpe_pciex_check_link(struct ppc4xx_pciex_port *port)
+{
+       u32 timeout_ms = 20;
+       u32 val = 0, mask = (PECFG_TLDLP_LNKUP|PECFG_TLDLP_PRESENT);
+       void __iomem *mbase = ioremap(port->cfg_space.start + 0x10000000,
+                                     0x1000);
+
+       printk(KERN_INFO "PCIE%d: Checking link...\n", port->index);
+
+       if (mbase == NULL) {
+               printk(KERN_WARNING "PCIE%d: failed to get cfg space\n",
+                                   port->index);
+               return;
+       }
+               
+       while (timeout_ms--) {
+               val = in_le32(mbase + PECFG_TLDLP);
+
+               if ((val & mask) == mask)
+                       break;
+               msleep(10);
+       }
+
+       if (val & PECFG_TLDLP_PRESENT) {
+               printk(KERN_INFO "PCIE%d: link is up !\n", port->index);
+               port->link = 1;
+       } else
+               printk(KERN_WARNING "PCIE%d: Link up failed\n", port->index);
+
+       iounmap(mbase);
+       return;
+}
+
+static struct ppc4xx_pciex_hwops ppc_476fpe_pcie_hwops __initdata =
+{
+       .core_init      = ppc_476fpe_pciex_core_init,
+       .check_link     = ppc_476fpe_pciex_check_link,
+};
+#endif /* CONFIG_476FPE */
+
 /* Check that the core has been initied and if not, do it */
 static int __init ppc4xx_pciex_check_core_init(struct device_node *np)
 {
@@ -1320,6 +1366,10 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np)
 #ifdef CONFIG_40x
        if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))
                ppc4xx_pciex_hwops = &ppc405ex_pcie_hwops;
+#endif
+#ifdef CONFIG_476FPE
+       if (of_device_is_compatible(np, "ibm,plb-pciex-476fpe"))
+               ppc4xx_pciex_hwops = &ppc_476fpe_pcie_hwops;
 #endif
        if (ppc4xx_pciex_hwops == NULL) {
                printk(KERN_WARNING "PCIE: unknown host type %s\n",
@@ -1629,6 +1679,10 @@ static int __init ppc4xx_setup_one_pciex_POM(struct ppc4xx_pciex_port    *port,
                        dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL,
                                sa | DCRO_PEGPL_460SX_OMR1MSKL_UOT
                                        | DCRO_PEGPL_OMRxMSKL_VAL);
+               else if (of_device_is_compatible(port->node, "ibm,plb-pciex-476fpe"))
+                       dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL,
+                               sa | DCRO_PEGPL_476FPE_OMR1MSKL_UOT
+                                       | DCRO_PEGPL_OMRxMSKL_VAL);
                else
                        dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL,
                                sa | DCRO_PEGPL_OMR1MSKL_UOT
@@ -1753,7 +1807,8 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
                if (res->flags & IORESOURCE_PREFETCH)
                        sa |= PCI_BASE_ADDRESS_MEM_PREFETCH;
 
-               if (of_device_is_compatible(port->node, "ibm,plb-pciex-460sx"))
+               if (of_device_is_compatible(port->node, "ibm,plb-pciex-460sx") ||
+                   of_device_is_compatible(port->node, "ibm,plb-pciex-476fpe"))
                        sa |= PCI_BASE_ADDRESS_MEM_TYPE_64;
 
                out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.h b/arch/powerpc/sysdev/ppc4xx_pci.h
index 32ce763a375a4c80867ac0b7c5f9ea85d2422032..bb4821938ab13bd5cf1f194c745eca8c8180379a 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_pci.h
+++ b/arch/powerpc/sysdev/ppc4xx_pci.h
@@ -476,6 +476,13 @@
 #define DCRO_PEGPL_OMR1MSKL_UOT         0x00000002
 #define DCRO_PEGPL_OMR3MSKL_IO  0x00000002
 
+/* 476FPE */
+#define PCCFG_LCPA                     0x270
+#define PECFG_TLDLP                    0x3F8
+#define PECFG_TLDLP_LNKUP              0x00000008
+#define PECFG_TLDLP_PRESENT            0x00000010
+#define DCRO_PEGPL_476FPE_OMR1MSKL_UOT  0x00000004
+
 /* SDR Bit Mappings */
 #define PESDRx_RCSSET_HLDPLB   0x10000000
 #define PESDRx_RCSSET_RSTGU    0x01000000