Revert "powerpc/powernv: Move GET_FIELD/SET_FIELD to vas.h"

[mirror_ubuntu-artful-kernel.git] / arch / powerpc / include / asm / vas.h

diff --git a/arch/powerpc/include/asm/vas.h b/arch/powerpc/include/asm/vas.h
index fd5963acd65824d2d6147a4816189637ccff9d73..9f81db68f27b4d8baa113fbdd78da11b20fd59e5 100644 (file)
--- a/arch/powerpc/include/asm/vas.h
+++ b/arch/powerpc/include/asm/vas.h
@@ -29,14 +29,6 @@
 #define VAS_THRESH_FIFO_GT_QTR_FULL    2
 #define VAS_THRESH_FIFO_GT_EIGHTH_FULL 3
 
-/*
- * Get/Set bit fields
- */
-#define GET_FIELD(m, v)                (((v) & (m)) >> MASK_LSH(m))
-#define MASK_LSH(m)            (__builtin_ffsl(m) - 1)
-#define SET_FIELD(m, v, val)   \
-               (((v) & ~(m)) | ((((typeof(v))(val)) << MASK_LSH(m)) & (m)))
-
 /*
  * Co-processor Engine type.
  */
@@ -50,110 +42,4 @@ enum vas_cop_type {
        VAS_COP_TYPE_MAX,
 };
 
-/*
- * Receive window attributes specified by the (in-kernel) owner of window.
- */
-struct vas_rx_win_attr {
-       void *rx_fifo;
-       int rx_fifo_size;
-       int wcreds_max;
-
-       bool pin_win;
-       bool rej_no_credit;
-       bool tx_wcred_mode;
-       bool rx_wcred_mode;
-       bool tx_win_ord_mode;
-       bool rx_win_ord_mode;
-       bool data_stamp;
-       bool nx_win;
-       bool fault_win;
-       bool user_win;
-       bool notify_disable;
-       bool intr_disable;
-       bool notify_early;
-
-       int lnotify_lpid;
-       int lnotify_pid;
-       int lnotify_tid;
-       u32 pswid;
-
-       int tc_mode;
-};
-
-/*
- * Window attributes specified by the in-kernel owner of a send window.
- */
-struct vas_tx_win_attr {
-       enum vas_cop_type cop;
-       int wcreds_max;
-       int lpid;
-       int pidr;               /* hardware PID (from SPRN_PID) */
-       int pid;                /* linux process id */
-       int pswid;
-       int rsvd_txbuf_count;
-       int tc_mode;
-
-       bool user_win;
-       bool pin_win;
-       bool rej_no_credit;
-       bool rsvd_txbuf_enable;
-       bool tx_wcred_mode;
-       bool rx_wcred_mode;
-       bool tx_win_ord_mode;
-       bool rx_win_ord_mode;
-};
-
-/*
- * Helper to initialize receive window attributes to defaults for an
- * NX window.
- */
-void vas_init_rx_win_attr(struct vas_rx_win_attr *rxattr, enum vas_cop_type cop);
-
-/*
- * Open a VAS receive window for the instance of VAS identified by @vasid
- * Use @attr to initialize the attributes of the window.
- *
- * Return a handle to the window or ERR_PTR() on error.
- */
-struct vas_window *vas_rx_win_open(int vasid, enum vas_cop_type cop,
-                                  struct vas_rx_win_attr *attr);
-
-/*
- * Helper to initialize send window attributes to defaults for an NX window.
- */
-extern void vas_init_tx_win_attr(struct vas_tx_win_attr *txattr,
-                       enum vas_cop_type cop);
-
-/*
- * Open a VAS send window for the instance of VAS identified by @vasid
- * and the co-processor type @cop. Use @attr to initialize attributes
- * of the window.
- *
- * Note: The instance of VAS must already have an open receive window for
- * the coprocessor type @cop.
- *
- * Return a handle to the send window or ERR_PTR() on error.
- */
-struct vas_window *vas_tx_win_open(int vasid, enum vas_cop_type cop,
-                       struct vas_tx_win_attr *attr);
-
-/*
- * Close the send or receive window identified by @win. For receive windows
- * return -EAGAIN if there are active send windows attached to this receive
- * window.
- */
-int vas_win_close(struct vas_window *win);
-
-/*
- * Copy the co-processor request block (CRB) @crb into the local L2 cache.
- */
-int vas_copy_crb(void *crb, int offset);
-
-/*
- * Paste a previously copied CRB (see vas_copy_crb()) from the L2 cache to
- * the hardware address associated with the window @win. @re is expected/
- * assumed to be true for NX windows.
- */
-int vas_paste_crb(struct vas_window *win, int offset, bool re);
-
 #endif /* __ASM_POWERPC_VAS_H */