Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 701e441d authored by Mitko Haralanov's avatar Mitko Haralanov Committed by Greg Kroah-Hartman
Browse files

staging/rdma/hfi1: Move macros to a common header 



In preparation of implementing TID caching move EXP_TID macros to a common
header user_exp_rcv.h

Signed-off-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 49efd866

drivers/staging/rdma/hfi1/file_ops.c

+1 −12
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "common.h"

#include "trace.h"

#include "user_sdma.h"

#include "user_exp_rcv.h"

#include "eprom.h"



#undef pr_fmt
@@ -160,18 +161,6 @@ enum mmap_types { 
	HFI1_MMAP_TOKEN_SET(SUBCTXT, subctxt) | \

	HFI1_MMAP_TOKEN_SET(OFFSET, (offset_in_page(addr))))



#define EXP_TID_SET(field, value)			\

	(((value) & EXP_TID_TID##field##_MASK) <<	\

	 EXP_TID_TID##field##_SHIFT)

#define EXP_TID_CLEAR(tid, field) {					\

		(tid) &= ~(EXP_TID_TID##field##_MASK <<			\

			   EXP_TID_TID##field##_SHIFT);			\

			}

#define EXP_TID_RESET(tid, field, value) do {				\

		EXP_TID_CLEAR(tid, field);				\

		(tid) |= EXP_TID_SET(field, value);			\

	} while (0)



#define dbg(fmt, ...)				\

	pr_info(fmt, ##__VA_ARGS__)

drivers/staging/rdma/hfi1/user_exp_rcv.h

0 → 100644
+74 −0
Original line number Diff line number Diff line 
#ifndef _HFI1_USER_EXP_RCV_H

#define _HFI1_USER_EXP_RCV_H

/*

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * BSD LICENSE

 *

 * Copyright(c) 2015 Intel Corporation.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  - Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  - Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  - Neither the name of Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 */



#define EXP_TID_TIDLEN_MASK   0x7FFULL

#define EXP_TID_TIDLEN_SHIFT  0

#define EXP_TID_TIDCTRL_MASK  0x3ULL

#define EXP_TID_TIDCTRL_SHIFT 20

#define EXP_TID_TIDIDX_MASK   0x3FFULL

#define EXP_TID_TIDIDX_SHIFT  22

#define EXP_TID_GET(tid, field)	\

	(((tid) >> EXP_TID_TID##field##_SHIFT) & EXP_TID_TID##field##_MASK)



#define EXP_TID_SET(field, value)			\

	(((value) & EXP_TID_TID##field##_MASK) <<	\

	 EXP_TID_TID##field##_SHIFT)

#define EXP_TID_CLEAR(tid, field) ({					\

		(tid) &= ~(EXP_TID_TID##field##_MASK <<			\

			   EXP_TID_TID##field##_SHIFT);			\

		})

#define EXP_TID_RESET(tid, field, value) do {				\

		EXP_TID_CLEAR(tid, field);				\

		(tid) |= EXP_TID_SET(field, (value));			\

	} while (0)



#endif /* _HFI1_USER_EXP_RCV_H */

drivers/staging/rdma/hfi1/user_sdma.h

+1 −9
Original line number Diff line number Diff line
@@ -52,15 +52,7 @@ 


#include "common.h"

#include "iowait.h"



#define EXP_TID_TIDLEN_MASK   0x7FFULL

#define EXP_TID_TIDLEN_SHIFT  0

#define EXP_TID_TIDCTRL_MASK  0x3ULL

#define EXP_TID_TIDCTRL_SHIFT 20

#define EXP_TID_TIDIDX_MASK   0x7FFULL

#define EXP_TID_TIDIDX_SHIFT  22

#define EXP_TID_GET(tid, field)	\

	(((tid) >> EXP_TID_TID##field##_SHIFT) & EXP_TID_TID##field##_MASK)

#include "user_exp_rcv.h"



extern uint extended_psn;