coreboot September 2009

coreboot@coreboot.org

62 participants
305 discussions

[v2] r4624 - trunk/util/msrtool
by svn＠coreboot.org 01 Sep '09

01 Sep '09

Author: stepan Date: 2009-09-01 12:03:01 +0200 (Tue, 01 Sep 2009) New Revision: 4624 Added: trunk/util/msrtool/darwin.c Modified: trunk/util/msrtool/Makefile.in trunk/util/msrtool/configure trunk/util/msrtool/msrtool.c trunk/util/msrtool/msrtool.h trunk/util/msrtool/sys.c Log: port msrtool to darwin. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> with minor changes to allow 32bit and 64bit compilation and (I hope), Peter's concerns addressed. Modified: trunk/util/msrtool/Makefile.in =================================================================== --- trunk/util/msrtool/Makefile.in 2009-09-01 09:57:55 UTC (rev 4623) +++ trunk/util/msrtool/Makefile.in 2009-09-01 10:03:01 UTC (rev 4624) @@ -27,7 +27,7 @@ LDFLAGS = @LDFLAGS@ TARGETS = geodelx.o cs5536.o k8.o -SYSTEMS = linux.o +SYSTEMS = linux.o darwin.o OBJS = $(PROGRAM).o msrutils.o sys.o $(SYSTEMS) $(TARGETS) all: $(PROGRAM) @@ -39,9 +39,8 @@ $(CC) $(CFLAGS) -DVERSION='"@VERSION@"' -c $< -o $@ install: $(PROGRAM) - $(INSTALL) $(PROGRAM) $(PREFIX)/sbin - mkdir -p $(PREFIX)/share/man/man8 - $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8 + mkdir -p $(DESTDIR)$(PREFIX)/sbin + $(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin distprep: distclean Makefile.deps Modified: trunk/util/msrtool/configure =================================================================== --- trunk/util/msrtool/configure 2009-09-01 09:57:55 UTC (rev 4623) +++ trunk/util/msrtool/configure 2009-09-01 10:03:01 UTC (rev 4624) @@ -155,7 +155,7 @@ rm -f .config.c exit 1 } -LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework IOKit -L/usr/local/lib -lpci -lz"` || { +LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectIO -lpci -lz"` || { rm -f .config.c .config.o exit 1 } Added: trunk/util/msrtool/darwin.c =================================================================== --- trunk/util/msrtool/darwin.c (rev 0) +++ trunk/util/msrtool/darwin.c 2009-09-01 10:03:01 UTC (rev 4624) @@ -0,0 +1,61 @@ +/* + * This file is part of msrtool. + * + * Copyright (c) 2009 coresystems GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +#include "msrtool.h" + +int darwin_probe(const struct sysdef *system) +{ +#ifdef __DARWIN__ + return iopl(3) == 0; +#else + return 0; +#endif +} + +int darwin_open(uint8_t cpu, enum SysModes mode) +{ + if (cpu > 0) { + fprintf(stderr, "%s: only core 0 is supported on Mac OS X right now.\n", __func__); + return 0; + } + return 1; +} + +int darwin_close(uint8_t cpu) +{ + return 1; +} + +int darwin_rdmsr(uint8_t cpu, uint32_t addr, struct msr *val) +{ + msr_t msr; + + msr = rdmsr(addr); + + val->hi = msr.lo; + val->lo = msr.hi; + return 1; +} Modified: trunk/util/msrtool/msrtool.c =================================================================== --- trunk/util/msrtool/msrtool.c 2009-09-01 09:57:55 UTC (rev 4623) +++ trunk/util/msrtool/msrtool.c 2009-09-01 10:03:01 UTC (rev 4624) @@ -48,6 +48,7 @@ static struct sysdef allsystems[] = { { "linux", "Linux with /dev/cpu/*/msr", linux_probe, linux_open, linux_close, linux_rdmsr }, + { "darwin", "OS X with DirectIO", darwin_probe, darwin_open, darwin_close, darwin_rdmsr }, { SYSTEM_EOT } }; Modified: trunk/util/msrtool/msrtool.h =================================================================== --- trunk/util/msrtool/msrtool.h 2009-09-01 09:57:55 UTC (rev 4623) +++ trunk/util/msrtool/msrtool.h 2009-09-01 10:03:01 UTC (rev 4624) @@ -2,6 +2,7 @@ * This file is part of msrtool. * * Copyright (c) 2008 Peter Stuge <peter(a)stuge.se> + * Copyright (c) 2009 coresystems GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -22,6 +23,11 @@ #include <stdio.h> #include <stdint.h> +#if (defined(__MACH__) && defined(__APPLE__)) +/* DirectIO is available here: http://www.coresystems.de/en/directio */ +#define __DARWIN__ +#include <DirectIO/darwinio.h> +#endif #include <pci/pci.h> #define HEXCHARS "0123456789abcdefABCDEF" @@ -174,6 +180,11 @@ extern int linux_close(uint8_t cpu); extern int linux_rdmsr(uint8_t cpu, uint32_t addr, struct msr *val); +/* darwin.c */ +extern int darwin_probe(const struct sysdef *system); +extern int darwin_open(uint8_t cpu, enum SysModes mode); +extern int darwin_close(uint8_t cpu); +extern int darwin_rdmsr(uint8_t cpu, uint32_t addr, struct msr *val); /** target externs **/ Modified: trunk/util/msrtool/sys.c =================================================================== --- trunk/util/msrtool/sys.c 2009-09-01 09:57:55 UTC (rev 4623) +++ trunk/util/msrtool/sys.c 2009-09-01 10:03:01 UTC (rev 4624) @@ -2,6 +2,7 @@ * This file is part of msrtool. * * Copyright (c) 2008 Peter Stuge <peter(a)stuge.se> + * Copyright (c) 2009 coresystems GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -25,7 +26,18 @@ struct cpuid_t *cpuid(void) { uint32_t outeax; + +#if defined(__DARWIN__) && !defined(__LP64__) + asm volatile ( + "pushl %%ebx \n" + "cpuid \n" + "popl %%ebx \n" + : "=a" (outeax) : "a" (1) : "%ecx", "%edx" + ); +#else asm ("cpuid" : "=a" (outeax) : "a" (1) : "%ebx", "%ecx", "%edx"); +#endif + id.stepping = outeax & 0xf; outeax >>= 4; id.model = outeax & 0xf; @@ -40,6 +52,9 @@ id.model |= (id.ext_model << 4); id.family += id.ext_family; } + printf_verbose("CPU: family %x, model %x, stepping %x\n", + id.family, id.model, id.stepping); + return &id; }

