March 2010 - coreboot - mail.coreboot.org

[FILO] r117 - in trunk/filo: fs include
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 13:03:48 2010 New Revision: 117 URL: http://tracker.coreboot.org/trac/filo/changeset/117 Log: filo cbfs filesystem driver cosmetics Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/fs/cbfs.c trunk/filo/include/cbfs.h Modified: trunk/filo/fs/cbfs.c ============================================================================== --- trunk/filo/fs/cbfs.c Fri Mar 26 13:01:39 2010 (r116) +++ trunk/filo/fs/cbfs.c Fri Mar 26 13:03:48 2010 (r117) @@ -85,7 +85,7 @@ if (header == NULL) return NULL; - offset = phys_to_virt(0 - ntohl(header->romsize) + ntohl(header->offset)); + offset = (unsigned long) phys_to_virt(0 - ntohl(header->romsize) + ntohl(header->offset)); int align= ntohl(header->align); @@ -105,7 +105,7 @@ printk_spew("%p\n", (void *)offset); if (virt_to_phys(offset) <= virt_to_phys(oldoffset)) return NULL; - if (offset < phys_to_virt(0xFFFFFFFF - ntohl(header->romsize))) + if (offset < (unsigned long)phys_to_virt(0xFFFFFFFF - ntohl(header->romsize))) return NULL; } } Modified: trunk/filo/include/cbfs.h ============================================================================== --- trunk/filo/include/cbfs.h Fri Mar 26 13:01:39 2010 (r116) +++ trunk/filo/include/cbfs.h Fri Mar 26 13:03:48 2010 (r117) @@ -157,7 +157,6 @@ #define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file)) #define CBFS_SUBHEADER(_p) ( (void *) ((((u8 *) (_p)) + ntohl((_p)->offset))) ) -void * cbfs_load_payload(struct lb_memory *lb_mem, const char *name); void * cbfs_load_stage(const char *name); int cbfs_execute_stage(const char *name); void * cbfs_get_file(const char *name);

1 0

