coreboot-gerrit January 2016

coreboot-gerrit@coreboot.org

1 participants
2471 discussions

Patch set updated for coreboot: inteltool: add NetBSD compatibility
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12835 -gerrit commit 40c5b7cfa56092edf49c576c5ef459608d432092 Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Tue Jan 5 19:59:06 2016 +0300 inteltool: add NetBSD compatibility Tested on NetBSD-7.0/i386 Change-Id: I6a693633d3a80ea07ade233b1b4fd1c5a1412032 Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/inteltool/Makefile | 8 ++++++++ util/inteltool/inteltool.c | 12 ++++++++++++ util/inteltool/inteltool.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index 6e202cf..eec1ad7 100644 --- a/util/inteltool/Makefile +++ b/util/inteltool/Makefile @@ -34,6 +34,10 @@ CFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib LIBS = -lz endif +ifeq ($(OS_ARCH), NetBSD) +CFLAGS += -I/usr/pkg/include +LDFLAGS += -L/usr/pkg/lib -Wl,-rpath-link,/usr/pkg/lib -lz -lpciutils -lpci -l$(shell uname -p) +endif all: pciutils dep $(PROGRAM) @@ -52,7 +56,11 @@ dep: define LIBPCI_TEST /* Avoid a failing test due to libpci header symbol shadowing breakage */ #define index shadow_workaround_index +#ifdef __NetBSD__ +#include <pciutils/pci.h> +#else #include <pci/pci.h> +#endif struct pci_access *pacc; int main(int argc, char **argv) { diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 9fcf58d..974db6f 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -24,6 +24,10 @@ #include <unistd.h> #include "inteltool.h" +#ifdef __NetBSD__ +#include <machine/sysarch.h> +#endif + /* * http://pci-ids.ucw.cz/read/PC/8086 * http://en.wikipedia.org/wiki/Intel_Tick-Tock @@ -344,6 +348,14 @@ int main(int argc, char *argv[]) #if defined(__FreeBSD__) if (open("/dev/io", O_RDWR) < 0) { perror("/dev/io"); +#elif defined(__NetBSD__) +# ifdef __i386__ + if (i386_iopl(3)) { + perror("iopl"); +# else + if (x86_64_iopl(3)) { + perror("iopl"); +# endif #else if (iopl(3)) { perror("iopl"); diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 6845b4e..85d2944 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -24,13 +24,41 @@ #define __DARWIN__ #include <DirectHW/DirectHW.h> #endif +#ifdef __NetBSD__ +#include <pciutils/pci.h> +#else #include <pci/pci.h> +#endif /* This #include is needed for freebsd_{rd,wr}msr. */ #if defined(__FreeBSD__) #include <machine/cpufunc.h> #endif +#ifdef __NetBSD__ +static uint8_t __attribute__ ((unused)) +inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} +static uint16_t __attribute__ ((unused)) +inw(unsigned port) +{ + uint16_t data; + __asm volatile("inw %w1,%0": "=a" (data) : "d" (port)); + return data; +} +static uint32_t __attribute__ ((unused)) +inl(unsigned port) +{ + uint32_t data; + __asm volatile("inl %w1,%0": "=a" (data) : "d" (port)); + return data; +} +#endif + #define INTELTOOL_VERSION "1.0" /* Tested chipsets: */

1 0

Patch set updated for coreboot: superiotool: fix out-of-box NetBSD Makefile support
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12830 -gerrit commit 71a221beab5120c07ff462673afb4d2154e87aea Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Mon Jan 4 02:20:04 2016 +0300 superiotool: fix out-of-box NetBSD Makefile support Change-Id: I812817a374aaba561b28d8a22f20d238c9dca32b Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/superiotool/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile index cf487dc..60f44c6 100644 --- a/util/superiotool/Makefile +++ b/util/superiotool/Makefile @@ -43,7 +43,9 @@ LDFLAGS += -L/usr/local/lib LIBS = -lz endif ifeq ($(OS_ARCH), NetBSD) -LDFLAGS = -l$(shell uname -p) +CFLAGS += -I/usr/pkg/include +LDFLAGS += -L/usr/pkg/lib -Wl,-rpath-link,/usr/pkg/lib +LIBS = -lz -l$(shell uname -p) endif # Support for PCI-attached "Super I/Os" (e.g. in VIA VT82686A/B). @@ -51,8 +53,13 @@ CONFIG_PCI = yes ifeq ($(CONFIG_PCI), yes) CFLAGS += -DPCI_SUPPORT -LIBS += -lpci OBJS += pci.o via.o amd.o + ifeq ($(OS_ARCH),NetBSD) + LIBS += -lpciutils -lpci + PCIUTIL_HACK := $(shell sed -i 's,<pci/pci.h>,<pciutils/pci.h>,g' *.c *.h) + else + LIBS += -lpci + endif endif all: $(PROGRAM)

