coreboot January 2011

coreboot@coreboot.org

65 participants
299 discussions

build service results for r6309
by repository service 28 Jan '11

28 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 6309 to the coreboot repository. This caused the following changes: Change Log: Eliminate a couple of 3-line functions that barely wrap *printf calls Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Build Log: Compilation of a-trend:atc-6220 has been fixed If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[PATCH] get USB debug console working in ROM stage
by Stefan Reinauer 28 Jan '11

28 Jan '11

See patch.

2 2

[commit] r6315 - in trunk/src: arch/x86/lib include include/console lib pc80
by repository service 28 Jan '11

28 Jan '11

Author: stepan Date: Fri Jan 28 09:05:54 2011 New Revision: 6315 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6315 Log: This patch gets usbdebug console working in romstage. - actually hook up usbdebug in printk/print_ for romstage - make usbdebug.c more similar to the Linux kernel version it was originally derived from. - increase retries and timing for usbdebug init (at least one chipset seems to need this) - src/pc80/usbdebug_serial.c is not needed - some small console cleanups Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Acked-by: Patrick Georgi <patrick.georgi(a)secunet.com> Deleted: trunk/src/pc80/usbdebug_serial.c Modified: trunk/src/arch/x86/lib/printk_init.c trunk/src/include/console/console.h trunk/src/include/usbdebug.h trunk/src/lib/Makefile.inc trunk/src/lib/usbdebug.c trunk/src/pc80/Makefile.inc Modified: trunk/src/arch/x86/lib/printk_init.c ============================================================================== --- trunk/src/arch/x86/lib/printk_init.c Fri Jan 28 08:56:39 2011 (r6314) +++ trunk/src/arch/x86/lib/printk_init.c Fri Jan 28 09:05:54 2011 (r6315) @@ -19,23 +19,30 @@ #include <console/console.h> #include <console/vtxprintf.h> +#if CONFIG_CONSOLE_SERIAL8250 #include <uart8250.h> - +#endif +#if CONFIG_USBDEBUG +#include <usbdebug.h> +#endif #if CONFIG_CONSOLE_NE2K #include <console/ne2k.h> #endif static void console_tx_byte(unsigned char byte) { -#if CONFIG_CONSOLE_NE2K -#ifdef __PRE_RAM__ - ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); -#endif -#endif if (byte == '\n') - uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r'); + console_tx_byte('\r'); +#if CONFIG_CONSOLE_SERIAL8250 uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); +#endif +#if CONFIG_USBDEBUG + usbdebug_tx_byte(byte); +#endif +#if CONFIG_CONSOLE_NE2K + ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); +#endif } int do_printk(int msg_level, const char *fmt, ...) Modified: trunk/src/include/console/console.h ============================================================================== --- trunk/src/include/console/console.h Fri Jan 28 08:56:39 2011 (r6314) +++ trunk/src/include/console/console.h Fri Jan 28 09:05:54 2011 (r6315) @@ -149,6 +149,7 @@ #define print_info_hex32(HEX) printk(BIOS_INFO, "%08x", (HEX)) #define print_debug_hex32(HEX) printk(BIOS_DEBUG, "%08x", (HEX)) #define print_spew_hex32(HEX) printk(BIOS_SPEW, "%08x", (HEX)) + #else /* __ROMCC__ */ @@ -357,9 +358,6 @@ #define print_spew_hex32(HEX) __console_tx_hex32(BIOS_SPEW, HEX) #endif -#endif - -#ifdef __ROMCC__ /* if included by romcc, include the sources, too. romcc can't use prototypes */ #include <console/console.c> #include <console/post.c> Modified: trunk/src/include/usbdebug.h ============================================================================== --- trunk/src/include/usbdebug.h Fri Jan 28 08:56:39 2011 (r6314) +++ trunk/src/include/usbdebug.h Fri Jan 28 09:05:54 2011 (r6315) @@ -27,22 +27,18 @@ void *ehci_caps; void *ehci_regs; void *ehci_debug; - unsigned devnum; - unsigned endpoint_out; - unsigned endpoint_in; + u32 devnum; + u32 endpoint_out; + u32 endpoint_in; }; int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size); int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size); -int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype, int request, - int value, int index, void *data, int size); -int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port); void set_ehci_base(unsigned ehci_base); -void set_ehci_debug(unsigned ehci_deug); +void set_ehci_debug(unsigned ehci_debug); unsigned get_ehci_debug(void); void set_debug_port(unsigned port); -void early_usbdebug_init(void); -void usbdebug_ram_tx_byte(unsigned char data); +int early_usbdebug_init(void); void usbdebug_tx_byte(unsigned char data); #endif Modified: trunk/src/lib/Makefile.inc ============================================================================== --- trunk/src/lib/Makefile.inc Fri Jan 28 08:56:39 2011 (r6314) +++ trunk/src/lib/Makefile.inc Fri Jan 28 09:05:54 2011 (r6315) @@ -26,8 +26,10 @@ #romstage-y += lzmadecode.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c + driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c +romstage-$(CONFIG_USBDEBUG) += usbdebug.c ramstage-$(CONFIG_USBDEBUG) += usbdebug.c ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c Modified: trunk/src/lib/usbdebug.c ============================================================================== --- trunk/src/lib/usbdebug.c Fri Jan 28 08:56:39 2011 (r6314) +++ trunk/src/lib/usbdebug.c Fri Jan 28 09:05:54 2011 (r6315) @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2006 Eric Biederman (ebiederm(a)xmission.com) + * Copyright (C) 2007 AMD * * 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 @@ -17,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#if !defined(__ROMCC__) +#include <stddef.h> #include <console/console.h> -#else -#if CONFIG_CACHE_AS_RAM==0 -#define printk(BIOS_DEBUG, fmt, arg...) do {} while(0) -#endif -#endif - #include <arch/io.h> +#include <arch/byteorder.h> #include <usb_ch9.h> #include <ehci.h> #include <usbdebug.h> +// Does not work if we want early printk to do usb debug, too.. +#define DBGP_DEBUG 0 +#if DBGP_DEBUG +# define dbgp_printk(fmt_arg...) printk(BIOS_DEBUG, fmt_arg) +#else +#define dbgp_printk(fmt_arg...) do {} while(0) +#endif + + #define USB_DEBUG_DEVNUM 127 #define DBGP_DATA_TOGGLE 0x8800 @@ -78,16 +83,18 @@ static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug) { - unsigned ctrl; + u32 ctrl; int loop = 0x100000; + do { ctrl = read32((unsigned long)&ehci_debug->control); /* Stop when the transaction is finished */ if (ctrl & DBGP_DONE) break; - } while(--loop>0); + } while (--loop > 0); - if (!loop) return -1000; + if (!loop) + return -1; /* Now that we have observed the completed transaction, * clear the done bit. @@ -96,15 +103,6 @@ return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl); } -static void dbgp_mdelay(int ms) -{ - int i; - while (ms--) { - for (i = 0; i < 1000; i++) - inb(0x80); - } -} - static void dbgp_breath(void) { /* Sleep to give the debug port a chance to breathe */ @@ -112,10 +110,10 @@ static int dbgp_wait_until_done(struct ehci_dbg_port *ehci_debug, unsigned ctrl) { - unsigned pids, lpid; + u32 pids, lpid; int ret; - int loop = 3; + retry: write32((unsigned long)&ehci_debug->control, ctrl | DBGP_GO); ret = dbgp_wait_until_complete(ehci_debug); @@ -133,7 +131,8 @@ /* If I get a NACK reissue the transmission */ if (lpid == USB_PID_NAK) { - if (--loop > 0) goto retry; + if (--loop > 0) + goto retry; } return ret; @@ -142,8 +141,9 @@ static void dbgp_set_data(struct ehci_dbg_port *ehci_debug, const void *buf, int size) { const unsigned char *bytes = buf; - unsigned lo, hi; + u32 lo, hi; int i; + lo = hi = 0; for (i = 0; i < 4 && i < size; i++) lo |= bytes[i] << (8*i); @@ -156,8 +156,9 @@ static void dbgp_get_data(struct ehci_dbg_port *ehci_debug, void *buf, int size) { unsigned char *bytes = buf; - unsigned lo, hi; + u32 lo, hi; int i; + lo = read32((unsigned long)&ehci_debug->data03); hi = read32((unsigned long)&ehci_debug->data47); for (i = 0; i < 4 && i < size; i++) @@ -166,10 +167,12 @@ bytes[i] = (hi >> (8*(i - 4))) & 0xff; } -static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug, unsigned devnum, unsigned endpoint, const char *bytes, int size) +static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug, + unsigned devnum, unsigned endpoint, const char *bytes, int size) { - unsigned pids, addr, ctrl; + u32 pids, addr, ctrl; int ret; + if (size > DBGP_MAX_PACKET) return -1; @@ -188,20 +191,20 @@ write32((unsigned long)&ehci_debug->pids, pids); ret = dbgp_wait_until_done(ehci_debug, ctrl); - if (ret < 0) { - return ret; - } + return ret; } int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size) { - return dbgp_bulk_write(dbg_info->ehci_debug, dbg_info->devnum, dbg_info->endpoint_out, bytes, size); + return dbgp_bulk_write(dbg_info->ehci_debug, dbg_info->devnum, + dbg_info->endpoint_out, bytes, size); } -static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum, unsigned endpoint, void *data, int size) +static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum, + unsigned endpoint, void *data, int size) { - unsigned pids, addr, ctrl; + u32 pids, addr, ctrl; int ret; if (size > DBGP_MAX_PACKET) @@ -222,34 +225,48 @@ ret = dbgp_wait_until_done(ehci_debug, ctrl); if (ret < 0) return ret; + if (size > ret) size = ret; dbgp_get_data(ehci_debug, data, size); return ret; } + int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size) { - return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum, dbg_info->endpoint_in, data, size); + return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum, + dbg_info->endpoint_in, data, size); +} + +#ifdef __PRE_RAM__ +static void dbgp_mdelay(int ms) +{ + int i; + + while (ms--) { + for (i = 0; i < 1000; i++) + inb(0x80); + } } -int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype, int request, - int value, int index, void *data, int size) +static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype, + int request, int value, int index, void *data, int size) { - unsigned pids, addr, ctrl; + u32 pids, addr, ctrl; struct usb_ctrlrequest req; int read; int ret; read = (requesttype & USB_DIR_IN) != 0; - if (size > (read?DBGP_MAX_PACKET:0)) + if (size > (read ? DBGP_MAX_PACKET:0)) return -1; /* Compute the control message */ req.bRequestType = requesttype; req.bRequest = request; - req.wValue = value; - req.wIndex = index; - req.wLength = size; + req.wValue = cpu_to_le16(value); + req.wIndex = cpu_to_le16(index); + req.wLength = cpu_to_le16(size); pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP); addr = DBGP_EPADDR(devnum, 0); @@ -275,8 +292,8 @@ static int ehci_reset_port(struct ehci_regs *ehci_regs, int port) { - unsigned portsc; - unsigned delay_time, delay_ms; + u32 portsc; + u32 delay_time, delay_ms; int loop; /* Reset the usb debug port */ @@ -308,23 +325,24 @@ /* Device went away? */ if (!(portsc & PORT_CONNECT)) - return -107;//-ENOTCONN; + return -1; //-ENOTCONN; /* bomb out completely if something weird happend */ if ((portsc & PORT_CSC)) - return -22;//-EINVAL; + return -2; //-EINVAL; /* If we've finished resetting, then break out of the loop */ if (!(portsc & PORT_RESET) && (portsc & PORT_PE)) return 0; } - return -16;//-EBUSY; + return -3; //-EBUSY; } -int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port) +static int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port) { - unsigned status; + u32 status; int ret, reps; + for (reps = 0; reps < 3; reps++) { dbgp_mdelay(100); status = read32((unsigned long)&ehci_regs->status); @@ -334,44 +352,33 @@ return 0; } } - return -107; //-ENOTCONN; + return -1; //-ENOTCONN; } -#define DBGP_DEBUG 1 -#if DBGP_DEBUG -# define dbgp_printk(fmt_arg...) printk(BIOS_DEBUG, fmt_arg) -#else -#define dbgp_printk(fmt_arg...) do {} while(0) -#endif - -#ifdef __PRE_RAM__ -static void usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info) +static int usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info) { struct ehci_caps *ehci_caps; struct ehci_regs *ehci_regs; struct ehci_dbg_port *ehci_debug; unsigned dbgp_endpoint_out; unsigned dbgp_endpoint_in; + struct usb_debug_descriptor dbgp_desc; - unsigned ctrl, devnum; - int ret; + u32 cmd, ctrl, status, portsc, hcs_params; + u32 debug_port, new_debug_port = 0, n_ports; + u32 devnum; + int ret, i; int loop; - - unsigned cmd, status, portsc, hcs_params, debug_port, n_ports, new_debug_port; - int i; - unsigned port_map_tried; - - unsigned playtimes = 3; + int port_map_tried; + int playtimes = 3; ehci_caps = (struct ehci_caps *)ehci_bar; - ehci_regs = (struct ehci_regs *)(ehci_bar + HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase))); + ehci_regs = (struct ehci_regs *)(ehci_bar + + HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase))); ehci_debug = (struct ehci_dbg_port *)(ehci_bar + offset); - info->ehci_debug = (void *)0; - new_debug_port = 0; - try_next_time: port_map_tried = 0; @@ -384,34 +391,36 @@ dbgp_printk("debug_port: %d\n", debug_port); dbgp_printk("n_ports: %d\n", n_ports); -#if 1 for (i = 1; i <= n_ports; i++) { portsc = read32((unsigned long)&ehci_regs->port_status[i-1]); dbgp_printk("PORTSC #%d: %08x\n", i, portsc); } -#endif - if(port_map_tried && (new_debug_port!=debug_port)) { + if(port_map_tried && (new_debug_port != debug_port)) { if(--playtimes) { set_debug_port(debug_port); goto try_next_time; } - return; + return -1; } + loop = 100; /* Reset the EHCI controller */ - loop = 10; cmd = read32((unsigned long)&ehci_regs->command); cmd |= CMD_RESET; write32((unsigned long)&ehci_regs->command, cmd); do { + dbgp_mdelay(10); cmd = read32((unsigned long)&ehci_regs->command); } while ((cmd & CMD_RESET) && (--loop > 0)); - if(!loop) + if(!loop) { dbgp_printk("Could not reset EHCI controller.\n"); - else + // on some systems it works without succeeding here. + // return -2; + } else { dbgp_printk("EHCI controller reset successfully.\n"); + } /* Claim ownership, but do not enable yet */ ctrl = read32((unsigned long)&ehci_debug->control); @@ -419,7 +428,7 @@ ctrl &= ~(DBGP_ENABLED | DBGP_INUSE); write32((unsigned long)&ehci_debug->control, ctrl); - /* Start the ehci running */ + /* Start EHCI controller */ cmd = read32((unsigned long)&ehci_regs->command); cmd &= ~(CMD_LRESET | CMD_IAAD | CMD_PSE | CMD_ASE | CMD_RESET); cmd |= CMD_RUN; @@ -431,12 +440,13 @@ /* Wait until the controller is no longer halted */ loop = 10; do { + dbgp_mdelay(10); status = read32((unsigned long)&ehci_regs->status); - } while ((status & STS_HALT) && (--loop>0)); + } while ((status & STS_HALT) && (--loop > 0)); if(!loop) { dbgp_printk("EHCI could not be started.\n"); - return; + return -3; } dbgp_printk("EHCI started.\n"); @@ -456,6 +466,7 @@ if ((ctrl & DBGP_CLAIM) != DBGP_CLAIM) { dbgp_printk("No device in EHCI debug port.\n"); write32((unsigned long)&ehci_debug->control, ctrl & ~DBGP_CLAIM); + ret = -4; goto err; } dbgp_printk("EHCI debug port enabled.\n"); @@ -478,10 +489,12 @@ } if (devnum > 127) { dbgp_printk("Could not find attached debug device.\n"); + ret = -5; goto err; } if (ret < 0) { dbgp_printk("Attached device is not a debug device.\n"); + ret = -6; goto err; } dbgp_endpoint_out = dbgp_desc.bDebugOutEndpoint; @@ -491,10 +504,11 @@ if (devnum != USB_DEBUG_DEVNUM) { ret = dbgp_control_msg(ehci_debug, devnum, USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE, - USB_REQ_SET_ADDRESS, USB_DEBUG_DEVNUM, 0, (void *)0, 0); + USB_REQ_SET_ADDRESS, USB_DEBUG_DEVNUM, 0, NULL, 0); if (ret < 0) { dbgp_printk("Could not move attached device to %d.\n", USB_DEBUG_DEVNUM); + ret = -7; goto err; } devnum = USB_DEBUG_DEVNUM; @@ -504,18 +518,19 @@ /* Enable the debug interface */ ret = dbgp_control_msg(ehci_debug, USB_DEBUG_DEVNUM, USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE, - USB_REQ_SET_FEATURE, USB_DEVICE_DEBUG_MODE, 0, (void *)0, 0); + USB_REQ_SET_FEATURE, USB_DEVICE_DEBUG_MODE, 0, NULL, 0); if (ret < 0) { dbgp_printk("Could not enable EHCI debug device.\n"); + ret = -8; goto err; } dbgp_printk("EHCI debug interface enabled.\n"); - /* Perform a small write to get the even/odd data state in sync - */ - ret = dbgp_bulk_write(ehci_debug, USB_DEBUG_DEVNUM, dbgp_endpoint_out, " ",1); + /* Perform a small write to get the even/odd data state in sync */ + ret = dbgp_bulk_write(ehci_debug, USB_DEBUG_DEVNUM, dbgp_endpoint_out, "USB\r\n",5); if (ret < 0) { dbgp_printk("dbgp_bulk_write failed: %d\n", ret); + ret = -9; goto err; } dbgp_printk("Test write done\n"); @@ -527,26 +542,50 @@ info->endpoint_out = dbgp_endpoint_out; info->endpoint_in = dbgp_endpoint_in; - return; + return 0; err: /* Things didn't work so remove my claim */ ctrl = read32((unsigned long)&ehci_debug->control); ctrl &= ~(DBGP_CLAIM | DBGP_OUT); write32((unsigned long)(unsigned long)&ehci_debug->control, ctrl); + //return ret; next_debug_port: - port_map_tried |= (1<<(debug_port-1)); - if(port_map_tried != ((1<<n_ports) -1)) { - new_debug_port = ((debug_port-1+1)%n_ports) + 1; + port_map_tried |= (1 << (debug_port - 1)); + new_debug_port = ((debug_port-1 + 1) % n_ports) + 1; + if (port_map_tried != ((1 << n_ports) - 1)) { set_debug_port(new_debug_port); goto try_next_port; } - if(--playtimes) { + if (--playtimes) { + //set_debug_port(new_debug_port); set_debug_port(debug_port); goto try_next_time; } + return -10; } -#endif +// **** This part is probably x86 specific and used by romstage.c **** // +int early_usbdebug_init(void) +{ + struct ehci_debug_info *dbg_info = (struct ehci_debug_info *) + (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info)); + + return usbdebug_init(CONFIG_EHCI_BAR, CONFIG_EHCI_DEBUG_OFFSET, dbg_info); +} + +void usbdebug_tx_byte(unsigned char data) +{ + struct ehci_debug_info *dbg_info; + + /* "Find" dbg_info structure in Cache */ + dbg_info = (struct ehci_debug_info *) + (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info)); + + if (dbg_info->ehci_debug) { + dbgp_bulk_write_x(dbg_info, (char*)&data, 1); + } +} +#endif Modified: trunk/src/pc80/Makefile.inc ============================================================================== --- trunk/src/pc80/Makefile.inc Fri Jan 28 08:56:39 2011 (r6314) +++ trunk/src/pc80/Makefile.inc Fri Jan 28 09:05:54 2011 (r6315) @@ -5,7 +5,6 @@ ramstage-y += keyboard.c romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c -romstage-$(CONFIG_USBDEBUG) += usbdebug_serial.c subdirs-y += vga $(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H)

