Andrey Korolyov (andrey@xdel.ru) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12836
-gerrit
commit f9f795a04facba3a6a087a7713fd647e85127c34 Author: Andrey Korolyov andrey@xdel.ru Date: Tue Jan 5 20:09:02 2016 +0300
viatool: add NetBSD support
Change-Id: I033044e4b781475d6d60a49a61313a720103ce38 Signed-off-by: Andrey Korolyov andrey@xdel.ru --- util/viatool/Makefile | 8 ++++++++ util/viatool/viatool.c | 12 ++++++++++++ util/viatool/viatool.h | 25 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+)
diff --git a/util/viatool/Makefile b/util/viatool/Makefile index de3bfdd..4d9d0d0 100644 --- a/util/viatool/Makefile +++ b/util/viatool/Makefile @@ -40,6 +40,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)
@@ -62,7 +66,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/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..7cce782 100644 --- a/util/viatool/viatool.h +++ b/util/viatool/viatool.h @@ -28,13 +28,38 @@ #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 inline uint8_t inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} +static inline uint16_t inw(unsigned port) +{ +uint16_t data; + __asm volatile("inw %w1,%0": "=a" (data) : "d" (port)); + return data; +} +static inline uint32_t 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"
-
Andrey Korolyov