1 0

Patch set updated for coreboot: ectool: fix NetBSD compilation
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12831 -gerrit commit f9ae7d71a13c7ada9dd052cc5b08a7d7cf2eb406 Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Tue Jan 5 14:27:59 2016 +0300 ectool: fix NetBSD compilation Most of ifification was taken directly from pkgsrc/vbetool/patches/patch-ab Change-Id: Ibd264384f49b33412f0ef8554bd9c9fb8f60a892 Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/ectool/Makefile | 10 ++++++++++ util/ectool/ec.c | 20 ++++++++++++++++++++ util/ectool/ectool.c | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/util/ectool/Makefile b/util/ectool/Makefile index a869577..25f9cb0 100644 --- a/util/ectool/Makefile +++ b/util/ectool/Makefile @@ -20,11 +20,21 @@ PROGRAM = ectool INSTALL = /usr/bin/install PREFIX = /usr/local +# Dancing around Cygwin uname output and lack of -o option in NetBSD +UNAME_O_SUPPORT := $(shell uname -o; echo $$?) +ifeq ((UNAME_O_SUPPORT),0) OS_ARCH = $(shell uname -o) +else +OS_ARCH = $(shell uname) +endif ifeq ($(OS_ARCH), Cygwin) LDFLAGS = -lioperm endif +ifeq ($(OS_ARCH), NetBSD) +LDFLAGS = -l$(shell uname -p) +endif + all: $(PROGRAM) $(PROGRAM): ec.o ectool.o diff --git a/util/ectool/ec.c b/util/ectool/ec.c index 406cc41..1c03c71 100644 --- a/util/ectool/ec.c +++ b/util/ectool/ec.c @@ -17,9 +17,29 @@ #include <stdint.h> #include <stdlib.h> #include <unistd.h> +#ifndef __NetBSD__ #include <sys/io.h> +#endif #include "ec.h" +#ifdef __NetBSD__ +#include <machine/sysarch.h> + +static uint8_t +inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} + +static __inline void +outb(uint8_t data, unsigned port) +{ + __asm volatile("outb %0,%w1" : : "a" (data), "d" (port)); +} +#endif + extern int verbose; #define debug(x...) if (verbose) printf(x) diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c index 4639c4e..623bc09 100644 --- a/util/ectool/ectool.c +++ b/util/ectool/ectool.c @@ -18,10 +18,17 @@ #include <stdlib.h> #include <unistd.h> #include <getopt.h> +#ifndef __NetBSD__ #include <sys/io.h> +#endif #include <ec.h> #include <stdlib.h> +#ifdef __NetBSD__ +#include <machine/sysarch.h> +#endif + + #define ECTOOL_VERSION "0.1" void print_version(void) @@ -108,7 +115,15 @@ int main(int argc, char *argv[]) } } +#ifdef __NetBSD__ +# ifdef __i386__ + if (i386_iopl(3)) { +# else + if (x86_64_iopl(3)) { +# endif +#else if (iopl(3)) { +#endif printf("You need to be root.\n"); exit(1); }

1 0

Patch set updated for coreboot: Drop abuild.disabled files for Braswell / Skylake boards
by Martin Roth 05 Jan '16