[FILO] r116 - in trunk/filo: drivers fs
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 13:01:39 2010 New Revision: 116 URL: http://tracker.coreboot.org/trac/filo/changeset/116 Log: improve IDE error handling Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/drivers/ide_new.c trunk/filo/drivers/ide_new.h trunk/filo/fs/blockdev.c Modified: trunk/filo/drivers/ide_new.c ============================================================================== --- trunk/filo/drivers/ide_new.c Fri Mar 26 12:59:14 2010 (r115) +++ trunk/filo/drivers/ide_new.c Fri Mar 26 13:01:39 2010 (r116) @@ -3,7 +3,7 @@ * * Copyright (C) 2004 Jens Axboe <axboe(a)suse.de> * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> - * Copyright (C) 2009 coresystems GmbH + * Copyright (C) 2009-2010 coresystems GmbH * * Credit goes to Hale Landis for his excellent ata demo software * @@ -164,14 +164,15 @@ if (!stat) stat = ob_ide_pio_readb(drive, IDEREG_STATUS); - printf("ob_ide_error drive<%d>: %s:\n", drive->nr, msg); - printf(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); + debug("ob_ide_error "); + printf("drive<%d>: %s:\n", drive->nr, msg); + debug(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); if ((stat & (BUSY_STAT | ERR_STAT)) == ERR_STAT) { err = ob_ide_pio_readb(drive, IDEREG_ERROR); - printf(", err=%x", err); + debug(", err=%x", err); } - printf("\n"); + debug("\n"); /* * see if sense is valid and dump that @@ -183,19 +184,19 @@ if (cmd->cdb[0] == ATAPI_REQ_SENSE) { old_cdb = cmd->old_cdb; - printf(" atapi opcode=%02x", old_cdb); + debug(" atapi opcode=%02x", old_cdb); } else { int i; - printf(" cdb: "); + debug(" cdb: "); for (i = 0; i < sizeof(cmd->cdb); i++) - printf("%02x ", cmd->cdb[i]); + debug("%02x ", cmd->cdb[i]); } if (cmd->sense_valid) - printf(", sense: %02x/%02x/%02x", cmd->sense.sense_key, cmd->sense.asc, cmd->sense.ascq); + debug(", sense: %02x/%02x/%02x", cmd->sense.sense_key, cmd->sense.asc, cmd->sense.ascq); else - printf(", no sense"); - printf("\n"); + debug(", no sense"); + debug("\n"); } } @@ -567,10 +568,15 @@ /* * ... except 'medium not present' */ - if (cmd->sense.asc == 0x3a) + if (cmd->sense.asc == 0x3a) { + /* 'medium not present' is not an error */ + ret = 0; + /* force reevaluation */ + drive->channel->present = 0; break; + } - udelay(1000000); + mdelay(1000); } while (retries--); if (ret) @@ -613,10 +619,23 @@ { struct atapi_command *cmd = &drive->channel->atapi_cmd; struct atapi_capacity cap; + int i; /* * Test Unit Ready is like a ping + * But wait a bit, as the drive might take a while */ + i = 30; + while (i-- != 0) { + memset(cmd, 0, sizeof(*cmd)); + cmd->cdb[0] = ATAPI_TUR; + + if (!ob_ide_atapi_packet(drive,cmd)) break; + + /* Give the drive some time to breathe */ + mdelay(500); + } + memset(cmd, 0, sizeof(*cmd)); cmd->cdb[0] = ATAPI_TUR; @@ -671,7 +690,7 @@ struct atapi_command *cmd = &drive->channel->atapi_cmd; if (ob_ide_atapi_drive_ready(drive)) - return 1; + return RETURN_NO_MEDIUM; if (drive->bs == 2048) { if (((block & 3) != 0) || ((sectors & 3) != 0)) { @@ -1149,7 +1168,9 @@ val == 0x0000ffff || val == 0xffff0000) continue; - if (val == 0xac8f104c) { + // skip TI bridges on Rocky (ac8f) and Getac (803b) + // There must be a better way to do this... + if (val == 0xac8f104c || val == 0x803b104c) { debug("Skipping TI bridge\n"); continue; } Modified: trunk/filo/drivers/ide_new.h ============================================================================== --- trunk/filo/drivers/ide_new.h Fri Mar 26 12:59:14 2010 (r115) +++ trunk/filo/drivers/ide_new.h Fri Mar 26 13:01:39 2010 (r116) @@ -5,6 +5,14 @@ #include "hdreg.h" /* + * Return values + */ + +#define RETURN_OK 0x00 +#define RETURN_ERROR 0x01 +#define RETURN_NO_MEDIUM 0x02 + +/* * legacy ide ports */ #define IDEREG_DATA 0x00 Modified: trunk/filo/fs/blockdev.c ============================================================================== --- trunk/filo/fs/blockdev.c Fri Mar 26 12:59:14 2010 (r115) +++ trunk/filo/fs/blockdev.c Fri Mar 26 13:01:39 2010 (r116) @@ -394,7 +394,11 @@ case DISK_IDE: { int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash); - if (ide_read_blocks(dev_drive, sector, count, buf) != 0) + int ret; + ret = ide_read_blocks(dev_drive, sector, count, buf); + if (ret == 2) + goto nomedium; + if (ret != 0) goto readerr; while (--count>0) { cache_sect[hash+count] = sector + count; @@ -439,6 +443,12 @@ readerr: printf("Disk read error dev=%d drive=%d sector=%lu\n", dev_type, dev_drive, sector); + flush_cache(); + dev_name[0] = '\0'; /* force re-open the device next time */ + return 0; + nomedium: + printf("No disk in drive.\n"); + flush_cache(); dev_name[0] = '\0'; /* force re-open the device next time */ return 0; }

1 0

