CPU selection Kconfig cleanup
Subsystems (7)
PowerPC Linux for power macintosh Cell broadband engine architecture PS3 platform support +3 more subsystems
PATCH 5/6 powerpc: Multiplatformize 8{2,3,6}xx configuration
In reply to Arnd BergmannAll platforms based on 6xx compatible cores should be able to coexisting in a single kernel image and do all necessary configuration based on the device tree.
This moves the missing 8{2,3,6}xx platforms under CONFIG_PPC_MULTIPLATFORM to make that possible to configure.
Signed-off-by Arnd Bergmann <[email protected]>
arch/powerpc/platforms/82xx/Kconfig +4 -6
@@ -1,10 +1,10 @@ -choice - prompt "Machine Type" - depends on PPC_82xx - default MPC82xx_ADS +config PPC_82xx + bool "Freescale 82xx" + depends on PPC_MULTIPLATFORM && 6xx config MPC82xx_ADS bool "Freescale MPC82xx ADS" + depends on PPC_82xx select DEFAULT_UIMAGE select PQ2ADS select 8272
@@ -13,8 +13,6 @@ config MPC82xx_ADS help This option enables support for the MPC8272 ADS board -endchoice - config PQ2ADS bool default n
arch/powerpc/platforms/83xx/Kconfig +12 -6
@@ -1,16 +1,20 @@ -choice - prompt "Machine Type" - depends on PPC_83xx - default MPC834x_MDS +config PPC_83xx + bool "Freescale 83xx" + depends on PPC_MULTIPLATFORM && 6xx + select FSL_SOC + select 83xx + select WANT_DEVICE_TREE config MPC8313_RDB bool "Freescale MPC8313 RDB" + depends on PPC_83xx select DEFAULT_UIMAGE help This option enables support for the MPC8313 RDB board. config MPC832x_MDS bool "Freescale MPC832x MDS" + depends on PPC_83xx select DEFAULT_UIMAGE select QUICC_ENGINE help
@@ -18,6 +22,7 @@ config MPC832x_MDS config MPC832x_RDB bool "Freescale MPC832x RDB" + depends on PPC_83xx select DEFAULT_UIMAGE select QUICC_ENGINE help
@@ -25,6 +30,7 @@ config MPC832x_RDB config MPC834x_MDS bool "Freescale MPC834x MDS" + depends on PPC_83xx select DEFAULT_UIMAGE help This option enables support for the MPC 834x MDS evaluation board.
@@ -36,6 +42,7 @@ config MPC834x_MDS config MPC834x_ITX bool "Freescale MPC834x ITX" + depends on PPC_83xx select DEFAULT_UIMAGE help This option enables support for the MPC 834x ITX evaluation board.
@@ -45,13 +52,12 @@ config MPC834x_ITX config MPC836x_MDS bool "Freescale MPC836x MDS" + depends on PPC_83xx select DEFAULT_UIMAGE select QUICC_ENGINE help This option enables support for the MPC836x MDS Processor Board. -endchoice - config PPC_MPC831x bool select PPC_UDBG_16550
arch/powerpc/platforms/86xx/Kconfig +9 -6
@@ -1,17 +1,20 @@ -choice - prompt "Machine Type" - depends on PPC_86xx - default MPC8641_HPCN +config PPC_86xx + bool "Freescale 86xx" + depends on PPC_MULTIPLATFORM && 6xx + select FSL_SOC + select FSL_PCIE + select ALTIVEC + help + The Freescale E600 SoCs have 74xx cores. config MPC8641_HPCN bool "Freescale MPC8641 HPCN" + depends on PPC_86xx select PPC_I8259 select DEFAULT_UIMAGE help This option enables support for the MPC8641 HPCN board. -endchoice - config MPC8641 bool select PPC_INDIRECT_PCI
arch/powerpc/platforms/Kconfig +0 -19
@@ -24,25 +24,6 @@ config APUS More information is available at: <http://linux-apus.sourceforge.net/>. -config PPC_82xx - bool "Freescale 82xx" - depends on 6xx - -config PPC_83xx - bool "Freescale 83xx" - depends on 6xx - select FSL_SOC - select 83xx - select WANT_DEVICE_TREE - -config PPC_86xx - bool "Freescale 86xx" - depends on 6xx - select FSL_SOC - select FSL_PCIE - select ALTIVEC - help - The Freescale E600 SoCs have 74xx cores. endchoice config CLASSIC32
--
PATCH 2/6 powerpc: Move CONFIG_PPC64 into CPU selection
In reply to Arnd BergmannCurrently, PPC64 is a top level configuration option in arch/powerpc/Kconfig, which is somewhat unconventional.
Moving it into the CPU selection menu is a natural choice, and is transparent to the rest of the configuration logic.
Signed-off-by Arnd Bergmann <[email protected]>
arch/powerpc/platforms/Kconfig.cputype +11 -25
@@ -1,37 +1,24 @@ -config PPC64 - bool "64-bit kernel" - default n - help - This option selects whether a 32-bit or a 64-bit kernel - will be built. - menu "Processor support" choice prompt "Processor Type" - depends on PPC32 default 6xx - -config CLASSIC32 - bool "52xx/6xx/7xx/74xx" - select PPC_FPU - select 6xx help There are four families of PowerPC chips supported. The more common types (601, 603, 604, 740, 750, 7400), the Motorola embedded - versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC - embedded versions (403 and 405) and the high end 64 bit Power - processors (POWER 3, POWER4, and IBM PPC970 also known as G5). - - This option is the catch-all for 6xx types, including some of the - embedded versions. Unless there is see an option for the specific - chip family you are using, you want this option. + versions (8xx, 55xx, 85xx), the AMCC embedded version (403, 405, + 440, 460) and the 64 bit processors (POWER 3, POWER4, POWER5, + POWER6, PowerPC 970, Cell/B.E., PA6T). - You do not want this if you are building a kernel for a 64 bit - IBM RS/6000 or an Apple G5, choose 6xx. + If unsure, select 52xx/6xx/7xx/74xx. - If unsure, select this option +config PPC64 + bool "any 64 bit PowerPC" + select PPC_FPU - Note that the kernel runs in 32-bit mode even on 64-bit chips. +config CLASSIC32 + bool "52xx/6xx/7xx/74xx" + select PPC_FPU + select 6xx config PPC_82xx bool "Freescale 82xx"
@@ -119,7 +106,6 @@ config E500 config PPC_FPU bool - default y if PPC64 config BOOKE bool
--
PATCH 3/6 powerpc: move 82xx/83xx/86xx Kconfig options to platform selection
In reply to Arnd BergmannThe cores used in the MPC82xx/83xx/86xx embedded controllers are very similar to those in the 32 bit general-purpose processors, so it makes sense to treat them as the same CPU family.
Choosing between the embedded platforms and the multiplatform code is now done in the platform menu, but functionally everything stays the same.
Signed-off-by Arnd Bergmann <[email protected]>
arch/powerpc/platforms/Kconfig +25 -1
@@ -2,7 +2,7 @@ menu "Platform support" choice prompt "Machine type" - depends on PPC64 || CLASSIC32 + depends on PPC64 || 6xx default PPC_MULTIPLATFORM config PPC_MULTIPLATFORM
@@ -23,8 +23,32 @@ config APUS Select APUS if configuring for a PowerUP Amiga. More information is available at: <http://linux-apus.sourceforge.net/>. + +config PPC_82xx + bool "Freescale 82xx" + depends on 6xx + +config PPC_83xx + bool "Freescale 83xx" + depends on 6xx + select FSL_SOC + select 83xx + select WANT_DEVICE_TREE + +config PPC_86xx + bool "Freescale 86xx" + depends on 6xx + select FSL_SOC + select FSL_PCIE + select ALTIVEC + help + The Freescale E600 SoCs have 74xx cores. endchoice +config CLASSIC32 + def_bool y + depends on 6xx && PPC_MULTIPLATFORM + source "arch/powerpc/platforms/pseries/Kconfig" source "arch/powerpc/platforms/iseries/Kconfig" source "arch/powerpc/platforms/chrp/Kconfig"
arch/powerpc/platforms/Kconfig.cputype +2 -26
@@ -15,24 +15,10 @@ config PPC64 bool "any 64 bit PowerPC" select PPC_FPU -config CLASSIC32 - bool "52xx/6xx/7xx/74xx" - select PPC_FPU - select 6xx - -config PPC_82xx - bool "Freescale 82xx" - select 6xx +config 6xx + bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx" select PPC_FPU -config PPC_83xx - bool "Freescale 83xx" - select 6xx - select FSL_SOC - select 83xx - select PPC_FPU - select WANT_DEVICE_TREE - config PPC_85xx bool "Freescale 85xx" select E500
@@ -40,16 +26,6 @@ config PPC_85xx select 85xx select WANT_DEVICE_TREE -config PPC_86xx - bool "Freescale 86xx" - select 6xx - select FSL_SOC - select FSL_PCIE - select PPC_FPU - select ALTIVEC - help - The Freescale E600 SoCs have 74xx cores. - config PPC_8xx bool "Freescale 8xx" select FSL_SOC
--
cover CPU selection Kconfig cleanup
This is a new attempt at improving the CPU selection menu in arch/powerpc/Kconfig, based on the comments for an older patch in the same general direction.
Please review.
Arnd <><
--
PATCH 1/6 powerpc: split out CPU specific options into a new Kconfig file
A lot of the options in arch/powerpc/Kconfig deal with the CPU menu, and my next patches add more to them. Moving them to a new arch/powerpc/platforms/Kconfig.cputype file makes it easier to follow.
There are no functional changes in here.
Signed-off-by Arnd Bergmann <[email protected]>
arch/powerpc/Kconfig +1 -237
@@ -4,12 +4,7 @@ mainmenu "Linux/PowerPC Kernel Configuration" -config PPC64 - bool "64-bit kernel" - default n - help - This option selects whether a 32-bit or a 64-bit kernel - will be built. +source "arch/powerpc/platforms/Kconfig.cputype" config PPC_PM_NEEDS_RTC_LIB bool
@@ -123,122 +118,6 @@ config DEFAULT_UIMAGE Used to allow a board to specify it wants a uImage built by default default n -menu "Processor support" -choice - prompt "Processor Type" - depends on PPC32 - default 6xx - -config CLASSIC32 - bool "52xx/6xx/7xx/74xx" - select PPC_FPU - select 6xx - help - There are four families of PowerPC chips supported. The more common - types (601, 603, 604, 740, 750, 7400), the Motorola embedded - versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC - embedded versions (403 and 405) and the high end 64 bit Power - processors (POWER 3, POWER4, and IBM PPC970 also known as G5). - - This option is the catch-all for 6xx types, including some of the - embedded versions. Unless there is see an option for the specific - chip family you are using, you want this option. - - You do not want this if you are building a kernel for a 64 bit - IBM RS/6000 or an Apple G5, choose 6xx. - - If unsure, select this option - - Note that the kernel runs in 32-bit mode even on 64-bit chips. - -config PPC_82xx - bool "Freescale 82xx" - select 6xx - select PPC_FPU - -config PPC_83xx - bool "Freescale 83xx" - select 6xx - select FSL_SOC - select 83xx - select PPC_FPU - select WANT_DEVICE_TREE - -config PPC_85xx - bool "Freescale 85xx" - select E500 - select FSL_SOC - select 85xx - select WANT_DEVICE_TREE - -config PPC_86xx - bool "Freescale 86xx" - select 6xx - select FSL_SOC - select FSL_PCIE - select PPC_FPU - select ALTIVEC - help - The Freescale E600 SoCs have 74xx cores. - -config PPC_8xx - bool "Freescale 8xx" - select FSL_SOC - select 8xx - -config 40x - bool "AMCC 40x" - select PPC_DCR_NATIVE - -config 44x - bool "AMCC 44x" - select PPC_DCR_NATIVE - -config E200 - bool "Freescale e200" - -endchoice - -config POWER4_ONLY - bool "Optimize for POWER4" - depends on PPC64 - default n - ---help--- - Cause the compiler to optimize for POWER4/POWER5/PPC970 processors. - The resulting binary will not work on POWER3 or RS64 processors - when compiled with binutils 2.15 or later. - -config POWER3 - bool - depends on PPC64 - default y if !POWER4_ONLY - -config POWER4 - depends on PPC64 - def_bool y - -config 6xx - bool - -# this is temp to handle compat with arch=ppc -config 8xx - bool - -# this is temp to handle compat with arch=ppc -config 83xx - bool - -# this is temp to handle compat with arch=ppc -config 85xx - bool - -config E500 - bool - -config PPC_FPU - bool - default y if PPC64 - config PPC_DCR_NATIVE bool default n
@@ -257,121 +136,6 @@ config PPC_OF_PLATFORM_PCI depends on PPC64 # not supported on 32 bits yet default n -config BOOKE - bool - depends on E200 || E500 - default y - -config FSL_BOOKE - bool - depends on E200 || E500 - default y - -config PTE_64BIT - bool - depends on 44x || E500 - default y if 44x - default y if E500 && PHYS_64BIT - -config PHYS_64BIT - bool 'Large physical address support' if E500 - depends on 44x || E500 - select RESOURCES_64BIT - default y if 44x - ---help--- - This option enables kernel support for larger than 32-bit physical - addresses. This features is not be available on all e500 cores. - - If in doubt, say N here. - -config ALTIVEC - bool "AltiVec Support" - depends on CLASSIC32 || POWER4 - ---help--- - This option enables kernel support for the Altivec extensions to the - PowerPC processor. The kernel currently supports saving and restoring - altivec registers, and turning on the 'altivec enable' bit so user - processes can execute altivec instructions. - - This option is only usefully if you have a processor that supports - altivec (G4, otherwise known as 74xx series), but does not have - any affect on a non-altivec cpu (it does, however add code to the - kernel). - - If in doubt, say Y here. - -config SPE - bool "SPE Support" - depends on E200 || E500 - default y - ---help--- - This option enables kernel support for the Signal Processing - Extensions (SPE) to the PowerPC processor. The kernel currently - supports saving and restoring SPE registers, and turning on the - 'spe enable' bit so user processes can execute SPE instructions. - - This option is only useful if you have a processor that supports - SPE (e500, otherwise known as 85xx series), but does not have any - effect on a non-spe cpu (it does, however add code to the kernel). - - If in doubt, say Y here. - -config PPC_STD_MMU - bool - depends on 6xx || POWER3 || POWER4 || PPC64 - default y - -config PPC_STD_MMU_32 - def_bool y - depends on PPC_STD_MMU && PPC32 - -config VIRT_CPU_ACCOUNTING - bool "Deterministic task and CPU time accounting" - depends on PPC64 - default y - help - Select this option to enable more accurate task and CPU time - accounting. This is done by reading a CPU counter on each - kernel entry and exit and on transitions within the kernel - between system, softirq and hardirq state, so there is a - small performance impact. This also enables accounting of - stolen time on logically-partitioned systems running on - IBM POWER5-based machines. - - If in doubt, say Y here. - -config SMP - depends on PPC_STD_MMU - bool "Symmetric multi-processing support" - ---help--- - This enables support for systems with more than one CPU. If you have - a system with only one CPU, say N. If you have a system with more - than one CPU, say Y. Note that the kernel does not currently - support SMP machines with 603/603e/603ev or PPC750 ("G3") processors - since they have inadequate hardware support for multiprocessor - operation. - - If you say N here, the kernel will run on single and multiprocessor - machines, but will use only one CPU of a multiprocessor machine. If - you say Y here, the kernel will run on single-processor machines. - On a single-processor machine, the kernel will run faster if you say - N here. - - If you don't know what to do here, say N. - -config NR_CPUS - int "Maximum number of CPUs (2-128)" - range 2 128 - depends on SMP - default "32" if PPC64 - default "4" - -config NOT_COHERENT_CACHE - bool - depends on 4xx || 8xx || E200 - default y -endmenu - source "init/Kconfig" source "arch/powerpc/platforms/Kconfig"
arch/powerpc/platforms/Kconfig.cputype new file +238 -0
238 lines not on this page · raw message
--
PATCH 4/6 powerpc: rename add_bridge to avoid namespace clashes
In reply to Arnd BergmannMany platforms currently define their own add_bridge function, some of them globally. This breaks some multiplatform configurations. Prefixing each of these functions with the platform name avoids this problem.
Signed-off-by Arnd Bergmann <[email protected]>
arch/powerpc/platforms/82xx/mpc82xx_ads.c +3 -3
@@ -49,7 +49,7 @@#include <linux/fs_enet_pd.h> #include <sysdev/fsl_soc.h> -#include <../sysdev/cpm2_pic.h> +#include <../../sysdev/cpm2_pic.h> #include "pq2ads.h"
@@ -515,7 +515,7 @@ static int m82xx_pci_exclude_device(u_chreturn PCIBIOS_SUCCESSFUL ; } -void __init add_bridge (struct device_node *np) +static void __init mpc82xx_add_bridge (struct device_node *np) {int len;struct pci_controller *hose;
@@ -584,7 +584,7 @@ static void __init mpc82xx_ads_setup_arc#ifdef CONFIG_PCI ppc_md.pci_exclude_device = m82xx_pci_exclude_device;for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc82xx_add_bridge (np);of_node_put (np);#endif
arch/powerpc/platforms/83xx/mpc836x_mds.c +1 -1
@@ -86,7 +86,7 @@ static void __init mpc836x_mds_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc83xx_add_bridge (np); ppc_md.pci_exclude_device = mpc83xx_exclude_device;#endif
arch/powerpc/platforms/83xx/mpc83xx.h +1 -1
@@ -27,7 +27,7 @@* mpc83xx_* files. Mostly for use by mpc83xx_setup */ -extern int add_bridge (struct device_node *dev); +extern int mpc83xx_add_bridge (struct device_node *dev);extern int mpc83xx_exclude_device (u_char bus,u_char devfn);extern void mpc83xx_restart (char *cmd);extern long mpc83xx_time_init (void );
arch/powerpc/platforms/83xx/mpc8313_rdb.c +1 -1
@@ -47,7 +47,7 @@ static void __init mpc8313_rdb_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc83xx_add_bridge (np); ppc_md.pci_exclude_device = mpc83xx_exclude_device;#endif
arch/powerpc/platforms/83xx/mpc832x_mds.c +1 -1
@@ -80,7 +80,7 @@ static void __init mpc832x_sys_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc83xx_add_bridge (np); ppc_md.pci_exclude_device = mpc83xx_exclude_device;#endif
arch/powerpc/platforms/83xx/mpc832x_rdb.c +1 -1
@@ -51,7 +51,7 @@ static void __init mpc832x_rdb_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc83xx_add_bridge (np); ppc_md.pci_exclude_device = mpc83xx_exclude_device;#endif
arch/powerpc/platforms/83xx/mpc834x_itx.c +1 -1
@@ -57,7 +57,7 @@ static void __init mpc834x_itx_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc83xx_add_bridge (np); ppc_md.pci_exclude_device = mpc83xx_exclude_device;#endif
arch/powerpc/platforms/83xx/mpc834x_mds.c +1 -1
@@ -127,7 +127,7 @@ static void __init mpc834x_mds_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc83xx_add_bridge (np); ppc_md.pci_exclude_device = mpc83xx_exclude_device;#endif
arch/powerpc/platforms/83xx/pci.c +1 -1
@@ -45,7 +45,7 @@ int mpc83xx_exclude_device(u_char bus, ureturn PCIBIOS_SUCCESSFUL ; } -int __init add_bridge (struct device_node *dev) +int __init mpc83xx_add_bridge (struct device_node *dev) {int len;struct pci_controller *hose;
arch/powerpc/platforms/85xx/mpc85xx.h +1 -1
@@ -15,4 +15,4 @@*/ extern void mpc85xx_restart (char *); -extern int add_bridge (struct device_node *dev); +extern int mpc85xx_add_bridge (struct device_node *dev);
arch/powerpc/platforms/85xx/mpc85xx_ads.c +1 -1
@@ -241,7 +241,7 @@ static void __init mpc85xx_ads_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc85xx_add_bridge (np); ppc_md.pci_exclude_device = mpc85xx_exclude_device;#endif }
arch/powerpc/platforms/85xx/mpc85xx_cds.c +1 -1
@@ -257,7 +257,7 @@ static void __init mpc85xx_cds_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc85xx_add_bridge (np); ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup; ppc_md.pci_exclude_device = mpc85xx_exclude_device;
arch/powerpc/platforms/85xx/mpc85xx_mds.c +1 -1
@@ -100,7 +100,7 @@ static void __init mpc85xx_mds_setup_arc#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) { -add_bridge (np); +mpc85xx_add_bridge (np); }of_node_put (np);#endif
arch/powerpc/platforms/85xx/pci.c +1 -1
@@ -36,7 +36,7 @@int mpc85xx_pci2_busno =0 ;#ifdef CONFIG_PCI -int __init add_bridge (struct device_node *dev) +int __init mpc85xx_add_bridge (struct device_node *dev) {int len;struct pci_controller *hose;
arch/powerpc/platforms/86xx/mpc86xx.h +1 -1
@@ -15,7 +15,7 @@* mpc86xx_* files. Mostly for use by mpc86xx_setup(). */ -extern int add_bridge (struct device_node *dev); +extern int mpc86xx_add_bridge (struct device_node *dev);extern int mpc86xx_exclude_device (u_char bus,u_char devfn);
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +1 -1
@@ -359,7 +359,7 @@ mpc86xx_hpcn_setup_arch(void)#ifdef CONFIG_PCI for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +mpc86xx_add_bridge (np); ppc_md.pci_exclude_device = mpc86xx_exclude_device;#endif
arch/powerpc/platforms/86xx/pci.c +1 -1
@@ -148,7 +148,7 @@ int mpc86xx_exclude_device(u_char bus, ureturn PCIBIOS_SUCCESSFUL ; } -int __init add_bridge (struct device_node *dev) +int __init mpc86xx_add_bridge (struct device_node *dev) {int len;struct pci_controller *hose;
arch/powerpc/platforms/embedded6xx/linkstation.c +2 -2
@@ -54,7 +54,7 @@ static struct mtd_partition linkstation_ }, }; -static int __init add_bridge (struct device_node *dev) +static int __init linkstation_add_bridge (struct device_node *dev) {int len;struct pci_controller *hose;
@@ -92,7 +92,7 @@ static void __init linkstation_setup_arc/* Lookup PCI host bridges */ for (np =NULL ; (np =of_find_node_by_type (np,"pci" )) !=NULL ;) -add_bridge (np); +linkstation_add_bridge (np);printk (KERN_INFO "BUFFALO Network Attached Storage Series\n" );printk (KERN_INFO "(C) 2002-2005 BUFFALO INC.\n" );
arch/powerpc/platforms/maple/pci.c +3 -3
@@ -444,7 +444,7 @@ static void __init setup_u3_ht(struct pc u3_ht = hose; } -static int __init add_bridge (struct device_node *dev) +static int __init maple_add_bridge (struct device_node *dev) {int len;struct pci_controller *hose;
@@ -558,7 +558,7 @@ void __init maple_pci_init(void)continue ;if ((device_is_compatible (np,"u4-pcie" ) ||device_is_compatible (np,"u3-agp" )) && -add_bridge (np) ==0 ) +maple_add_bridge (np) ==0 )of_node_get (np);if (device_is_compatible (np,"u3-ht" )) {
@@ -570,7 +570,7 @@ void __init maple_pci_init(void)/* Now setup the HyperTransport host if we found any */ -if (ht &&add_bridge (ht) !=0 ) +if (ht &&maple_add_bridge (ht) !=0 )of_node_put (ht);/*
arch/powerpc/platforms/pasemi/pci.c +2 -2
@@ -132,7 +132,7 @@ static void __init setup_pa_pxp(struct p hose->cfg_data =ioremap (0xe0000000 ,0x10000000 ); } -static int __init add_bridge (struct device_node *dev) +static int __init pas_add_bridge (struct device_node *dev) {struct pci_controller *hose;
@@ -198,7 +198,7 @@ void __init pas_pci_init(void) }for (np =NULL ; (np =of_get_next_child (root, np)) !=NULL ;) -if (np->name && !strcmp (np->name,"pxp" ) && !add_bridge (np)) +if (np->name && !strcmp (np->name,"pxp" ) && !pas_add_bridge (np))of_node_get (np);of_node_put (root);
arch/powerpc/platforms/powermac/pci.c +3 -5
@@ -35,8 +35,6 @@ #define DBG(x...)#endif -static int add_bridge (struct device_node *dev); -/* XXX Could be per-controller, but I don't think we risk anything by * assuming we won't have both UniNorth and Bandit */ static int has_uninorth;
@@ -897,7 +895,7 @@ static void __init setup_u3_ht(struct pc* "pci" (a MPC106) and no bandit or chaos bridges, and contrariwise, * if we have one or more bandit or chaos bridges, we don't have a MPC106. */ -static int __init add_bridge (struct device_node *dev) +static int __init pmac_add_bridge (struct device_node *dev) {int len;struct pci_controller *hose;
@@ -1036,7 +1034,7 @@ void __init pmac_pci_init(void)if (strcmp (np->name,"bandit" ) ==0 ||strcmp (np->name,"chaos" ) ==0 ||strcmp (np->name,"pci" ) ==0 ) { -if (add_bridge (np) ==0 ) +if (pmac_add_bridge (np) ==0 )of_node_get (np); }if (strcmp (np->name,"ht" ) ==0 ) {
@@ -1050,7 +1048,7 @@ void __init pmac_pci_init(void)/* Probe HT last as it relies on the agp resources to be already * setup */ -if (ht &&add_bridge (ht) !=0 ) +if (ht &&pmac_add_bridge (ht) !=0 )of_node_put (ht);/*
--
PATCH 6/6 powerpc: autoselect optimal -mcpu= flag by platform
In reply to Arnd BergmannWe can choose the -mcpu= gcc flags for compiling the kernel based on the platform that we build for. In case of multiplatform kernels, this chooses a setting for a common subset.
When using a platform type that can use different CPUs, a new option CONFIG_PPC_CPU_SELECTION can be enabled to select more specifically which CPUs the kernel will be able to run on.
This replaces the CONFIG_POWER4_ONLY option with an much more generic approach.
Also, when CONFIG_PPC_CPU_SELECTION is set, it is now possible to select a CPU to tune for by means of the -mtune= option.
I tried to be very careful when coding the specific rules into the Kconfig language, but it would be good to have a few people sanity-checking them.
Signed-off-by Arnd Bergmann <[email protected]>
arch/powerpc/platforms/4xx/Kconfig +11 -0
@@ -87,6 +87,7 @@ endmenu # 40x specific CPU modules, selected based on the board above. config NP405H bool + select CPU_405 #depends on ASH # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
@@ -94,6 +95,7 @@ config 403GCX bool #depends on OAK select IBM405_ERR51 + select CPU_403 config 405GP bool
@@ -102,19 +104,23 @@ config 405GP config 405EP bool + select CPU_405 config 405GPR bool + select CPU_405 config VIRTEX_II_PRO bool select IBM405_ERR77 select IBM405_ERR51 + select CPU_405 config STB03xxx bool select IBM405_ERR77 select IBM405_ERR51 + select CPU_405 # 40x errata/workaround config symbols, selected by the CPU models above
@@ -168,20 +174,25 @@ config 440EP bool select PPC_FPU select IBM440EP_ERR42 + select CPU_440 config 440GP bool select IBM_NEW_EMAC_ZMII + select CPU_440 config 440GX bool + select CPU_440 config 440SP bool + select CPU_440 config 440A bool depends on 440GX + select CPU_440 default y # 44x errata/workaround config symbols, selected by the CPU models above
arch/powerpc/platforms/52xx/Kconfig +1 -0
@@ -1,6 +1,7 @@ config PPC_MPC52xx bool default n + select CPU_603e config PPC_MPC5200 bool
arch/powerpc/platforms/82xx/Kconfig +1 -0
@@ -1,6 +1,7 @@ config PPC_82xx bool "Freescale 82xx" depends on PPC_MULTIPLATFORM && 6xx + select CPU_603e config MPC82xx_ADS bool "Freescale MPC82xx ADS"
arch/powerpc/platforms/83xx/Kconfig +1 -0
@@ -4,6 +4,7 @@ config PPC_83xx select FSL_SOC select 83xx select WANT_DEVICE_TREE + select CPU_603e config MPC8313_RDB bool "Freescale MPC8313 RDB"
arch/powerpc/platforms/86xx/Kconfig +1 -0
@@ -4,6 +4,7 @@ config PPC_86xx select FSL_SOC select FSL_PCIE select ALTIVEC + select CPU_74xx help The Freescale E600 SoCs have 74xx cores.
arch/powerpc/platforms/Kconfig.cputype +225 -2
234 lines not on this page · raw message
arch/powerpc/platforms/cell/Kconfig +1 -0
@@ -20,6 +20,7 @@ config PPC_IBM_CELL_BLADE select MMIO_NVRAM select PPC_UDBG_16550 select UDBG_RTAS_CONSOLE + select CPU_CELL menu "Cell Broadband Engine options" depends on PPC_CELL
arch/powerpc/platforms/celleb/Kconfig +1 -0
@@ -2,6 +2,7 @@ config PPC_CELLEB bool "Toshiba's Cell Reference Set 'Celleb' Architecture" depends on PPC_MULTIPLATFORM && PPC64 select PPC_CELL + select CPU_CELL select PPC_OF_PLATFORM_PCI select HAS_TXX9_SERIAL select PPC_UDBG_BEAT
arch/powerpc/platforms/embedded6xx/Kconfig +2 -0
@@ -8,6 +8,7 @@ config LINKSTATION select FSL_SOC select PPC_UDBG_16550 if SERIAL_8250 select DEFAULT_UIMAGE + select CPU_603e help Select LINKSTATION if configuring for one of PPC- (MPC8241) based NAS systems from Buffalo Technology. So far only
@@ -22,6 +23,7 @@ config MPC7448HPC2 select PPC_UDBG_16550 select MPIC select MPIC_WEIRD + select CPU_74xx help Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) platform
arch/powerpc/platforms/maple/Kconfig +1 -0
@@ -11,6 +11,7 @@ config PPC_MAPLE select PPC_RTAS select MMIO_NVRAM select ATA_NONSTANDARD if ATA + select CPU_970 default n help This option enables support for the Maple 970FX Evaluation Board.
arch/powerpc/platforms/pasemi/Kconfig +1 -0
@@ -6,6 +6,7 @@ config PPC_PASEMI select PPC_UDBG_16550 select GENERIC_TBSYNC select PPC_NATIVE + select CPU_PA6T help This option enables support for PA Semi's PWRficient line of SoC processors, including PA6T-1682M
arch/powerpc/platforms/powermac/Kconfig +1 -0
@@ -15,6 +15,7 @@ config PPC_PMAC64 select MPIC_U3_HT_IRQS select GENERIC_TBSYNC select PPC_970_NAP + select CPU_970 default y
arch/powerpc/platforms/ps3/Kconfig +1 -0
@@ -2,6 +2,7 @@ config PPC_PS3 bool "Sony PS3 (incomplete)" depends on PPC_MULTIPLATFORM && PPC64 select PPC_CELL + select CPU_CELL select USB_ARCH_HAS_OHCI select USB_OHCI_LITTLE_ENDIAN select USB_OHCI_BIG_ENDIAN_MMIO
arch/powerpc/Makefile +7 -12
@@ -77,24 +77,23 @@ LINUXINCLUDE += $(LINUXINCLUDE-y) CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__ +OPTFLAGS := $(call cc-option,$(CONFIG_PPC_MCPU)) $(call cc-option,$(CONFIG_PPC_MTUNE)) + +# compilers older than 4.0.0 can only set -maltivec in 64 bit mode +# when compiling for 970 ifeq ($(CONFIG_PPC64),y) GCC_BROKEN_VEC := $(shell if [ $(call cc-version) -lt 0400 ] ; then echo "y"; fi) - ifeq ($(CONFIG_POWER4_ONLY),y) ifeq ($(CONFIG_ALTIVEC),y) ifeq ($(GCC_BROKEN_VEC),y) - CFLAGS += $(call cc-option,-mcpu=970) -else - CFLAGS += $(call cc-option,-mcpu=power4) + OPTFLAGS := $(call cc-option,-mcpu=970) $(call cc-option,$(CONFIG_PPC_MTUNE)) endif -else - CFLAGS += $(call cc-option,-mcpu=power4) endif -else - CFLAGS += $(call cc-option,-mtune=power4) endif endif +CFLAGS += $(OPTFLAGS) + # No AltiVec instruction when building kernel CFLAGS += $(call cc-option,-mno-altivec)
@@ -106,10 +105,6 @@ CFLAGS += $(call cc-option,-funit-at-a-t # often slow when they are implemented at all CFLAGS += -mno-string -ifeq ($(CONFIG_6xx),y) -CFLAGS += -mcpu=powerpc -endif - cpu-as-$(CONFIG_4xx) += -Wa,-m405 cpu-as-$(CONFIG_6xx) += -Wa,-maltivec cpu-as-$(CONFIG_POWER4) += -Wa,-maltivec
Re: [PATCH 2/6] powerpc: Move CONFIG_PPC64 into CPU selection
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
Currently, PPC64 is a top level configuration option in
arch/powerpc/Kconfig, which is somewhat unconventional.Moving it into the CPU selection menu is a natural choice, and is transparent to the rest of the configuration logic.
Signed-off-by Arnd Bergmann <[email protected]>
I know Paul made a very conscious decisions to make the 64-bit choice a top level config option when we moved to arch/powerpc. This is patch effective reverts back to how we did things in arch/ppc.
I'll let it up to him to remind us why he wanted that since I dont remember.
- k
Quoted 64 lines
Index: linux-2.6/arch/powerpc/platforms/Kconfig.cputype
===================================================================arch/powerpc/platforms/Kconfig.cputype +0
-13@@ -1,37 +1,24 @@ -config PPC64 - bool "64-bit kernel" - default n - help - This option selects whether a 32-bit or a 64-bit kernel - will be built. - menu "Processor support" choice prompt "Processor Type" - depends on PPC32 default 6xx - -config CLASSIC32 - bool "52xx/6xx/7xx/74xx" - select PPC_FPU - select 6xx help There are four families of PowerPC chips supported. The morecommon
arch/powerpc/platforms/Kconfig.cputype +11
-13types (601, 603, 604, 740, 750, 7400), the Motorola embedded - versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC - embedded versions (403 and 405) and the high end 64 bit Power - processors (POWER 3, POWER4, and IBM PPC970 also known as G5). - - This option is the catch-all for 6xx types, including some of the - embedded versions. Unless there is see an option for the specific - chip family you are using, you want this option. + versions (8xx, 55xx, 85xx), the AMCC embedded version (403, 405, + 440, 460) and the 64 bit processors (POWER 3, POWER4, POWER5, + POWER6, PowerPC 970, Cell/B.E., PA6T). - You do not want this if you are building a kernel for a 64 bit - IBM RS/6000 or an Apple G5, choose 6xx. + If unsure, select 52xx/6xx/7xx/74xx. - If unsure, select this option +config PPC64 + bool "any 64 bit PowerPC" + select PPC_FPU - Note that the kernel runs in 32-bit mode even on 64-bit chips. +config CLASSIC32 + bool "52xx/6xx/7xx/74xx" + select PPC_FPU + select 6xx config PPC_82xx bool "Freescale 82xx"@@ -119,7 +106,6 @@ config E500 config PPC_FPU bool - default y if PPC64 config BOOKE bool --
Re: [PATCH 1/6] powerpc: split out CPU specific options into a new Kconfig file
In reply to Arnd Bergmannarch/powerpc/platforms/Kconfig.cputype line 23
Quoted 10 lines · Arnd Bergmann
arch/powerpc/platforms/Kconfig.cputype new file +10
-0+config CLASSIC32 + bool "52xx/6xx/7xx/74xx" + select PPC_FPU + select 6xx + help + There are four families of PowerPC chips supported. The more common + types (601, 603, 604, 740, 750, 7400), the Motorola embedded + versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC + embedded versions (403 and 405) and the high end 64 bit Power + processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
Is this help text still accurate? The bool line says "52xx/6xx/7xx/74xx", but you talk about many more processors in the help text. You mention the 83xx, but not the 85xx or 86xx, nor do you mention Freescale. Not only that, but the help text implies that 8xx, 52xx, 82xx, and 83xx are part of the same family, but the bool text implies that 52xx is part of a different family.
arch/powerpc/platforms/Kconfig.cputype line 27
Quoted 3 lines
arch/powerpc/platforms/Kconfig.cputype new file +3
-0+ This option is the catch-all for 6xx types, including some of the + embedded versions. Unless there is see an option for the specific + chip family you are using, you want this option.
So CLASSIC32 is only for 6xx families, not any of the others? Then what's the "select 6xx" for? Isn't that redundant?
arch/powerpc/platforms/Kconfig.cputype line 30
Quoted 2 lines
arch/powerpc/platforms/Kconfig.cputype new file +2
-0+ You do not want this if you are building a kernel for a 64 bit + IBM RS/6000 or an Apple G5, choose 6xx.
This needs to be reworded, as the English doesn't make sense.
Signature · 2 lines
Timur Tabi Linux Kernel Developer @ Freescale
Re: [PATCH 1/6] powerpc: split out CPU specific options into a new Kconfig file
Quoted 18 lines · Timur Tabi
arch/powerpc/platforms/Kconfig.cputype line 23
Quoted 10 lines · Arnd Bergmann
arch/powerpc/platforms/Kconfig.cputype new file +10
-0+config CLASSIC32 + bool "52xx/6xx/7xx/74xx" + select PPC_FPU + select 6xx + help + There are four families of PowerPC chips supported. The more common + types (601, 603, 604, 740, 750, 7400), the Motorola embedded + versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC + embedded versions (403 and 405) and the high end 64 bit Power + processors (POWER 3, POWER4, and IBM PPC970 also known as G5).Is this help text still accurate? The bool line says "52xx/6xx/7xx/74xx", but you talk about many more processors in the help text. You mention the 83xx, but not the 85xx or 86xx, nor do you mention Freescale. Not only that, but the help text implies that 8xx, 52xx, 82xx, and 83xx are part of the same family, but the bool text implies that 52xx is part of a different family.
This patch just moves stuff around, one of the later patches fixes the text.
Quoted 6 lines
arch/powerpc/platforms/Kconfig.cputype line 27
Quoted 3 lines
arch/powerpc/platforms/Kconfig.cputype new file +3
-0+ This option is the catch-all for 6xx types, including some of the + embedded versions. Unless there is see an option for the specific + chip family you are using, you want this option.So CLASSIC32 is only for 6xx families, not any of the others? Then what's the "select 6xx" for? Isn't that redundant?
Currently, CLASSIC32 refers to all Open Firmware based 6xx machines, including PowerMac, rs6000, CHRP and PReP. 6xx includes those, and also the embedded platforms based on 6xx cores, like 86xx.
My last patch changes it so that CLASSIC32 and 6xx are actually synonyms, and we could kill one of them.
Quoted 4 lines
arch/powerpc/platforms/Kconfig.cputype line 30
Quoted 2 lines
arch/powerpc/platforms/Kconfig.cputype new file +2
-0+ You do not want this if you are building a kernel for a 64 bit + IBM RS/6000 or an Apple G5, choose 6xx.This needs to be reworded, as the English doesn't make sense.
It also gets fixed in a later patch.
Arnd <><
Re: [PATCH 1/6] powerpc: split out CPU specific options into a new Kconfig file
In reply to Timur TabiQuoted 18 lines · Timur Tabi
arch/powerpc/platforms/Kconfig.cputype line 23
Quoted 10 lines · Arnd Bergmann
arch/powerpc/platforms/Kconfig.cputype new file +10
-0+config CLASSIC32 + bool "52xx/6xx/7xx/74xx" + select PPC_FPU + select 6xx + help + There are four families of PowerPC chips supported. The more common + types (601, 603, 604, 740, 750, 7400), the Motorola embedded + versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC + embedded versions (403 and 405) and the high end 64 bit Power + processors (POWER 3, POWER4, and IBM PPC970 also known as G5).Is this help text still accurate? The bool line says "52xx/6xx/7xx/74xx", but you talk about many more processors in the help text. You mention the 83xx, but not the 85xx or 86xx, nor do you mention Freescale. Not only that, but the help text implies that 8xx, 52xx, 82xx, and 83xx are part of the same family, but the bool text implies that 52xx is part of a different family.
Timur,
Please read through the rest of the patch sequence. This patch was just the "first step", moving things around without additional changes.
jdl