From mboxrd@z Thu Jan 1 00:00:00 1970 From: marc.zyngier@arm.com (Marc Zyngier) Date: Thu, 8 Sep 2011 18:00:10 +0100 Subject: [RFC PATCH 1/3] ARM: SoC: Introduce per SoC descriptor In-Reply-To: <1315501212-1820-1-git-send-email-marc.zyngier@arm.com> References: <1315501212-1820-1-git-send-email-marc.zyngier@arm.com> Message-ID: <1315501212-1820-2-git-send-email-marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The ARM core code expects the various SoCs to hide their implementation differences behind a well established API. The various sub-arch-specific bit are often either at the machine descriptor level, or provided at link time by the sub-arch code. The SoC descriptor is a container that holds the SoC specific bits that can be moved away from the machine descriptor as well as an indirection point for the global symbols (SMP and CPU hotplug support, for example). This patch introduce this SoC descriptor, with the only field being the name of the SoC. Signed-off-by: Marc Zyngier --- arch/arm/include/asm/mach/arch.h | 2 ++ arch/arm/include/asm/soc.h | 21 +++++++++++++++++++++ arch/arm/kernel/setup.c | 5 +++++ 3 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/soc.h diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 727da11..82883ca 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h @@ -13,6 +13,7 @@ struct tag; struct meminfo; struct sys_timer; +struct arm_soc_desc; struct machine_desc { unsigned int nr; /* architecture number */ @@ -34,6 +35,7 @@ struct machine_desc { unsigned int reserve_lp1 :1; /* never has lp1 */ unsigned int reserve_lp2 :1; /* never has lp2 */ unsigned int soft_reboot :1; /* soft reboot */ + struct arm_soc_desc *soc; /* SoC descriptor */ void (*fixup)(struct machine_desc *, struct tag *, char **, struct meminfo *); diff --git a/arch/arm/include/asm/soc.h b/arch/arm/include/asm/soc.h new file mode 100644 index 0000000..d9a6671 --- /dev/null +++ b/arch/arm/include/asm/soc.h @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/include/asm/soc.h + * + * Copyright (C) 2011 ARM Ltd. + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __ASM_ARM_SOC_H +#define __ASM_ARM_SOC_H + +struct arm_soc_desc { + const char *name; +}; + +extern struct arm_soc_desc *soc_desc; + +#endif /* __ASM_ARM_SOC_H */ diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 192a24f..2d25835 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -140,6 +141,7 @@ static const char *cpu_name; static const char *machine_name; static char __initdata cmd_line[COMMAND_LINE_SIZE]; struct machine_desc *machine_desc __initdata; +struct arm_soc_desc *soc_desc; static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } }; @@ -909,6 +911,9 @@ void __init setup_arch(char **cmdline_p) mdesc = setup_machine_tags(machine_arch_type); machine_desc = mdesc; machine_name = mdesc->name; + soc_desc = mdesc->soc; + if (soc_desc && soc_desc->name) + pr_info("SoC: %s\n", soc_desc->name); if (mdesc->soft_reboot) reboot_setup("s"); -- 1.7.0.4