1 0

build service results for r6308
by repository service 28 Jan '11

28 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 6308 to the coreboot repository. This caused the following changes: Change Log: No need to add varargs magic to a simple regex wrapper. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Build Log: Compilation of a-trend:atc-6220 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6308&device=atc-6220&vendo… If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6314 - in trunk/util/nvramtool: . accessors
by repository service 28 Jan '11

28 Jan '11

Author: oxygene Date: Fri Jan 28 08:56:39 2011 New Revision: 6314 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6314 Log: Separate CMOS layout from lbtable handling Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Added: trunk/util/nvramtool/accessors/layout-bin.c - copied, changed from r6313, trunk/util/nvramtool/lbtable.c Modified: trunk/util/nvramtool/Makefile trunk/util/nvramtool/lbtable.c trunk/util/nvramtool/lbtable.h Modified: trunk/util/nvramtool/Makefile ============================================================================== --- trunk/util/nvramtool/Makefile Fri Jan 28 08:54:11 2011 (r6313) +++ trunk/util/nvramtool/Makefile Fri Jan 28 08:56:39 2011 (r6314) @@ -30,7 +30,7 @@ CLI_OBJS = cli/nvramtool.o cli/opts.o OBJS = cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \ - hexdump.o input_file.o layout.o accessors/layout-text.o lbtable.o \ + hexdump.o input_file.o layout.o accessors/layout-text.o accessors/layout-bin.o lbtable.o \ reg_expr.o cbfs.o accessors/cmos-hw-unix.o accessors/cmos-mem.o OBJS += $(CLI_OBJS) Copied and modified: trunk/util/nvramtool/accessors/layout-bin.c (from r6313, trunk/util/nvramtool/lbtable.c) ============================================================================== --- trunk/util/nvramtool/lbtable.c Fri Jan 28 08:54:11 2011 (r6313, copy source) +++ trunk/util/nvramtool/accessors/layout-bin.c Fri Jan 28 08:56:39 2011 (r6314) @@ -41,35 +41,11 @@ #include "hexdump.h" #include "cbfs.h" -typedef void (*lbtable_print_fn_t) (const struct lb_record * rec); - -/* This structure represents an item in the coreboot table that may be - * displayed using the -l option. - */ -typedef struct { - uint32_t tag; - const char *name; - const char *description; - const char *nofound_msg; - lbtable_print_fn_t print_fn; -} lbtable_choice_t; - -typedef struct { - unsigned long start; /* address of first byte of memory range */ - unsigned long end; /* address of last byte of memory range */ -} mem_range_t; - -static const struct lb_header *lbtable_scan(unsigned long start, - unsigned long end, - int *bad_header_count, - int *bad_table_count); static void process_cmos_table(void); static void get_cmos_checksum_info(void); static void try_convert_checksum_layout(cmos_checksum_layout_t * layout); static void try_add_cmos_table_enum(cmos_enum_t * cmos_enum); static void try_add_cmos_table_entry(cmos_entry_t * cmos_entry); -static const struct lb_record *find_lbrec(uint32_t tag); -static const char *lbrec_tag_to_str(uint32_t tag); static const struct cmos_entries *first_cmos_table_entry(void); static const struct cmos_entries *next_cmos_table_entry(const struct cmos_entries *last); @@ -79,244 +55,13 @@ static const struct lb_record *first_cmos_rec(uint32_t tag); static const struct lb_record *next_cmos_rec(const struct lb_record *last, uint32_t tag); -static void memory_print_fn(const struct lb_record *rec); -static void mainboard_print_fn(const struct lb_record *rec); -static void cmos_opt_table_print_fn(const struct lb_record *rec); -static void print_option_record(const struct cmos_entries *cmos_entry); -static void print_enum_record(const struct cmos_enums *cmos_enum); -static void print_defaults_record(const struct cmos_defaults *cmos_defaults); -static void print_unknown_record(const struct lb_record *cmos_item); -static void option_checksum_print_fn(const struct lb_record *rec); -static void string_print_fn(const struct lb_record *rec); - -static const char memory_desc[] = - " This shows information about system memory.\n"; - -static const char mainboard_desc[] = - " This shows information about your mainboard.\n"; - -static const char version_desc[] = - " This shows coreboot version information.\n"; - -static const char extra_version_desc[] = - " This shows extra coreboot version information.\n"; - -static const char build_desc[] = " This shows coreboot build information.\n"; - -static const char compile_time_desc[] = - " This shows when coreboot was compiled.\n"; - -static const char compile_by_desc[] = " This shows who compiled coreboot.\n"; - -static const char compile_host_desc[] = - " This shows the name of the machine that compiled coreboot.\n"; - -static const char compile_domain_desc[] = - " This shows the domain name of the machine that compiled coreboot.\n"; - -static const char compiler_desc[] = - " This shows the name of the compiler used to build coreboot.\n"; - -static const char linker_desc[] = - " This shows the name of the linker used to build coreboot.\n"; - -static const char assembler_desc[] = - " This shows the name of the assembler used to build coreboot.\n"; - -static const char cmos_opt_table_desc[] = - " This does a low-level dump of the CMOS option table. The table " - "contains\n" - " information about the layout of the values that coreboot stores in\n" - " nonvolatile RAM.\n"; - -static const char option_checksum_desc[] = - " This shows the location of the CMOS checksum and the area over which it " - "is\n" " calculated.\n"; - -static const char generic_nofound_msg[] = - "%s: Item %s not found in coreboot table.\n"; - -static const char nofound_msg_cmos_opt_table[] = - "%s: Item %s not found in coreboot table. Apparently, the " - "coreboot installed on this system was built without specifying " - "CONFIG_HAVE_OPTION_TABLE.\n"; - -static const char nofound_msg_option_checksum[] = - "%s: Item %s not found in coreboot table. Apparently, you are " - "using coreboot v1.\n"; - -int fd; - -/* This is the number of items from the coreboot table that may be displayed - * using the -l option. - */ -#define NUM_LBTABLE_CHOICES 14 - -/* These represent the various items from the coreboot table that may be - * displayed using the -l option. - */ -static const lbtable_choice_t lbtable_choices[NUM_LBTABLE_CHOICES] = - { {LB_TAG_MEMORY, "memory", - memory_desc, generic_nofound_msg, - memory_print_fn}, -{LB_TAG_MAINBOARD, "mainboard", - mainboard_desc, generic_nofound_msg, - mainboard_print_fn}, -{LB_TAG_VERSION, "version", - version_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_EXTRA_VERSION, "extra_version", - extra_version_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_BUILD, "build", - build_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_COMPILE_TIME, "compile_time", - compile_time_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_COMPILE_BY, "compile_by", - compile_by_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_COMPILE_HOST, "compile_host", - compile_host_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_COMPILE_DOMAIN, "compile_domain", - compile_domain_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_COMPILER, "compiler", - compiler_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_LINKER, "linker", - linker_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_ASSEMBLER, "assembler", - assembler_desc, generic_nofound_msg, - string_print_fn}, -{LB_TAG_CMOS_OPTION_TABLE, "cmos_opt_table", - cmos_opt_table_desc, nofound_msg_cmos_opt_table, - cmos_opt_table_print_fn}, -{LB_TAG_OPTION_CHECKSUM, "option_checksum", - option_checksum_desc, nofound_msg_option_checksum, - option_checksum_print_fn} -}; - -/* The coreboot table resides in low physical memory, which we access using - * /dev/mem. These are ranges of physical memory that should be scanned for a - * coreboot table. - */ - -#define NUM_MEM_RANGES 2 - -static const mem_range_t mem_ranges[NUM_MEM_RANGES] = - { {0x00000000, 0x00000fff}, -{0x000f0000, 0x000fffff} -}; - -/* This is the number of bytes of physical memory to map, starting at physical - * address 0. This value must be large enough to contain all memory ranges - * specified in mem_ranges above plus the maximum possible size of the - * coreboot table (since the start of the table could potentially occur at - * the end of the last memory range). - */ -static const size_t BYTES_TO_MAP = (1024 * 1024); - -/* Pointer to low physical memory that we access by calling mmap() on - * /dev/mem. - */ -static const void *low_phys_mem; -static unsigned long low_phys_base = 0; - -/* Pointer to coreboot table. */ -static const struct lb_header *lbtable = NULL; /* The CMOS option table is located within the coreboot table. It tells us * where the CMOS parameters are located in the nonvolatile RAM. */ static const struct cmos_option_table *cmos_table = NULL; -static const hexdump_format_t format = - { 12, 4, " ", " | ", " ", " | ", '.' }; - -/**************************************************************************** - * vtophys - * - * Convert a virtual address to a physical address. 'vaddr' is a virtual - * address in the address space of the current process. It points to - * somewhere in the chunk of memory that we mapped by calling mmap() on - * /dev/mem. This macro converts 'vaddr' to a physical address. - ****************************************************************************/ -#define vtophys(vaddr) (((unsigned long) vaddr) - \ - ((unsigned long) low_phys_mem) + low_phys_base) - -/**************************************************************************** - * phystov - * - * Convert a physical address to a virtual address. 'paddr' is a physical - * address. This macro converts 'paddr' to a virtual address in the address - * space of the current process. The virtual to physical mapping was set up - * by calling mmap() on /dev/mem. - ****************************************************************************/ -#define phystov(paddr) (((unsigned long) low_phys_mem) + \ - ((unsigned long) paddr) - low_phys_base) - -/**************************************************************************** - * get_lbtable - * - * Find the coreboot table and set global variable lbtable to point to it. - ****************************************************************************/ -void get_lbtable(void) -{ - int i, bad_header_count, bad_table_count, bad_headers, bad_tables; - - if (lbtable != NULL) - return; - - /* The coreboot table is located in low physical memory, which may be - * conveniently accessed by calling mmap() on /dev/mem. - */ - - if ((fd = open("/dev/mem", O_RDONLY, 0)) < 0) { - fprintf(stderr, "%s: Can not open /dev/mem for reading: %s\n", - prog_name, strerror(errno)); - exit(1); - } - - if ((low_phys_mem = - mmap(NULL, BYTES_TO_MAP, PROT_READ, MAP_SHARED, fd, 0)) - == MAP_FAILED) { - fprintf(stderr, "%s: Failed to mmap /dev/mem: %s\n", prog_name, - strerror(errno)); - exit(1); - } - - bad_header_count = 0; - bad_table_count = 0; - - for (i = 0; i < NUM_MEM_RANGES; i++) { - lbtable = lbtable_scan(phystov(mem_ranges[i].start), - phystov(mem_ranges[i].end), - &bad_headers, &bad_tables); - - if (lbtable != NULL) - return; /* success: we found it! */ - - bad_header_count += bad_headers; - bad_table_count += bad_tables; - } - - fprintf(stderr, - "%s: coreboot table not found. coreboot does not appear to\n" - " be installed on this system. Scanning for the table " - "produced the\n" - " following results:\n\n" - " %d valid signatures were found with bad header " - "checksums.\n" - " %d valid headers were found with bad table " - "checksums.\n", prog_name, bad_header_count, bad_table_count); - exit(1); -} - -static void process_layout(void) +void process_layout(void) { if ((cmos_table) == NULL) { fprintf(stderr, @@ -331,248 +76,14 @@ get_cmos_checksum_info(); } -/**************************************************************************** - * get_layout_from_cmos_table - * - * Find the CMOS table which is stored within the coreboot table and set the - * global variable cmos_table to point to it. - ****************************************************************************/ -void get_layout_from_cmos_table(void) -{ - - get_lbtable(); - cmos_table = (const struct cmos_option_table *) - find_lbrec(LB_TAG_CMOS_OPTION_TABLE); - process_layout(); -} - void get_layout_from_cbfs_file(void) { - static struct lb_header header; - u32 len; + uint32_t len; cmos_table = cbfs_find_file("cmos_layout.bin", CBFS_COMPONENT_CMOS_LAYOUT, &len); - lbtable = &header; - header.header_bytes = (u32)cmos_table-(u32)lbtable; - header.table_bytes = ntohl(len); process_layout(); } /**************************************************************************** - * dump_lbtable - * - * Do a low-level dump of the coreboot table. - ****************************************************************************/ -void dump_lbtable(void) -{ - const char *p, *data; - uint32_t bytes_processed; - const struct lb_record *lbrec; - - p = ((const char *)lbtable) + lbtable->header_bytes; - printf("Coreboot table at physical address 0x%lx:\n" - " signature: 0x%x (ASCII: %c%c%c%c)\n" - " header_bytes: 0x%x (decimal: %d)\n" - " header_checksum: 0x%x (decimal: %d)\n" - " table_bytes: 0x%x (decimal: %d)\n" - " table_checksum: 0x%x (decimal: %d)\n" - " table_entries: 0x%x (decimal: %d)\n\n", - vtophys(lbtable), lbtable->signature32, - lbtable->signature[0], lbtable->signature[1], - lbtable->signature[2], lbtable->signature[3], - lbtable->header_bytes, lbtable->header_bytes, - lbtable->header_checksum, lbtable->header_checksum, - lbtable->table_bytes, lbtable->table_bytes, - lbtable->table_checksum, lbtable->table_checksum, - lbtable->table_entries, lbtable->table_entries); - - if ((lbtable->table_bytes == 0) != (lbtable->table_entries == 0)) { - printf - ("Inconsistent values for table_bytes and table_entries!!!\n" - "They should be either both 0 or both nonzero.\n"); - return; - } - - if (lbtable->table_bytes == 0) { - printf("The coreboot table is empty!!!\n"); - return; - } - - for (bytes_processed = 0;;) { - lbrec = (const struct lb_record *)&p[bytes_processed]; - printf(" %s record at physical address 0x%lx:\n" - " tag: 0x%x (decimal: %d)\n" - " size: 0x%x (decimal: %d)\n" - " data:\n", - lbrec_tag_to_str(lbrec->tag), vtophys(lbrec), lbrec->tag, - lbrec->tag, lbrec->size, lbrec->size); - - data = ((const char *)lbrec) + sizeof(*lbrec); - hexdump(data, lbrec->size - sizeof(*lbrec), vtophys(data), - stdout, &format); - - bytes_processed += lbrec->size; - - if (bytes_processed >= lbtable->table_bytes) - break; - - printf("\n"); - } -} - -/**************************************************************************** - * list_lbtable_choices - * - * List names and informational blurbs for items from the coreboot table - * that may be displayed using the -l option. - ****************************************************************************/ -void list_lbtable_choices(void) -{ - int i; - - for (i = 0;;) { - printf("%s:\n%s", - lbtable_choices[i].name, lbtable_choices[i].description); - - if (++i >= NUM_LBTABLE_CHOICES) - break; - - printf("\n"); - } -} - -/**************************************************************************** - * list_lbtable_item - * - * Show the coreboot table item specified by 'item'. - ****************************************************************************/ -void list_lbtable_item(const char item[]) -{ - int i; - const struct lb_record *rec; - - for (i = 0; i < NUM_LBTABLE_CHOICES; i++) { - if (strcmp(item, lbtable_choices[i].name) == 0) - break; - } - - if (i == NUM_LBTABLE_CHOICES) { - fprintf(stderr, "%s: Invalid coreboot table item %s.\n", - prog_name, item); - exit(1); - } - - if ((rec = find_lbrec(lbtable_choices[i].tag)) == NULL) { - fprintf(stderr, lbtable_choices[i].nofound_msg, prog_name, - lbtable_choices[i].name); - exit(1); - } - - lbtable_choices[i].print_fn(rec); -} - -/**************************************************************************** - * lbtable_scan - * - * Scan the chunk of memory specified by 'start' and 'end' for a coreboot - * table. The first 4 bytes of the table are marked by the signature - * { 'L', 'B', 'I', 'O' }. 'start' and 'end' indicate the addresses of the - * first and last bytes of the chunk of memory to be scanned. For instance, - * values of 0x10000000 and 0x1000ffff for 'start' and 'end' specify a 64k - * chunk of memory starting at address 0x10000000. 'start' and 'end' are - * virtual addresses in the address space of the current process. They - * represent a chunk of memory obtained by calling mmap() on /dev/mem. - * - * If a coreboot table is found, return a pointer to it. Otherwise return - * NULL. On return, *bad_header_count and *bad_table_count are set as - * follows: - * - * *bad_header_count: - * Indicates the number of times in which a valid signature was found - * but the header checksum was invalid. - * - * *bad_table_count: - * Indicates the number of times in which a header with a valid - * checksum was found but the table checksum was invalid. - ****************************************************************************/ -static const struct lb_header *lbtable_scan(unsigned long start, - unsigned long end, - int *bad_header_count, - int *bad_table_count) -{ - static const char signature[4] = { 'L', 'B', 'I', 'O' }; - const struct lb_header *table; - const struct lb_forward *forward; - const uint32_t *p; - uint32_t sig; - - assert(end >= start); - memcpy(&sig, signature, sizeof(sig)); - table = NULL; - *bad_header_count = 0; - *bad_table_count = 0; - - /* Look for signature. Table is aligned on 16-byte boundary. Therefore - * only check every fourth 32-bit memory word. As the loop is coded below, - * this function will behave in a reasonable manner for ALL possible values - * for 'start' and 'end': even weird boundary cases like 0x00000000 and - * 0xffffffff on a 32-bit architecture. - */ - for (p = (const uint32_t *)start; - (((unsigned long)p) <= end) && - ((end - (unsigned long)p) >= (sizeof(uint32_t) - 1)); p += 4) { - if (*p != sig) - continue; - - /* We found a valid signature. */ - table = (const struct lb_header *)p; - - /* validate header checksum */ - if (compute_ip_checksum((void *)table, sizeof(*table))) { - (*bad_header_count)++; - continue; - } - - /* validate table checksum */ - if (table->table_checksum != - compute_ip_checksum(((char *)table) + sizeof(*table), - table->table_bytes)) { - (*bad_table_count)++; - continue; - } - - /* checksums are ok: we found it! */ - /* But it may just be a forwarding table, so look if there's a forwarder */ - lbtable = table; - forward = (struct lb_forward *)find_lbrec(LB_TAG_FORWARD); - lbtable = NULL; - - if (forward) { - uint64_t new_phys = forward->forward; - - new_phys &= ~(getpagesize() - 1); - - munmap((void *)low_phys_mem, BYTES_TO_MAP); - if ((low_phys_mem = - mmap(NULL, BYTES_TO_MAP, PROT_READ, MAP_SHARED, fd, - (off_t) new_phys)) == MAP_FAILED) { - fprintf(stderr, - "%s: Failed to mmap /dev/mem: %s\n", - prog_name, strerror(errno)); - exit(1); - } - low_phys_base = new_phys; - table = - lbtable_scan(phystov(low_phys_base), - phystov(low_phys_base + BYTES_TO_MAP), - bad_header_count, bad_table_count); - } - return table; - } - - return NULL; -} - -/**************************************************************************** * process_cmos_table * * Extract layout information from the CMOS option table and store it in our @@ -646,11 +157,7 @@ cmos_checksum_layout_t layout; unsigned index, index2; - checksum = (struct cmos_checksum *)find_lbrec(LB_TAG_OPTION_CHECKSUM); - - if (checksum == NULL) { - checksum = (struct cmos_checksum *)next_cmos_rec((const struct lb_record *)first_cmos_table_enum(), LB_TAG_OPTION_CHECKSUM); - } + checksum = (struct cmos_checksum *)next_cmos_rec((const struct lb_record *)first_cmos_table_enum(), LB_TAG_OPTION_CHECKSUM); if (checksum != NULL) { /* We are lucky. The coreboot table hints us to the checksum. * We might have to check the type field here though. @@ -836,105 +343,6 @@ } /**************************************************************************** - * find_lbrec - * - * Find the record in the coreboot table that matches 'tag'. Return pointer - * to record on success or NULL if record not found. - ****************************************************************************/ -static const struct lb_record *find_lbrec(uint32_t tag) -{ - const char *p; - uint32_t bytes_processed; - const struct lb_record *lbrec; - - p = ((const char *)lbtable) + lbtable->header_bytes; - - for (bytes_processed = 0; - bytes_processed < lbtable->table_bytes; - bytes_processed += lbrec->size) { - lbrec = (const struct lb_record *)&p[bytes_processed]; - - if (lbrec->tag == tag) - return lbrec; - } - - return NULL; -} - -/**************************************************************************** - * lbrec_tag_to_str - * - * Return a pointer to the string representation of the given coreboot table - * tag. - ****************************************************************************/ -static const char *lbrec_tag_to_str(uint32_t tag) -{ - switch (tag) { - case LB_TAG_UNUSED: - return "UNUSED"; - - case LB_TAG_MEMORY: - return "MEMORY"; - - case LB_TAG_HWRPB: - return "HWRPB"; - - case LB_TAG_MAINBOARD: - return "MAINBOARD"; - - case LB_TAG_VERSION: - return "VERSION"; - - case LB_TAG_EXTRA_VERSION: - return "EXTRA_VERSION"; - - case LB_TAG_BUILD: - return "BUILD"; - - case LB_TAG_COMPILE_TIME: - return "COMPILE_TIME"; - - case LB_TAG_COMPILE_BY: - return "COMPILE_BY"; - - case LB_TAG_COMPILE_HOST: - return "COMPILE_HOST"; - - case LB_TAG_COMPILE_DOMAIN: - return "COMPILE_DOMAIN"; - - case LB_TAG_COMPILER: - return "COMPILER"; - - case LB_TAG_LINKER: - return "LINKER"; - - case LB_TAG_ASSEMBLER: - return "ASSEMBLER"; - - case LB_TAG_SERIAL: - return "SERIAL"; - - case LB_TAG_CONSOLE: - return "CONSOLE"; - - case LB_TAG_FORWARD: - return "FORWARD"; - - case LB_TAG_CMOS_OPTION_TABLE: - return "CMOS_OPTION_TABLE"; - - case LB_TAG_OPTION_CHECKSUM: - return "OPTION_CHECKSUM"; - - default: - break; - } - - return "UNKNOWN"; -} - -/**************************************************************************** * first_cmos_table_entry * * Return a pointer to the first entry in the CMOS table that represents a @@ -1050,275 +458,3 @@ return NULL; } -/**************************************************************************** - * memory_print_fn - * - * Display function for 'memory' item of coreboot table. - ****************************************************************************/ -static void memory_print_fn(const struct lb_record *rec) -{ - const struct lb_memory *p; - const char *mem_type; - const struct lb_memory_range *ranges; - uint64_t size, start, end; - int i, entries; - - p = (const struct lb_memory *)rec; - entries = (p->size - sizeof(*p)) / sizeof(p->map[0]); - ranges = p->map; - - if (entries == 0) { - printf("No memory ranges were found.\n"); - return; - } - - for (i = 0;;) { - switch (ranges[i].type) { - case LB_MEM_RAM: - mem_type = "AVAILABLE"; - break; - - case LB_MEM_RESERVED: - mem_type = "RESERVED"; - break; - - case LB_MEM_TABLE: - mem_type = "CONFIG_TABLE"; - break; - - default: - mem_type = "UNKNOWN"; - break; - } - - size = unpack_lb64(ranges[i].size); - start = unpack_lb64(ranges[i].start); - end = start + size - 1; - printf("%s memory:\n" - " from physical addresses 0x%016llx to 0x%016llx\n" - " size is 0x%016llx bytes (%lld in decimal)\n", - mem_type, start, end, size, - (unsigned long long)size); - - if (++i >= entries) - break; - - printf("\n"); - } -} - -/**************************************************************************** - * mainboard_print_fn - * - * Display function for 'mainboard' item of coreboot table. - ****************************************************************************/ -static void mainboard_print_fn(const struct lb_record *rec) -{ - const struct lb_mainboard *p; - - p = (const struct lb_mainboard *)rec; - printf("Vendor: %s\n" - "Part number: %s\n", - &p->strings[p->vendor_idx], &p->strings[p->part_number_idx]); -} - -/**************************************************************************** - * cmos_opt_table_print_fn - * - * Display function for 'cmos_opt_table' item of coreboot table. - ****************************************************************************/ -static void cmos_opt_table_print_fn(const struct lb_record *rec) -{ - const struct cmos_option_table *p; - const struct lb_record *cmos_item; - uint32_t bytes_processed, bytes_for_entries; - const char *q; - - p = (const struct cmos_option_table *)rec; - q = ((const char *)p) + p->header_length; - bytes_for_entries = p->size - p->header_length; - - printf("CMOS option table at physical address 0x%lx:\n" - " tag: 0x%x (decimal: %d)\n" - " size: 0x%x (decimal: %d)\n" - " header_length: 0x%x (decimal: %d)\n\n", - vtophys(p), p->tag, p->tag, p->size, p->size, p->header_length, - p->header_length); - - if (p->header_length > p->size) { - printf - ("Header length for CMOS option table is greater than the size " - "of the entire table including header!!!\n"); - return; - } - - if (bytes_for_entries == 0) { - printf("The CMOS option table is empty!!!\n"); - return; - } - - for (bytes_processed = 0;;) { - cmos_item = (const struct lb_record *)&q[bytes_processed]; - - switch (cmos_item->tag) { - case LB_TAG_OPTION: - print_option_record((const struct cmos_entries *) - cmos_item); - break; - - case LB_TAG_OPTION_ENUM: - print_enum_record((const struct cmos_enums *)cmos_item); - break; - - case LB_TAG_OPTION_DEFAULTS: - print_defaults_record((const struct cmos_defaults *) - cmos_item); - break; - - default: - print_unknown_record(cmos_item); - break; - } - - bytes_processed += cmos_item->size; - - if (bytes_processed >= bytes_for_entries) - break; - - printf("\n"); - } -} - -/**************************************************************************** - * print_option_record - * - * Display "option" record from CMOS option table. - ****************************************************************************/ -static void print_option_record(const struct cmos_entries *cmos_entry) -{ - static const size_t S_BUFSIZE = 80; - char s[S_BUFSIZE]; - - switch (cmos_entry->config) { - case 'e': - strcpy(s, "ENUM"); - break; - - case 'h': - strcpy(s, "HEX"); - break; - - case 'r': - strcpy(s, "RESERVED"); - break; - - default: - snprintf(s, S_BUFSIZE, "UNKNOWN: value is 0x%x (decimal: %d)", - cmos_entry->config, cmos_entry->config); - break; - } - - printf(" OPTION record at physical address 0x%lx:\n" - " tag: 0x%x (decimal: %d)\n" - " size: 0x%x (decimal: %d)\n" - " bit: 0x%x (decimal: %d)\n" - " length: 0x%x (decimal: %d)\n" - " config: %s\n" - " config_id: 0x%x (decimal: %d)\n" - " name: %s\n", - vtophys(cmos_entry), cmos_entry->tag, cmos_entry->tag, - cmos_entry->size, cmos_entry->size, cmos_entry->bit, - cmos_entry->bit, cmos_entry->length, cmos_entry->length, s, - cmos_entry->config_id, cmos_entry->config_id, cmos_entry->name); -} - -/**************************************************************************** - * print_enum_record - * - * Display "enum" record from CMOS option table. - ****************************************************************************/ -static void print_enum_record(const struct cmos_enums *cmos_enum) -{ - printf(" ENUM record at physical address 0x%lx:\n" - " tag: 0x%x (decimal: %d)\n" - " size: 0x%x (decimal: %d)\n" - " config_id: 0x%x (decimal: %d)\n" - " value: 0x%x (decimal: %d)\n" - " text: %s\n", - vtophys(cmos_enum), cmos_enum->tag, cmos_enum->tag, - cmos_enum->size, cmos_enum->size, cmos_enum->config_id, - cmos_enum->config_id, cmos_enum->value, cmos_enum->value, - cmos_enum->text); -} - -/**************************************************************************** - * print_defaults_record - * - * Display "defaults" record from CMOS option table. - ****************************************************************************/ -static void print_defaults_record(const struct cmos_defaults *cmos_defaults) -{ - printf(" DEFAULTS record at physical address 0x%lx:\n" - " tag: 0x%x (decimal: %d)\n" - " size: 0x%x (decimal: %d)\n" - " name_length: 0x%x (decimal: %d)\n" - " name: %s\n" - " default_set:\n", - vtophys(cmos_defaults), cmos_defaults->tag, cmos_defaults->tag, - cmos_defaults->size, cmos_defaults->size, - cmos_defaults->name_length, cmos_defaults->name_length, - cmos_defaults->name); - hexdump(cmos_defaults->default_set, CMOS_IMAGE_BUFFER_SIZE, - vtophys(cmos_defaults->default_set), stdout, &format); -} - -/**************************************************************************** - * print_unknown_record - * - * Display record of unknown type from CMOS option table. - ****************************************************************************/ -static void print_unknown_record(const struct lb_record *cmos_item) -{ - const char *data; - - printf(" UNKNOWN record at physical address 0x%lx:\n" - " tag: 0x%x (decimal: %d)\n" - " size: 0x%x (decimal: %d)\n" - " data:\n", - vtophys(cmos_item), cmos_item->tag, cmos_item->tag, - cmos_item->size, cmos_item->size); - data = ((const char *)cmos_item) + sizeof(*cmos_item); - hexdump(data, cmos_item->size - sizeof(*cmos_item), vtophys(data), - stdout, &format); -} - -/**************************************************************************** - * option_checksum_print_fn - * - * Display function for 'option_checksum' item of coreboot table. - ****************************************************************************/ -static void option_checksum_print_fn(const struct lb_record *rec) -{ - struct cmos_checksum *p; - - p = (struct cmos_checksum *)rec; - printf("CMOS checksum from bit %d to bit %d\n" - "at position %d is type %s.\n", - p->range_start, p->range_end, p->location, - (p->type == CHECKSUM_PCBIOS) ? "PC BIOS" : "NONE"); -} - -/**************************************************************************** - * string_print_fn - * - * Display function for a generic item of coreboot table that simply - * consists of a string. - ****************************************************************************/ -static void string_print_fn(const struct lb_record *rec) -{ - const struct lb_string *p; - - p = (const struct lb_string *)rec; - printf("%s\n", p->string); -} - Modified: trunk/util/nvramtool/lbtable.c ============================================================================== --- trunk/util/nvramtool/lbtable.c Fri Jan 28 08:54:11 2011 (r6313) +++ trunk/util/nvramtool/lbtable.c Fri Jan 28 08:56:39 2011 (r6314) @@ -63,22 +63,8 @@ unsigned long end, int *bad_header_count, int *bad_table_count); -static void process_cmos_table(void); -static void get_cmos_checksum_info(void); -static void try_convert_checksum_layout(cmos_checksum_layout_t * layout); -static void try_add_cmos_table_enum(cmos_enum_t * cmos_enum); -static void try_add_cmos_table_entry(cmos_entry_t * cmos_entry); static const struct lb_record *find_lbrec(uint32_t tag); static const char *lbrec_tag_to_str(uint32_t tag); -static const struct cmos_entries *first_cmos_table_entry(void); -static const struct cmos_entries *next_cmos_table_entry(const struct - cmos_entries *last); -static const struct cmos_enums *first_cmos_table_enum(void); -static const struct cmos_enums *next_cmos_table_enum - (const struct cmos_enums *last); -static const struct lb_record *first_cmos_rec(uint32_t tag); -static const struct lb_record *next_cmos_rec(const struct lb_record *last, - uint32_t tag); static void memory_print_fn(const struct lb_record *rec); static void mainboard_print_fn(const struct lb_record *rec); static void cmos_opt_table_print_fn(const struct lb_record *rec); @@ -316,21 +302,6 @@ exit(1); } -static void process_layout(void) -{ - if ((cmos_table) == NULL) { - fprintf(stderr, - "%s: CMOS option table not found in coreboot table. " - "Apparently, the coreboot installed on this system was " - "built without specifying CONFIG_HAVE_OPTION_TABLE.\n", - prog_name); - exit(1); - } - - process_cmos_table(); - get_cmos_checksum_info(); -} - /**************************************************************************** * get_layout_from_cmos_table * @@ -346,17 +317,6 @@ process_layout(); } -void get_layout_from_cbfs_file(void) -{ - static struct lb_header header; - u32 len; - cmos_table = cbfs_find_file("cmos_layout.bin", CBFS_COMPONENT_CMOS_LAYOUT, &len); - lbtable = &header; - header.header_bytes = (u32)cmos_table-(u32)lbtable; - header.table_bytes = ntohl(len); - process_layout(); -} - /**************************************************************************** * dump_lbtable * @@ -573,269 +533,6 @@ } /**************************************************************************** - * process_cmos_table - * - * Extract layout information from the CMOS option table and store it in our - * internal repository. - ****************************************************************************/ -static void process_cmos_table(void) -{ - const struct cmos_enums *p; - const struct cmos_entries *q; - cmos_enum_t cmos_enum; - cmos_entry_t cmos_entry; - - /* First add the enums. */ - for (p = first_cmos_table_enum(); p != NULL; - p = next_cmos_table_enum(p)) { - cmos_enum.config_id = p->config_id; - cmos_enum.value = p->value; - strncpy(cmos_enum.text, (char *)p->text, CMOS_MAX_TEXT_LENGTH); - cmos_enum.text[CMOS_MAX_TEXT_LENGTH] = '\0'; - try_add_cmos_table_enum(&cmos_enum); - } - - /* Now add the entries. We must add the entries after the enums because - * the entries are sanity checked against the enums as they are added. - */ - for (q = first_cmos_table_entry(); q != NULL; - q = next_cmos_table_entry(q)) { - cmos_entry.bit = q->bit; - cmos_entry.length = q->length; - - switch (q->config) { - case 'e': - cmos_entry.config = CMOS_ENTRY_ENUM; - break; - - case 'h': - cmos_entry.config = CMOS_ENTRY_HEX; - break; - - case 'r': - cmos_entry.config = CMOS_ENTRY_RESERVED; - break; - - case 's': - cmos_entry.config = CMOS_ENTRY_STRING; - break; - - default: - fprintf(stderr, - "%s: Entry in CMOS option table has unknown config " - "value.\n", prog_name); - exit(1); - } - - cmos_entry.config_id = q->config_id; - strncpy(cmos_entry.name, (char *)q->name, CMOS_MAX_NAME_LENGTH); - cmos_entry.name[CMOS_MAX_NAME_LENGTH] = '\0'; - try_add_cmos_table_entry(&cmos_entry); - } -} - -/**************************************************************************** - * get_cmos_checksum_info - * - * Get layout information for CMOS checksum. - ****************************************************************************/ -static void get_cmos_checksum_info(void) -{ - const cmos_entry_t *e; - struct cmos_checksum *checksum; - cmos_checksum_layout_t layout; - unsigned index, index2; - - checksum = (struct cmos_checksum *)find_lbrec(LB_TAG_OPTION_CHECKSUM); - - if (checksum == NULL) { - checksum = (struct cmos_checksum *)next_cmos_rec((const struct lb_record *)first_cmos_table_enum(), LB_TAG_OPTION_CHECKSUM); - } - - if (checksum != NULL) { /* We are lucky. The coreboot table hints us to the checksum. - * We might have to check the type field here though. - */ - layout.summed_area_start = checksum->range_start; - layout.summed_area_end = checksum->range_end; - layout.checksum_at = checksum->location; - try_convert_checksum_layout(&layout); - cmos_checksum_start = layout.summed_area_start; - cmos_checksum_end = layout.summed_area_end; - cmos_checksum_index = layout.checksum_at; - return; - } - - if ((e = find_cmos_entry(checksum_param_name)) == NULL) - return; - - /* If we get here, we are unlucky. The CMOS option table contains the - * location of the CMOS checksum. However, there is no information - * regarding which bytes of the CMOS area the checksum is computed over. - * Thus we have to hope our presets will be fine. - */ - - if (e->bit % 8) { - fprintf(stderr, - "%s: Error: CMOS checksum is not byte-aligned.\n", - prog_name); - exit(1); - } - - index = e->bit / 8; - index2 = index + 1; /* The CMOS checksum occupies 16 bits. */ - - if (verify_cmos_byte_index(index) || verify_cmos_byte_index(index2)) { - fprintf(stderr, - "%s: Error: CMOS checksum location out of range.\n", - prog_name); - exit(1); - } - - if (((index >= cmos_checksum_start) && (index <= cmos_checksum_end)) || - (((index2) >= cmos_checksum_start) - && ((index2) <= cmos_checksum_end))) { - fprintf(stderr, - "%s: Error: CMOS checksum overlaps checksummed area.\n", - prog_name); - exit(1); - } - - cmos_checksum_index = index; -} - -/**************************************************************************** - * try_convert_checksum_layout - * - * Perform sanity checking on CMOS checksum layout information and attempt to - * convert information from bit positions to byte positions. Return OK on - * success or an error code on failure. - ****************************************************************************/ -static void try_convert_checksum_layout(cmos_checksum_layout_t * layout) -{ - switch (checksum_layout_to_bytes(layout)) { - case OK: - return; - - case LAYOUT_SUMMED_AREA_START_NOT_ALIGNED: - fprintf(stderr, - "%s: CMOS checksummed area start is not byte-aligned.\n", - prog_name); - break; - - case LAYOUT_SUMMED_AREA_END_NOT_ALIGNED: - fprintf(stderr, - "%s: CMOS checksummed area end is not byte-aligned.\n", - prog_name); - break; - - case LAYOUT_CHECKSUM_LOCATION_NOT_ALIGNED: - fprintf(stderr, - "%s: CMOS checksum location is not byte-aligned.\n", - prog_name); - break; - - case LAYOUT_INVALID_SUMMED_AREA: - fprintf(stderr, - "%s: CMOS checksummed area end must be greater than " - "CMOS checksummed area start.\n", prog_name); - break; - - case LAYOUT_CHECKSUM_OVERLAPS_SUMMED_AREA: - fprintf(stderr, - "%s: CMOS checksum overlaps checksummed area.\n", - prog_name); - break; - - case LAYOUT_SUMMED_AREA_OUT_OF_RANGE: - fprintf(stderr, - "%s: CMOS checksummed area out of range.\n", prog_name); - break; - - case LAYOUT_CHECKSUM_LOCATION_OUT_OF_RANGE: - fprintf(stderr, - "%s: CMOS checksum location out of range.\n", - prog_name); - break; - - default: - BUG(); - } - - exit(1); -} - -/**************************************************************************** - * try_add_cmos_table_enum - * - * Attempt to add a CMOS enum to our internal repository. Exit with an error - * message on failure. - ****************************************************************************/ -static void try_add_cmos_table_enum(cmos_enum_t * cmos_enum) -{ - switch (add_cmos_enum(cmos_enum)) { - case OK: - return; - - case LAYOUT_DUPLICATE_ENUM: - fprintf(stderr, "%s: Duplicate enum %s found in CMOS option " - "table.\n", prog_name, cmos_enum->text); - break; - - default: - BUG(); - } - - exit(1); -} - -/**************************************************************************** - * try_add_cmos_table_entry - * - * Attempt to add a CMOS entry to our internal repository. Exit with an - * error message on failure. - ****************************************************************************/ -static void try_add_cmos_table_entry(cmos_entry_t * cmos_entry) -{ - const cmos_entry_t *conflict; - - switch (add_cmos_entry(cmos_entry, &conflict)) { - case OK: - return; - - case CMOS_AREA_OUT_OF_RANGE: - fprintf(stderr, - "%s: Bad CMOS option layout in CMOS option table entry " - "%s.\n", prog_name, cmos_entry->name); - break; - - case CMOS_AREA_TOO_WIDE: - fprintf(stderr, - "%s: Area too wide for CMOS option table entry %s.\n", - prog_name, cmos_entry->name); - break; - - case LAYOUT_ENTRY_OVERLAP: - fprintf(stderr, - "%s: CMOS option table entries %s and %s have overlapping " - "layouts.\n", prog_name, cmos_entry->name, - conflict->name); - break; - - case LAYOUT_ENTRY_BAD_LENGTH: - /* Silently ignore entries with zero length. Although this should - * never happen in practice, we should handle the case in a - * reasonable manner just to be safe. - */ - return; - - default: - BUG(); - } - - exit(1); -} - -/**************************************************************************** * find_lbrec * * Find the record in the coreboot table that matches 'tag'. Return pointer @@ -935,122 +632,6 @@ } /**************************************************************************** - * first_cmos_table_entry - * - * Return a pointer to the first entry in the CMOS table that represents a - * CMOS parameter. Return NULL if CMOS table is empty. - ****************************************************************************/ -static const struct cmos_entries *first_cmos_table_entry(void) -{ - return (const struct cmos_entries *)first_cmos_rec(LB_TAG_OPTION); -} - -/**************************************************************************** - * next_cmos_table_entry - * - * Return a pointer to the next entry after 'last' in the CMOS table that - * represents a CMOS parameter. Return NULL if there are no more parameters. - ****************************************************************************/ -static const struct cmos_entries *next_cmos_table_entry(const struct - cmos_entries *last) -{ - return (const struct cmos_entries *) - next_cmos_rec((const struct lb_record *)last, LB_TAG_OPTION); -} - -/**************************************************************************** - * first_cmos_table_enum - * - * Return a pointer to the first entry in the CMOS table that represents a - * possible CMOS parameter value. Return NULL if the table does not contain - * any such entries. - ****************************************************************************/ -static const struct cmos_enums *first_cmos_table_enum(void) -{ - return (const struct cmos_enums *)first_cmos_rec(LB_TAG_OPTION_ENUM); -} - -/**************************************************************************** - * next_cmos_table_enum - * - * Return a pointer to the next entry after 'last' in the CMOS table that - * represents a possible CMOS parameter value. Return NULL if there are no - * more parameter values. - ****************************************************************************/ -static const struct cmos_enums *next_cmos_table_enum - (const struct cmos_enums *last) { - return (const struct cmos_enums *) - next_cmos_rec((const struct lb_record *)last, LB_TAG_OPTION_ENUM); -} - -/**************************************************************************** - * first_cmos_rec - * - * Return a pointer to the first entry in the CMOS table whose type matches - * 'tag'. Return NULL if CMOS table contains no such entry. - * - * Possible values for 'tag' are as follows: - * - * LB_TAG_OPTION: The entry represents a CMOS parameter. - * LB_TAG_OPTION_ENUM: The entry represents a possible value for a CMOS - * parameter of type 'enum'. - * - * The CMOS table tells us where in the nonvolatile RAM to look for CMOS - * parameter values and specifies their types as 'enum', 'hex', or - * 'reserved'. - ****************************************************************************/ -static const struct lb_record *first_cmos_rec(uint32_t tag) -{ - const char *p; - uint32_t bytes_processed, bytes_for_entries; - const struct lb_record *lbrec; - - p = ((const char *)cmos_table) + cmos_table->header_length; - bytes_for_entries = cmos_table->size - cmos_table->header_length; - - for (bytes_processed = 0; - bytes_processed < bytes_for_entries; - bytes_processed += lbrec->size) { - lbrec = (const struct lb_record *)&p[bytes_processed]; - - if (lbrec->tag == tag) - return lbrec; - } - - return NULL; -} - -/**************************************************************************** - * next_cmos_rec - * - * Return a pointer to the next entry after 'last' in the CMOS table whose - * type matches 'tag'. Return NULL if the table contains no more entries of - * this type. - ****************************************************************************/ -static const struct lb_record *next_cmos_rec(const struct lb_record *last, - uint32_t tag) -{ - const char *p; - uint32_t bytes_processed, bytes_for_entries, last_offset; - const struct lb_record *lbrec; - - p = ((const char *)cmos_table) + cmos_table->header_length; - bytes_for_entries = cmos_table->size - cmos_table->header_length; - last_offset = ((const char *)last) - p; - - for (bytes_processed = last_offset + last->size; - bytes_processed < bytes_for_entries; - bytes_processed += lbrec->size) { - lbrec = (const struct lb_record *)&p[bytes_processed]; - - if (lbrec->tag == tag) - return lbrec; - } - - return NULL; -} - -/**************************************************************************** * memory_print_fn * * Display function for 'memory' item of coreboot table. Modified: trunk/util/nvramtool/lbtable.h ============================================================================== --- trunk/util/nvramtool/lbtable.h Fri Jan 28 08:54:11 2011 (r6313) +++ trunk/util/nvramtool/lbtable.h Fri Jan 28 08:56:39 2011 (r6314) @@ -40,4 +40,5 @@ void list_lbtable_choices(void); void list_lbtable_item(const char item[]); +void process_layout(void); #endif /* LBTABLE_H */

