Merge branch 'for-4.12/dax' into libnvdimm-for-next

2 files changed, 79 insertions, 0 deletions

diff --git a/include/uapi/linux/aspeed-lpc-ctrl.h b/include/uapi/linux/aspeed-lpc-ctrl.h
new file mode 100644
index 000000000000..f96fa995a3f0
--- /dev/null
+++ b/include/uapi/linux/aspeed-lpc-ctrl.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_ASPEED_LPC_CTRL_H
+#define _UAPI_LINUX_ASPEED_LPC_CTRL_H
+
+#include <linux/ioctl.h>
+
+/* Window types */
+#define ASPEED_LPC_CTRL_WINDOW_FLASH    1
+#define ASPEED_LPC_CTRL_WINDOW_MEMORY   2
+
+/*
+ * This driver provides a window for the host to access a BMC resource
+ * across the BMC <-> Host LPC bus.
+ *
+ * window_type: The BMC resource that the host will access through the
+ * window. BMC flash and BMC RAM.
+ *
+ * window_id: For each window type there may be multiple windows,
+ * these are referenced by ID.
+ *
+ * flags: Reserved for future use, this field is expected to be
+ * zeroed.
+ *
+ * addr: Address on the host LPC bus that the specified window should
+ * be mapped. This address must be power of two aligned.
+ *
+ * offset: Offset into the BMC window that should be mapped to the
+ * host (at addr). This must be a multiple of size.
+ *
+ * size: The size of the mapping. The smallest possible size is 64K.
+ * This must be power of two aligned.
+ *
+ */
+
+struct aspeed_lpc_ctrl_mapping {
+        __u8    window_type;
+        __u8    window_id;
+        __u16   flags;
+        __u32   addr;
+        __u32   offset;
+        __u32   size;
+};
+
+#define __ASPEED_LPC_CTRL_IOCTL_MAGIC   0xb2
+
+#define ASPEED_LPC_CTRL_IOCTL_GET_SIZE  _IOWR(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \
+                0x00, struct aspeed_lpc_ctrl_mapping)
+
+#define ASPEED_LPC_CTRL_IOCTL_MAP       _IOW(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \
+                0x01, struct aspeed_lpc_ctrl_mapping)
+
+#endif /* _UAPI_LINUX_ASPEED_LPC_CTRL_H */
diff --git a/include/uapi/linux/pps.h b/include/uapi/linux/pps.h
index a9bb1d93451a..c1cb3825a8bc 100644
--- a/include/uapi/linux/pps.h
+++ b/include/uapi/linux/pps.h
@@ -55,6 +55,12 @@ struct pps_ktime {
         __s32 nsec;
         __u32 flags;
 };
+
+struct pps_ktime_compat {
+        __s64 sec;
+        __s32 nsec;
+        __u32 flags;
+} __attribute__((packed, aligned(4)));
 #define PPS_TIME_INVALID        (1<<0)  /* used to specify timeout==NULL */
 
 struct pps_kinfo {
@@ -65,6 +71,14 @@ struct pps_kinfo {
         int current_mode;               /* current mode bits */
 };
 
+struct pps_kinfo_compat {
+        __u32 assert_sequence;                  /* seq. num. of assert event */
+        __u32 clear_sequence;                   /* seq. num. of clear event */
+        struct pps_ktime_compat assert_tu;      /* time of assert event */
+        struct pps_ktime_compat clear_tu;       /* time of clear event */
+        int current_mode;                       /* current mode bits */
+};
+
 struct pps_kparams {
         int api_version;                /* API version # */
         int mode;                       /* mode bits */
@@ -114,6 +128,11 @@ struct pps_fdata {
         struct pps_ktime timeout;
 };
 
+struct pps_fdata_compat {
+        struct pps_kinfo_compat info;
+        struct pps_ktime_compat timeout;
+};
+
 struct pps_bind_args {
         int tsformat;   /* format of time stamps */
         int edge;       /* selected event type */