Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 487d70d0b8bd1c70d099a7526077ffefee412050

Authored by Gabor Juhos
Committed by Ralf Baechle
1 parent 0bec405e8e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

MIPS: Add generic support for multiple machines within a single kernel 

This patch adds a generic solution to support multiple machines based on
a given SoC within a single kernel image. It is implemented already for
several other architectures but MIPS has no generic support for that yet.

[Ralf: This competes with DT but DT is a much more complex solution and this
code has been used by OpenWRT for a long time so for now DT is a bad reason
to stop the merge but longer term this should be migrated to DT.]

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: kaloz@openwrt.org
Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
Cc: Cliff Holden <Cliff.Holden@Atheros.com>
Patchwork: https://patchwork.linux-mips.org/patch/1814/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Showing 6 changed files with 157 additions and 1 deletions Side-by-side Diff

... ... @@ -883,6 +883,9 @@
883 883 config SYNC_R4K
884 884 bool
885 885  
  886 +config MIPS_MACHINE
  887 + def_bool n
  888 +
886 889 config NO_IOPORT
887 890 def_bool n
888 891  
arch/mips/include/asm/mips_machine.h
Diff comments   View file @ 487d70d
  1 +/*
  2 + * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify it
  5 + * under the terms of the GNU General Public License version 2 as published
  6 + * by the Free Software Foundation.
  7 + *
  8 + */
  9 +
  10 +#ifndef __ASM_MIPS_MACHINE_H
  11 +#define __ASM_MIPS_MACHINE_H
  12 +
  13 +#include <linux/init.h>
  14 +#include <linux/stddef.h>
  15 +
  16 +#include <asm/bootinfo.h>
  17 +
  18 +struct mips_machine {
  19 + unsigned long mach_type;
  20 + const char *mach_id;
  21 + const char *mach_name;
  22 + void (*mach_setup)(void);
  23 +};
  24 +
  25 +#define MIPS_MACHINE(_type, _id, _name, _setup) \
  26 +static const char machine_name_##_type[] __initconst \
  27 + __aligned(1) = _name; \
  28 +static const char machine_id_##_type[] __initconst \
  29 + __aligned(1) = _id; \
  30 +static struct mips_machine machine_##_type \
  31 + __used __section(.mips.machines.init) = \
  32 +{ \
  33 + .mach_type = _type, \
  34 + .mach_id = machine_id_##_type, \
  35 + .mach_name = machine_name_##_type, \
  36 + .mach_setup = _setup, \
  37 +};
  38 +
  39 +extern long __mips_machines_start;
  40 +extern long __mips_machines_end;
  41 +
  42 +#ifdef CONFIG_MIPS_MACHINE
  43 +int mips_machtype_setup(char *id) __init;
  44 +void mips_machine_setup(void) __init;
  45 +void mips_set_machine_name(const char *name) __init;
  46 +char *mips_get_machine_name(void);
  47 +#else
  48 +static inline int mips_machtype_setup(char *id) { return 1; }
  49 +static inline void mips_machine_setup(void) { }
  50 +static inline void mips_set_machine_name(const char *name) { }
  51 +static inline char *mips_get_machine_name(void) { return NULL; }
  52 +#endif /* CONFIG_MIPS_MACHINE */
  53 +
  54 +#endif /* __ASM_MIPS_MACHINE_H */
arch/mips/kernel/Makefile
Diff comments   View file @ 487d70d
... ... @@ -95,6 +95,7 @@
95 95 obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
96 96 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
97 97 obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
  98 +obj-$(CONFIG_MIPS_MACHINE) += mips_machine.o
