powerpc: Add Efika platform support
Add Efika platform support
PS: I did not success to properly inline the file using thrunderbird.
arch/powerpc/platforms/efika/setup.c +164 -0
@@ -0,0 +1,164 @@ +/* +* +* Efika 5K2 platform setup +* Some code really inspired from the lite5200b platform. +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. +* +*/ + +#include <linux/errno.h> +#include <linux/sched.h> +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <linux/slab.h> +#include <linux/user.h> +#include <linux/interrupt.h> +#include <linux/reboot.h> +#include <linux/init.h> +#include <linux/utsrelease.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/console.h> +#include <linux/seq_file.h> +#include <linux/root_dev.h> +#include <linux/initrd.h> +#include <linux/module.h> +#include <linux/timer.h> + +#include <asm/pgtable.h> +#include <asm/prom.h> +#include <asm/dma.h> +#include <asm/machdep.h> +#include <asm/irq.h> +#include <asm/sections.h> +#include <asm/time.h> +#include <asm/rtas.h> +#include <asm/of_device.h> +#include <asm/mpc52xx.h> + +#include "efika.h" + +static void efika_show_cpuinfo (struct seq_file *m) +{ +struct device_node *root; +const char *revision =NULL ; +const char *codegendescription =NULL ; +const char *codegenvendor =NULL ; + + root =of_find_node_by_path ("/" ); +if (root) { + revision =get_property (root,"revision" ,NULL ); + codegendescription = +get_property (root,"CODEGEN,description" ,NULL ); + codegenvendor =get_property (root,"CODEGEN,vendor" ,NULL ); + } + +if (codegendescription) +seq_printf (m,"machine\t\t: %s\n" , codegendescription); +else +seq_printf (m,"machine\t\t: Efika\n" ); + +if (revision) +seq_printf (m,"revision\t: %s\n" , revision); + +if (codegenvendor) +seq_printf (m,"vendor\t\t: %s\n" , codegenvendor); +} + +static void __init efika_setup_arch (void ) +{ +rtas_initialize (); + +#ifdef CONFIG_BLK_DEV_INITRD + initrd_below_start_ok =1 ; + +if (initrd_start) +ROOT_DEV = Root_RAM0; + else +#endif +ROOT_DEV = Root_SDA2;/* sda2 (sda1 is for the kernel) */ + +efika_pcisetup (); + +if (ppc_md.progress) + ppc_md.progress ("Linux/PPC " UTS_RELEASE " runnung on Efika ;-)\n" ,0x0 ); +} + +static void __init efika_init_IRQ (void ) +{ +mpc52xx_init_irq (); +} + +static void __init efika_init (void ) +{ +struct device_node *np; +struct device_node *cnp =NULL ; +const u32 *base; +char *name; + +/* Find every child of the SOC node and add it to of_platform */ + np =of_find_node_by_name (NULL ,"builtin" ); +if (np) { +while ((cnp =of_get_next_child (np, cnp))) { + name =kmalloc (BUS_ID_SIZE ,GFP_KERNEL ); +if (name ==NULL ) +continue ; + +strcpy (name, cnp->name); + + base =get_property (cnp,"reg" ,NULL ); +if (base ==NULL ) { +kfree (name); +continue ; + } + +sprintf (name+strlen (name),"@%x" , *base); +of_platform_device_create (cnp, name,NULL ); + +printk (KERN_INFO ": Added %s (%s) to the known devices\n" , name, cnp->full_name); + } + } + +if (ppc_md.progress) + ppc_md.progress (" Have fun with your Efika! " ,0x7777 ); +} + +static int __init efika_probe (void ) +{ +char *model =of_get_flat_dt_prop (of_get_flat_dt_root (), +"model" ,NULL ); + +if (model ==NULL ) +return 0 ; +if (strcmp (model,"EFIKA5K2" )) +return 0 ; + +ISA_DMA_THRESHOLD = ~0L ; +DMA_MODE_READ =0x44 ; +DMA_MODE_WRITE =0x48 ; + +return 1 ; +} + +define_machine (efika) +{ + .name = EFIKA_PLATFORM_NAME, + .probe = efika_probe, + .setup_arch = efika_setup_arch, + .init = efika_init, + .show_cpuinfo = efika_show_cpuinfo, + .init_IRQ = efika_init_IRQ, + .get_irq = mpc52xx_get_irq, + .restart = rtas_restart, + .power_off = rtas_power_off, + .halt = rtas_halt, + .set_rtc_time = rtas_set_rtc_time, + .get_rtc_time = rtas_get_rtc_time, + .progress = rtas_progress, + .get_boot_time = rtas_get_boot_time, + .calibrate_decr = generic_calibrate_decr, + .phys_mem_access_prot = pci_phys_mem_access_prot, +};
arch/powerpc/platforms/efika/pci.c +119 -0
119 lines not on this page · raw message
arch/powerpc/platforms/efika/efika.h +19 -0
@@ -0,0 +1,19 @@ +/* +* Efika 5K2 platform setup - Header file +* +* Copyright (C) 2006 bplan GmbH +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. +* +*/ + +#ifndef __ARCH_POWERPC_EFIKA__ +#define __ARCH_POWERPC_EFIKA__ + +#define EFIKA_PLATFORM_NAME "Efika" + +extern void __init efika_pcisetup (void ); + +#endif
arch/powerpc/platforms/efika/Makefile +1 -0
@@ -0,0 +1 @@ +obj-y += setup.o mpc52xx.o pci.o
arch/powerpc/platforms/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_PPC_PMAC) += powermac/ endif endif obj-$(CONFIG_PPC_CHRP) += chrp/ +obj-$(CONFIG_PPC_EFIKA) += efika/ obj-$(CONFIG_4xx) += 4xx/ obj-$(CONFIG_PPC_83xx) += 83xx/ obj-$(CONFIG_PPC_85xx) += 85xx/
arch/powerpc/boot/Makefile +2 -1
@@ -115,7 +115,7 @@ endif quiet_cmd_wrap = WRAP $@ cmd_wrap =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux quiet_cmd_wrap_initrd = WRAP $@ - cmd_wrap_initrd =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ + cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ -i $(obj)/ramdisk.image.gz vmlinux $(obj)/zImage.chrp: vmlinux $(wrapperbits)
@@ -155,6 +155,7 @@ image-$(CONFIG_PPC_PSERIES) += zImage.p image-$(CONFIG_PPC_MAPLE) += zImage.pseries image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries image-$(CONFIG_PPC_CHRP) += zImage.chrp +image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac image-$(CONFIG_DEFAULT_UIMAGE) += uImage
arch/powerpc/Kconfig +8 -0
@@ -386,6 +386,14 @@ config PPC_CHRP select PPC_UDBG_16550 default y +config PPC_EFIKA + bool "bPlan Efika 5k2. MPC5200B based computer" + depends on PPC_MULTIPLATFORM && PPC32 + select PPC_RTAS + select RTAS_PROC + select PPC_MPC52xx + default y + config PPC_PMAC bool "Apple PowerMac based machines" depends on PPC_MULTIPLATFORM
begin:vcard
fn:Nicolas DET ( bplan GmbH )
n:DET;Nicolas
org:bplan GmbH
adr:;;;;;;Germany
email;internet:[email protected]
title:Software Entwicklung
tel;work:+49 6171 9187 - 31
x-mozilla-html:FALSE
url:http://www.bplan-gmbh.de
version:2.1
end:vcard
Quoted 2 lines · Nicolas DET
Add Efika platform support
I'll soon (well It's alraedy done) run out of time to spend of this. This means, I won't be able to work more on the interrupt controller, and others devices support.
I hope patches could be finally accepted. Moreover, I think the code is now in better shape han it was in arch/ppc.
Regards
begin:vcard
fn:Nicolas DET ( bplan GmbH )
n:DET;Nicolas
org:bplan GmbH
adr:;;;;;;Germany
email;internet:[email protected]
title:Software Entwicklung
tel;work:+49 6171 9187 - 31
x-mozilla-html:FALSE
url:http://www.bplan-gmbh.de
version:2.1
end:vcard
Quoted 16 lines · Nicolas DET
arch/powerpc/platforms/efika/setup.c +16
-0+ +static void efika_show_cpuinfo (struct seq_file *m) +{ +struct device_node *root; +const char *revision =NULL ; +const char *codegendescription =NULL ; +const char *codegenvendor =NULL ; + + root =of_find_node_by_path ("/" ); +if (root) { + revision =get_property (root,"revision" ,NULL ); + codegendescription = +get_property (root,"CODEGEN,description" ,NULL ); + codegenvendor =get_property (root,"CODEGEN,vendor" ,NULL ); + } +
arch/powerpc/platforms/efika/setup.c line 68
Quoted 10 lines
arch/powerpc/platforms/efika/setup.c +10
-0+if (codegendescription) +seq_printf (m,"machine\t\t: %s\n" , codegendescription); +else +seq_printf (m,"machine\t\t: Efika\n" ); + +if (revision) +seq_printf (m,"revision\t: %s\n" , revision); + +if (codegenvendor) +seq_printf (m,"vendor\t\t: %s\n" , codegenvendor);
+ of_node_put(root);
arch/powerpc/platforms/efika/setup.c line 93
Quoted 5 lines
arch/powerpc/platforms/efika/setup.c +5
-0+ +static void __init efika_init_IRQ (void ) +{ +mpc52xx_init_irq (); +}
Ya pas moyen que mpc52xx_init_irq() ait le bon prototype pour que tu le colle directement dans ppc_md. ?
arch/powerpc/platforms/efika/setup.c line 141
Quoted 4 lines
arch/powerpc/platforms/efika/setup.c +4
-0+ +ISA_DMA_THRESHOLD = ~0L ; +DMA_MODE_READ =0x44 ; +DMA_MODE_WRITE =0x48 ;
Ca viens de CHRP ca ? Je suis pas sur que ca soit super utile... mais bon, ca mange pas de pain.. Au cas ou qqun colle un southbridge ISA sur le bus PCI :)
Quoted 19 lines
arch/powerpc/platforms/efika/pci.c +19
-0+void __init efika_pcisetup (void ) +{ +const int *bus_range; +int len; +struct pci_controller *hose; +struct device_node *root; +struct device_node *pcictrl; + + root =of_find_node_by_path ("/" ); +if (root ==NULL ) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the root node\n"); +return ; + } + +for (pcictrl =NULL ;;) { + pcictrl =of_get_next_child (root, pcictrl); +if ((pcictrl ==NULL ) || (strcmp (pcictrl->name,"pci" ) ==0 )) +break ;
arch/powerpc/platforms/efika/pci.c line 83
Quoted 10 lines
arch/powerpc/platforms/efika/pci.c +10
-0+ } + +if (pcictrl ==NULL ) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the PCI bridge node\n"); +return ; + } + +of_node_put (pcictrl); +of_node_put (root);
Euh... non... tu fait pas of_node_put(pcictrl) avant de t'en servir... tu fait ca quand tu as fini. Ca veut dire probablement changer test "return" en "goto bail;" ou un truc du genre.
arch/powerpc/platforms/efika/pci.c line 98
Quoted 8 lines
arch/powerpc/platforms/efika/pci.c +8
-0+if (bus_range[1 ] == bus_range[0 ]) + printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI bus %d", + bus_range[0 ]); +else + printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI buses %d..%d", + bus_range[0 ], bus_range[1 ]); +printk (" controlled by %s" , pcictrl->full_name); +printk ("\n" );
You really need the above printk's ?
arch/powerpc/platforms/efika/pci.c line 108
Quoted 9 lines
arch/powerpc/platforms/efika/pci.c +9
-0+ hose =pcibios_alloc_controller (); +if (!hose) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME +": Can't allocate PCI controller structure for %s\n" , + pcictrl->full_name); +return ; + } + + hose->arch_data = pcictrl;
Et ici, tu garde une reference, donc to fait
hose->arch_data = of_node_get(pcictrl);
arch/powerpc/platforms/efika/pci.c line 114
Quoted 6 lines
arch/powerpc/platforms/efika/pci.c +6
-0+ hose->first_busno = bus_range[0 ]; + hose->last_busno = bus_range[1 ]; + hose->ops = &rtas_pci_ops; + +pci_process_bridge_OF_ranges (hose, pcictrl,0 ); +}
Le reste est bon.
On y est presque ! :)
Ben.
Quoted 1 line · Benjamin Herrenschmidt
On Wed, 2006-11-01 at 21:29 +0100, Nicolas DET wrote:
Ooops ... here's the english version :)
Quoted 8 lines
arch/powerpc/platforms/efika/setup.c line 93
Quoted 5 lines
arch/powerpc/platforms/efika/setup.c +5
-0+ +static void __init efika_init_IRQ (void ) +{ +mpc52xx_init_irq (); +}Ya pas moyen que
mpc52xx_init_irq()ait le bon prototype pour que tu le colle directement dansppc_md. ?
It would be better if mpc52xx_init_irq() had the right prototype so it can be hooked directly from ppc_md.
Quoted 8 lines
arch/powerpc/platforms/efika/setup.c line 141
Quoted 4 lines
arch/powerpc/platforms/efika/setup.c +4
-0+ +ISA_DMA_THRESHOLD = ~0L ; +DMA_MODE_READ =0x44 ; +DMA_MODE_WRITE =0x48 ;Ca viens de CHRP ca ? Je suis pas sur que ca soit super utile... mais bon, ca mange pas de pain.. Au cas ou qqun colle un southbridge ISA sur le bus PCI :)
This comes from CHRP ? I'm not sure it's terribly useful, at least for Efika, though it doesn't hurt. Maybe some day somebody will stick an ISA southbridge on the 5200 PCI bus :)
Quoted 25 lines
Quoted 25 lines
arch/powerpc/platforms/efika/pci.c +25
-0+void __init efika_pcisetup (void ) +{ +const int *bus_range; +int len; +struct pci_controller *hose; +struct device_node *root; +struct device_node *pcictrl; + + root =of_find_node_by_path ("/" ); +if (root ==NULL ) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the root node\n"); +return ; + } + +for (pcictrl =NULL ;;) { + pcictrl =of_get_next_child (root, pcictrl); +if ((pcictrl ==NULL ) || (strcmp (pcictrl->name,"pci" ) ==0 )) +break ; + } + +if (pcictrl ==NULL ) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the PCI bridge node\n"); +return ;
Quoted 8 lines
arch/powerpc/platforms/efika/pci.c line 83
Quoted 4 lines
arch/powerpc/platforms/efika/pci.c +4
-0+ } + +of_node_put (pcictrl); +of_node_put (root);Euh... non... tu fait pas
of_node_put(pcictrl)avant de t'en servir... tu fait ca quand tu as fini. Ca veut dire probablement changer test "return" en "goto bail;" ou un truc du genre.
Don't do an of_node_put(pcictrl) before you use that node... Do it when you are done with it, which probably means changing "return" statements into something like "goto bail;"
Quoted 10 lines
arch/powerpc/platforms/efika/pci.c line 98
Quoted 8 lines
arch/powerpc/platforms/efika/pci.c +8
-0+if (bus_range[1 ] == bus_range[0 ]) + printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI bus %d", + bus_range[0 ]); +else + printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI buses %d..%d", + bus_range[0 ], bus_range[1 ]); +printk (" controlled by %s" , pcictrl->full_name); +printk ("\n" );You really need the above printk's ?
Ah, that one was good :)
Quoted 11 lines
arch/powerpc/platforms/efika/pci.c line 108
Quoted 9 lines
arch/powerpc/platforms/efika/pci.c +9
-0+ hose =pcibios_alloc_controller (); +if (!hose) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME +": Can't allocate PCI controller structure for %s\n" , + pcictrl->full_name); +return ; + } + + hose->arch_data = pcictrl;Et ici, tu garde une reference, donc to fait
Here's you are keeping a reference to the node, thus you should do:
Quoted 11 lines
hose->arch_data = of_node_get(pcictrl);arch/powerpc/platforms/efika/pci.c line 114
Quoted 6 lines
arch/powerpc/platforms/efika/pci.c +6
-0+ hose->first_busno = bus_range[0 ]; + hose->last_busno = bus_range[1 ]; + hose->ops = &rtas_pci_ops; + +pci_process_bridge_OF_ranges (hose, pcictrl,0 ); +}Le reste est bon.
Quoted 1 line
On y est presque ! :)
The rest is good, we're almost there :)
Ben.
Quoted 13 lines · Benjamin Herrenschmidt
Quoted 1 line · Benjamin Herrenschmidt
On Wed, 2006-11-01 at 21:29 +0100, Nicolas DET wrote:
Ooops ... here's the english version :)
Quoted 7 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ +static void __init efika_init_IRQ(void) +{ + mpc52xx_init_irq(); +}Ya pas moyen que
mpc52xx_init_irq()ait le bon prototype pour que tu le colle directement dansppc_md. ?
Quoted 2 lines
It would be better if
mpc52xx_init_irq()had the right prototype so it can be hooked directly fromppc_md.
Well. there was other init done here before. However, I think it's good to have this here, in case more code would be needed or in the ppc_md.init_IRQ is changed. no ?
Quoted 8 lines
Quoted 7 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ + ISA_DMA_THRESHOLD = ~0L; + DMA_MODE_READ = 0x44; + DMA_MODE_WRITE = 0x48;Ca viens de CHRP ca ? Je suis pas sur que ca soit super utile... mais bon, ca mange pas de pain.. Au cas ou qqun colle un southbridge ISA sur le bus PCI :)
Well. It it doesn't hurt it can stay here. People are a little bit weird today. Maybe they would try to solder a PCI southbridige to get a nice PC speaker beep ;-)
Quoted 37 lines
This comes from CHRP ? I'm not sure it's terribly useful, at least for Efika, though it doesn't hurt. Maybe some day somebody will stick an ISA southbridge on the 5200 PCI bus :)
Quoted 24 lines
Quoted 24 lines
(quoted diff) +24
-0+void __init efika_pcisetup(void) +{ + const int *bus_range; + int len; + struct pci_controller *hose; + struct device_node *root; + struct device_node *pcictrl; + + root = of_find_node_by_path("/"); + if (root == NULL) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the root node\n"); + return; + } + + for (pcictrl = NULL;;) { + pcictrl = of_get_next_child(root, pcictrl); + if ((pcictrl == NULL) || (strcmp(pcictrl->name, "pci") == 0)) + break; + } + + if (pcictrl == NULL) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the PCI bridge node\n");Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ return; + } + + of_node_put(pcictrl); + of_node_put(root);Euh... non... tu fait pas
of_node_put(pcictrl)avant de t'en servir... tu fait ca quand tu as fini. Ca veut dire probablement changer test "return" en "goto bail;" ou un truc du genre.
Quoted 4 lines
Don't do an
of_node_put(pcictrl)before you use that node... Do it when you are done with it, which probably means changing "return" statements into something like "goto bail;"
I hope I did it right.
Quoted 10 lines
Quoted 9 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+ if (bus_range[1] == bus_range[0]) + printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI bus %d", + bus_range[0]); + else + printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI buses %d..%d", + bus_range[0], bus_range[1]); + printk(" controlled by %s", pcictrl->full_name); + printk("\n");You really need the above printk's ?
Quoted 5 lines
Ah, that one was good :)
Quoted 2 lines
hose->arch_data = of_node_get(pcictrl);
Ok
Quoted 8 lines
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+ hose->first_busno = bus_range[0]; + hose->last_busno = bus_range[1]; + hose->ops = &rtas_pci_ops; + + pci_process_bridge_OF_ranges(hose, pcictrl, 0); +}Le reste est bon.
Quoted 4 lines
Quoted 1 line
On y est presque ! :)
The rest is good, we're almost there :)
arch/powerpc/platforms/efika/setup.c +166 -0
@@ -0,0 +1,166 @@ +/* +* +* Efika 5K2 platform setup +* Some code really inspired from the lite5200b platform. +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. +* +*/ + +#include <linux/errno.h> +#include <linux/sched.h> +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <linux/slab.h> +#include <linux/user.h> +#include <linux/interrupt.h> +#include <linux/reboot.h> +#include <linux/init.h> +#include <linux/utsrelease.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/console.h> +#include <linux/seq_file.h> +#include <linux/root_dev.h> +#include <linux/initrd.h> +#include <linux/module.h> +#include <linux/timer.h> + +#include <asm/pgtable.h> +#include <asm/prom.h> +#include <asm/dma.h> +#include <asm/machdep.h> +#include <asm/irq.h> +#include <asm/sections.h> +#include <asm/time.h> +#include <asm/rtas.h> +#include <asm/of_device.h> +#include <asm/mpc52xx.h> + +#include "efika.h" + +static void efika_show_cpuinfo (struct seq_file *m) +{ +struct device_node *root; +const char *revision =NULL ; +const char *codegendescription =NULL ; +const char *codegenvendor =NULL ; + + root =of_find_node_by_path ("/" ); +if (root) { + revision =get_property (root,"revision" ,NULL ); + codegendescription = +get_property (root,"CODEGEN,description" ,NULL ); + codegenvendor =get_property (root,"CODEGEN,vendor" ,NULL ); + } + +of_node_put (root); + +if (codegendescription) +seq_printf (m,"machine\t\t: %s\n" , codegendescription); +else +seq_printf (m,"machine\t\t: Efika\n" ); + +if (revision) +seq_printf (m,"revision\t: %s\n" , revision); + +if (codegenvendor) +seq_printf (m,"vendor\t\t: %s\n" , codegenvendor); +} + +static void __init efika_setup_arch (void ) +{ +rtas_initialize (); + +#ifdef CONFIG_BLK_DEV_INITRD + initrd_below_start_ok =1 ; + +if (initrd_start) +ROOT_DEV = Root_RAM0; + else +#endif +ROOT_DEV = Root_SDA2;/* sda2 (sda1 is for the kernel) */ + +efika_pcisetup (); + +if (ppc_md.progress) + ppc_md.progress ("Linux/PPC " UTS_RELEASE " runnung on Efika ;-)\n" ,0x0 ); +} + +static void __init efika_init_IRQ (void ) +{ +mpc52xx_init_irq (); +} + +static void __init efika_init (void ) +{ +struct device_node *np; +struct device_node *cnp =NULL ; +const u32 *base; +char *name; + +/* Find every child of the SOC node and add it to of_platform */ + np =of_find_node_by_name (NULL ,"builtin" ); +if (np) { +while ((cnp =of_get_next_child (np, cnp))) { + name =kmalloc (BUS_ID_SIZE ,GFP_KERNEL ); +if (name ==NULL ) +continue ; + +strcpy (name, cnp->name); + + base =get_property (cnp,"reg" ,NULL ); +if (base ==NULL ) { +kfree (name); +continue ; + } + +sprintf (name+strlen (name),"@%x" , *base); +of_platform_device_create (cnp, name,NULL ); + +printk (KERN_INFO ": Added %s (%s) to the known devices\n" , name, cnp->full_name); + } + } + +if (ppc_md.progress) + ppc_md.progress (" Have fun with your Efika! " ,0x7777 ); +} + +static int __init efika_probe (void ) +{ +char *model =of_get_flat_dt_prop (of_get_flat_dt_root (), +"model" ,NULL ); + +if (model ==NULL ) +return 0 ; +if (strcmp (model,"EFIKA5K2" )) +return 0 ; + +ISA_DMA_THRESHOLD = ~0L ; +DMA_MODE_READ =0x44 ; +DMA_MODE_WRITE =0x48 ; + +return 1 ; +} + +define_machine (efika) +{ + .name = EFIKA_PLATFORM_NAME, + .probe = efika_probe, + .setup_arch = efika_setup_arch, + .init = efika_init, + .show_cpuinfo = efika_show_cpuinfo, + .init_IRQ = efika_init_IRQ, + .get_irq = mpc52xx_get_irq, + .restart = rtas_restart, + .power_off = rtas_power_off, + .halt = rtas_halt, + .set_rtc_time = rtas_set_rtc_time, + .get_rtc_time = rtas_get_rtc_time, + .progress = rtas_progress, + .get_boot_time = rtas_get_boot_time, + .calibrate_decr = generic_calibrate_decr, + .phys_mem_access_prot = pci_phys_mem_access_prot, +};
arch/powerpc/platforms/efika/pci.c +119 -0
119 lines not on this page · raw message
arch/powerpc/platforms/efika/efika.h +19 -0
@@ -0,0 +1,19 @@ +/* +* Efika 5K2 platform setup - Header file +* +* Copyright (C) 2006 bplan GmbH +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. +* +*/ + +#ifndef __ARCH_POWERPC_EFIKA__ +#define __ARCH_POWERPC_EFIKA__ + +#define EFIKA_PLATFORM_NAME "Efika" + +extern void __init efika_pcisetup (void ); + +#endif
arch/powerpc/platforms/efika/Makefile +1 -0
@@ -0,0 +1 @@ +obj-y += setup.o pci.o
arch/powerpc/platforms/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_PPC_PMAC) += powermac/ endif endif obj-$(CONFIG_PPC_CHRP) += chrp/ +obj-$(CONFIG_PPC_EFIKA) += efika/ obj-$(CONFIG_4xx) += 4xx/ obj-$(CONFIG_PPC_83xx) += 83xx/ obj-$(CONFIG_PPC_85xx) += 85xx/
arch/powerpc/boot/Makefile +2 -1
@@ -115,7 +115,7 @@ endif quiet_cmd_wrap = WRAP $@ cmd_wrap =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux quiet_cmd_wrap_initrd = WRAP $@ - cmd_wrap_initrd =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ + cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ -i $(obj)/ramdisk.image.gz vmlinux $(obj)/zImage.chrp: vmlinux $(wrapperbits)
@@ -155,6 +155,7 @@ image-$(CONFIG_PPC_PSERIES) += zImage.p image-$(CONFIG_PPC_MAPLE) += zImage.pseries image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries image-$(CONFIG_PPC_CHRP) += zImage.chrp +image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac image-$(CONFIG_DEFAULT_UIMAGE) += uImage
arch/powerpc/Kconfig +8 -0
@@ -386,6 +386,14 @@ config PPC_CHRP select PPC_UDBG_16550 default y +config PPC_EFIKA + bool "bPlan Efika 5k2. MPC5200B based computer" + depends on PPC_MULTIPLATFORM && PPC32 + select PPC_RTAS + select RTAS_PROC + select PPC_MPC52xx + default y + config PPC_PMAC bool "Apple PowerMac based machines" depends on PPC_MULTIPLATFORM
begin:vcard
fn:Nicolas DET ( bplan GmbH )
n:DET;Nicolas
org:bplan GmbH
adr:;;;;;;Germany
email;internet:[email protected]
title:Software Entwicklung
tel;work:+49 6171 9187 - 31
x-mozilla-html:FALSE
url:http://www.bplan-gmbh.de
version:2.1
end:vcard
Review
Quoted 8 lines · Nicolas DET
(quoted diff) +8
-0+ of_node_put(root); + + if (pcictrl == NULL) { + printk(KERN_WARNING EFIKA_PLATFORM_NAME + ": Unable to find the PCI bridge node\n"); + of_node_put(pcictrl); + return; + }
Oups...
By the way, take advantage of this one
http://patchwork.ozlabs.org/linuxppc/patch?id=7648
It means, it won't work if you source tree doesn't include this.
Regards,
arch/powerpc/platforms/efika/setup.c +166 -0
@@ -0,0 +1,166 @@ +/* +* +* Efika 5K2 platform setup +* Some code really inspired from the lite5200b platform. +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. +* +*/ + +#include <linux/errno.h> +#include <linux/sched.h> +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <linux/slab.h> +#include <linux/user.h> +#include <linux/interrupt.h> +#include <linux/reboot.h> +#include <linux/init.h> +#include <linux/utsrelease.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/console.h> +#include <linux/seq_file.h> +#include <linux/root_dev.h> +#include <linux/initrd.h> +#include <linux/module.h> +#include <linux/timer.h> + +#include <asm/pgtable.h> +#include <asm/prom.h> +#include <asm/dma.h> +#include <asm/machdep.h> +#include <asm/irq.h> +#include <asm/sections.h> +#include <asm/time.h> +#include <asm/rtas.h> +#include <asm/of_device.h> +#include <asm/mpc52xx.h> + +#include "efika.h" + +static void efika_show_cpuinfo (struct seq_file *m) +{ +struct device_node *root; +const char *revision =NULL ; +const char *codegendescription =NULL ; +const char *codegenvendor =NULL ; + + root =of_find_node_by_path ("/" ); +if (root) { + revision =get_property (root,"revision" ,NULL ); + codegendescription = +get_property (root,"CODEGEN,description" ,NULL ); + codegenvendor =get_property (root,"CODEGEN,vendor" ,NULL ); + } + +of_node_put (root); + +if (codegendescription) +seq_printf (m,"machine\t\t: %s\n" , codegendescription); +else +seq_printf (m,"machine\t\t: Efika\n" ); + +if (revision) +seq_printf (m,"revision\t: %s\n" , revision); + +if (codegenvendor) +seq_printf (m,"vendor\t\t: %s\n" , codegenvendor); +} + +static void __init efika_setup_arch (void ) +{ +rtas_initialize (); + +#ifdef CONFIG_BLK_DEV_INITRD + initrd_below_start_ok =1 ; + +if (initrd_start) +ROOT_DEV = Root_RAM0; + else +#endif +ROOT_DEV = Root_SDA2;/* sda2 (sda1 is for the kernel) */ + +efika_pcisetup (); + +if (ppc_md.progress) + ppc_md.progress ("Linux/PPC " UTS_RELEASE " runnung on Efika ;-)\n" ,0x0 ); +} + +static void __init efika_init_IRQ (void ) +{ +mpc52xx_init_irq (); +} + +static void __init efika_init (void ) +{ +struct device_node *np; +struct device_node *cnp =NULL ; +const u32 *base; +char *name; + +/* Find every child of the SOC node and add it to of_platform */ + np =of_find_node_by_name (NULL ,"builtin" ); +if (np) { +while ((cnp =of_get_next_child (np, cnp))) { + name =kmalloc (BUS_ID_SIZE ,GFP_KERNEL ); +if (name ==NULL ) +continue ; + +strcpy (name, cnp->name); + + base =get_property (cnp,"reg" ,NULL ); +if (base ==NULL ) { +kfree (name); +continue ; + } + +sprintf (name+strlen (name),"@%x" , *base); +of_platform_device_create (cnp, name,NULL ); + +printk (KERN_INFO ": Added %s (%s) to the known devices\n" , name, cnp->full_name); + } + } + +if (ppc_md.progress) + ppc_md.progress (" Have fun with your Efika! " ,0x7777 ); +} + +static int __init efika_probe (void ) +{ +char *model =of_get_flat_dt_prop (of_get_flat_dt_root (), +"model" ,NULL ); + +if (model ==NULL ) +return 0 ; +if (strcmp (model,"EFIKA5K2" )) +return 0 ; + +ISA_DMA_THRESHOLD = ~0L ; +DMA_MODE_READ =0x44 ; +DMA_MODE_WRITE =0x48 ; + +return 1 ; +} + +define_machine (efika) +{ + .name = EFIKA_PLATFORM_NAME, + .probe = efika_probe, + .setup_arch = efika_setup_arch, + .init = efika_init, + .show_cpuinfo = efika_show_cpuinfo, + .init_IRQ = efika_init_IRQ, + .get_irq = mpc52xx_get_irq, + .restart = rtas_restart, + .power_off = rtas_power_off, + .halt = rtas_halt, + .set_rtc_time = rtas_set_rtc_time, + .get_rtc_time = rtas_get_rtc_time, + .progress = rtas_progress, + .get_boot_time = rtas_get_boot_time, + .calibrate_decr = generic_calibrate_decr, + .phys_mem_access_prot = pci_phys_mem_access_prot, +};
arch/powerpc/platforms/efika/pci.c +119 -0
119 lines not on this page · raw message
arch/powerpc/platforms/efika/efika.h +19 -0
@@ -0,0 +1,19 @@ +/* +* Efika 5K2 platform setup - Header file +* +* Copyright (C) 2006 bplan GmbH +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. +* +*/ + +#ifndef __ARCH_POWERPC_EFIKA__ +#define __ARCH_POWERPC_EFIKA__ + +#define EFIKA_PLATFORM_NAME "Efika" + +extern void __init efika_pcisetup (void ); + +#endif
arch/powerpc/platforms/efika/Makefile +1 -0
@@ -0,0 +1 @@ +obj-y += setup.o pci.o
arch/powerpc/platforms/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_PPC_PMAC) += powermac/ endif endif obj-$(CONFIG_PPC_CHRP) += chrp/ +obj-$(CONFIG_PPC_EFIKA) += efika/ obj-$(CONFIG_4xx) += 4xx/ obj-$(CONFIG_PPC_83xx) += 83xx/ obj-$(CONFIG_PPC_85xx) += 85xx/
arch/powerpc/boot/Makefile +2 -1
@@ -115,7 +115,7 @@ endif quiet_cmd_wrap = WRAP $@ cmd_wrap =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux quiet_cmd_wrap_initrd = WRAP $@ - cmd_wrap_initrd =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ + cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \ -i $(obj)/ramdisk.image.gz vmlinux $(obj)/zImage.chrp: vmlinux $(wrapperbits)
@@ -155,6 +155,7 @@ image-$(CONFIG_PPC_PSERIES) += zImage.p image-$(CONFIG_PPC_MAPLE) += zImage.pseries image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries image-$(CONFIG_PPC_CHRP) += zImage.chrp +image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac image-$(CONFIG_DEFAULT_UIMAGE) += uImage
arch/powerpc/Kconfig +8 -0
@@ -386,6 +386,14 @@ config PPC_CHRP select PPC_UDBG_16550 default y +config PPC_EFIKA + bool "bPlan Efika 5k2. MPC5200B based computer" + depends on PPC_MULTIPLATFORM && PPC32 + select PPC_RTAS + select RTAS_PROC + select PPC_MPC52xx + default y + config PPC_PMAC bool "Apple PowerMac based machines" depends on PPC_MULTIPLATFORM
begin:vcard
fn:Nicolas DET ( bplan GmbH )
n:DET;Nicolas
org:bplan GmbH
adr:;;;;;;Germany
email;internet:[email protected]
title:Software Entwicklung
tel;work:+49 6171 9187 - 31
x-mozilla-html:FALSE
url:http://www.bplan-gmbh.de
version:2.1
end:vcard
Quoted 3 lines · Nicolas DET
Well. there was other init done here before. However, I think it's good to have this here, in case more code would be needed or in the ppc_md.init_IRQ is changed. no ?
No. Hook it directly. Don't solve problems you don't have. If you ever need to do other inits there, you can change it back.
Quoted 3 lines
Well. It it doesn't hurt it can stay here. People are a little bit weird today. Maybe they would try to solder a PCI southbridige to get a nice PC speaker beep ;-)
Yeah, doesn't hurt.
On a general note about your patches: Don't reply and post a new patch in the same email. Reply, then separately, post patches using the proper format for patch submission. That is, a changelog comment, a
Signed-off-by: line followed by the patch.
If you want to have off-the-record comments, add "---" after the
Signed-off-by: line and insert your comments between that and the patch itself, they will be stripped when commiting to git.
Ben.
Quoted 2 lines
* Efika 5K2 platform setup
+ * Some code really inspired from the lite5200b platform.
No (c) ?
Quoted 28 lines
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */arch/powerpc/platforms/efika/setup.c +22
-0+ +#include <linux/errno.h> +#include <linux/sched.h> +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <linux/slab.h> +#include <linux/user.h> +#include <linux/interrupt.h> +#include <linux/reboot.h> +#include <linux/init.h> +#include <linux/utsrelease.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/console.h> +#include <linux/seq_file.h> +#include <linux/root_dev.h> +#include <linux/initrd.h> +#include <linux/module.h> +#include <linux/timer.h> + +#include <asm/pgtable.h> +#include <asm/prom.h>
arch/powerpc/platforms/efika/setup.c line 42
Quoted 10 lines
arch/powerpc/platforms/efika/setup.c +10
-0+#include <asm/dma.h> +#include <asm/machdep.h> +#include <asm/irq.h> +#include <asm/sections.h> +#include <asm/time.h> +#include <asm/rtas.h> +#include <asm/of_device.h> +#include <asm/mpc52xx.h> + +#include "efika.h"
You probably don't need half of those includes :)
Quoted 6 lines
arch/powerpc/platforms/efika/setup.c +6
-0+static void efika_show_cpuinfo (struct seq_file *m) +{ +struct device_node *root; +const char *revision =NULL ; +const char *codegendescription =NULL ; +const char *codegenvendor =NULL ;
arch/powerpc/platforms/efika/setup.c line 59
Quoted 10 lines
arch/powerpc/platforms/efika/setup.c +10
-0+ + root =of_find_node_by_path ("/" ); +if (root) { + revision =get_property (root,"revision" ,NULL ); + codegendescription = +get_property (root,"CODEGEN,description" ,NULL ); + codegenvendor =get_property (root,"CODEGEN,vendor" ,NULL ); + } + +of_node_put (root);
Move the above to after you are done with the results of get_property().
Quoted 6 lines
arch/powerpc/platforms/efika/setup.c +6
-0+if (codegendescription) +seq_printf (m,"machine\t\t: %s\n" , codegendescription); +else +seq_printf (m,"machine\t\t: Efika\n" ); + +if (revision)
arch/powerpc/platforms/efika/setup.c line 95
Quoted 10 lines
arch/powerpc/platforms/efika/setup.c +9
-0+seq_printf (m,"revision\t: %s\n" , revision); + +if (codegenvendor) +seq_printf (m,"vendor\t\t: %s\n" , codegenvendor); +} +static void __init efika_init_IRQ (void ) +{ +mpc52xx_init_irq (); +}
Just hook mpc52xx_init_irq() directly
Quoted 4 lines
arch/powerpc/platforms/efika/setup.c +4
-0+static void __init efika_init (void ) +{ +struct device_node *np; +struct device_node *cnp =NULL ;
arch/powerpc/platforms/efika/setup.c line 110
Quoted 10 lines
arch/powerpc/platforms/efika/setup.c +10
-0+const u32 *base; +char *name; + +/* Find every child of the SOC node and add it to of_platform */ + np =of_find_node_by_name (NULL ,"builtin" ); +if (np) { +while ((cnp =of_get_next_child (np, cnp))) { + name =kmalloc (BUS_ID_SIZE ,GFP_KERNEL ); +if (name ==NULL ) +continue ;
Why kmalloc ?
arch/powerpc/platforms/efika/setup.c line 121
Quoted 10 lines
arch/powerpc/platforms/efika/setup.c +10
-0+strcpy (name, cnp->name); + + base =get_property (cnp,"reg" ,NULL ); +if (base ==NULL ) { +kfree (name); +continue ; + } + +sprintf (name+strlen (name),"@%x" , *base); +of_platform_device_create (cnp, name,NULL );
Just use a stack based buffer. Either that, or kfree(name) when you are done. of_platform_device_create() will make a copy of the sting.
Rest looks good.
Ben.