[FILO] r115 - trunk/filo/i386
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:59:14 2010 New Revision: 115 URL: http://tracker.coreboot.org/trac/filo/changeset/115 Log: linux loader support for fb only mode (not fully functional, but does not break anything either) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/i386/linux_load.c Modified: trunk/filo/i386/linux_load.c ============================================================================== --- trunk/filo/i386/linux_load.c Fri Mar 26 12:57:34 2010 (r114) +++ trunk/filo/i386/linux_load.c Fri Mar 26 12:59:14 2010 (r115) @@ -27,6 +27,7 @@ #include <libpayload.h> #include <libpayload-config.h> +#include <coreboot_tables.h> #include <config.h> #include <fs.h> #include "context.h" @@ -297,6 +298,33 @@ debug("ext_mem_k=%d, alt_mem_k=%d\n", params->ext_mem_k, params->alt_mem_k); } +/* Video mode */ +static void +set_video_mode(struct linux_params *params) +{ +#if CONFIG_COREBOOT_VIDEO_CONSOLE + /* Are we running on a framebuffer console? */ + if (!lib_sysinfo.framebuffer) + return; + + params->lfb_width = lib_sysinfo.framebuffer->x_resolution; + params->lfb_height = lib_sysinfo.framebuffer->y_resolution; + params->lfb_depth = lib_sysinfo.framebuffer->bits_per_pixel; + params->lfb_linelength = lib_sysinfo.framebuffer->bytes_per_line; + params->lfb_base = lib_sysinfo.framebuffer->physical_address; + // prolly not enough for the boot splash?! + params->lfb_size = (params->lfb_linelength * params->lfb_height + 65535 ) >> 16; + params->red_size = lib_sysinfo.framebuffer->red_mask_size; + params->red_pos = lib_sysinfo.framebuffer->red_mask_pos; + params->green_size = lib_sysinfo.framebuffer->green_mask_size; + params->green_pos = lib_sysinfo.framebuffer->green_mask_pos; + params->blue_size = lib_sysinfo.framebuffer->blue_mask_size; + params->blue_pos = lib_sysinfo.framebuffer->blue_mask_pos; + params->rsvd_size = lib_sysinfo.framebuffer->reserved_mask_size; + params->rsvd_pos = lib_sysinfo.framebuffer->reserved_mask_pos; +#endif +} + /* * Parse command line * Some parameters, like initrd=<file>, are not passed to kernel, @@ -667,6 +695,7 @@ params = phys_to_virt(LINUX_PARAM_LOC); init_linux_params(params, &hdr); set_memory_size(params); + set_video_mode(params); initrd_file = parse_command_line(cmdline, phys_to_virt(COMMAND_LINE_LOC)); set_command_line_loc(params, &hdr);

1 0

[FILO] r113 - trunk/filo/main
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:55:18 2010 New Revision: 113 URL: http://tracker.coreboot.org/trac/filo/changeset/113 Log: use new libpayload HID mechanism to register reset handler for USB and PS2 keyboard Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/main/filo.c Modified: trunk/filo/main/filo.c ============================================================================== --- trunk/filo/main/filo.c Fri Mar 26 12:51:57 2010 (r112) +++ trunk/filo/main/filo.c Fri Mar 26 12:55:18 2010 (r113) @@ -45,14 +45,26 @@ void relocate(void); -static void init(void) +void filo_reset_handler(void) { - /* Set up the consoles. */ - console_init(); + void __attribute__((weak)) platform_reboot(void); + + if (platform_reboot) + platform_reboot(); + else + printf("Rebooting not supported.\n"); + +} + +static void init(void) +{ /* Gather system information, and implicitly sets up timers */ lib_get_sysinfo(); + /* Set up the consoles. */ + console_init(); + printf("%s version %s\n", program_name, program_version); collect_sys_info(&sys_info); relocate(); @@ -68,8 +80,9 @@ printf("No USB stack in libpayload.\n"); #endif #endif - - +#if defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_USB_HID) + add_reset_handler(filo_reset_handler); +#endif #ifdef CONFIG_SUPPORT_SOUND sound_init(); #endif @@ -125,17 +138,6 @@ return ret; } -void reset_handler(void) -{ - void __attribute__((weak)) platform_reboot(void); - - if (platform_reboot) - platform_reboot(); - else - printf("Rebooting not supported.\n"); - -} - #if CONFIG_USE_GRUB /* The main routine */ int main(void) @@ -145,9 +147,6 @@ /* Initialize */ init(); -#ifdef CONFIG_PC_KEYBOARD - keyboard_add_reset_handler(reset_handler); -#endif grub_menulst(); grub_main(); return 0;