05 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12463 -gerrit commit da39eb8ff24225aaf155c7d4320925f2cf5bd7fc Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Wed Nov 18 15:21:34 2015 -0800 Drop abuild.disabled files for Braswell / Skylake boards Make sure the latest & greatest Intel targets actually build in our build system. Change-Id: I479ad473c260fc914d224cb58f4be1837aff2502 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- src/mainboard/google/chell/abuild.disabled | 2 -- src/mainboard/google/cyan/abuild.disabled | 2 -- src/mainboard/google/glados/abuild.disabled | 2 -- src/mainboard/google/lars/abuild.disabled | 2 -- src/mainboard/intel/kunimitsu/abuild.disabled | 2 -- src/mainboard/intel/sklrvp/abuild.disabled | 2 -- src/mainboard/intel/strago/abuild.disabled | 2 -- 7 files changed, 14 deletions(-) diff --git a/src/mainboard/google/chell/abuild.disabled b/src/mainboard/google/chell/abuild.disabled deleted file mode 100644 index 7d1725a..0000000 --- a/src/mainboard/google/chell/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Skylake FSP binary and header files -along with the Skylake microcode files from Intel. diff --git a/src/mainboard/google/cyan/abuild.disabled b/src/mainboard/google/cyan/abuild.disabled deleted file mode 100644 index 025ebea..0000000 --- a/src/mainboard/google/cyan/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Braswell FSP binary and header -files along with the Braswell microcode files from Intel. diff --git a/src/mainboard/google/glados/abuild.disabled b/src/mainboard/google/glados/abuild.disabled deleted file mode 100644 index 7d1725a..0000000 --- a/src/mainboard/google/glados/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Skylake FSP binary and header files -along with the Skylake microcode files from Intel. diff --git a/src/mainboard/google/lars/abuild.disabled b/src/mainboard/google/lars/abuild.disabled deleted file mode 100644 index 7d1725a..0000000 --- a/src/mainboard/google/lars/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Skylake FSP binary and header files -along with the Skylake microcode files from Intel. diff --git a/src/mainboard/intel/kunimitsu/abuild.disabled b/src/mainboard/intel/kunimitsu/abuild.disabled deleted file mode 100644 index 7d1725a..0000000 --- a/src/mainboard/intel/kunimitsu/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Skylake FSP binary and header files -along with the Skylake microcode files from Intel. diff --git a/src/mainboard/intel/sklrvp/abuild.disabled b/src/mainboard/intel/sklrvp/abuild.disabled deleted file mode 100644 index 7d1725a..0000000 --- a/src/mainboard/intel/sklrvp/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Skylake FSP binary and header files -along with the Skylake microcode files from Intel. diff --git a/src/mainboard/intel/strago/abuild.disabled b/src/mainboard/intel/strago/abuild.disabled deleted file mode 100644 index 025ebea..0000000 --- a/src/mainboard/intel/strago/abuild.disabled +++ /dev/null @@ -1,2 +0,0 @@ -Successful builds for this board require the Braswell FSP binary and header -files along with the Braswell microcode files from Intel.

1 0

