c5783af354
As done for other sections, define the extern as a character array,
which relaxes many of the compiler-time object size checks, which would
otherwise assume it's a single long. Solves the following build error:
arch/sh/kernel/machvec.c: error: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Werror=array-bounds]: => 105:33
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/lkml/alpine.DEB.2.22.394.2209050944290.964530@ramsan.of.borg/
Fixes: 9655ad03af ("sh: Fixup machvec support.")
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Acked-by: Rich Felker <dalias@libc.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
123 lines
2.8 KiB
C
123 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* arch/sh/kernel/machvec.c
|
|
*
|
|
* The SuperH machine vector setup handlers, yanked from setup.c
|
|
*
|
|
* Copyright (C) 1999 Niibe Yutaka
|
|
* Copyright (C) 2002 - 2007 Paul Mundt
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/string.h>
|
|
#include <asm/machvec.h>
|
|
#include <asm/sections.h>
|
|
#include <asm/addrspace.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/processor.h>
|
|
|
|
#define MV_NAME_SIZE 32
|
|
|
|
#define for_each_mv(mv) \
|
|
for ((mv) = (struct sh_machine_vector *)__machvec_start; \
|
|
(mv) && (unsigned long)(mv) < (unsigned long)__machvec_end; \
|
|
(mv)++)
|
|
|
|
static struct sh_machine_vector * __init get_mv_byname(const char *name)
|
|
{
|
|
struct sh_machine_vector *mv;
|
|
|
|
for_each_mv(mv)
|
|
if (strcasecmp(name, mv->mv_name) == 0)
|
|
return mv;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static unsigned int __initdata machvec_selected;
|
|
|
|
static int __init early_parse_mv(char *from)
|
|
{
|
|
char mv_name[MV_NAME_SIZE] = "";
|
|
char *mv_end;
|
|
char *mv_comma;
|
|
int mv_len;
|
|
struct sh_machine_vector *mvp;
|
|
|
|
mv_end = strchr(from, ' ');
|
|
if (mv_end == NULL)
|
|
mv_end = from + strlen(from);
|
|
|
|
mv_comma = strchr(from, ',');
|
|
mv_len = mv_end - from;
|
|
if (mv_len > (MV_NAME_SIZE-1))
|
|
mv_len = MV_NAME_SIZE-1;
|
|
memcpy(mv_name, from, mv_len);
|
|
mv_name[mv_len] = '\0';
|
|
from = mv_end;
|
|
|
|
machvec_selected = 1;
|
|
|
|
/* Boot with the generic vector */
|
|
if (strcmp(mv_name, "generic") == 0)
|
|
return 0;
|
|
|
|
mvp = get_mv_byname(mv_name);
|
|
if (unlikely(!mvp)) {
|
|
pr_info("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
|
|
for_each_mv(mvp)
|
|
pr_cont("'%s', ", mvp->mv_name);
|
|
pr_cont("\n\n");
|
|
panic("Failed to select machvec '%s' -- halting.\n",
|
|
mv_name);
|
|
} else
|
|
sh_mv = *mvp;
|
|
|
|
return 0;
|
|
}
|
|
early_param("sh_mv", early_parse_mv);
|
|
|
|
void __init sh_mv_setup(void)
|
|
{
|
|
/*
|
|
* Only overload the machvec if one hasn't been selected on
|
|
* the command line with sh_mv=
|
|
*/
|
|
if (!machvec_selected) {
|
|
unsigned long machvec_size;
|
|
|
|
machvec_size = ((unsigned long)__machvec_end -
|
|
(unsigned long)__machvec_start);
|
|
|
|
/*
|
|
* Sanity check for machvec section alignment. Ensure
|
|
* __initmv hasn't been misused.
|
|
*/
|
|
if (machvec_size % sizeof(struct sh_machine_vector))
|
|
panic("machvec misaligned, invalid __initmv use?");
|
|
|
|
/*
|
|
* If the machvec hasn't been preselected, use the first
|
|
* vector (usually the only one) from .machvec.init.
|
|
*/
|
|
if (machvec_size >= sizeof(struct sh_machine_vector))
|
|
sh_mv = *(struct sh_machine_vector *)__machvec_start;
|
|
}
|
|
|
|
pr_notice("Booting machvec: %s\n", get_system_type());
|
|
|
|
/*
|
|
* Manually walk the vec, fill in anything that the board hasn't yet
|
|
* by hand, wrapping to the generic implementation.
|
|
*/
|
|
#define mv_set(elem) do { \
|
|
if (!sh_mv.mv_##elem) \
|
|
sh_mv.mv_##elem = generic_##elem; \
|
|
} while (0)
|
|
|
|
mv_set(irq_demux);
|
|
mv_set(mode_pins);
|
|
mv_set(mem_init);
|
|
}
|