github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-13 12:59:45 +00:00
Code Issues Projects Releases Wiki Activity

HV: refine cmdline code, move parts into dbg_cmd

Browse Source 
move the debug related command handle into debug/dbg_cmd.c;
so release build will not include that.

Tracked-On: #2170
Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Minggui Cao
2018-12-26 16:39:35 +08:00
committed by wenlingz
parent a5ca305cf6
commit 7ebc4877c8
5 changed files with 79 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
hypervisor/bsp/uefi/cmdline.c
View File

@@ -7,67 +7,8 @@
#include <hypervisor.h>
#include <multiboot.h>
#define MAX_PORT 0x10000 /* port 0 - 64K */
#define DEFAULT_UART_PORT 0x3F8
#define ACRN_DBG_PARSE 6
#define MAX_CMD_LEN 64
static const char * const cmd_list[] = {
"uart=disabled", /* to disable uart */
"uart=port@", /* like uart=port@0x3F8 */
"uart=bdf@", /*like: uart=bdf@0:18.2, it is for ttyS2 */
/* format: vuart=ttySx@irqN, like vuart=ttyS1@irq6; better to unify
* uart & vuart & SOS console the same one, and irq same with the native.
* ttySx range (0-3), irqN (0-255)
*/
"vuart=ttyS",
};
enum IDX_CMD {
IDX_DISABLE_UART,
IDX_PORT_UART,
IDX_PCI_UART,
IDX_SET_VUART,
IDX_MAX_CMD,
};
static void handle_cmd(const char *cmd, int32_t len)
{
int32_t i;
for (i = 0; i < IDX_MAX_CMD; i++) {
int32_t tmp = strnlen_s(cmd_list[i], MAX_CMD_LEN);
/*cmd prefix should be same with one in cmd_list */
if (len < tmp)
continue;
if (strncmp(cmd_list[i], cmd, tmp) != 0)
continue;
if (i == IDX_DISABLE_UART) {
/* set uart disabled*/
uart16550_set_property(false, false, 0UL);
} else if (i == IDX_PORT_UART) {
uint64_t addr = strtoul_hex(cmd + tmp);
if (addr > MAX_PORT) {
addr = DEFAULT_UART_PORT;
}
uart16550_set_property(true, true, addr);
} else if (i == IDX_PCI_UART) {
uart16550_set_property(true, false, (uint64_t)(cmd+tmp));
} else if (i == IDX_SET_VUART) {
vuart_set_property(cmd+tmp);
}
}
}
int32_t parse_hv_cmdline(void)
{
const char *start;
@@ -98,7 +39,9 @@ int32_t parse_hv_cmdline(void)
while (*end != ' ' && *end)
end++;
handle_cmd(start, end - start);
if (!handle_dbg_cmd(start, end - start)) {
/* if not handled by handle_dbg_cmd, it can be handled further */
}
start = end + 1;
} while (*end && *start);