1 0

[v2] r4623 - trunk/util/superiotool
by svn＠coreboot.org 01 Sep '09

01 Sep '09

Author: stepan Date: 2009-09-01 11:57:55 +0200 (Tue, 01 Sep 2009) New Revision: 4623 Modified: trunk/util/superiotool/Makefile trunk/util/superiotool/superiotool.h Log: * Add OSX/Darwin support * Add DESTDIR support Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/util/superiotool/Makefile =================================================================== --- trunk/util/superiotool/Makefile 2009-09-01 09:54:21 UTC (rev 4622) +++ trunk/util/superiotool/Makefile 2009-09-01 09:57:55 UTC (rev 4623) @@ -34,17 +34,23 @@ OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o +OS_ARCH = $(shell uname) +ifeq ($(OS_ARCH), Darwin) +LDFLAGS = -framework IOKit -framework DirectIO -lpci -lz +endif + all: $(PROGRAM) superiotool.o: *.c superiotool.h $(PROGRAM): $(OBJS) superiotool.h - $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) install: $(PROGRAM) - $(INSTALL) $(PROGRAM) $(PREFIX)/sbin - mkdir -p $(PREFIX)/share/man/man8 - $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8 + 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 clean: rm -f $(PROGRAM) *.o Modified: trunk/util/superiotool/superiotool.h =================================================================== --- trunk/util/superiotool/superiotool.h 2009-09-01 09:54:21 UTC (rev 4622) +++ trunk/util/superiotool/superiotool.h 2009-09-01 09:57:55 UTC (rev 4623) @@ -4,6 +4,7 @@ * Copyright (C) 2007 Carl-Daniel Hailfinger * Copyright (C) 2007 Uwe Hermann <uwe(a)hermann-uwe.de> * Copyright (C) 2008 Robinson P. Tryon <bishop.robinson(a)gmail.com> + * Copyright (C) 2008-2009 coresystems GmbH * * 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 @@ -31,6 +32,10 @@ #if defined(__GLIBC__) #include <sys/io.h> #endif +#if (defined(__MACH__) && defined(__APPLE__)) +/* DirectIO is available here: http://www.coresystems.de/en/directio */ +#include <DirectIO/darwinio.h> +#endif #if defined(__FreeBSD__) #include <sys/types.h>