Patch set updated for coreboot: ectool: fix NetBSD compilation
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12831 -gerrit commit bfb07ca5f247d29d39ba3a9730c882a1d1f6a553 Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Tue Jan 5 14:27:59 2016 +0300 ectool: fix NetBSD compilation Most of ifification was taken directly from pkgsrc/vbetool/patches/patch-ab Change-Id: Ibd264384f49b33412f0ef8554bd9c9fb8f60a892 Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/ectool/Makefile | 6 +++++- util/ectool/ec.c | 20 ++++++++++++++++++++ util/ectool/ectool.c | 15 +++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/util/ectool/Makefile b/util/ectool/Makefile index a869577..214032f 100644 --- a/util/ectool/Makefile +++ b/util/ectool/Makefile @@ -20,11 +20,15 @@ PROGRAM = ectool INSTALL = /usr/bin/install PREFIX = /usr/local -OS_ARCH = $(shell uname -o) +OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Cygwin) LDFLAGS = -lioperm endif +ifeq ($(OS_ARCH), NetBSD) +LDFLAGS = -l$(shell uname -p) +endif + all: $(PROGRAM) $(PROGRAM): ec.o ectool.o diff --git a/util/ectool/ec.c b/util/ectool/ec.c index 406cc41..1c03c71 100644 --- a/util/ectool/ec.c +++ b/util/ectool/ec.c @@ -17,9 +17,29 @@ #include <stdint.h> #include <stdlib.h> #include <unistd.h> +#ifndef __NetBSD__ #include <sys/io.h> +#endif #include "ec.h" +#ifdef __NetBSD__ +#include <machine/sysarch.h> + +static uint8_t +inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} + +static __inline void +outb(uint8_t data, unsigned port) +{ + __asm volatile("outb %0,%w1" : : "a" (data), "d" (port)); +} +#endif + extern int verbose; #define debug(x...) if (verbose) printf(x) diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c index 4639c4e..623bc09 100644 --- a/util/ectool/ectool.c +++ b/util/ectool/ectool.c @@ -18,10 +18,17 @@ #include <stdlib.h> #include <unistd.h> #include <getopt.h> +#ifndef __NetBSD__ #include <sys/io.h> +#endif #include <ec.h> #include <stdlib.h> +#ifdef __NetBSD__ +#include <machine/sysarch.h> +#endif + + #define ECTOOL_VERSION "0.1" void print_version(void) @@ -108,7 +115,15 @@ int main(int argc, char *argv[]) } } +#ifdef __NetBSD__ +# ifdef __i386__ + if (i386_iopl(3)) { +# else + if (x86_64_iopl(3)) { +# endif +#else if (iopl(3)) { +#endif printf("You need to be root.\n"); exit(1); }

1 0

Patch set updated for coreboot: ectool: fix NetBSD compilation
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12831 -gerrit commit bb6388ac11c1a8df57c638b0cd032f52fa5717e1 Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Tue Jan 5 14:27:59 2016 +0300 ectool: fix NetBSD compilation Most of ifification was taken directly from pkgsrc/vbetool/patches/patch-ab Change-Id: Ibd264384f49b33412f0ef8554bd9c9fb8f60a892 Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/ectool/Makefile | 6 +++++- util/ectool/ec.c | 22 ++++++++++++++++++++++ util/ectool/ectool.c | 17 +++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/util/ectool/Makefile b/util/ectool/Makefile index a869577..214032f 100644 --- a/util/ectool/Makefile +++ b/util/ectool/Makefile @@ -20,11 +20,15 @@ PROGRAM = ectool INSTALL = /usr/bin/install PREFIX = /usr/local -OS_ARCH = $(shell uname -o) +OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Cygwin) LDFLAGS = -lioperm endif +ifeq ($(OS_ARCH), NetBSD) +LDFLAGS = -l$(shell uname -p) +endif + all: $(PROGRAM) $(PROGRAM): ec.o ectool.o diff --git a/util/ectool/ec.c b/util/ectool/ec.c index 406cc41..592491c 100644 --- a/util/ectool/ec.c +++ b/util/ectool/ec.c @@ -17,9 +17,31 @@ #include <stdint.h> #include <stdlib.h> #include <unistd.h> +#ifdef __NetBSD__ +#include <sys/uio.h> +#else #include <sys/io.h> +#endif #include "ec.h" +#ifdef __NetBSD__ +#include <machine/sysarch.h> + +static uint8_t +inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} + +static __inline void +outb(uint8_t data, unsigned port) +{ + __asm volatile("outb %0,%w1" : : "a" (data), "d" (port)); +} +#endif + extern int verbose; #define debug(x...) if (verbose) printf(x) diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c index 4639c4e..f1a8631 100644 --- a/util/ectool/ectool.c +++ b/util/ectool/ectool.c @@ -18,10 +18,19 @@ #include <stdlib.h> #include <unistd.h> #include <getopt.h> +#ifdef __NetBSD__ +#include <sys/uio.h> +#else #include <sys/io.h> +#endif #include <ec.h> #include <stdlib.h> +#ifdef __NetBSD__ +#include <machine/sysarch.h> +#endif + + #define ECTOOL_VERSION "0.1" void print_version(void) @@ -108,7 +117,15 @@ int main(int argc, char *argv[]) } } +#ifdef __NetBSD__ +# ifdef __i386__ + if (i386_iopl(3)) { +# else + if (x86_64_iopl(3)) { +# endif +#else if (iopl(3)) { +#endif printf("You need to be root.\n"); exit(1); }

