summaryrefslogtreecommitdiff
path: root/util/dell-flash-unlock
diff options
context:
space:
mode:
Diffstat (limited to 'util/dell-flash-unlock')
-rw-r--r--util/dell-flash-unlock/Makefile9
-rw-r--r--util/dell-flash-unlock/README.md4
-rw-r--r--util/dell-flash-unlock/accessors.c72
-rw-r--r--util/dell-flash-unlock/dell_flash_unlock.c5
4 files changed, 76 insertions, 14 deletions
diff --git a/util/dell-flash-unlock/Makefile b/util/dell-flash-unlock/Makefile
index fae52dea..8528c10e 100644
--- a/util/dell-flash-unlock/Makefile
+++ b/util/dell-flash-unlock/Makefile
@@ -3,13 +3,14 @@
CC=cc
CFLAGS=-Wall -Wextra -Werror -O2 -pedantic
-ifeq ($(shell uname), OpenBSD)
- CFLAGS += -l$(shell uname -p)
-endif
SRCS=dell_flash_unlock.c accessors.c
all: $(SRCS) accessors.h
- $(CC) $(CFLAGS) $(SRCS) -o dell_flash_unlock
+ CFLAGS="$(CFLAGS)"; \
+ if [ $$(uname) = OpenBSD ] || [ $$(uname) = NetBSD ]; then \
+ CFLAGS="$$CFLAGS -l$$(uname -p)"; \
+ fi; \
+ $(CC) $$CFLAGS $(SRCS) -o dell_flash_unlock
clean:
rm -f dell_flash_unlock
diff --git a/util/dell-flash-unlock/README.md b/util/dell-flash-unlock/README.md
index 9c7d292c..7333f63e 100644
--- a/util/dell-flash-unlock/README.md
+++ b/util/dell-flash-unlock/README.md
@@ -20,8 +20,8 @@ around 2008 (E6400 era).
If it says it is not set, then you will need to install or compile a kernel
with that option set.
-### OpenBSD
-- On OpenBSD, ensure you are booting with securelevel set to -1.
+### OpenBSD/NetBSD/FreeBSD
+- On OpenBSD/NetBSD/FreeBSD, ensure you are booting with securelevel set to -1.
### General
Make sure an AC adapter is plugged into your system
diff --git a/util/dell-flash-unlock/accessors.c b/util/dell-flash-unlock/accessors.c
index 6fca2817..0a5df760 100644
--- a/util/dell-flash-unlock/accessors.c
+++ b/util/dell-flash-unlock/accessors.c
@@ -5,9 +5,12 @@
#include <sys/io.h>
#endif
-#if defined(__OpenBSD__)
-#include <machine/sysarch.h>
+#if defined(__OpenBSD__) || defined(__NetBSD__)
#include <sys/types.h>
+#include <machine/sysarch.h>
+#endif /* __OpenBSD__ || __NetBSD__ */
+
+#if defined(__OpenBSD__)
#if defined(__amd64__)
#include <amd64/pio.h>
#elif defined(__i386__)
@@ -15,6 +18,13 @@
#endif /* __i386__ */
#endif /* __OpenBSD__ */
+#if defined(__FreeBSD__)
+#include <fcntl.h>
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#include <unistd.h>
+#endif /* __FreeBSD__ */
+
#include <errno.h>
#include "accessors.h"
@@ -39,9 +49,12 @@ sys_outb(unsigned int port, uint8_t data)
#if defined(__linux__)
outb(data, port);
#endif
- #if defined(__OpenBSD__)
+ #if defined(__OpenBSD__) || defined(__FreeBSD__)
outb(port, data);
#endif
+ #if defined(__NetBSD__)
+ __asm__ volatile ("outb %b0, %w1" : : "a"(data), "d"(port));
+ #endif
}
void
@@ -50,26 +63,42 @@ sys_outl(unsigned int port, uint32_t data)
#if defined(__linux__)
outl(data, port);
#endif
- #if defined(__OpenBSD__)
+ #if defined(__OpenBSD__) || defined(__FreeBSD__)
outl(port, data);
#endif
+ #if defined(__NetBSD__)
+ __asm__ volatile ("outl %0, %w1" : : "a"(data), "d"(port));
+ #endif
}
uint8_t
sys_inb(unsigned int port)
{
- #if defined(__linux__) || defined (__OpenBSD__)
+ #if defined(__linux__) || defined (__OpenBSD__) \
+ || defined(__FreeBSD__)
return inb(port);
#endif
+
+ #if defined(__NetBSD__)
+ uint8_t retval;
+ __asm__ volatile ("inb %w1, %b0" : "=a" (retval) : "d" (port));
+ return retval;
+ #endif
return 0;
}
uint32_t
sys_inl(unsigned int port)
{
- #if defined(__linux__) || defined (__OpenBSD__)
+ #if defined(__linux__) || defined (__OpenBSD__) \
+ || defined(__FreeBSD__)
return inl(port);
#endif
+ #if defined(__NetBSD__)
+ int retval;
+ __asm__ volatile ("inl %w1, %0" : "=a" (retval) : "d" (port));
+ return retval;
+ #endif
return 0;
}
@@ -86,6 +115,37 @@ sys_iopl(int level)
return amd64_iopl(level);
#endif /* __amd64__ */
#endif /* __OpenBSD__ */
+
+#if defined(__NetBSD__)
+#if defined(__i386__)
+ return i386_iopl(level);
+#elif defined(__amd64__)
+ return x86_64_iopl(level);
+#endif /* __amd64__ */
+#endif /* __NetBSD__ */
+
+#if defined(__FreeBSD__)
+ /* Refer to io(4) manual page. This assumes the legacy behavior
+ * where opening /dev/io raises the IOPL of the process */
+ static int io_fd = -1;
+
+ /* Requesting privileged access */
+ if (level > 0) {
+ if (io_fd == -1) {
+ io_fd = open("/dev/io", O_RDONLY);
+ return (io_fd == -1) ? -1 : 0;
+ }
+ /* Lowering access to lowest level */
+ } else if (level == 0 && io_fd != -1) {
+ if (close(io_fd) == -1) {
+ return -1;
+ } else {
+ io_fd = -1;
+ }
+ }
+ return 0;
+#endif /* __FreeBSD__ */
+
errno = ENOSYS;
return -1;
}
diff --git a/util/dell-flash-unlock/dell_flash_unlock.c b/util/dell-flash-unlock/dell_flash_unlock.c
index 174a1c92..d59f5d5b 100644
--- a/util/dell-flash-unlock/dell_flash_unlock.c
+++ b/util/dell-flash-unlock/dell_flash_unlock.c
@@ -15,7 +15,7 @@
int get_fdo_status(void);
int check_lpc_decode(void);
-void ec_set_fdo();
+void ec_set_fdo(void);
void write_ec_reg(uint8_t index, uint8_t data);
void send_ec_cmd(uint8_t cmd);
int wait_ec(void);
@@ -96,6 +96,7 @@ main(int argc, char *argv[])
"You can now shutdown the system.\n");
}
}
+ sys_iopl(0);
return errno;
}
@@ -141,7 +142,7 @@ check_lpc_decode(void)
}
void
-ec_set_fdo()
+ec_set_fdo(void)
{
/* EC FDO command arguments for reference:
* 0 = Query EC FDO status