1 0

[v2] r4622 - trunk/util/nvramtool
by svn＠coreboot.org 01 Sep '09

01 Sep '09

Author: stepan Date: 2009-09-01 11:54:21 +0200 (Tue, 01 Sep 2009) New Revision: 4622 Modified: trunk/util/nvramtool/Makefile trunk/util/nvramtool/common.h trunk/util/nvramtool/nvramtool.spec Log: nvramtool: * Add OSX/Darwin support * Add $DESTDIR support * Clean up make install/spec Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/util/nvramtool/Makefile =================================================================== --- trunk/util/nvramtool/Makefile 2009-09-01 09:52:14 UTC (rev 4621) +++ trunk/util/nvramtool/Makefile 2009-09-01 09:54:21 UTC (rev 4622) @@ -18,6 +18,11 @@ hexdump.o input_file.o layout.o layout_file.o lbtable.o \ nvramtool.o opts.o reg_expr.o +OS_ARCH = $(shell uname) +ifeq ($(OS_ARCH), Darwin) +LDFLAGS = -framework DirectIO +endif + all: dep $(PROGRAM) $(PROGRAM): $(OBJS) @@ -34,9 +39,10 @@ @$(CC) -MM *.c > .dependencies install: $(PROGRAM) - $(INSTALL) $(PROGRAM) $(PREFIX)/sbin - mkdir -p $(PREFIX)/share/man/man1 - $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8 + 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 .PHONY: all clean distclean dep Modified: trunk/util/nvramtool/common.h =================================================================== --- trunk/util/nvramtool/common.h 2009-09-01 09:52:14 UTC (rev 4621) +++ trunk/util/nvramtool/common.h 2009-09-01 09:54:21 UTC (rev 4622) @@ -53,7 +53,12 @@ #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 Modified: trunk/util/nvramtool/nvramtool.spec =================================================================== --- trunk/util/nvramtool/nvramtool.spec 2009-09-01 09:52:14 UTC (rev 4621) +++ trunk/util/nvramtool/nvramtool.spec 2009-09-01 09:54:21 UTC (rev 4622) @@ -33,9 +33,9 @@ %install rm -rf "$RPM_BUILD_ROOT" mkdir -p "$RPM_BUILD_ROOT/usr/bin" -mkdir -p "$RPM_BUILD_ROOT/usr/man/man1" +mkdir -p "$RPM_BUILD_ROOT/usr/man/man8" cp nvramtool "$RPM_BUILD_ROOT/usr/bin" -cp nvramtool.1.gz $RPM_BUILD_ROOT/usr/man/man1 +cp nvramtool.8.gz $RPM_BUILD_ROOT/usr/man/man8 %clean rm -rf "$RPM_BUILD_ROOT" @@ -45,4 +45,4 @@ %doc ChangeLog README %doc README /usr/bin/nvramtool -/usr/man/man1/nvramtool.1.gz +/usr/man/man8/nvramtool.8.gz

1 0

[v2] r4621 - trunk/util/inteltool
by svn＠coreboot.org 01 Sep '09

01 Sep '09

Author: stepan Date: 2009-09-01 11:52:14 +0200 (Tue, 01 Sep 2009) New Revision: 4621 Modified: trunk/util/inteltool/Makefile trunk/util/inteltool/cpu.c trunk/util/inteltool/inteltool.c trunk/util/inteltool/inteltool.h Log: Clean up Mac OS X support of inteltool Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Some minor modifications to allow 64bit/32bit compilation on Darwin Modified: trunk/util/inteltool/Makefile =================================================================== --- trunk/util/inteltool/Makefile 2009-08-29 15:45:43 UTC (rev 4620) +++ trunk/util/inteltool/Makefile 2009-09-01 09:52:14 UTC (rev 4621) @@ -31,9 +31,7 @@ OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) -CFLAGS += -DDARWIN -I/usr/local/include -LDFLAGS = -framework IOKit -framework DirectIO -L/usr/local/lib -lpci -lz -# OBJS += darwinio.o +LDFLAGS = -framework DirectIO -lpci -lz endif all: pciutils dep $(PROGRAM) @@ -56,7 +54,7 @@ printf "struct pci_access *pacc;\n"; \ printf "int main(int argc, char **argv)\n"; \ printf "{ pacc = pci_alloc(); return 0; }\n"; ) > .test.c ) - @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) &>/dev/null && \ + @$(CC) $(CFLAGS) $(LDFLAGS) .test.c -o .test &>/dev/null && \ printf "found.\n" || ( printf "not found.\n\n"; \ printf "Please install pciutils-devel and zlib-devel.\n"; \ printf "See README for more information.\n\n"; \ @@ -64,6 +62,7 @@ @rm -rf .test.c .test .test.dSYM install: $(PROGRAM) + 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 Modified: trunk/util/inteltool/cpu.c =================================================================== --- trunk/util/inteltool/cpu.c 2009-08-29 15:45:43 UTC (rev 4620) +++ trunk/util/inteltool/cpu.c 2009-09-01 09:52:14 UTC (rev 4621) @@ -30,30 +30,23 @@ unsigned int cpuid(unsigned int op) { - unsigned int ret; - unsigned int dummy2, dummy3, dummy4; -#if DARWIN - asm volatile ( - "pushl %%ebx \n" - "cpuid \n" - "movl %%ebx, %1 \n" - "popl %%ebx \n" - : "=a" (ret), "=r" (dummy2), "=c" (dummy3), "=d" (dummy4) - : "a" (op) - : "cc" - ); + uint32_t ret; + +#if defined(__DARWIN__) && !defined(__LP64__) + asm volatile ( + "pushl %%ebx \n" + "cpuid \n" + "popl %%ebx \n" + : "=a" (ret) : "a" (op) : "%ecx", "%edx" + ); #else - asm volatile ( - "cpuid" - : "=a" (ret), "=b" (dummy2), "=c" (dummy3), "=d" (dummy4) - : "a" (op) - : "cc" - ); + asm ("cpuid" : "=a" (ret) : "a" (op) : "%ebx", "%ecx", "%edx"); #endif + return ret; } -#ifndef DARWIN +#ifndef __DARWIN__ int msr_readerror = 0; msr_t rdmsr(int addr) @@ -288,7 +281,7 @@ return -1; } -#ifndef DARWIN +#ifndef __DARWIN__ fd_msr = open("/dev/cpu/0/msr", O_RDWR); if (fd_msr < 0) { perror("Error while opening /dev/cpu/0/msr"); @@ -309,7 +302,7 @@ close(fd_msr); for (core = 0; core < 8; core++) { -#ifndef DARWIN +#ifndef __DARWIN__ char msrfilename[64]; memset(msrfilename, 0, 64); sprintf(msrfilename, "/dev/cpu/%d/msr", core); @@ -330,12 +323,12 @@ cpu->per_core_msrs[i].number, msr.hi, msr.lo, cpu->per_core_msrs[i].name); } -#ifndef DARWIN +#ifndef __DARWIN__ close(fd_msr); #endif } -#ifndef DARWIN +#ifndef __DARWIN__ if (msr_readerror) printf("\n(*) Some MSRs could not be read. The marked values are unreliable.\n"); #endif Modified: trunk/util/inteltool/inteltool.c =================================================================== --- trunk/util/inteltool/inteltool.c 2009-08-29 15:45:43 UTC (rev 4620) +++ trunk/util/inteltool/inteltool.c 2009-09-01 09:52:14 UTC (rev 4621) @@ -50,10 +50,10 @@ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH, "ICH" } }; -#ifndef DARWIN +#ifndef __DARWIN__ static int fd_mem; -void *map_physical(unsigned long phys_addr, int len) +void *map_physical(unsigned long phys_addr, size_t len) { void *virt_addr; @@ -68,7 +68,7 @@ return virt_addr; } -void unmap_physical(void *virt_addr, int len) +void unmap_physical(void *virt_addr, size_t len) { munmap(virt_addr, len); } @@ -192,7 +192,7 @@ exit(1); } -#ifndef DARWIN +#ifndef __DARWIN__ if ((fd_mem = open("/dev/mem", O_RDWR)) < 0) { perror("Can not open /dev/mem"); exit(1); Modified: trunk/util/inteltool/inteltool.h =================================================================== --- trunk/util/inteltool/inteltool.h 2009-08-29 15:45:43 UTC (rev 4620) +++ trunk/util/inteltool/inteltool.h 2009-09-01 09:52:14 UTC (rev 4621) @@ -18,12 +18,13 @@ */ #include <stdint.h> -#ifndef DARWIN + +#if defined(__GLIBC__) #include <sys/io.h> -#else -/* DirectIO is available here: - * http://www.coresystems.de/en/directio - */ +#endif +#if (defined(__MACH__) && defined(__APPLE__)) +/* DirectIO is available here: http://www.coresystems.de/en/directio */ +#define __DARWIN__ #include <DirectIO/darwinio.h> #endif #include <pci/pci.h> @@ -55,13 +56,13 @@ #define ARRAY_SIZE(a) ((int)(sizeof(a) / sizeof((a)[0]))) -#ifndef DARWIN +#ifndef __DARWIN__ typedef struct { uint32_t hi, lo; } msr_t; #endif typedef struct { uint16_t addr; int size; char *name; } io_register_t; -void *map_physical(unsigned long phys_addr, int len); -void unmap_physical(void *virt_addr, int len); +void *map_physical(unsigned long phys_addr, size_t len); +void unmap_physical(void *virt_addr, size_t len); unsigned int cpuid(unsigned int op); int print_intel_core_msrs(void);

1 0

SeaBIOS and USB?
by Kevin O'Connor 01 Sep '09

01 Sep '09

Hi, The 2009 GSOC is winding down. I'd like to get some feedback on what people's plans are for USB support. The GSOC experience demonstrated both some successes and challanges. I believe Jason was able to launch some executables with the code which demonstrates that it can work. However, there were some issues with memory management. Besides the direct issue of not reserving the rom's memory, the memory needed is also an issue. The usbrom itself is just squeezing into 128K and it looks like it needs an additional 1M of working memory. In practice, I don't think the USB bootup code should use more than 30K of option rom space or more than 20K of reserved memory. Anyway, it would be helpful to hear from those that are planning to work in this area and the work that they are planning. Thanks, -Kevin

3 3

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 September 2009