1 0

[commit] r6313 - in trunk/util/nvramtool: . accessors
by repository service 28 Jan '11

28 Jan '11

Author: oxygene Date: Fri Jan 28 08:54:11 2011 New Revision: 6313 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6313 Log: Move CMOS handling into separate files in accessors Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Added: trunk/util/nvramtool/accessors/cmos-hw-unix.c - copied, changed from r6311, trunk/util/nvramtool/cmos_lowlevel.c trunk/util/nvramtool/accessors/cmos-mem.c - copied, changed from r6311, trunk/util/nvramtool/cmos_lowlevel.c Modified: trunk/util/nvramtool/Makefile trunk/util/nvramtool/cmos_lowlevel.c trunk/util/nvramtool/cmos_lowlevel.h trunk/util/nvramtool/common.h Modified: trunk/util/nvramtool/Makefile ============================================================================== --- trunk/util/nvramtool/Makefile Fri Jan 28 08:50:33 2011 (r6312) +++ trunk/util/nvramtool/Makefile Fri Jan 28 08:54:11 2011 (r6313) @@ -31,7 +31,7 @@ OBJS = cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \ hexdump.o input_file.o layout.o accessors/layout-text.o lbtable.o \ - reg_expr.o cbfs.o + reg_expr.o cbfs.o accessors/cmos-hw-unix.o accessors/cmos-mem.o OBJS += $(CLI_OBJS) Copied and modified: trunk/util/nvramtool/accessors/cmos-hw-unix.c (from r6311, trunk/util/nvramtool/cmos_lowlevel.c) ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 28 08:47:35 2011 (r6311, copy source) +++ trunk/util/nvramtool/accessors/cmos-hw-unix.c Fri Jan 28 08:54:11 2011 (r6313) @@ -1,76 +1,35 @@ -/*****************************************************************************\ - * cmos_lowlevel.c - ***************************************************************************** - * Copyright (C) 2002-2005 The Regents of the University of California. - * Produced at the Lawrence Livermore National Laboratory. - * Written by David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. - * UCRL-CODE-2003-012 - * All rights reserved. - * - * This file is part of nvramtool, a utility for reading/writing coreboot - * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/nvramtool. - * - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * 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) version 2, dated June 1991. - * - * 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 terms and - * conditions of 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, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -\*****************************************************************************/ +#include <assert.h> +#include "cmos_lowlevel.h" #if defined(__FreeBSD__) -#include <fcntl.h> -#include <unistd.h> +#include <sys/types.h> +#include <machine/cpufunc.h> +#define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0) +#define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0) +#define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0) +#define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); }) +#define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) +#define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) +#else +#if defined(__GLIBC__) +#include <sys/io.h> +#endif +#if (defined(__MACH__) && defined(__APPLE__)) +#include <DirectIO/darwinio.h> +#endif +#define OUTB outb +#define OUTW outw +#define OUTL outl +#define INB inb +#define INW inw +#define INL inl #endif - -#include "common.h" -#include "cmos_lowlevel.h" - -/* Hardware Abstraction Layer: lowlevel byte-wise write access */ - -typedef struct { - void (*init)(void* data); - unsigned char (*read)(unsigned addr); - void (*write)(unsigned addr, unsigned char value); - void (*set_iopl)(int level); -} cmos_access_t; static void cmos_hal_init(void* data); static unsigned char cmos_hal_read(unsigned addr); static void cmos_hal_write(unsigned addr, unsigned char value); static void cmos_set_iopl(int level); -static cmos_access_t cmos_hal = { - .init = cmos_hal_init, - .read = cmos_hal_read, - .write = cmos_hal_write, - .set_iopl = cmos_set_iopl, -}; - -static void mem_hal_init(void* data); -static unsigned char mem_hal_read(unsigned addr); -static void mem_hal_write(unsigned addr, unsigned char value); -static void mem_set_iopl(int level); - -static cmos_access_t memory_hal = { - .init = mem_hal_init, - .read = mem_hal_read, - .write = mem_hal_write, - .set_iopl = mem_set_iopl, -}; - -static cmos_access_t *current_access = &cmos_hal; - /* no need to initialize anything */ static void cmos_hal_init(__attribute__((unused)) void *data) { @@ -112,235 +71,9 @@ OUTB(value, port_1); } -static unsigned char* mem_hal_data = (unsigned char*)-1; -static void mem_hal_init(void *data) -{ - mem_hal_data = data; -} - -static unsigned char mem_hal_read(unsigned index) -{ - assert(mem_hal_data != (unsigned char*)-1); - return mem_hal_data[index]; -} - -static void mem_hal_write(unsigned index, unsigned char value) -{ - assert(mem_hal_data != (unsigned char*)-1); - mem_hal_data[index] = value; -} - -void select_hal(hal_t hal, void *data) -{ - switch(hal) { - case HAL_CMOS: - current_access = &cmos_hal; - break; - case HAL_MEMORY: - current_access = &memory_hal; - break; - } - current_access->init(data); -} - -/* Bit-level access */ -typedef struct { - unsigned byte_index; - unsigned bit_offset; -} cmos_bit_op_location_t; - -static unsigned cmos_bit_op_strategy(unsigned bit, unsigned bits_left, - cmos_bit_op_location_t * where); -static unsigned char cmos_read_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits); -static void cmos_write_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits, unsigned char value); -static unsigned char get_bits(unsigned long long value, unsigned bit, - unsigned nr_bits); -static void put_bits(unsigned char value, unsigned bit, unsigned nr_bits, - unsigned long long *result); - -/**************************************************************************** - * get_bits - * - * Extract a value 'nr_bits' bits wide starting at bit position 'bit' from - * 'value' and return the result. It is assumed that 'nr_bits' is at most 8. - ****************************************************************************/ -static inline unsigned char get_bits(unsigned long long value, unsigned bit, - unsigned nr_bits) -{ - return (value >> bit) & ((unsigned char)((1 << nr_bits) - 1)); -} - -/**************************************************************************** - * put_bits - * - * Extract the low order 'nr_bits' bits from 'value' and store them in the - * value pointed to by 'result' starting at bit position 'bit'. The bit - * positions in 'result' where the result is stored are assumed to be - * initially zero. - ****************************************************************************/ -static inline void put_bits(unsigned char value, unsigned bit, - unsigned nr_bits, unsigned long long *result) -{ - *result += ((unsigned long long)(value & - ((unsigned char)((1 << nr_bits) - 1)))) << bit; -} - -/**************************************************************************** - * cmos_read - * - * Read value from nonvolatile RAM at position given by 'bit' and 'length' - * and return this value. The I/O privilege level of the currently executing - * process must be set appropriately. - ****************************************************************************/ -unsigned long long cmos_read(const cmos_entry_t * e) -{ - cmos_bit_op_location_t where; - unsigned bit = e->bit, length = e->length; - unsigned next_bit, bits_left, nr_bits; - unsigned long long result = 0; - unsigned char value; - - assert(!verify_cmos_op(bit, length, e->config)); - result = 0; - - if (e->config == CMOS_ENTRY_STRING) { - char *newstring = calloc(1, (length + 7) / 8); - unsigned usize = (8 * sizeof(unsigned long long)); - - if (!newstring) { - out_of_memory(); - } - - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = cmos_bit_op_strategy(bit + next_bit, - bits_left > usize ? usize : bits_left, &where); - value = cmos_read_bits(&where, nr_bits); - put_bits(value, next_bit % usize, nr_bits, - &((unsigned long long *)newstring)[next_bit / - usize]); - result = (unsigned long)newstring; - } - } else { - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = - cmos_bit_op_strategy(bit + next_bit, bits_left, - &where); - value = cmos_read_bits(&where, nr_bits); - put_bits(value, next_bit, nr_bits, &result); - } - } - - return result; -} - -/**************************************************************************** - * cmos_write - * - * Write 'data' to nonvolatile RAM at position given by 'bit' and 'length'. - * The I/O privilege level of the currently executing process must be set - * appropriately. - ****************************************************************************/ -void cmos_write(const cmos_entry_t * e, unsigned long long value) -{ - cmos_bit_op_location_t where; - unsigned bit = e->bit, length = e->length; - unsigned next_bit, bits_left, nr_bits; - - assert(!verify_cmos_op(bit, length, e->config)); - - if (e->config == CMOS_ENTRY_STRING) { - unsigned long long *data = - (unsigned long long *)(unsigned long)value; - unsigned usize = (8 * sizeof(unsigned long long)); - - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = cmos_bit_op_strategy(bit + next_bit, - bits_left > usize ? usize : bits_left, - &where); - value = data[next_bit / usize]; - cmos_write_bits(&where, nr_bits, - get_bits(value, next_bit % usize, nr_bits)); - } - } else { - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = cmos_bit_op_strategy(bit + next_bit, - bits_left, &where); - cmos_write_bits(&where, nr_bits, - get_bits(value, next_bit, nr_bits)); - } - } -} /**************************************************************************** - * cmos_read_byte - * - * Read a byte from nonvolatile RAM at a position given by 'index' and return - * the result. An 'index' value of 0 represents the first byte of - * nonvolatile RAM. - * - * Note: the first 14 bytes of nonvolatile RAM provide an interface to the - * real time clock. - ****************************************************************************/ -unsigned char cmos_read_byte(unsigned index) -{ - return current_access->read(index); -} - -/**************************************************************************** - * cmos_write_byte - * - * Write 'value' to nonvolatile RAM at a position given by 'index'. An - * 'index' of 0 represents the first byte of nonvolatile RAM. - * - * Note: the first 14 bytes of nonvolatile RAM provide an interface to the - * real time clock. Writing to any of these bytes will therefore - * affect its functioning. - ****************************************************************************/ -void cmos_write_byte(unsigned index, unsigned char value) -{ - current_access->write(index, value); -} - -/**************************************************************************** - * cmos_read_all - * - * Read all contents of CMOS memory into array 'data'. The first 14 bytes of - * 'data' are set to zero since this corresponds to the real time clock area. - ****************************************************************************/ -void cmos_read_all(unsigned char data[]) -{ - unsigned i; - - for (i = 0; i < CMOS_RTC_AREA_SIZE; i++) - data[i] = 0; - - for (; i < CMOS_SIZE; i++) - data[i] = cmos_read_byte(i); -} - -/**************************************************************************** - * cmos_write_all - * - * Update all of CMOS memory with the contents of array 'data'. The first 14 - * bytes of 'data' are ignored since this corresponds to the real time clock - * area. - ****************************************************************************/ -void cmos_write_all(unsigned char data[]) -{ - unsigned i; - - for (i = CMOS_RTC_AREA_SIZE; i < CMOS_SIZE; i++) - cmos_write_byte(i, data[i]); -} - -/**************************************************************************** - * set_iopl + * cmos_set_iopl * * Set the I/O privilege level of the executing process. Root privileges are * required for performing this action. A sufficient I/O privilege level @@ -348,11 +81,6 @@ * interrupts while executing in user space. Messing with the I/O privilege * level is therefore somewhat dangerous. ****************************************************************************/ -void set_iopl(int level) -{ - current_access->set_iopl(level); -} - static void cmos_set_iopl(int level) { #if defined(__FreeBSD__) @@ -385,84 +113,10 @@ #endif } -static void mem_set_iopl(__attribute__ ((unused)) int level) -{ -} - -/**************************************************************************** - * verify_cmos_op - * - * 'bit' represents a bit position in the nonvolatile RAM. The first bit - * (i.e. the lowest order bit of the first byte) of nonvolatile RAM is - * labeled as bit 0. 'length' represents the width in bits of a value we - * wish to read or write. Perform sanity checking on 'bit' and 'length'. If - * no problems were encountered, return OK. Else return an error code. - ****************************************************************************/ -int verify_cmos_op(unsigned bit, unsigned length, cmos_entry_config_t config) -{ - if ((bit >= (8 * CMOS_SIZE)) || ((bit + length) > (8 * CMOS_SIZE))) - return CMOS_AREA_OUT_OF_RANGE; - - if (bit < (8 * CMOS_RTC_AREA_SIZE)) - return CMOS_AREA_OVERLAPS_RTC; - - if (config == CMOS_ENTRY_STRING) - return OK; - - if (length > (8 * sizeof(unsigned long long))) - return CMOS_AREA_TOO_WIDE; - - return OK; -} - -/**************************************************************************** - * cmos_bit_op_strategy - * - * Helper function used by cmos_read() and cmos_write() to determine which - * bits to read or write next. - ****************************************************************************/ -static unsigned cmos_bit_op_strategy(unsigned bit, unsigned bits_left, - cmos_bit_op_location_t * where) -{ - unsigned max_bits; - - where->byte_index = bit >> 3; - where->bit_offset = bit & 0x07; - max_bits = 8 - where->bit_offset; - return (bits_left > max_bits) ? max_bits : bits_left; -} - -/**************************************************************************** - * cmos_read_bits - * - * Read a chunk of bits from a byte location within CMOS memory. Return the - * value represented by the chunk of bits. - ****************************************************************************/ -static unsigned char cmos_read_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits) -{ - return (cmos_read_byte(where->byte_index) >> where->bit_offset) & - ((unsigned char)((1 << nr_bits) - 1)); -} - -/**************************************************************************** - * cmos_write_bits - * - * Write a chunk of bits (the low order 'nr_bits' bits of 'value') to an area - * within a particular byte of CMOS memory. - ****************************************************************************/ -static void cmos_write_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits, unsigned char value) -{ - unsigned char n, mask; - - if (nr_bits == 8) { - cmos_write_byte(where->byte_index, value); - return; - } +cmos_access_t cmos_hal = { + .init = cmos_hal_init, + .read = cmos_hal_read, + .write = cmos_hal_write, + .set_iopl = cmos_set_iopl, +}; - n = cmos_read_byte(where->byte_index); - mask = ((unsigned char)((1 << nr_bits) - 1)) << where->bit_offset; - n = (n & ~mask) + ((value << where->bit_offset) & mask); - cmos_write_byte(where->byte_index, n); -} Copied and modified: trunk/util/nvramtool/accessors/cmos-mem.c (from r6311, trunk/util/nvramtool/cmos_lowlevel.c) ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 28 08:47:35 2011 (r6311, copy source) +++ trunk/util/nvramtool/accessors/cmos-mem.c Fri Jan 28 08:54:11 2011 (r6313) @@ -1,117 +1,11 @@ -/*****************************************************************************\ - * cmos_lowlevel.c - ***************************************************************************** - * Copyright (C) 2002-2005 The Regents of the University of California. - * Produced at the Lawrence Livermore National Laboratory. - * Written by David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. - * UCRL-CODE-2003-012 - * All rights reserved. - * - * This file is part of nvramtool, a utility for reading/writing coreboot - * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/nvramtool. - * - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * 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) version 2, dated June 1991. - * - * 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 terms and - * conditions of 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, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -\*****************************************************************************/ - -#if defined(__FreeBSD__) -#include <fcntl.h> -#include <unistd.h> -#endif - -#include "common.h" +#include <assert.h> #include "cmos_lowlevel.h" -/* Hardware Abstraction Layer: lowlevel byte-wise write access */ - -typedef struct { - void (*init)(void* data); - unsigned char (*read)(unsigned addr); - void (*write)(unsigned addr, unsigned char value); - void (*set_iopl)(int level); -} cmos_access_t; - -static void cmos_hal_init(void* data); -static unsigned char cmos_hal_read(unsigned addr); -static void cmos_hal_write(unsigned addr, unsigned char value); -static void cmos_set_iopl(int level); - -static cmos_access_t cmos_hal = { - .init = cmos_hal_init, - .read = cmos_hal_read, - .write = cmos_hal_write, - .set_iopl = cmos_set_iopl, -}; - static void mem_hal_init(void* data); static unsigned char mem_hal_read(unsigned addr); static void mem_hal_write(unsigned addr, unsigned char value); static void mem_set_iopl(int level); -static cmos_access_t memory_hal = { - .init = mem_hal_init, - .read = mem_hal_read, - .write = mem_hal_write, - .set_iopl = mem_set_iopl, -}; - -static cmos_access_t *current_access = &cmos_hal; - -/* no need to initialize anything */ -static void cmos_hal_init(__attribute__((unused)) void *data) -{ -} - -static unsigned char cmos_hal_read(unsigned index) -{ - unsigned short port_0, port_1; - - assert(!verify_cmos_byte_index(index)); - - if (index < 128) { - port_0 = 0x70; - port_1 = 0x71; - } else { - port_0 = 0x72; - port_1 = 0x73; - } - - OUTB(index, port_0); - return INB(port_1); -} - -static void cmos_hal_write(unsigned index, unsigned char value) -{ - unsigned short port_0, port_1; - - assert(!verify_cmos_byte_index(index)); - - if (index < 128) { - port_0 = 0x70; - port_1 = 0x71; - } else { - port_0 = 0x72; - port_1 = 0x73; - } - - OUTB(index, port_0); - OUTB(value, port_1); -} - static unsigned char* mem_hal_data = (unsigned char*)-1; static void mem_hal_init(void *data) { @@ -130,339 +24,14 @@ mem_hal_data[index] = value; } -void select_hal(hal_t hal, void *data) -{ - switch(hal) { - case HAL_CMOS: - current_access = &cmos_hal; - break; - case HAL_MEMORY: - current_access = &memory_hal; - break; - } - current_access->init(data); -} - -/* Bit-level access */ -typedef struct { - unsigned byte_index; - unsigned bit_offset; -} cmos_bit_op_location_t; - -static unsigned cmos_bit_op_strategy(unsigned bit, unsigned bits_left, - cmos_bit_op_location_t * where); -static unsigned char cmos_read_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits); -static void cmos_write_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits, unsigned char value); -static unsigned char get_bits(unsigned long long value, unsigned bit, - unsigned nr_bits); -static void put_bits(unsigned char value, unsigned bit, unsigned nr_bits, - unsigned long long *result); - -/**************************************************************************** - * get_bits - * - * Extract a value 'nr_bits' bits wide starting at bit position 'bit' from - * 'value' and return the result. It is assumed that 'nr_bits' is at most 8. - ****************************************************************************/ -static inline unsigned char get_bits(unsigned long long value, unsigned bit, - unsigned nr_bits) -{ - return (value >> bit) & ((unsigned char)((1 << nr_bits) - 1)); -} - -/**************************************************************************** - * put_bits - * - * Extract the low order 'nr_bits' bits from 'value' and store them in the - * value pointed to by 'result' starting at bit position 'bit'. The bit - * positions in 'result' where the result is stored are assumed to be - * initially zero. - ****************************************************************************/ -static inline void put_bits(unsigned char value, unsigned bit, - unsigned nr_bits, unsigned long long *result) -{ - *result += ((unsigned long long)(value & - ((unsigned char)((1 << nr_bits) - 1)))) << bit; -} - -/**************************************************************************** - * cmos_read - * - * Read value from nonvolatile RAM at position given by 'bit' and 'length' - * and return this value. The I/O privilege level of the currently executing - * process must be set appropriately. - ****************************************************************************/ -unsigned long long cmos_read(const cmos_entry_t * e) -{ - cmos_bit_op_location_t where; - unsigned bit = e->bit, length = e->length; - unsigned next_bit, bits_left, nr_bits; - unsigned long long result = 0; - unsigned char value; - - assert(!verify_cmos_op(bit, length, e->config)); - result = 0; - - if (e->config == CMOS_ENTRY_STRING) { - char *newstring = calloc(1, (length + 7) / 8); - unsigned usize = (8 * sizeof(unsigned long long)); - - if (!newstring) { - out_of_memory(); - } - - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = cmos_bit_op_strategy(bit + next_bit, - bits_left > usize ? usize : bits_left, &where); - value = cmos_read_bits(&where, nr_bits); - put_bits(value, next_bit % usize, nr_bits, - &((unsigned long long *)newstring)[next_bit / - usize]); - result = (unsigned long)newstring; - } - } else { - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = - cmos_bit_op_strategy(bit + next_bit, bits_left, - &where); - value = cmos_read_bits(&where, nr_bits); - put_bits(value, next_bit, nr_bits, &result); - } - } - - return result; -} - -/**************************************************************************** - * cmos_write - * - * Write 'data' to nonvolatile RAM at position given by 'bit' and 'length'. - * The I/O privilege level of the currently executing process must be set - * appropriately. - ****************************************************************************/ -void cmos_write(const cmos_entry_t * e, unsigned long long value) -{ - cmos_bit_op_location_t where; - unsigned bit = e->bit, length = e->length; - unsigned next_bit, bits_left, nr_bits; - - assert(!verify_cmos_op(bit, length, e->config)); - - if (e->config == CMOS_ENTRY_STRING) { - unsigned long long *data = - (unsigned long long *)(unsigned long)value; - unsigned usize = (8 * sizeof(unsigned long long)); - - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = cmos_bit_op_strategy(bit + next_bit, - bits_left > usize ? usize : bits_left, - &where); - value = data[next_bit / usize]; - cmos_write_bits(&where, nr_bits, - get_bits(value, next_bit % usize, nr_bits)); - } - } else { - for (next_bit = 0, bits_left = length; - bits_left; next_bit += nr_bits, bits_left -= nr_bits) { - nr_bits = cmos_bit_op_strategy(bit + next_bit, - bits_left, &where); - cmos_write_bits(&where, nr_bits, - get_bits(value, next_bit, nr_bits)); - } - } -} - -/**************************************************************************** - * cmos_read_byte - * - * Read a byte from nonvolatile RAM at a position given by 'index' and return - * the result. An 'index' value of 0 represents the first byte of - * nonvolatile RAM. - * - * Note: the first 14 bytes of nonvolatile RAM provide an interface to the - * real time clock. - ****************************************************************************/ -unsigned char cmos_read_byte(unsigned index) -{ - return current_access->read(index); -} - -/**************************************************************************** - * cmos_write_byte - * - * Write 'value' to nonvolatile RAM at a position given by 'index'. An - * 'index' of 0 represents the first byte of nonvolatile RAM. - * - * Note: the first 14 bytes of nonvolatile RAM provide an interface to the - * real time clock. Writing to any of these bytes will therefore - * affect its functioning. - ****************************************************************************/ -void cmos_write_byte(unsigned index, unsigned char value) -{ - current_access->write(index, value); -} - -/**************************************************************************** - * cmos_read_all - * - * Read all contents of CMOS memory into array 'data'. The first 14 bytes of - * 'data' are set to zero since this corresponds to the real time clock area. - ****************************************************************************/ -void cmos_read_all(unsigned char data[]) -{ - unsigned i; - - for (i = 0; i < CMOS_RTC_AREA_SIZE; i++) - data[i] = 0; - - for (; i < CMOS_SIZE; i++) - data[i] = cmos_read_byte(i); -} - -/**************************************************************************** - * cmos_write_all - * - * Update all of CMOS memory with the contents of array 'data'. The first 14 - * bytes of 'data' are ignored since this corresponds to the real time clock - * area. - ****************************************************************************/ -void cmos_write_all(unsigned char data[]) -{ - unsigned i; - - for (i = CMOS_RTC_AREA_SIZE; i < CMOS_SIZE; i++) - cmos_write_byte(i, data[i]); -} - -/**************************************************************************** - * set_iopl - * - * Set the I/O privilege level of the executing process. Root privileges are - * required for performing this action. A sufficient I/O privilege level - * allows the process to access x86 I/O address space and to disable/reenable - * interrupts while executing in user space. Messing with the I/O privilege - * level is therefore somewhat dangerous. - ****************************************************************************/ -void set_iopl(int level) -{ - current_access->set_iopl(level); -} - -static void cmos_set_iopl(int level) -{ -#if defined(__FreeBSD__) - static int io_fd = -1; -#endif - - assert((level >= 0) && (level <= 3)); - -#if defined(__FreeBSD__) - if (level == 0) { - if (io_fd != -1) { - close(io_fd); - io_fd = -1; - } - } else { - if (io_fd == -1) { - io_fd = open("/dev/io", O_RDWR); - if (io_fd < 0) { - perror("/dev/io"); - exit(1); - } - } - } -#else - if (iopl(level)) { - fprintf(stderr, "%s: iopl() system call failed. " - "You must be root to do this.\n", prog_name); - exit(1); - } -#endif -} - static void mem_set_iopl(__attribute__ ((unused)) int level) { } -/**************************************************************************** - * verify_cmos_op - * - * 'bit' represents a bit position in the nonvolatile RAM. The first bit - * (i.e. the lowest order bit of the first byte) of nonvolatile RAM is - * labeled as bit 0. 'length' represents the width in bits of a value we - * wish to read or write. Perform sanity checking on 'bit' and 'length'. If - * no problems were encountered, return OK. Else return an error code. - ****************************************************************************/ -int verify_cmos_op(unsigned bit, unsigned length, cmos_entry_config_t config) -{ - if ((bit >= (8 * CMOS_SIZE)) || ((bit + length) > (8 * CMOS_SIZE))) - return CMOS_AREA_OUT_OF_RANGE; - - if (bit < (8 * CMOS_RTC_AREA_SIZE)) - return CMOS_AREA_OVERLAPS_RTC; - - if (config == CMOS_ENTRY_STRING) - return OK; - - if (length > (8 * sizeof(unsigned long long))) - return CMOS_AREA_TOO_WIDE; - - return OK; -} - -/**************************************************************************** - * cmos_bit_op_strategy - * - * Helper function used by cmos_read() and cmos_write() to determine which - * bits to read or write next. - ****************************************************************************/ -static unsigned cmos_bit_op_strategy(unsigned bit, unsigned bits_left, - cmos_bit_op_location_t * where) -{ - unsigned max_bits; - - where->byte_index = bit >> 3; - where->bit_offset = bit & 0x07; - max_bits = 8 - where->bit_offset; - return (bits_left > max_bits) ? max_bits : bits_left; -} - -/**************************************************************************** - * cmos_read_bits - * - * Read a chunk of bits from a byte location within CMOS memory. Return the - * value represented by the chunk of bits. - ****************************************************************************/ -static unsigned char cmos_read_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits) -{ - return (cmos_read_byte(where->byte_index) >> where->bit_offset) & - ((unsigned char)((1 << nr_bits) - 1)); -} - -/**************************************************************************** - * cmos_write_bits - * - * Write a chunk of bits (the low order 'nr_bits' bits of 'value') to an area - * within a particular byte of CMOS memory. - ****************************************************************************/ -static void cmos_write_bits(const cmos_bit_op_location_t * where, - unsigned nr_bits, unsigned char value) -{ - unsigned char n, mask; - - if (nr_bits == 8) { - cmos_write_byte(where->byte_index, value); - return; - } +cmos_access_t memory_hal = { + .init = mem_hal_init, + .read = mem_hal_read, + .write = mem_hal_write, + .set_iopl = mem_set_iopl, +}; - n = cmos_read_byte(where->byte_index); - mask = ((unsigned char)((1 << nr_bits) - 1)) << where->bit_offset; - n = (n & ~mask) + ((value << where->bit_offset) & mask); - cmos_write_byte(where->byte_index, n); -} Modified: trunk/util/nvramtool/cmos_lowlevel.c ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 28 08:50:33 2011 (r6312) +++ trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 28 08:54:11 2011 (r6313) @@ -38,98 +38,9 @@ /* Hardware Abstraction Layer: lowlevel byte-wise write access */ -typedef struct { - void (*init)(void* data); - unsigned char (*read)(unsigned addr); - void (*write)(unsigned addr, unsigned char value); - void (*set_iopl)(int level); -} cmos_access_t; - -static void cmos_hal_init(void* data); -static unsigned char cmos_hal_read(unsigned addr); -static void cmos_hal_write(unsigned addr, unsigned char value); -static void cmos_set_iopl(int level); - -static cmos_access_t cmos_hal = { - .init = cmos_hal_init, - .read = cmos_hal_read, - .write = cmos_hal_write, - .set_iopl = cmos_set_iopl, -}; - -static void mem_hal_init(void* data); -static unsigned char mem_hal_read(unsigned addr); -static void mem_hal_write(unsigned addr, unsigned char value); -static void mem_set_iopl(int level); - -static cmos_access_t memory_hal = { - .init = mem_hal_init, - .read = mem_hal_read, - .write = mem_hal_write, - .set_iopl = mem_set_iopl, -}; - +extern cmos_access_t cmos_hal, memory_hal; static cmos_access_t *current_access = &cmos_hal; -/* no need to initialize anything */ -static void cmos_hal_init(__attribute__((unused)) void *data) -{ -} - -static unsigned char cmos_hal_read(unsigned index) -{ - unsigned short port_0, port_1; - - assert(!verify_cmos_byte_index(index)); - - if (index < 128) { - port_0 = 0x70; - port_1 = 0x71; - } else { - port_0 = 0x72; - port_1 = 0x73; - } - - OUTB(index, port_0); - return INB(port_1); -} - -static void cmos_hal_write(unsigned index, unsigned char value) -{ - unsigned short port_0, port_1; - - assert(!verify_cmos_byte_index(index)); - - if (index < 128) { - port_0 = 0x70; - port_1 = 0x71; - } else { - port_0 = 0x72; - port_1 = 0x73; - } - - OUTB(index, port_0); - OUTB(value, port_1); -} - -static unsigned char* mem_hal_data = (unsigned char*)-1; -static void mem_hal_init(void *data) -{ - mem_hal_data = data; -} - -static unsigned char mem_hal_read(unsigned index) -{ - assert(mem_hal_data != (unsigned char*)-1); - return mem_hal_data[index]; -} - -static void mem_hal_write(unsigned index, unsigned char value) -{ - assert(mem_hal_data != (unsigned char*)-1); - mem_hal_data[index] = value; -} - void select_hal(hal_t hal, void *data) { switch(hal) { @@ -353,42 +264,6 @@ current_access->set_iopl(level); } -static void cmos_set_iopl(int level) -{ -#if defined(__FreeBSD__) - static int io_fd = -1; -#endif - - assert((level >= 0) && (level <= 3)); - -#if defined(__FreeBSD__) - if (level == 0) { - if (io_fd != -1) { - close(io_fd); - io_fd = -1; - } - } else { - if (io_fd == -1) { - io_fd = open("/dev/io", O_RDWR); - if (io_fd < 0) { - perror("/dev/io"); - exit(1); - } - } - } -#else - if (iopl(level)) { - fprintf(stderr, "%s: iopl() system call failed. " - "You must be root to do this.\n", prog_name); - exit(1); - } -#endif -} - -static void mem_set_iopl(__attribute__ ((unused)) int level) -{ -} - /**************************************************************************** * verify_cmos_op * Modified: trunk/util/nvramtool/cmos_lowlevel.h ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.h Fri Jan 28 08:50:33 2011 (r6312) +++ trunk/util/nvramtool/cmos_lowlevel.h Fri Jan 28 08:54:11 2011 (r6313) @@ -34,6 +34,13 @@ #include "common.h" #include "layout.h" +typedef struct { + void (*init)(void* data); + unsigned char (*read)(unsigned addr); + void (*write)(unsigned addr, unsigned char value); + void (*set_iopl)(int level); +} cmos_access_t; + typedef enum { HAL_CMOS, HAL_MEMORY } hal_t; void select_hal(hal_t hal, void *data); Modified: trunk/util/nvramtool/common.h ============================================================================== --- trunk/util/nvramtool/common.h Fri Jan 28 08:50:33 2011 (r6312) +++ trunk/util/nvramtool/common.h Fri Jan 28 08:54:11 2011 (r6313) @@ -43,30 +43,6 @@ #include <string.h> #include <ctype.h> -#if defined(__FreeBSD__) -#include <sys/types.h> -#include <machine/cpufunc.h> -#define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0) -#define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0) -#define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0) -#define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); }) -#define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) -#define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) -#else -#if defined(__GLIBC__) -#include <sys/io.h> -#endif -#if (defined(__MACH__) && defined(__APPLE__)) -#include <DirectIO/darwinio.h> -#endif -#define OUTB outb -#define OUTW outw -#define OUTL outl -#define INB inb -#define INW inw -#define INL inl -#endif - #define FALSE 0 #define TRUE 1

1 0

[commit] r6312 - in trunk/util/nvramtool: . accessors cli
by repository service 28 Jan '11

28 Jan '11

Author: oxygene Date: Fri Jan 28 08:50:33 2011 New Revision: 6312 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6312 Log: Move the parser for cmos.layout text files to accessors Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Added: trunk/util/nvramtool/accessors/ trunk/util/nvramtool/accessors/layout-text.c - copied, changed from r6311, trunk/util/nvramtool/layout_file.c trunk/util/nvramtool/accessors/layout-text.h - copied unchanged from r6311, trunk/util/nvramtool/layout_file.h Deleted: trunk/util/nvramtool/layout_file.c trunk/util/nvramtool/layout_file.h Modified: trunk/util/nvramtool/Makefile trunk/util/nvramtool/cli/nvramtool.c Modified: trunk/util/nvramtool/Makefile ============================================================================== --- trunk/util/nvramtool/Makefile Fri Jan 28 08:47:35 2011 (r6311) +++ trunk/util/nvramtool/Makefile Fri Jan 28 08:50:33 2011 (r6312) @@ -30,7 +30,7 @@ CLI_OBJS = cli/nvramtool.o cli/opts.o OBJS = cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \ - hexdump.o input_file.o layout.o layout_file.o lbtable.o \ + hexdump.o input_file.o layout.o accessors/layout-text.o lbtable.o \ reg_expr.o cbfs.o OBJS += $(CLI_OBJS) Copied and modified: trunk/util/nvramtool/accessors/layout-text.c (from r6311, trunk/util/nvramtool/layout_file.c) ============================================================================== --- trunk/util/nvramtool/layout_file.c Fri Jan 28 08:47:35 2011 (r6311, copy source) +++ trunk/util/nvramtool/accessors/layout-text.c Fri Jan 28 08:50:33 2011 (r6312) @@ -1,5 +1,5 @@ /*****************************************************************************\ - * layout_file.c + * layout-text.c ***************************************************************************** * Copyright (C) 2002-2005 The Regents of the University of California. * Produced at the Lawrence Livermore National Laboratory. @@ -29,7 +29,7 @@ \*****************************************************************************/ #include "common.h" -#include "layout_file.h" +#include "layout-text.h" #include "layout.h" #include "cmos_lowlevel.h" #include "reg_expr.h" Copied: trunk/util/nvramtool/accessors/layout-text.h (from r6311, trunk/util/nvramtool/layout_file.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/nvramtool/accessors/layout-text.h Fri Jan 28 08:50:33 2011 (r6312, copy of r6311, trunk/util/nvramtool/layout_file.h) @@ -0,0 +1,41 @@ +/*****************************************************************************\ + * layout_file.h + ***************************************************************************** + * Copyright (C) 2002-2005 The Regents of the University of California. + * Produced at the Lawrence Livermore National Laboratory. + * Written by Dave Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. + * UCRL-CODE-2003-012 + * All rights reserved. + * + * This file is part of nvramtool, a utility for reading/writing coreboot + * parameters and displaying information from the coreboot table. + * For details, see http://coreboot.org/nvramtool. + * + * Please also read the file DISCLAIMER which is included in this software + * distribution. + * + * 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) version 2, dated June 1991. + * + * 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 terms and + * conditions of 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, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +\*****************************************************************************/ + +#ifndef LAYOUT_FILE_H +#define LAYOUT_FILE_H + +#include "common.h" +#include "coreboot_tables.h" + +void set_layout_filename(const char filename[]); +void get_layout_from_file(void); +void write_cmos_layout(FILE * f); + +#endif /* LAYOUT_FILE_H */ Modified: trunk/util/nvramtool/cli/nvramtool.c ============================================================================== --- trunk/util/nvramtool/cli/nvramtool.c Fri Jan 28 08:47:35 2011 (r6311) +++ trunk/util/nvramtool/cli/nvramtool.c Fri Jan 28 08:50:33 2011 (r6312) @@ -36,7 +36,7 @@ #include "opts.h" #include "lbtable.h" #include "layout.h" -#include "layout_file.h" +#include "accessors/layout-text.h" #include "input_file.h" #include "cmos_ops.h" #include "cmos_lowlevel.h"