1 0

[FILO] r112 - trunk/filo
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:51:57 2010 New Revision: 112 URL: http://tracker.coreboot.org/trac/filo/changeset/112 Log: add -pipe, this significantly increases build performance on windows. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/Makefile Modified: trunk/filo/Makefile ============================================================================== --- trunk/filo/Makefile Fri Mar 26 12:50:53 2010 (r111) +++ trunk/filo/Makefile Fri Mar 26 12:51:57 2010 (r112) @@ -44,8 +44,8 @@ CC = gcc HOSTCC = gcc HOSTCXX = g++ -HOSTCFLAGS := -I$(srck) -I$(objk) -HOSTCXXFLAGS := -I$(srck) -I$(objk) +HOSTCFLAGS := -I$(srck) -I$(objk) -pipe +HOSTCXXFLAGS := -I$(srck) -I$(objk) -pipe STRIP ?= strip NM ?= nm @@ -93,7 +93,7 @@ GCCINCDIR = $(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include CPPFLAGS = -nostdinc -imacros $(obj)/config.h -Iinclude -I$(GCCINCDIR) -MD -CFLAGS += $(STACKPROTECT) $(INCLUDES) -Wall -Os -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing -Wshadow +CFLAGS += $(STACKPROTECT) $(INCLUDES) -Wall -Os -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing -Wshadow -pipe TARGET = $(obj)/filo.elf

1 0

[FILO] r111 - trunk/filo/drivers
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:50:53 2010 New Revision: 111 URL: http://tracker.coreboot.org/trac/filo/changeset/111 Log: fix typo in comment Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/drivers/intel.c Modified: trunk/filo/drivers/intel.c ============================================================================== --- trunk/filo/drivers/intel.c Fri Mar 26 12:49:05 2010 (r110) +++ trunk/filo/drivers/intel.c Fri Mar 26 12:50:53 2010 (r111) @@ -148,7 +148,7 @@ outw(PWRBTN_STS, pmbase + PM1_STS); /* PMBASE + 4, Bit 10-12, Sleeping Type, - * set to 110 -> S5, soft_off */ + * set to 111 -> S5, soft_off */ reg32 = inl(pmbase + PM1_CNT);

1 0

[FILO] r110 - trunk/filo
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:49:05 2010 New Revision: 110 URL: http://tracker.coreboot.org/trac/filo/changeset/110 Log: build script - pick up coreboot cross compiler - use coreboot copy of libpayload Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/build.sh Modified: trunk/filo/build.sh ============================================================================== --- trunk/filo/build.sh Fri Mar 26 12:42:06 2010 (r109) +++ trunk/filo/build.sh Fri Mar 26 12:49:05 2010 (r110) @@ -10,7 +10,7 @@ done GCCPREFIX=invalid -for gccprefixes in `pwd`/../crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do +for gccprefixes in `pwd`/../coreboot/util/crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do TMP=`mktemp /tmp/temp.XXXX` echo "mov %eax, %eax" > ${TMP}.s printf "\x7fELF" > ${TMP}.compare @@ -50,13 +50,13 @@ cp configs/$CONFIG ./.config $MAKE oldconfig -cd libpayload +cd ../coreboot/payloads/libpayload $MAKE distclean cp configs/$CONFIG .config $MAKE oldconfig eval $MAKE $MAKEFLAGS -eval $MAKE $MAKEFLAGS DESTDIR=../build install -cd .. +eval $MAKE $MAKEFLAGS DESTDIR=../../../filo/build install +cd ../../../filo eval $MAKE $MAKEFLAGS

