diff options
| author | Thomas Heijligen <thomas.heijligen@secunet.com> | 2021-12-14 17:25:49 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-12-22 12:35:29 +0000 |
| commit | 50720a4b0b251eb1d97d4682a4db9c2c589d6019 (patch) | |
| tree | 4f5229baa9c0e0a3fc42bd1384dc5f5a01c53a7d /hwaccess.h | |
| parent | 49d758698a0dd166679c48b1a2785e50e9b0cc83 (diff) | |
| download | flashrom-50720a4b0b251eb1d97d4682a4db9c2c589d6019.tar.gz flashrom-50720a4b0b251eb1d97d4682a4db9c2c589d6019.tar.bz2 flashrom-50720a4b0b251eb1d97d4682a4db9c2c589d6019.zip | |
hwaccess physmap: move x86 msr related code into own files
Allow x86 msr related code to be compiled independent from memory
mapping functionality. This enables for a better selection of needed
hardware access types.
Change-Id: Idc9ce9df3ea1e291ad469de59467646b294119c4
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/60111
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'hwaccess.h')
| -rw-r--r-- | hwaccess.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/hwaccess.h b/hwaccess.h index 5b7b079fb..d80e0e34a 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -122,35 +122,4 @@ cpu_to_be(64) #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_RAW_ACCESS == 1 && (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) - -#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) -typedef struct { uint32_t hi, lo; } msr_t; -msr_t rdmsr(int addr); -int wrmsr(int addr, msr_t msr); -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -/* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ -#undef rdmsr -#undef wrmsr -#define rdmsr freebsd_rdmsr -#define wrmsr freebsd_wrmsr -typedef struct { uint32_t hi, lo; } msr_t; -msr_t freebsd_rdmsr(int addr); -int freebsd_wrmsr(int addr, msr_t msr); -#endif -#if defined(__LIBPAYLOAD__) -#include <arch/io.h> -#include <arch/msr.h> -typedef struct { uint32_t hi, lo; } msr_t; -msr_t libpayload_rdmsr(int addr); -int libpayload_wrmsr(int addr, msr_t msr); -#undef rdmsr -#define rdmsr libpayload_rdmsr -#define wrmsr libpayload_wrmsr -#endif - - -#endif - #endif /* !__HWACCESS_H__ */ |