mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-26 04:53:42 +00:00
54841ab50c
The hush shell dynamically allocates (and re-allocates) memory for the
argument strings in the "char *argv[]" argument vector passed to
commands. Any code that modifies these pointers will cause serious
corruption of the malloc data structures and crash U-Boot, so make
sure the compiler can check that no such modifications are being done
by changing the code into "char * const argv[]".
This modification is the result of debugging a strange crash caused
after adding a new command, which used the following argument
processing code which has been working perfectly fine in all Unix
systems since version 6 - but not so in U-Boot:
int main (int argc, char **argv)
{
while (--argc > 0 && **++argv == '-') {
/* ====> */ while (*++*argv) {
switch (**argv) {
case 'd':
debug++;
break;
...
default:
usage ();
}
}
}
...
}
The line marked "====>" will corrupt the malloc data structures and
usually cause U-Boot to crash when the next command gets executed by
the shell. With the modification, the compiler will prevent this with
an
error: increment of read-only location '*argv'
N.B.: The code above can be trivially rewritten like this:
while (--argc > 0 && **++argv == '-') {
char *arg = *argv;
while (*++arg) {
switch (*arg) {
...
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
171 lines
3.9 KiB
C
171 lines
3.9 KiB
C
/*
|
|
* (C) Copyright 2003
|
|
* Martin Winistoerfer, martinwinistoerfer@gmx.ch.
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation,
|
|
*/
|
|
|
|
/*
|
|
* File: cpu.c
|
|
*
|
|
* Discription: Some cpu specific function for watchdog,
|
|
* cpu version test, clock setting ...
|
|
*
|
|
*/
|
|
|
|
|
|
#include <common.h>
|
|
#include <watchdog.h>
|
|
#include <command.h>
|
|
#include <mpc5xx.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
#if (defined(CONFIG_MPC555))
|
|
# define ID_STR "MPC555/556"
|
|
|
|
/*
|
|
* Check version of cpu with Processor Version Register (PVR)
|
|
*/
|
|
static int check_cpu_version (long clock, uint pvr, uint immr)
|
|
{
|
|
char buf[32];
|
|
/* The highest 16 bits should be 0x0002 for a MPC555/556 */
|
|
if ((pvr >> 16) == 0x0002) {
|
|
printf (" " ID_STR " Version %x", (pvr >> 16));
|
|
printf (" at %s MHz:", strmhz (buf, clock));
|
|
} else {
|
|
printf ("Not supported cpu version");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_MPC555 */
|
|
|
|
|
|
/*
|
|
* Check version of mpc5xx
|
|
*/
|
|
int checkcpu (void)
|
|
{
|
|
ulong clock = gd->cpu_clk;
|
|
uint immr = get_immr (0); /* Return full IMMR contents */
|
|
uint pvr = get_pvr (); /* Retrieve PVR register */
|
|
|
|
puts ("CPU: ");
|
|
|
|
return check_cpu_version (clock, pvr, immr);
|
|
}
|
|
|
|
/*
|
|
* Called by macro WATCHDOG_RESET
|
|
*/
|
|
#if defined(CONFIG_WATCHDOG)
|
|
void watchdog_reset (void)
|
|
{
|
|
int re_enable = disable_interrupts ();
|
|
|
|
reset_5xx_watchdog ((immap_t *) CONFIG_SYS_IMMR);
|
|
if (re_enable)
|
|
enable_interrupts ();
|
|
}
|
|
|
|
/*
|
|
* Will clear software reset
|
|
*/
|
|
void reset_5xx_watchdog (volatile immap_t * immr)
|
|
{
|
|
/* Use the MPC5xx Internal Watchdog */
|
|
immr->im_siu_conf.sc_swsr = 0x556c; /* Prevent SW time-out */
|
|
immr->im_siu_conf.sc_swsr = 0xaa39;
|
|
}
|
|
|
|
#endif /* CONFIG_WATCHDOG */
|
|
|
|
|
|
/*
|
|
* Get timebase clock frequency
|
|
*/
|
|
unsigned long get_tbclk (void)
|
|
{
|
|
volatile immap_t *immr = (volatile immap_t *) CONFIG_SYS_IMMR;
|
|
ulong oscclk, factor;
|
|
|
|
if (immr->im_clkrst.car_sccr & SCCR_TBS) {
|
|
return (gd->cpu_clk / 16);
|
|
}
|
|
|
|
factor = (((CONFIG_SYS_PLPRCR) & PLPRCR_MF_MSK) >> PLPRCR_MF_SHIFT) + 1;
|
|
|
|
oscclk = gd->cpu_clk / factor;
|
|
|
|
if ((immr->im_clkrst.car_sccr & SCCR_RTSEL) == 0 || factor > 2) {
|
|
return (oscclk / 4);
|
|
}
|
|
return (oscclk / 16);
|
|
}
|
|
|
|
void dcache_enable (void)
|
|
{
|
|
return;
|
|
}
|
|
|
|
void dcache_disable (void)
|
|
{
|
|
return;
|
|
}
|
|
|
|
int dcache_status (void)
|
|
{
|
|
return 0; /* always off */
|
|
}
|
|
|
|
/*
|
|
* Reset board
|
|
*/
|
|
int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
#if defined(CONFIG_PATI)
|
|
volatile ulong *addr = (ulong *) CONFIG_SYS_RESET_ADDRESS;
|
|
*addr = 1;
|
|
#else
|
|
ulong addr;
|
|
|
|
/* Interrupts off, enable reset */
|
|
__asm__ volatile (" mtspr 81, %r0 \n\t"
|
|
" mfmsr %r3 \n\t"
|
|
" rlwinm %r31,%r3,0,25,23\n\t"
|
|
" mtmsr %r31 \n\t");
|
|
/*
|
|
* Trying to execute the next instruction at a non-existing address
|
|
* should cause a machine check, resulting in reset
|
|
*/
|
|
#ifdef CONFIG_SYS_RESET_ADDRESS
|
|
addr = CONFIG_SYS_RESET_ADDRESS;
|
|
#else
|
|
/*
|
|
* note: when CONFIG_SYS_MONITOR_BASE points to a RAM address, CONFIG_SYS_MONITOR_BASE * - sizeof (ulong) is usually a valid address. Better pick an address
|
|
* known to be invalid on your system and assign it to CONFIG_SYS_RESET_ADDRESS.
|
|
* "(ulong)-1" used to be a good choice for many systems...
|
|
*/
|
|
addr = CONFIG_SYS_MONITOR_BASE - sizeof (ulong);
|
|
#endif
|
|
((void (*) (void)) addr) ();
|
|
#endif /* #if defined(CONFIG_PATI) */
|
|
return 1;
|
|
}
|