mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-12-30 02:20:48 +00:00
8c4421759d
Even when CONFIG_RESTRICTED_CONSOLE_COMMANDS is enabled, there are many commands that can't do anything dangerous. This marks some of those commands as safe to use, even when restrictions are enforced. I'm only marking commands that are used by the Cr50, since that's the only board that has restrictions. BUG=chrome-os-partner:55322 BRANCH=none TEST=make buildall, test on Cr50 hardware Change-Id: I6289d332830175b6adcb6b20cb4c21d01d27a25e Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/376188 Reviewed-by: Randall Spangler <rspangler@chromium.org>
152 lines
3.6 KiB
C
152 lines
3.6 KiB
C
/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
/* Console output module for Chrome EC */
|
|
|
|
#include "console.h"
|
|
#include "uart.h"
|
|
#include "usb_console.h"
|
|
#include "util.h"
|
|
|
|
/* Default to all channels active */
|
|
#ifndef CC_DEFAULT
|
|
#define CC_DEFAULT CC_ALL
|
|
#endif
|
|
static uint32_t channel_mask = CC_DEFAULT;
|
|
static uint32_t channel_mask_saved = CC_DEFAULT;
|
|
|
|
/*
|
|
* List of channel names;
|
|
*
|
|
* We could try to get clever with #ifdefs or board-specific lists of channel
|
|
* names, so that for example boards without port80 support don't waste binary
|
|
* size on the channel name string for "port80". Pruning the channel list
|
|
* might also become more important if we have >32 channels - for example, if
|
|
* we decide to replace enum console_channel with enum module_id.
|
|
*/
|
|
static const char * const channel_names[] = {
|
|
#define CONSOLE_CHANNEL(enumeration, string) string,
|
|
#include "include/console_channel.inc"
|
|
#undef CONSOLE_CHANNEL
|
|
};
|
|
BUILD_ASSERT(ARRAY_SIZE(channel_names) == CC_CHANNEL_COUNT);
|
|
/* ensure that we are not silently masking additional channels */
|
|
BUILD_ASSERT(CC_CHANNEL_COUNT <= 8*sizeof(uint32_t));
|
|
|
|
/*****************************************************************************/
|
|
/* Channel-based console output */
|
|
|
|
int cputs(enum console_channel channel, const char *outstr)
|
|
{
|
|
int rv1, rv2;
|
|
|
|
/* Filter out inactive channels */
|
|
if (!(CC_MASK(channel) & channel_mask))
|
|
return EC_SUCCESS;
|
|
|
|
rv1 = usb_puts(outstr);
|
|
rv2 = uart_puts(outstr);
|
|
|
|
return rv1 == EC_SUCCESS ? rv2 : rv1;
|
|
}
|
|
|
|
int cprintf(enum console_channel channel, const char *format, ...)
|
|
{
|
|
int rv1, rv2;
|
|
va_list args;
|
|
|
|
/* Filter out inactive channels */
|
|
if (!(CC_MASK(channel) & channel_mask))
|
|
return EC_SUCCESS;
|
|
|
|
usb_va_start(args, format);
|
|
rv1 = usb_vprintf(format, args);
|
|
usb_va_end(args);
|
|
|
|
va_start(args, format);
|
|
rv2 = uart_vprintf(format, args);
|
|
va_end(args);
|
|
|
|
return rv1 == EC_SUCCESS ? rv2 : rv1;
|
|
}
|
|
|
|
int cprints(enum console_channel channel, const char *format, ...)
|
|
{
|
|
int r, rv;
|
|
va_list args;
|
|
|
|
/* Filter out inactive channels */
|
|
if (!(CC_MASK(channel) & channel_mask))
|
|
return EC_SUCCESS;
|
|
|
|
rv = cprintf(channel, "[%T ");
|
|
|
|
va_start(args, format);
|
|
r = uart_vprintf(format, args);
|
|
if (r)
|
|
rv = r;
|
|
va_end(args);
|
|
|
|
usb_va_start(args, format);
|
|
r = usb_vprintf(format, args);
|
|
if (r)
|
|
rv = r;
|
|
usb_va_end(args);
|
|
|
|
r = cputs(channel, "]\n");
|
|
return r ? r : rv;
|
|
}
|
|
|
|
void cflush(void)
|
|
{
|
|
uart_flush_output();
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
/* Console commands */
|
|
|
|
/* Set active channels */
|
|
static int command_ch(int argc, char **argv)
|
|
{
|
|
int i;
|
|
char *e;
|
|
|
|
/* If one arg, save / restore, or set the mask */
|
|
if (argc == 2) {
|
|
if (strcasecmp(argv[1], "save") == 0) {
|
|
channel_mask_saved = channel_mask;
|
|
return EC_SUCCESS;
|
|
} else if (strcasecmp(argv[1], "restore") == 0) {
|
|
channel_mask = channel_mask_saved;
|
|
return EC_SUCCESS;
|
|
|
|
} else {
|
|
/* Set the mask */
|
|
int m = strtoi(argv[1], &e, 0);
|
|
if (*e)
|
|
return EC_ERROR_PARAM1;
|
|
|
|
/* No disabling the command output channel */
|
|
channel_mask = m | CC_MASK(CC_COMMAND);
|
|
|
|
return EC_SUCCESS;
|
|
}
|
|
}
|
|
|
|
/* Print the list of channels */
|
|
ccputs(" # Mask E Channel\n");
|
|
for (i = 0; i < CC_CHANNEL_COUNT; i++) {
|
|
ccprintf("%2d %08x %c %s\n",
|
|
i, CC_MASK(i),
|
|
(channel_mask & CC_MASK(i)) ? '*' : ' ',
|
|
channel_names[i]);
|
|
cflush();
|
|
}
|
|
return EC_SUCCESS;
|
|
};
|
|
DECLARE_SAFE_CONSOLE_COMMAND(chan, command_ch,
|
|
"[ save | restore | <mask> ]",
|
|
"Save, restore, get or set console channel mask");
|