1 0

[commit] r5302 - trunk/payloads/libpayload/configs
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:47:13 2010 New Revision: 5302 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5302 Log: Update libpayload default configuration so a make oldconfig on that configuration does not ask questions. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/payloads/libpayload/configs/defconfig Modified: trunk/payloads/libpayload/configs/defconfig ============================================================================== --- trunk/payloads/libpayload/configs/defconfig Fri Mar 26 11:33:36 2010 (r5301) +++ trunk/payloads/libpayload/configs/defconfig Fri Mar 26 12:47:13 2010 (r5302) @@ -1,10 +1,17 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Thu May 21 12:01:39 2009 +# Fri Mar 26 12:45:27 2010 # # +# Generic Options +# +# CONFIG_EXPERIMENTAL is not set +# CONFIG_OBSOLETE is not set +# CONFIG_DEVELOPER is not set + +# # Architecture Options # CONFIG_TARGET_I386=y @@ -16,6 +23,7 @@ # CONFIG_LIBC=y CONFIG_TINYCURSES=y +# CONFIG_CBFS is not set # # Console Options @@ -27,6 +35,7 @@ CONFIG_VIDEO_CONSOLE=y CONFIG_VGA_VIDEO_CONSOLE=y # CONFIG_GEODELX_VIDEO_CONSOLE is not set +CONFIG_COREBOOT_VIDEO_CONSOLE=y CONFIG_PC_KEYBOARD=y CONFIG_PC_KEYBOARD_LAYOUT_US=y # CONFIG_PC_KEYBOARD_LAYOUT_DE is not set @@ -38,4 +47,10 @@ CONFIG_NVRAM=y # CONFIG_RTC_PORT_EXTENDED_VIA is not set CONFIG_SPEAKER=y -# CONFIG_USB is not set +CONFIG_USB=y +CONFIG_USB_UHCI=y +# CONFIG_USB_OHCI is not set +# CONFIG_USB_EHCI is not set +CONFIG_USB_HID=y +CONFIG_USB_HUB=y +CONFIG_USB_MSC=y

1 0

[FILO] r109 - trunk/filo
by repository service March 26, 2010

March 26, 2010

Author: stepan Date: Fri Mar 26 12:42:06 2010 New Revision: 109 URL: http://tracker.coreboot.org/trac/filo/changeset/109 Log: drop svn:externals of libpayload from filo. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/filo/ (props changed) trunk/filo/README Modified: trunk/filo/README ============================================================================== --- trunk/filo/README Mon Mar 8 14:09:45 2010 (r108) +++ trunk/filo/README Fri Mar 26 12:42:06 2010 (r109) @@ -39,13 +39,13 @@ INSTALL - First, you need to compile libpayload (included via svn:externals in FILO): + First, you need to compile libpayload (included in coreboot): - $ cd libpayload + $ cd ../coreboot/payloads/libpayload $ make defconfig $ make - $ make DESTDIR=../build install - $ cd .. + $ make DESTDIR=../../../filo/build install + $ cd ../../../filo Configure FILO using the Kconfig interface:

1 0

[commit] r5301 - trunk/util/sconfig
by repository service March 26, 2010

March 26, 2010

Author: oxygene Date: Fri Mar 26 11:33:36 2010 New Revision: 5301 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5301 Log: Make sconfig only complain about real conflicts. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/sconfig/config.g Modified: trunk/util/sconfig/config.g ============================================================================== --- trunk/util/sconfig/config.g Fri Mar 26 02:43:30 2010 (r5300) +++ trunk/util/sconfig/config.g Fri Mar 26 11:33:36 2010 (r5301) @@ -602,8 +602,8 @@ def setdict(dict, name, value): debug.info(debug.dict, "setdict sets %s to %s" % (name, value)) - if name in dict.keys(): - print "Duplicate in dict: %s" % name + if name in dict.keys() and not dict[name] == value: + print "Collision in dict: %s is %s, shall be set to %s" % (name, dict[name], value) dict[name] = value

1 0