1 0

Patch set updated for coreboot: cpu/amd/fam10h-15h: Add tsc_freq_mhz() function
by Timothy Pearson 05 Jan '16

05 Jan '16

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12834 -gerrit commit 90b954b04092b4f0ffdc32b0def79df9fd428746 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Tue Jan 5 11:00:49 2016 -0600 cpu/amd/fam10h-15h: Add tsc_freq_mhz() function The AMD Family 10h/15h processors use a TSC that increments at the P0 core frequency. Allow coreboot to query the TSC frequency. Change-Id: I73ead4fd4af18991452d59985b667a54689778cd Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/cpu/amd/family_10h-family_15h/Makefile.inc | 2 ++ src/cpu/amd/family_10h-family_15h/tsc_freq.c | 37 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/cpu/amd/family_10h-family_15h/Makefile.inc b/src/cpu/amd/family_10h-family_15h/Makefile.inc index 6cd2513..f10f732 100644 --- a/src/cpu/amd/family_10h-family_15h/Makefile.inc +++ b/src/cpu/amd/family_10h-family_15h/Makefile.inc @@ -3,6 +3,8 @@ ramstage-y += model_10xxx_init.c ramstage-y += processor_name.c romstage-y += update_microcode.c +romstage-y += tsc_freq.c +ramstage-y += tsc_freq.c romstage-y += ram_calc.c ramstage-y += ram_calc.c ramstage-y += monotonic_timer.c diff --git a/src/cpu/amd/family_10h-family_15h/tsc_freq.c b/src/cpu/amd/family_10h-family_15h/tsc_freq.c new file mode 100644 index 0000000..afd7dab --- /dev/null +++ b/src/cpu/amd/family_10h-family_15h/tsc_freq.c @@ -0,0 +1,37 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016 Raptor Engineering + * + * 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 of the License. + * + * 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. + */ + +#include <stdint.h> +#include <cpu/x86/msr.h> +#include <cpu/x86/tsc.h> + +unsigned long tsc_freq_mhz(void) +{ + msr_t msr; + uint8_t cpufid; + uint8_t cpudid; + + /* On Family 10h/15h CPUs the TSC increments + * at the P0 clock rate. Read the P0 clock + * frequency from the P0 MSR and convert + * to MHz. See also the Family 15h BKDG + * Rev. 3.14 page 569. + */ + msr = rdmsr(0xc0010064); + cpufid = (msr.lo & 0x3f); + cpudid = (msr.lo & 0x1c0) >> 6; + + return (100 * (cpufid + 0x10)) / (0x01 << cpudid); +}

1 0

