Commit 76bc080e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[POWERPC] Make default cputable entries reflect selected CPU family 



Changes the cputable so that various CPU families that have an exclusive
CONFIG_ option have a more sensible default entry to use if the specific
processor hasn't been identified.

This makes the kernel more generally useful when booted on an unknown
PVR for things like new 4xx variants.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2a5f2e3e

arch/powerpc/kernel/cputable.c

+43 −10
Original line number Diff line number Diff line
@@ -1208,6 +1208,18 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check		= machine_check_4xx,

		.platform		= "ppc405",

	},

	{	/* default match */

		.pvr_mask		= 0x00000000,

		.pvr_value		= 0x00000000,

		.cpu_name		= "(generic 40x PPC)",

		.cpu_features		= CPU_FTRS_40X,

		.cpu_user_features	= PPC_FEATURE_32 |

			PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

		.machine_check		= machine_check_4xx,

		.platform		= "ppc405",

	}



#endif /* CONFIG_40x */

#ifdef CONFIG_44x
@@ -1421,8 +1433,18 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check		= machine_check_440A,

		.platform		= "ppc440",

	},

	{	/* default match */

		.pvr_mask		= 0x00000000,

		.pvr_value		= 0x00000000,

		.cpu_name		= "(generic 44x PPC)",

		.cpu_features		= CPU_FTRS_44X,

		.cpu_user_features	= COMMON_USER_BOOKE,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

		.machine_check		= machine_check_4xx,

		.platform		= "ppc440",

	}

#endif /* CONFIG_44x */

#ifdef CONFIG_FSL_BOOKE

#ifdef CONFIG_E200

	{	/* e200z5 */

		.pvr_mask		= 0xfff00000,
@@ -1451,7 +1473,19 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check		= machine_check_e200,

		.platform		= "ppc5554",

	},

#elif defined(CONFIG_E500)

	{	/* default match */

		.pvr_mask		= 0x00000000,

		.pvr_value		= 0x00000000,

		.cpu_name		= "(generic E200 PPC)",

		.cpu_features		= CPU_FTRS_E200,

		.cpu_user_features	= COMMON_USER_BOOKE |

			PPC_FEATURE_HAS_EFP_SINGLE |

			PPC_FEATURE_UNIFIED_CACHE,

		.dcache_bsize		= 32,

		.machine_check		= machine_check_e200,

		.platform		= "ppc5554",

#endif /* CONFIG_E200 */

#ifdef CONFIG_E500

	{	/* e500 */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x80200000,
@@ -1487,20 +1521,19 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check		= machine_check_e500,

		.platform		= "ppc8548",

	},

#endif

#endif

#if !CLASSIC_PPC

	{	/* default match */

		.pvr_mask		= 0x00000000,

		.pvr_value		= 0x00000000,

		.cpu_name		= "(generic PPC)",

		.cpu_features		= CPU_FTRS_GENERIC_32,

		.cpu_user_features	= PPC_FEATURE_32,

		.cpu_name		= "(generic E500 PPC)",

		.cpu_features		= CPU_FTRS_E500,

		.cpu_user_features	= COMMON_USER_BOOKE |

			PPC_FEATURE_HAS_SPE_COMP |

			PPC_FEATURE_HAS_EFP_SINGLE_COMP,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

		.machine_check		= machine_check_e500,

		.platform		= "powerpc",

	}

#endif /* !CLASSIC_PPC */

#endif /* CONFIG_E500 */

#endif /* CONFIG_PPC32 */

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE