Attachment 118480 Details for Bug 92158 – Patch to allow compilation under FreeBSD. It applies against version 2.11.17

Patch to allow compilation under FreeBSD. It applies against version 2.11.17

patch (text/plain), 1.44 KB, created by Arrigo Marchiori on 2015-09-28 09:40:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Arrigo Marchiori

Created: 2015-09-28 09:40:38 UTC

Size: 1.44 KB

patch

obsolete

>--- geode_msr.c.orig	2015-03-12 10:28:33.000000000 +0000
>+++ geode_msr.c	2015-09-28 09:38:11.000000000 +0000
>@@ -39,12 +39,19 @@
> #include <machine/amdmsr.h>
> #endif
> 
>+#ifdef __FreeBSD__
>+#include <sys/ioctl.h>
>+#include <sys/cpuctl.h>
>+#endif
>+
> #include "os.h"
> #include "geode.h"
> 
> #ifdef __OpenBSD__
> #define _PATH_MSRDEV	"/dev/amdmsr"
> #define X_PRIVSEP
>+#elif defined __FreeBSD__
>+#define _PATH_MSRDEV	"/dev/cpuctl0"
> #else
> #define _PATH_MSRDEV	"/dev/cpu/0/msr"
> #endif
>@@ -83,6 +90,18 @@
> 
>     *hi = req.val >> 32;
>     *lo = req.val & 0xffffffff;
>+#elif defined __FreeBSD__
>+    cpuctl_msr_args_t args;
>+    int fd = _msr_open();
>+
>+    args.msr = addr;
>+
>+    if (ioctl(fd, CPUCTL_RDMSR, &args) == -1)
>+	FatalError("Unable to read MSR at address %0x06x: %s\n", addr,
>+	    strerror(errno));
>+
>+    *hi = args.data >> 32;
>+    *lo = args.data & 0xffffffff;
> #else
>     unsigned int data[2];
>     int fd = _msr_open();
>@@ -120,6 +139,16 @@
>     if (ioctl(fd, WRMSR, &req) == -1)
>         FatalError("Unable to write MSR at address 0x%06x: %s\n", addr,
>             strerror(errno));
>+#elif defined __FreeBSD__
>+    cpuctl_msr_args_t args;
>+    int fd = _msr_open();
>+
>+    args.msr = addr;
>+    args.data = (u_int64_t) hi << 32 | (u_int64_t)lo;
>+
>+    if (ioctl(fd, CPUCTL_WRMSR, &args) == -1)
>+        FatalError("Unable to write MSR at address 0x%06x: %s\n", addr,
>+            strerror(errno));
> #else
>     unsigned int data[2];
>     int fd = _msr_open();

Actions: View

Attachments on bug 92158: 118480 | 118485

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.