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
20240612_branch
Leah Rowe 2024-05-02 02:33:52 +00:00
commit 05c3f4938a
3 changed files with 53 additions and 15 deletions

View File

@ -20,14 +20,17 @@ around 2008 (E6400 era).
If it says it is not set, then you will need to install or compile a kernel If it says it is not set, then you will need to install or compile a kernel
with that option set. with that option set.
### OpenBSD/NetBSD ### OpenBSD/NetBSD/FreeBSD
- On OpenBSD/NetBSD, ensure you are booting with securelevel set to -1. - The makefile is not currently compatible with POSIX make; install and use GNU
Make (gmake) to build dell-flash-unlock instead of make
- On OpenBSD/NetBSD/FreeBSD, ensure you are booting with securelevel set to -1.
### General ### General
Make sure an AC adapter is plugged into your system Make sure an AC adapter is plugged into your system
Run `make` to compile the utility, and then run `./dell_flash_unlock` with Run `make` (or `gmake` on BSD) to compile the utility, and then run
root/superuser permissions and follow the directions it outputs. `./dell_flash_unlock` with root/superuser permissions and follow the directions
it outputs.
## Confirmed supported devices ## Confirmed supported devices
- Latitude E6400, E6500 - Latitude E6400, E6500

View File

@ -8,12 +8,22 @@
#if defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__OpenBSD__) || defined(__NetBSD__)
#include <sys/types.h> #include <sys/types.h>
#include <machine/sysarch.h> #include <machine/sysarch.h>
#endif /* __OpenBSD__ || __NetBSD__ */
#if defined(__OpenBSD__)
#if defined(__amd64__) #if defined(__amd64__)
#include <amd64/pio.h> #include <amd64/pio.h>
#elif defined(__i386__) #elif defined(__i386__)
#include <i386/pio.h> #include <i386/pio.h>
#endif /* __i386__ */ #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> #include <errno.h>
@ -39,11 +49,11 @@ sys_outb(unsigned int port, uint8_t data)
#if defined(__linux__) #if defined(__linux__)
outb(data, port); outb(data, port);
#endif #endif
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__)
outb(port, data); outb(port, data);
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
__asm__ volatile ( "outb %b0, %w1" : : "a"(data), "d"(port) : "memory"); __asm__ volatile ("outb %b0, %w1" : : "a"(data), "d"(port));
#endif #endif
} }
@ -53,24 +63,25 @@ sys_outl(unsigned int port, uint32_t data)
#if defined(__linux__) #if defined(__linux__)
outl(data, port); outl(data, port);
#endif #endif
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__)
outl(port, data); outl(port, data);
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
__asm__ volatile ( "outl %0, %w1" : : "a"(data), "d"(port) : "memory"); __asm__ volatile ("outl %0, %w1" : : "a"(data), "d"(port));
#endif #endif
} }
uint8_t uint8_t
sys_inb(unsigned int port) sys_inb(unsigned int port)
{ {
#if defined(__linux__) || defined (__OpenBSD__) #if defined(__linux__) || defined (__OpenBSD__) \
|| defined(__FreeBSD__)
return inb(port); return inb(port);
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
uint8_t retval; uint8_t retval;
__asm__ volatile("inb %w1, %b0" : "=a" (retval) : "d" (port) : "memory"); __asm__ volatile ("inb %w1, %b0" : "=a" (retval) : "d" (port));
return retval; return retval;
#endif #endif
return 0; return 0;
@ -79,12 +90,13 @@ sys_inb(unsigned int port)
uint32_t uint32_t
sys_inl(unsigned int port) sys_inl(unsigned int port)
{ {
#if defined(__linux__) || defined (__OpenBSD__) #if defined(__linux__) || defined (__OpenBSD__) \
|| defined(__FreeBSD__)
return inl(port); return inl(port);
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
int retval; int retval;
__asm__ volatile("inl %w1, %0" : "=a" (retval) : "d" (port) : "memory"); __asm__ volatile ("inl %w1, %0" : "=a" (retval) : "d" (port));
return retval; return retval;
#endif #endif
return 0; return 0;
@ -112,6 +124,28 @@ sys_iopl(int level)
#endif /* __amd64__ */ #endif /* __amd64__ */
#endif /* __NetBSD__ */ #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; errno = ENOSYS;
return -1; return -1;
} }

View File

@ -15,7 +15,7 @@
int get_fdo_status(void); int get_fdo_status(void);
int check_lpc_decode(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 write_ec_reg(uint8_t index, uint8_t data);
void send_ec_cmd(uint8_t cmd); void send_ec_cmd(uint8_t cmd);
int wait_ec(void); int wait_ec(void);
@ -96,6 +96,7 @@ main(int argc, char *argv[])
"You can now shutdown the system.\n"); "You can now shutdown the system.\n");
} }
} }
sys_iopl(0);
return errno; return errno;
} }
@ -141,7 +142,7 @@ check_lpc_decode(void)
} }
void void
ec_set_fdo() ec_set_fdo(void)
{ {
/* EC FDO command arguments for reference: /* EC FDO command arguments for reference:
* 0 = Query EC FDO status * 0 = Query EC FDO status