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

Commit 9c3da099 authored by Harvey Harrison's avatar Harvey Harrison Committed by Roland Dreier
Browse files

IB: Remove __constant_{endian} uses 



The base versions handle constant folding just fine, use them
directly.  The replacements are OK in the include/ files as they are
not exported to userspace so we don't need the __ prefixed versions.

This patch does not affect code generation at all.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent f3b8436a

drivers/infiniband/core/cm.c

+7 −8
Original line number Diff line number Diff line
@@ -927,8 +927,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask, 
	unsigned long flags;

	int ret = 0;



	service_mask = service_mask ? service_mask :

		       __constant_cpu_to_be64(~0ULL);

	service_mask = service_mask ? service_mask : ~cpu_to_be64(0);

	service_id &= service_mask;

	if ((service_id & IB_SERVICE_ID_AGN_MASK) == IB_CM_ASSIGN_SERVICE_ID &&

	    (service_id != IB_CM_ASSIGN_SERVICE_ID))
@@ -954,7 +953,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask, 
	spin_lock_irqsave(&cm.lock, flags);

	if (service_id == IB_CM_ASSIGN_SERVICE_ID) {

		cm_id->service_id = cpu_to_be64(cm.listen_service_id++);

		cm_id->service_mask = __constant_cpu_to_be64(~0ULL);

		cm_id->service_mask = ~cpu_to_be64(0);

	} else {

		cm_id->service_id = service_id;

		cm_id->service_mask = service_mask;
@@ -1134,7 +1133,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, 
			goto error1;

	}

	cm_id->service_id = param->service_id;

	cm_id->service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id->service_mask = ~cpu_to_be64(0);

	cm_id_priv->timeout_ms = cm_convert_to_ms(

				    param->primary_path->packet_life_time) * 2 +

				 cm_convert_to_ms(
@@ -1545,7 +1544,7 @@ static int cm_req_handler(struct cm_work *work) 
	cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;

	cm_id_priv->id.context = listen_cm_id_priv->id.context;

	cm_id_priv->id.service_id = req_msg->service_id;

	cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id_priv->id.service_mask = ~cpu_to_be64(0);



	cm_process_routed_req(req_msg, work->mad_recv_wc->wc);

	cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);
@@ -2898,7 +2897,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id, 
		goto out;



	cm_id->service_id = param->service_id;

	cm_id->service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id->service_mask = ~cpu_to_be64(0);

	cm_id_priv->timeout_ms = param->timeout_ms;

	cm_id_priv->max_cm_retries = param->max_cm_retries;

	ret = cm_alloc_msg(cm_id_priv, &msg);
@@ -2992,7 +2991,7 @@ static int cm_sidr_req_handler(struct cm_work *work) 
	cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;

	cm_id_priv->id.context = cur_cm_id_priv->id.context;

	cm_id_priv->id.service_id = sidr_req_msg->service_id;

	cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id_priv->id.service_mask = ~cpu_to_be64(0);



	cm_format_sidr_req_event(work, &cur_cm_id_priv->id);

	cm_process_work(cm_id_priv, work);
@@ -3789,7 +3788,7 @@ static int __init ib_cm_init(void) 
	rwlock_init(&cm.device_lock);

	spin_lock_init(&cm.lock);

	cm.listen_service_table = RB_ROOT;

	cm.listen_service_id = __constant_be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);

	cm.listen_service_id = be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);

	cm.remote_id_table = RB_ROOT;

	cm.remote_qp_table = RB_ROOT;

	cm.remote_sidr_table = RB_ROOT;

drivers/infiniband/core/cm_msgs.h

+11 −11
Original line number Diff line number Diff line
@@ -44,17 +44,17 @@ 


#define IB_CM_CLASS_VERSION	2 /* IB specification 1.2 */



#define CM_REQ_ATTR_ID	    __constant_htons(0x0010)