1 0

[commit] r6311 - trunk/src/console
by repository service 28 Jan '11

28 Jan '11

Author: stepan Date: Fri Jan 28 08:47:35 2011 New Revision: 6311 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6311 Log: rename CONFIG_SERIAL_POST to CONFIG_CONSOLE_POST because that is what it does. Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Acked-by: Patrick Georgi <patrick.georgi(a)secunet.com> Modified: trunk/src/console/Kconfig trunk/src/console/post.c Modified: trunk/src/console/Kconfig ============================================================================== --- trunk/src/console/Kconfig Fri Jan 28 08:47:10 2011 (r6310) +++ trunk/src/console/Kconfig Fri Jan 28 08:47:35 2011 (r6311) @@ -326,14 +326,14 @@ bool "Don't show any POST codes" default n -config SERIAL_POST - bool "Show POST codes on the serial port console" - depends on CONSOLE_SERIAL8250 && !NO_POST +config CONSOLE_POST + bool "Show POST codes on the debug console" + depends on !NO_POST default n help If enabled, coreboot will additionally print POST codes (which are usually displayed using a so-called "POST card" ISA/PCI/PCI-E - device) on the serial console. + device) on the debug console. endmenu Modified: trunk/src/console/post.c ============================================================================== --- trunk/src/console/post.c Fri Jan 28 08:47:10 2011 (r6310) +++ trunk/src/console/post.c Fri Jan 28 08:47:35 2011 (r6311) @@ -27,7 +27,7 @@ void post_code(uint8_t value) { #if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0 -#if CONFIG_SERIAL_POST==1 +#if CONFIG_CONSOLE_POST==1 print_emerg("POST: 0x"); print_emerg_hex8(value); print_emerg("\n");

1 0

[commit] r6310 - in trunk/util/nvramtool: . cli
by repository service 28 Jan '11

28 Jan '11

Author: oxygene Date: Fri Jan 28 08:47:10 2011 New Revision: 6310 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6310 Log: Move CLI portion of nvramtool into cli/ subdirectory as first step towards librarization. Also: update one regex wrapper user. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Added: trunk/util/nvramtool/cli/ trunk/util/nvramtool/cli/nvramtool.8 - copied unchanged from r6309, trunk/util/nvramtool/nvramtool.8 trunk/util/nvramtool/cli/nvramtool.c - copied, changed from r6309, trunk/util/nvramtool/nvramtool.c trunk/util/nvramtool/cli/opts.c - copied unchanged from r6309, trunk/util/nvramtool/opts.c trunk/util/nvramtool/cli/opts.h - copied unchanged from r6309, trunk/util/nvramtool/opts.h Deleted: trunk/util/nvramtool/nvramtool.8 trunk/util/nvramtool/nvramtool.c trunk/util/nvramtool/opts.c trunk/util/nvramtool/opts.h Modified: trunk/util/nvramtool/Makefile Modified: trunk/util/nvramtool/Makefile ============================================================================== --- trunk/util/nvramtool/Makefile Fri Jan 28 08:41:10 2011 (r6309) +++ trunk/util/nvramtool/Makefile Fri Jan 28 08:47:10 2011 (r6310) @@ -24,12 +24,16 @@ STRIP = strip INSTALL = /usr/bin/install PREFIX = /usr/local -CFLAGS = -O2 -g -Wall -W +CFLAGS = -O2 -g -Wall -W -I. #CFLAGS = -Os -Wall +CLI_OBJS = cli/nvramtool.o cli/opts.o + OBJS = cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \ hexdump.o input_file.o layout.o layout_file.o lbtable.o \ - nvramtool.o opts.o reg_expr.o cbfs.o + reg_expr.o cbfs.o + +OBJS += $(CLI_OBJS) OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) @@ -43,7 +47,7 @@ $(STRIP) $(STRIP_ARGS) $(PROGRAM) clean: - rm -f $(PROGRAM) *.o + rm -f $(PROGRAM) $(OBJS) distclean: clean rm -f .dependencies @@ -55,7 +59,7 @@ mkdir -p $(DESTDIR)$(PREFIX)/sbin $(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8 - $(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8 + $(INSTALL) cli/$(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8 .PHONY: all clean distclean dep Copied: trunk/util/nvramtool/cli/nvramtool.8 (from r6309, trunk/util/nvramtool/nvramtool.8) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/nvramtool/cli/nvramtool.8 Fri Jan 28 08:47:10 2011 (r6310, copy of r6309, trunk/util/nvramtool/nvramtool.8) @@ -0,0 +1,254 @@ +.\"***************************************************************************\ +.\" nvramtool.8 +.\"*************************************************************************** +.\" Copyright (C) 2002, 2003 The Regents of the University of California. +.\" Produced at the Lawrence Livermore National Laboratory. +.\" Written by David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. +.\" UCRL-CODE-2003-012 +.\" All rights reserved. +.\" +.\" This file is part of nvramtool, a utility for reading/writing coreboot +.\" parameters and displaying information from the coreboot table. +.\" For details, see http://coreboot.org/nvramtool. +.\" +.\" Please also read the file DISCLAIMER which is included in this software +.\" distribution. +.\" +.\" 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) version 2, dated June 1991. +.\" +.\" 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 terms and +.\" conditions of 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, Inc., +.\" 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\"***************************************************************************/ +.TH NVRAMTOOL 8 "September 2008" +.SH NAME +nvramtool \- read/write coreboot-related information +.SH SYNOPSIS +.B "nvramtool [OPTS] [-n] -r NAME" +.br +.B "nvramtool [OPTS] -e NAME" +.br +.B "nvramtool [OPTS] -a" +.br +.B "nvramtool [OPTS] -w NAME=VALUE" +.br +.B "nvramtool [OPTS] -p INPUT_FILE" +.br +.B "nvramtool [OPTS] -i" +.br +.B "nvramtool [OPTS] -c [VALUE]" +.br +.B "nvramtool [OPTS] -l [ARG]" +.br +.B "nvramtool [OPTS] -d" +.br +.B "nvramtool [OPTS] -Y" +.br +.B "nvramtool [OPTS] -b OUTPUT_FILE" +.br +.B "nvramtool [OPTS] -B INPUT_FILE" +.br +.B "nvramtool [OPTS] -x" +.br +.B "nvramtool [OPTS] -X DUMPFILE" +.br +.B "nvramtool [OPTS] -v" +.br +.B "nvramtool [OPTS] -h" +.SH DESCRIPTION +.B "nvramtool" +is a utility for reading/writing coreboot parameters and displaying +information from the coreboot table. + +The coreboot table resides in low physical memory. It is created at boot +time by coreboot, and contains various system information such as the type +of mainboard in use. It specifies locations in the CMOS (nonvolatile RAM) +where the coreboot parameters are stored. + +This program is intended for (x86-based) systems that use coreboot. For +information about coreboot, see +.br +http://www.coreboot.org/. +.SH PARAMETERS +.TP +.B "[-n] -r NAME" +Show the value of the coreboot parameter given by +.B "NAME." +If +.B "-n" +is specified, show only the value. Otherwise show both parameter name and +value. +.TP +.B "-e NAME" +Show all possible values for parameter given by +.B "NAME." +.TP +.B "-a" +Show the names and values for all coreboot parameters. +.TP +.B "-w NAME=VALUE" +Assign +.B "VALUE" +to coreboot parameter given by +.B "NAME." +.TP +.B "-p INPUT_FILE" +Assign values to coreboot parameters according to the contents of +.B "INPUT_FILE." +The format of this file is described below. +.TP +.B "-i" +This is similar to the +.B "-p" +option, except that the contents of the input file are taken from standard +input. +.TP +.B "-c [VALUE]" +If +.B "VALUE" +is present then set the CMOS checksum for the coreboot parameters to +.B "VALUE." +Otherwise, show the checksum value. +.TP +.B "-l [ARG]" +If +.B "ARG" +is present then show information from the coreboot table as specified by +.B "ARG." +Otherwise show all possible values for +.B "ARG." +.TP +.B "-d" +Do a low-level dump of the coreboot table. +.TP +.B "-Y" +Write CMOS layout information to standard output. If redirected to a file, +the layout information may be used as input for the +.B "'-y LAYOUT_FILE'" +option (see below). +.TP +.B "-b OUTPUT_FILE" +Write the contents of CMOS memory to the binary file +.B "OUTPUT_FILE." +The first 14 bytes of +.B "OUTPUT_FILE" +do not contain actual CMOS data, and are always written as zeros. This is +because the first 14 bytes of the CMOS area do not contain CMOS memory. These +bytes are involved with the functioning of the real time clock. +.TP +.B "-B INPUT_FILE" +Read binary data from +.B "INPUT_FILE" +and write the data to CMOS memory. The first 14 bytes of +.B "INPUT_FILE" +are skipped and data is written to CMOS starting at the 15th byte of the CMOS +area. This is because the first 14 bytes of the CMOS area do not contain CMOS +memory. These bytes are involved with the functioning of the real time clock. +.TP +.B "-x" +Show a hex dump of all CMOS data. The first 14 bytes of the dump do not +contain actual CMOS data, and are always shown as zeros. This is because the +first 14 bytes of the CMOS area do not contain CMOS memory. These bytes are +involved with the functioning of the real time clock. +.TP +.B "-X DUMPFILE" +Read binary data from +.B "DUMPFILE" +(presumably a CMOS dumpfile created using the +.B "-b OUTPUT_FILE" +option) and show a hex dump of the data. +.TP +.B "-v" +Show version information for this program. +.TP +.B "-h" +Show a help message for this program. +.SH "OPTIONS" +In all cases above, +.B "[OPTS]" +evaluates to the following: + +.B " [-y LAYOUT_FILE | -t]" + +The +.B "'-y LAYOUT_FILE'" +option tells nvramtool to obtain CMOS layout information from the contents of +.B "LAYOUT_FILE." +Likewise, the +.B "'-t'" +option tells nvramtool to obtain CMOS layout information from the CMOS option +table (contained within the coreboot table). If neither option is +specified, the CMOS option table is used by default. +.B "LAYOUT_FILE" +follows the format of the +.B "cmos.layout" +files provided by coreboot. + +If the coreboot installed on your system was built without specifying +.B "CONFIG_HAVE_OPTION_TABLE," +then the coreboot table will not contain a CMOS option table. In this case, +the +.B "'-y LAYOUT_FILE'" +option must be used. + +These two options are silently ignored when used in combination with other +options (such as +.B "-h," +for instance) for which they are not applicable. +.SH FILE FORMAT +For the +.B "-p" +option, +.B "INPUT_FILE" +must consist of a sequence of lines such that each line is either a blank +line, a comment, or an assignment. A blank line consists only of zero or +more whitespace characters (spaces and tabs). A comment is constructed as +follows: + +.B " [ws]#[text]" + +Here, +.B "[ws]" +indicates optional whitespace characters and +.B "[text]" +indicates optional text. Blank lines and comments are both ignored. An +assignment is constructed as follows: + +.B " [ws]NAME[ws]=[ws]VALUE[ws]" + +Here, +.B "NAME" +is the name of a coreboot parameter and +.B "VALUE" +is the value that will be assigned to +.B "NAME." +.B "VALUE" +is allowed to contain whitespace characters, but it must begin and end with +nonwhitespace characters. Note that each comment must appear on a line by +itself. If you attempt to add a comment to the end of an assignment, then the +comment will be interpreted as part of +.B "VALUE." +It is useful to observe that the output produced by both the +.B "-a" +and the +.B "'[-n] NAME'" +options (without +.B "-n" +specified) adheres to this file format. +.SH BUGS +This program does not implement any type of synchronization to ensure that +different processes don't stomp on each other when trying to access the +nonvolatile RAM simultaneously. Therefore, corruption of the BIOS parameter +values may occur if multiple instances of this program are executed +concurrently. +.SH AUTHORS +David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com> +.br +Stefan Reinauer <stepan(a)coresystems.de> Copied and modified: trunk/util/nvramtool/cli/nvramtool.c (from r6309, trunk/util/nvramtool/nvramtool.c) ============================================================================== --- trunk/util/nvramtool/nvramtool.c Fri Jan 28 08:41:10 2011 (r6309, copy source) +++ trunk/util/nvramtool/cli/nvramtool.c Fri Jan 28 08:47:10 2011 (r6310) @@ -682,8 +682,7 @@ regmatch_t match[N_MATCHES]; regex_t assignment; - compile_reg_exprs(REG_EXTENDED | REG_NEWLINE, 1, assignment_regex, - &assignment); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, assignment_regex, &assignment); /* Does 'arg' conform to proper assignment syntax? If not, exit with a * usage message. @@ -699,7 +698,7 @@ *name = &arg[match[1].rm_so]; *value = &arg[match[2].rm_so]; - free_reg_exprs(1, &assignment); + regfree(&assignment); } /**************************************************************************** Copied: trunk/util/nvramtool/cli/opts.c (from r6309, trunk/util/nvramtool/opts.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/nvramtool/cli/opts.c Fri Jan 28 08:47:10 2011 (r6310, copy of r6309, trunk/util/nvramtool/opts.c) @@ -0,0 +1,259 @@ +/*****************************************************************************\ + * opts.c + ***************************************************************************** + * Copyright (C) 2002-2005 The Regents of the University of California. + * Produced at the Lawrence Livermore National Laboratory. + * Written by Dave Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. + * UCRL-CODE-2003-012 + * All rights reserved. + * + * This file is part of nvramtool, a utility for reading/writing coreboot + * parameters and displaying information from the coreboot table. + * For details, see http://coreboot.org/nvramtool. + * + * Please also read the file DISCLAIMER which is included in this software + * distribution. + * + * 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) version 2, dated June 1991. + * + * 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 terms and + * conditions of 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, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +\*****************************************************************************/ + +#include "common.h" +#include "opts.h" + +nvramtool_op_info_t nvramtool_op; + +nvramtool_op_modifier_info_t nvramtool_op_modifiers[NVRAMTOOL_NUM_OP_MODIFIERS]; + +static char *handle_optional_arg(int argc, char *argv[]); +static void register_op(int *op_found, nvramtool_op_t op, char op_param[]); +static void register_op_modifier(nvramtool_op_modifier_t mod, char mod_param[]); +static void resolve_op_modifiers(void); +static void sanity_check_args(void); + +static const char getopt_string[] = "-ab:B:c::C:dD:e:hil::np:r:tvw:xX:y:Y"; + +/**************************************************************************** + * parse_nvramtool_args + * + * Parse command line arguments. + ****************************************************************************/ +void parse_nvramtool_args(int argc, char *argv[]) +{ + nvramtool_op_modifier_info_t *mod_info; + int i, op_found; + char c; + + for (i = 0, mod_info = nvramtool_op_modifiers; + i < NVRAMTOOL_NUM_OP_MODIFIERS; i++, mod_info++) { + mod_info->found = FALSE; + mod_info->found_seq = 0; + mod_info->param = NULL; + } + + op_found = FALSE; + opterr = 0; + + do { + switch (c = getopt(argc, argv, getopt_string)) { + case 'a': + register_op(&op_found, + NVRAMTOOL_OP_CMOS_SHOW_ALL_PARAMS, NULL); + break; + case 'b': + register_op(&op_found, NVRAMTOOL_OP_WRITE_CMOS_DUMP, + optarg); + break; + case 'B': + register_op(&op_found, NVRAMTOOL_OP_READ_CMOS_DUMP, + optarg); + break; + case 'c': + register_op(&op_found, NVRAMTOOL_OP_CMOS_CHECKSUM, + handle_optional_arg(argc, argv)); + break; + case 'C': + register_op_modifier(NVRAMTOOL_MOD_USE_CBFS_FILE, + optarg); + break; + case 'd': + register_op(&op_found, NVRAMTOOL_OP_LBTABLE_DUMP, NULL); + break; + case 'D': + register_op_modifier(NVRAMTOOL_MOD_USE_CMOS_FILE, + optarg); + break; + case 'e': + register_op(&op_found, NVRAMTOOL_OP_SHOW_PARAM_VALUES, + optarg); + break; + case 'h': + register_op(&op_found, NVRAMTOOL_OP_SHOW_USAGE, NULL); + break; + case 'i': + register_op(&op_found, + NVRAMTOOL_OP_CMOS_SET_PARAMS_STDIN, NULL); + break; + case 'l': + register_op(&op_found, NVRAMTOOL_OP_LBTABLE_SHOW_INFO, + handle_optional_arg(argc, argv)); + break; + case 'n': + register_op_modifier(NVRAMTOOL_MOD_SHOW_VALUE_ONLY, + NULL); + break; + case 'p': + register_op(&op_found, + NVRAMTOOL_OP_CMOS_SET_PARAMS_FILE, optarg); + break; + case 'r': + register_op(&op_found, NVRAMTOOL_OP_CMOS_SHOW_ONE_PARAM, + optarg); + break; + case 't': + register_op_modifier(NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE, + NULL); + break; + case 'v': + register_op(&op_found, NVRAMTOOL_OP_SHOW_VERSION, NULL); + break; + case 'w': + register_op(&op_found, NVRAMTOOL_OP_CMOS_SET_ONE_PARAM, + optarg); + break; + case 'x': + register_op(&op_found, NVRAMTOOL_OP_SHOW_CMOS_HEX_DUMP, + NULL); + break; + case 'X': + register_op(&op_found, NVRAMTOOL_OP_SHOW_CMOS_DUMPFILE, + optarg); + break; + case 'y': + register_op_modifier(NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE, + optarg); + break; + case 'Y': + register_op(&op_found, NVRAMTOOL_OP_SHOW_LAYOUT, NULL); + break; + case -1: /* no more command line args */ + break; + case '?': /* unknown option found */ + case 1: /* nonoption command line arg found */ + default: + usage(stderr); + break; + } + } while (c != -1); + + if (!op_found) + usage(stderr); + + resolve_op_modifiers(); + sanity_check_args(); +} + +/**************************************************************************** + * handle_optional_arg + * + * Handle a command line option with an optional argument. + ****************************************************************************/ +static char *handle_optional_arg(int argc, char *argv[]) +{ + char *arg; + + if (optarg != NULL) { + /* optional arg is present and arg was specified as + * "-zarg" (with no whitespace between "z" and "arg"), + * where -z is the option and "arg" is the value of the + * optional arg + */ + return optarg; + } + + if ((argv[optind] == NULL) || (argv[optind][0] == '-')) + return NULL; + + arg = argv[optind]; /* optional arg is present */ + + /* This call to getopt yields the optional arg we just found, + * which we want to skip. + */ + getopt(argc, argv, getopt_string); + + return arg; +} + +/**************************************************************************** + * register_op + * + * Store the user's selection of which operation this program should perform. + ****************************************************************************/ +static void register_op(int *op_found, nvramtool_op_t op, char op_param[]) +{ + if (*op_found && (op != nvramtool_op.op)) + usage(stderr); + + *op_found = TRUE; + nvramtool_op.op = op; + nvramtool_op.param = op_param; +} + +/**************************************************************************** + * register_op_modifier + * + * Store information regarding an optional argument specified in addition to + * the user's selection of which operation this program should perform. + ****************************************************************************/ +static void register_op_modifier(nvramtool_op_modifier_t mod, char mod_param[]) +{ + static int found_seq = 0; + nvramtool_op_modifier_info_t *mod_info; + + mod_info = &nvramtool_op_modifiers[mod]; + mod_info->found = TRUE; + mod_info->found_seq = ++found_seq; + mod_info->param = mod_param; +} + +/**************************************************************************** + * resolve_op_modifiers + * + * If the user specifies multiple arguments that conflict with each other, + * the last specified argument overrides previous conflicting arguments. + ****************************************************************************/ +static void resolve_op_modifiers(void) +{ + if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found && + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found) { + if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found_seq > + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found_seq) + nvramtool_op_modifiers + [NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found = FALSE; + else + nvramtool_op_modifiers + [NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found = FALSE; + } +} + +/**************************************************************************** + * sanity_check_args + * + * Perform sanity checking on command line arguments. + ****************************************************************************/ +static void sanity_check_args(void) +{ + if ((nvramtool_op_modifiers[NVRAMTOOL_MOD_SHOW_VALUE_ONLY].found) && + (nvramtool_op.op != NVRAMTOOL_OP_CMOS_SHOW_ONE_PARAM)) + usage(stderr); +} Copied: trunk/util/nvramtool/cli/opts.h (from r6309, trunk/util/nvramtool/opts.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/nvramtool/cli/opts.h Fri Jan 28 08:47:10 2011 (r6310, copy of r6309, trunk/util/nvramtool/opts.h) @@ -0,0 +1,79 @@ +/*****************************************************************************\ + * opts.h + ***************************************************************************** + * Copyright (C) 2002-2005 The Regents of the University of California. + * Produced at the Lawrence Livermore National Laboratory. + * Written by Dave Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. + * UCRL-CODE-2003-012 + * All rights reserved. + * + * This file is part of nvramtool, a utility for reading/writing coreboot + * parameters and displaying information from the coreboot table. + * For details, see http://coreboot.org/nvramtool. + * + * Please also read the file DISCLAIMER which is included in this software + * distribution. + * + * 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) version 2, dated June 1991. + * + * 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 terms and + * conditions of 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, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +\*****************************************************************************/ + +#ifndef OPTS_H +#define OPTS_H + +#include "common.h" + +typedef enum { NVRAMTOOL_OP_SHOW_VERSION = 0, + NVRAMTOOL_OP_SHOW_USAGE, + NVRAMTOOL_OP_LBTABLE_SHOW_INFO, + NVRAMTOOL_OP_LBTABLE_DUMP, + NVRAMTOOL_OP_SHOW_PARAM_VALUES, + NVRAMTOOL_OP_CMOS_SHOW_ONE_PARAM, + NVRAMTOOL_OP_CMOS_SHOW_ALL_PARAMS, + NVRAMTOOL_OP_CMOS_SET_ONE_PARAM, + NVRAMTOOL_OP_CMOS_SET_PARAMS_STDIN, + NVRAMTOOL_OP_CMOS_SET_PARAMS_FILE, + NVRAMTOOL_OP_CMOS_CHECKSUM, + NVRAMTOOL_OP_SHOW_LAYOUT, + NVRAMTOOL_OP_WRITE_CMOS_DUMP, + NVRAMTOOL_OP_READ_CMOS_DUMP, + NVRAMTOOL_OP_SHOW_CMOS_HEX_DUMP, + NVRAMTOOL_OP_SHOW_CMOS_DUMPFILE +} nvramtool_op_t; + +typedef struct { + nvramtool_op_t op; + char *param; +} nvramtool_op_info_t; + +typedef enum { NVRAMTOOL_MOD_SHOW_VALUE_ONLY = 0, + NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE, + NVRAMTOOL_MOD_USE_CBFS_FILE, + NVRAMTOOL_MOD_USE_CMOS_FILE, + NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE, + NVRAMTOOL_NUM_OP_MODIFIERS /* must always be last */ +} nvramtool_op_modifier_t; + +typedef struct { + int found; + int found_seq; + char *param; +} nvramtool_op_modifier_info_t; + +extern nvramtool_op_info_t nvramtool_op; + +extern nvramtool_op_modifier_info_t nvramtool_op_modifiers[]; + +void parse_nvramtool_args(int argc, char *argv[]); + +#endif /* OPTS_H */

1 0

[commit] r6309 - trunk/util/nvramtool
by repository service 28 Jan '11

28 Jan '11

Author: oxygene Date: Fri Jan 28 08:41:10 2011 New Revision: 6309 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6309 Log: Eliminate a couple of 3-line functions that barely wrap *printf calls Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Modified: trunk/util/nvramtool/hexdump.c trunk/util/nvramtool/lbtable.c Modified: trunk/util/nvramtool/hexdump.c ============================================================================== --- trunk/util/nvramtool/hexdump.c Fri Jan 28 08:40:08 2011 (r6308) +++ trunk/util/nvramtool/hexdump.c Fri Jan 28 08:41:10 2011 (r6309) @@ -3,6 +3,7 @@ \*****************************************************************************/ #include "hexdump.h" +#include <ctype.h> /* hexdump.c * @@ -44,9 +45,6 @@ */ static void addrprint(FILE * outfile, uint64_t address, int width); -static void hexprint(FILE * outfile, unsigned char byte); -static void charprint(FILE * outfile, unsigned char byte, - unsigned char nonprintable); /*-------------------------------------------------------------------------- * hexdump @@ -92,7 +90,7 @@ /* display the bytes in hex */ for (i = 0;;) { - hexprint(outfile, p[index++]); + fprintf(outfile, "%02x", p[index++]); if (++i >= format->bytes_per_line) break; @@ -104,8 +102,8 @@ fprintf(outfile, format->sep3); /* display the bytes as characters */ - for (i = 0; i < format->bytes_per_line; i++) - charprint(outfile, p[index++], format->nonprintable); + for (i = 0; i < format->bytes_per_line; i++, index++) + fputc(isprint(p[index])?p[index]:format->nonprintable, outfile); fprintf(outfile, "\n"); } @@ -120,7 +118,7 @@ /* display bytes for last line in hex */ for (i = 0; i < bytes_left; i++) { - hexprint(outfile, p[index++]); + fprintf(outfile, "%02x", p[index++]); fprintf(outfile, format->sep2); } @@ -140,7 +138,7 @@ /* display bytes for last line as characters */ for (i = 0; i < bytes_left; i++) - charprint(outfile, p[index++], format->nonprintable); + fputc(isprint(p[index])?p[index++]:format->nonprintable, outfile); /* pad the rest of the character area with spaces */ for (; i < format->bytes_per_line; i++) @@ -188,38 +186,3 @@ } } -/*-------------------------------------------------------------------------- - * hexprint - * - * Display a byte as a two digit hex value. - * - * parameters: - * outfile: the place where the output should be written - * byte: the byte to display - *--------------------------------------------------------------------------*/ -static void hexprint(FILE * outfile, unsigned char byte) -{ - static const char tbl[] = { - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' - }; - - fprintf(outfile, "%c%c", tbl[byte >> 4], tbl[byte & 0x0f]); -} - -/*-------------------------------------------------------------------------- - * charprint - * - * Display a byte as its character representation. - * - * parameters: - * outfile: the place where the output should be written - * byte: the byte to display - * nonprintable: a substitute character to display if the byte - * represents a nonprintable character - *--------------------------------------------------------------------------*/ -static void charprint(FILE * outfile, unsigned char byte, - unsigned char nonprintable) -{ - fprintf(outfile, "%c", ((byte >= 0x20) && (byte <= 0x7e)) ? byte : nonprintable); -} Modified: trunk/util/nvramtool/lbtable.c ============================================================================== --- trunk/util/nvramtool/lbtable.c Fri Jan 28 08:40:08 2011 (r6308) +++ trunk/util/nvramtool/lbtable.c Fri Jan 28 08:41:10 2011 (r6309) @@ -88,7 +88,6 @@ static void print_unknown_record(const struct lb_record *cmos_item); static void option_checksum_print_fn(const struct lb_record *rec); static void string_print_fn(const struct lb_record *rec); -static void uint64_to_hex_string(char str[], uint64_t n); static const char memory_desc[] = " This shows information about system memory.\n"; @@ -1058,7 +1057,6 @@ ****************************************************************************/ static void memory_print_fn(const struct lb_record *rec) { - char start_str[19], end_str[19], size_str[19]; const struct lb_memory *p; const char *mem_type; const struct lb_memory_range *ranges; @@ -1096,13 +1094,10 @@ size = unpack_lb64(ranges[i].size); start = unpack_lb64(ranges[i].start); end = start + size - 1; - uint64_to_hex_string(start_str, start); - uint64_to_hex_string(end_str, end); - uint64_to_hex_string(size_str, size); printf("%s memory:\n" - " from physical addresses %s to %s\n" - " size is %s bytes (%lld in decimal)\n", - mem_type, start_str, end_str, size_str, + " from physical addresses 0x%016llx to 0x%016llx\n" + " size is 0x%016llx bytes (%lld in decimal)\n", + mem_type, start, end, size, (unsigned long long)size); if (++i >= entries) @@ -1327,24 +1322,3 @@ printf("%s\n", p->string); } -/**************************************************************************** - * uint64_to_hex_string - * - * Convert the 64-bit integer 'n' to its hexadecimal string representation, - * storing the result in 's'. 's' must point to a buffer at least 19 bytes - * long. The result is displayed with as many leading zeros as needed to - * make a 16-digit hex number including a 0x prefix (example: the number 1 - * will be displayed as "0x0000000000000001"). - ****************************************************************************/ -static void uint64_to_hex_string(char str[], uint64_t n) -{ - int chars_printed; - - str[0] = '0'; - str[1] = 'x'; - - /* Print the result right-justified with leading spaces in a - * 16-character field. */ - chars_printed = sprintf(&str[2], "%016llx", (unsigned long long)n); - assert(chars_printed == 16); -}

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot January 2011