98 99  
99 100 obj-$(CONFIG_OF) += prom.o
100 101  
arch/mips/kernel/mips_machine.c
Diff comments   View file @ 487d70d
  1 +/*
  2 + * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify it
  5 + * under the terms of the GNU General Public License version 2 as published
  6 + * by the Free Software Foundation.
  7 + *
  8 + */
  9 +#include <linux/mm.h>
  10 +#include <linux/string.h>
  11 +#include <linux/slab.h>
  12 +
  13 +#include <asm/mips_machine.h>
  14 +
  15 +static struct mips_machine *mips_machine __initdata;
  16 +static char *mips_machine_name = "Unknown";
  17 +
  18 +#define for_each_machine(mach) \
  19 + for ((mach) = (struct mips_machine *)&__mips_machines_start; \
  20 + (mach) && \
  21 + (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
  22 + (mach)++)
  23 +
  24 +__init void mips_set_machine_name(const char *name)
  25 +{
  26 + char *p;
  27 +
  28 + if (name == NULL)
  29 + return;
  30 +
  31 + p = kstrdup(name, GFP_KERNEL);
  32 + if (!p)
  33 + pr_err("MIPS: no memory for machine_name\n");
  34 +
  35 + mips_machine_name = p;
  36 +}
  37 +
  38 +char *mips_get_machine_name(void)
  39 +{
  40 + return mips_machine_name;
  41 +}
  42 +
  43 +__init int mips_machtype_setup(char *id)
  44 +{
  45 + struct mips_machine *mach;
  46 +
  47 + for_each_machine(mach) {
  48 + if (mach->mach_id == NULL)
  49 + continue;
  50 +
  51 + if (strcmp(mach->mach_id, id) == 0) {
  52 + mips_machtype = mach->mach_type;
  53 + return 0;
  54 + }
  55 + }
  56 +
  57 + pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
  58 + pr_err("%-24s %s\n", "id", "name");
  59 + for_each_machine(mach)
  60 + pr_err("%-24s %s\n", mach->mach_id, mach->mach_name);
  61 +
  62 + return 1;
  63 +}
  64 +
  65 +__setup("machtype=", mips_machtype_setup);
  66 +
  67 +__init void mips_machine_setup(void)
  68 +{
  69 + struct mips_machine *mach;
  70 +
  71 + for_each_machine(mach) {
  72 + if (mips_machtype == mach->mach_type) {
  73 + mips_machine = mach;
  74 + break;
  75 + }
  76 + }
  77 +
  78 + if (!mips_machine)
  79 + return;
  80 +
  81 + mips_set_machine_name(mips_machine->mach_name);
  82 + pr_info("MIPS: machine is %s\n", mips_machine_name);
  83 +
  84 + if (mips_machine->mach_setup)
  85 + mips_machine->mach_setup();
  86 +}
arch/mips/kernel/proc.c
Diff comments   View file @ 487d70d
... ... @@ -12,6 +12,7 @@
12 12 #include <asm/cpu-features.h>
13 13 #include <asm/mipsregs.h>
14 14 #include <asm/processor.h>
  15 +#include <asm/mips_machine.h>
15 16  
16 17 unsigned int vced_count, vcei_count;
17 18  
18 19  
... ... @@ -31,8 +32,12 @@
31 32 /*
32 33 * For the first processor also print the system type
33 34 */
34   - if (n == 0)
  35 + if (n == 0) {
35 36 seq_printf(m, "system type\t\t: %s\n", get_system_type());
  37 + if (mips_get_machine_name())
  38 + seq_printf(m, "machine\t\t\t: %s\n",
  39 + mips_get_machine_name());
  40 + }
36 41  
37 42 seq_printf(m, "processor\t\t: %ld\n", n);
38 43 sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
arch/mips/kernel/vmlinux.lds.S
Diff comments   View file @ 487d70d
... ... @@ -98,6 +98,13 @@
98 98 INIT_TEXT_SECTION(PAGE_SIZE)
99 99 INIT_DATA_SECTION(16)
100 100  
  101 + . = ALIGN(4);
  102 + .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
  103 + __mips_machines_start = .;
  104 + *(.mips.machines.init)
  105 + __mips_machines_end = .;
  106 + }
  107 +
101 108 /* .exit.text is discarded at runtime, not link time, to deal with
102 109 * references from .rodata
103 110 */