Patch set updated for coreboot: inteltool: add NetBSD compatibility
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12835 -gerrit commit f30f9341013103807415822ae53b105d64dbb248 Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Tue Jan 5 19:59:06 2016 +0300 inteltool: add NetBSD compatibility Change-Id: I6a693633d3a80ea07ade233b1b4fd1c5a1412032 Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/inteltool/Makefile | 13 +++++++++++-- util/inteltool/inteltool.c | 12 ++++++++++++ util/inteltool/inteltool.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index 6e202cf..5b95850 100644 --- a/util/inteltool/Makefile +++ b/util/inteltool/Makefile @@ -34,11 +34,16 @@ CFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib LIBS = -lz endif +ifeq ($(OS_ARCH), NetBSD) +CFLAGS += -I/usr/pkg/include +LDFLAGS += -L/usr/pkg/lib -Wl,-rpath-link,/usr/pkg/lib +LIBS = -lz -lpciutils -lpci -l$(shell uname -p) +endif all: pciutils dep $(PROGRAM) $(PROGRAM): $(OBJS) - $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(LDFLAGS) + $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(LDFLAGS) $(LIBS) clean: rm -f $(PROGRAM) *.o *~ junit.xml @@ -52,7 +57,11 @@ dep: define LIBPCI_TEST /* Avoid a failing test due to libpci header symbol shadowing breakage */ #define index shadow_workaround_index +#ifdef __NetBSD__ +#include <pciutils/pci.h> +#else #include <pci/pci.h> +#endif struct pci_access *pacc; int main(int argc, char **argv) { @@ -67,7 +76,7 @@ export LIBPCI_TEST pciutils: @printf "\nChecking for pciutils and zlib... " @echo "$$LIBPCI_TEST" > .test.c - @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 && \ + @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) $(LIBS) >/dev/null 2>&1 && \ 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"; \ diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 9fcf58d..974db6f 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -24,6 +24,10 @@ #include <unistd.h> #include "inteltool.h" +#ifdef __NetBSD__ +#include <machine/sysarch.h> +#endif + /* * http://pci-ids.ucw.cz/read/PC/8086 * http://en.wikipedia.org/wiki/Intel_Tick-Tock @@ -344,6 +348,14 @@ int main(int argc, char *argv[]) #if defined(__FreeBSD__) if (open("/dev/io", O_RDWR) < 0) { perror("/dev/io"); +#elif defined(__NetBSD__) +# ifdef __i386__ + if (i386_iopl(3)) { + perror("iopl"); +# else + if (x86_64_iopl(3)) { + perror("iopl"); +# endif #else if (iopl(3)) { perror("iopl"); diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 6845b4e..85d2944 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -24,13 +24,41 @@ #define __DARWIN__ #include <DirectHW/DirectHW.h> #endif +#ifdef __NetBSD__ +#include <pciutils/pci.h> +#else #include <pci/pci.h> +#endif /* This #include is needed for freebsd_{rd,wr}msr. */ #if defined(__FreeBSD__) #include <machine/cpufunc.h> #endif +#ifdef __NetBSD__ +static uint8_t __attribute__ ((unused)) +inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} +static uint16_t __attribute__ ((unused)) +inw(unsigned port) +{ + uint16_t data; + __asm volatile("inw %w1,%0": "=a" (data) : "d" (port)); + return data; +} +static uint32_t __attribute__ ((unused)) +inl(unsigned port) +{ + uint32_t data; + __asm volatile("inl %w1,%0": "=a" (data) : "d" (port)); + return data; +} +#endif + #define INTELTOOL_VERSION "1.0" /* Tested chipsets: */

1 0

Patch set updated for coreboot: viatool: add NetBSD support
by Andrey Korolyov 05 Jan '16

05 Jan '16

