diff options
| author | Leah Rowe <vimuser@noreply.codeberg.org> | 2024-05-02 02:33:52 +0000 |
|---|---|---|
| committer | Leah Rowe <vimuser@noreply.codeberg.org> | 2024-05-02 02:33:52 +0000 |
| commit | 05c3f4938acb9a8901560ad30a66d871e75912a3 (patch) | |
| tree | 3ccb26f8be853df8ff64fcc85b55a0e5e79190cc /util/dell-flash-unlock/accessors.c | |
| parent | 5c3d81fff9f90b19f09c95fae43eacff10ab932e (diff) | |
| parent | 61f66a46eab2480d45b14a14889e082678daaa80 (diff) | |
Merge pull request 'dell-flash-unlock-updates' (#206) from nic3-14159/lbmk:dell-flash-unlock-updates into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/206
Diffstat (limited to 'util/dell-flash-unlock/accessors.c')
| -rw-r--r-- | util/dell-flash-unlock/accessors.c | 52 |
1 files changed, 43 insertions, 9 deletions
diff --git a/util/dell-flash-unlock/accessors.c b/util/dell-flash-unlock/accessors.c index a35f8139..0a5df760 100644 --- a/util/dell-flash-unlock/accessors.c +++ b/util/dell-flash-unlock/accessors.c @@ -8,12 +8,22 @@ #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__) #include <i386/pio.h> #endif /* __i386__ */ -#endif /* __OpenBSD__ || __NetBSD__ */ +#endif /* __OpenBSD__ */ + +#if defined(__FreeBSD__) +#include <fcntl.h> +#include <sys/types.h> +#include <machine/cpufunc.h> +#include <unistd.h> +#endif /* __FreeBSD__ */ #include <errno.h> @@ -39,11 +49,11 @@ 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) : "memory"); + __asm__ volatile ("outb %b0, %w1" : : "a"(data), "d"(port)); #endif } @@ -53,24 +63,25 @@ 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) : "memory"); + __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) : "memory"); + __asm__ volatile ("inb %w1, %b0" : "=a" (retval) : "d" (port)); return retval; #endif return 0; @@ -79,12 +90,13 @@ sys_inb(unsigned int port) 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) : "memory"); + __asm__ volatile ("inl %w1, %0" : "=a" (retval) : "d" (port)); return retval; #endif return 0; @@ -112,6 +124,28 @@ sys_iopl(int 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; } |