#define CM_MRA_ATTR_ID	    __constant_htons(0x0011)

#define CM_REJ_ATTR_ID	    __constant_htons(0x0012)

#define CM_REP_ATTR_ID	    __constant_htons(0x0013)

#define CM_RTU_ATTR_ID	    __constant_htons(0x0014)

#define CM_DREQ_ATTR_ID	    __constant_htons(0x0015)

#define CM_DREP_ATTR_ID	    __constant_htons(0x0016)

#define CM_SIDR_REQ_ATTR_ID __constant_htons(0x0017)

#define CM_SIDR_REP_ATTR_ID __constant_htons(0x0018)

#define CM_LAP_ATTR_ID      __constant_htons(0x0019)

#define CM_APR_ATTR_ID      __constant_htons(0x001A)

#define CM_REQ_ATTR_ID		cpu_to_be16(0x0010)

#define CM_MRA_ATTR_ID		cpu_to_be16(0x0011)

#define CM_REJ_ATTR_ID		cpu_to_be16(0x0012)

#define CM_REP_ATTR_ID		cpu_to_be16(0x0013)

#define CM_RTU_ATTR_ID		cpu_to_be16(0x0014)

#define CM_DREQ_ATTR_ID		cpu_to_be16(0x0015)

#define CM_DREP_ATTR_ID		cpu_to_be16(0x0016)

#define CM_SIDR_REQ_ATTR_ID	cpu_to_be16(0x0017)

#define CM_SIDR_REP_ATTR_ID	cpu_to_be16(0x0018)

#define CM_LAP_ATTR_ID		cpu_to_be16(0x0019)

#define CM_APR_ATTR_ID		cpu_to_be16(0x001A)



enum cm_msg_sequence {

	CM_MSG_SEQUENCE_REQ,

drivers/infiniband/core/mad_rmpp.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ process_rmpp_data(struct ib_mad_agent_private *agent, 
		goto bad;

	}



	if (rmpp_hdr->seg_num == __constant_htonl(1)) {

	if (rmpp_hdr->seg_num == cpu_to_be32(1)) {

		if (!(ib_get_rmpp_flags(rmpp_hdr) & IB_MGMT_RMPP_FLAG_FIRST)) {

			rmpp_status = IB_MGMT_RMPP_STATUS_BAD_SEG;

			goto bad;

drivers/infiniband/hw/cxgb3/iwch_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ static int build_rdma_write(union t3_wr *wqe, struct ib_send_wr *wr, 
	if (wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {

		plen = 4;

		wqe->write.sgl[0].stag = wr->ex.imm_data;

		wqe->write.sgl[0].len = __constant_cpu_to_be32(0);

		wqe->write.num_sgle = __constant_cpu_to_be32(0);

		wqe->write.sgl[0].len = cpu_to_be32(0);

		wqe->write.num_sgle = cpu_to_be32(0);

		*flit_cnt = 6;

	} else {

		plen = 0;

drivers/infiniband/hw/ehca/ehca_sqp.c

+4 −4
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ 
#include "ehca_iverbs.h"

#include "hcp_if.h"



#define IB_MAD_STATUS_REDIRECT		__constant_htons(0x0002)

#define IB_MAD_STATUS_UNSUP_VERSION	__constant_htons(0x0004)

#define IB_MAD_STATUS_UNSUP_METHOD	__constant_htons(0x0008)

#define IB_MAD_STATUS_REDIRECT		cpu_to_be16(0x0002)

#define IB_MAD_STATUS_UNSUP_VERSION	cpu_to_be16(0x0004)

#define IB_MAD_STATUS_UNSUP_METHOD	cpu_to_be16(0x0008)



#define IB_PMA_CLASS_PORT_INFO		__constant_htons(0x0001)

#define IB_PMA_CLASS_PORT_INFO		cpu_to_be16(0x0001)



/**

 * ehca_define_sqp - Defines special queue pair 1 (GSI QP). When special queue