Andrey Korolyov (andrey(a)xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12836 -gerrit commit cad16b70bcc4a1365985f933b0110075f8c76a8e Author: Andrey Korolyov <andrey(a)xdel.ru> Date: Tue Jan 5 20:09:02 2016 +0300 viatool: add NetBSD support Change-Id: I033044e4b781475d6d60a49a61313a720103ce38 Signed-off-by: Andrey Korolyov <andrey(a)xdel.ru> --- util/viatool/Makefile | 13 +++++++++++-- util/viatool/viatool.c | 12 ++++++++++++ util/viatool/viatool.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/util/viatool/Makefile b/util/viatool/Makefile index de3bfdd..f34a121 100644 --- a/util/viatool/Makefile +++ b/util/viatool/Makefile @@ -40,11 +40,16 @@ CFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib LIBS = -lz endif +ifeq ($(OS_ARCH), NetBSD) +CFLAGS += -I/usr/pkg/include +LDFLAGS += -L/usr/pkg/lib -Wl,-rpath-link,/usr/pkg/lib +LIBS = -lz -lpciutils -lpci -l$(shell uname -p) +endif all: pciutils dep $(PROGRAM) $(PROGRAM): $(OBJS) - $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(LDFLAGS) + $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(LDFLAGS) $(LIBS) clean: # Remove build results @@ -62,7 +67,11 @@ dep: define LIBPCI_TEST /* Avoid a failing test due to libpci header symbol shadowing breakage */ #define index shadow_workaround_index +#ifdef __NetBSD__ +#include <pciutils/pci.h> +#else #include <pci/pci.h> +#endif struct pci_access *pacc; int main(int argc, char **argv) { @@ -77,7 +86,7 @@ export LIBPCI_TEST pciutils: @printf "\nChecking for pciutils and zlib... " @echo "$$LIBPCI_TEST" > .test.c - @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 && \ + @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) $(LIBS) >/dev/null 2>&1 && \ 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"; \ diff --git a/util/viatool/viatool.c b/util/viatool/viatool.c index 0fde455..c19647f 100644 --- a/util/viatool/viatool.c +++ b/util/viatool/viatool.c @@ -25,6 +25,10 @@ #include <unistd.h> #include "viatool.h" +#ifdef __NetBSD__ +#include <machine/sysarch.h> +#endif + /* * http://pci-ids.ucw.cz/read/PC/8086 * http://en.wikipedia.org/wiki/Intel_Tick-Tock @@ -146,6 +150,14 @@ int main(int argc, char *argv[]) #if defined(__FreeBSD__) if (open("/dev/io", O_RDWR) < 0) { perror("/dev/io"); +#elif defined(__NetBSD__) +# ifdef __i386__ + if (i386_iopl(3)) { + perror("iopl"); +# else + if (x86_64_iopl(3)) { + perror("iopl"); +# endif #else if (iopl(3)) { perror("iopl"); diff --git a/util/viatool/viatool.h b/util/viatool/viatool.h index a0a5d79..338d7a5 100644 --- a/util/viatool/viatool.h +++ b/util/viatool/viatool.h @@ -28,13 +28,41 @@ #define __DARWIN__ #include <DirectHW/DirectHW.h> #endif +#ifdef __NetBSD__ +#include <pciutils/pci.h> +#else #include <pci/pci.h> +#endif /* This #include is needed for freebsd_{rd,wr}msr. */ #if defined(__FreeBSD__) #include <machine/cpufunc.h> #endif +#ifdef __NetBSD__ +static uint8_t __attribute__ ((unused)) +inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} +static uint16_t __attribute__ ((unused)) +inw(unsigned port) +{ +uint16_t data; + __asm volatile("inw %w1,%0": "=a" (data) : "d" (port)); + return data; +} +static uint32_t __attribute__ ((unused)) +inl(unsigned port) +{ + uint32_t data; + __asm volatile("inl %w1,%0": "=a" (data) : "d" (port)); + return data; +} +#endif + #include <stdlib.h> #define VIATOOL_VERSION "1.0"

1 0

Patch set updated for coreboot: cbfstool: Add 'hashcbfs' command to compute hash of CBFS region.
by Aaron Durbin 05 Jan '16

05 Jan '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12790 -gerrit commit 028a3c6c9eeb023ff04adc071fdac279f03c719e Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Dec 15 18:00:30 2015 -0600 cbfstool: Add 'hashcbfs' command to compute hash of CBFS region. For the purposes of maintaining integrity of a CBFS allow one to hash a CBFS over a given region. The hash consists of all file metadata and non-empty file data. The resulting digest is saved to the requested destination region. BUG=chrome-os-partner:48412 BUG=chromium:445938 BRANCH=None TEST=Integrated with glados chrome os build. vboot verification works using the same code to generate the hash in the tooling as well as at runtime on the board in question. Change-Id: Ib0d6bf668ffd6618f5f73e1217bdef404074dbfc Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- util/cbfstool/Makefile.inc | 8 +++++++ util/cbfstool/cbfs_hash.c | 33 +++++++++++++++++++++++++++ util/cbfstool/cbfstool.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 9633ca4..8e04411 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -2,10 +2,14 @@ cbfsobj := cbfsobj += cbfstool.o cbfsobj += common.o cbfsobj += compress.o +cbfsobj += cbfs.o +cbfsobj += cbfs_hash.o cbfsobj += cbfs_image.o cbfsobj += cbfs-mkstage.o cbfsobj += cbfs-mkpayload.o cbfsobj += elfheaders.o +cbfsobj += mem_pool.o +cbfsobj += region.o cbfsobj += rmodule.o cbfsobj += xdr.o cbfsobj += fit.o @@ -129,6 +133,10 @@ $(objutil)/cbfstool/LzmaEnc.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual # Tolerate vboot warnings $(objutil)/cbfstool/2sha_utility.o: TOOLCFLAGS += -Wno-sign-compare $(objutil)/cbfstool/2sha1.o: TOOLCFLAGS += -Wno-cast-qual +# Tolerate commonlib warnings +$(objutil)/cbfstool/region.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual +$(objutil)/cbfstool/cbfs.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual +$(objutil)/cbfstool/mem_pool.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual $(objutil)/cbfstool/fmd.o: $(objutil)/cbfstool/fmd_parser.h $(objutil)/cbfstool/fmd.o: $(objutil)/cbfstool/fmd_scanner.h diff --git a/util/cbfstool/cbfs_hash.c b/util/cbfstool/cbfs_hash.c new file mode 100644 index 0000000..332a59b --- /dev/null +++ b/util/cbfstool/cbfs_hash.c @@ -0,0 +1,33 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2015 Google Inc. + * + * 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 of the License. + * + * 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. + */ + +#include <commonlib/cbfs.h> +#include <commonlib/region.h> + +int cbfs_calculate_hash(void *cbfs, size_t cbfs_sz, + enum vb2_hash_algorithm hash_algo, + void *digest, size_t digest_sz); + +int cbfs_calculate_hash(void *cbfs, size_t cbfs_sz, + enum vb2_hash_algorithm hash_algo, + void *digest, size_t digest_sz) +{ + struct mem_region_device mdev; + + mem_region_device_init(&mdev, cbfs, cbfs_sz); + + return cbfs_vb2_hash_contents(&mdev.rdev, + hash_algo, digest, digest_sz); +} diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index f00aa30..9519953 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -781,6 +781,59 @@ static int cbfs_print(void) return 0; } +/* Forward declared so there aren't type collisions with cbfstool proper + * and commonlib. */ +int cbfs_calculate_hash(void *cbfs, size_t cbfs_sz, + enum vb2_hash_algorithm hash_algo, + void *digest, size_t digest_sz); + +static int cbfs_hash(void) +{ + struct cbfs_image src_image; + struct buffer src_buf; + struct buffer *dst = param.image_region; + + if (param.hash == VB2_HASH_INVALID) { + ERROR("You need to specify -A/--hash-algorithm.\n"); + return 1; + } + + if (!param.source_region) { + ERROR("You need to specify -R/--source-region.\n"); + return 1; + } + + unsigned hash_size = widths_cbfs_hash[param.hash]; + if (hash_size == 0) + return 1; + + if (buffer_size(param.image_region) != hash_size) { + ERROR("Region '%s' size (%zd) not equal to hash size (%d).\n", + param.region_name, buffer_size(param.image_region), + hash_size); + return 1; + } + + /* Obtain the source region and convert it to a cbfs_image. */ + if (!partitioned_file_read_region(&src_buf, param.image_file, + param.source_region)) { + ERROR("Region not found in image: %s\n", param.source_region); + return 1; + } + + if (cbfs_image_from_buffer(&src_image, &src_buf, param.headeroffset)) + return 1; + + if (cbfs_calculate_hash(buffer_get(&src_image.buffer), + buffer_size(&src_image.buffer), + param.hash, buffer_get(dst), hash_size)) { + ERROR("Hash calculation failed.\n"); + return 1; + } + + return 0; +} + static int cbfs_extract(void) { if (!param.filename) { @@ -947,6 +1000,7 @@ static const struct command commands[] = { {"add-master-header", "H:r:vh?", cbfs_add_master_header, true, true}, {"copy", "r:R:h?", cbfs_copy, true, true}, {"create", "M:r:s:B:b:H:o:m:vh?", cbfs_create, true, true}, + {"hashcbfs", "r:R:A:vh?", cbfs_hash, true, true}, {"extract", "H:r:m:n:f:vh?", cbfs_extract, true, false}, {"layout", "wvh?", cbfs_layout, false, false}, {"print", "H:r:vh?", cbfs_print, true, false}, @@ -1090,6 +1144,8 @@ static void usage(char *name) " print [-r image,regions] " "Show the contents of the ROM\n" " extract [-r image,regions] [-m ARCH] -n NAME -f FILE " + " hashcbfs -r image_region -R source-region " + "Hashes CBFS source-region and saves digest\n" "Extracts a raw payload from ROM\n" " write -r image,regions -f file [-u | -d] " "Write file into same-size [or larger] raw region\n"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2016