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

Commit 30da7cff authored by Faisal Latif's avatar Faisal Latif Committed by Roland Dreier
Browse files

RDMA/nes: Fix CRC endianness for RDMA connection establishment on big-endian 



With commit ef19454b ("[LIB] crc32c: Keep intermediate crc state in
cpu order"), the behavior of crc32c changes on big-endian platforms.

Our algorithm expects the previous behavior; otherwise we have RDMA
connection establishment failure on big-endian platforms like powerpc.
Apply cpu_to_le32() to value returned by crc32c() to get the previous
behavior.

Signed-off-by: default avatarFaisal Latif <flatif@neteffect.com>
Signed-off-by: default avatarGlenn Streiff <gstreiff@neteffect.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent a2e9c384

drivers/infiniband/hw/nes/nes.h

+15 −0
Original line number Diff line number Diff line
@@ -285,6 +285,21 @@ struct nes_device { 
};





static inline __le32 get_crc_value(struct nes_v4_quad *nes_quad)

{

	u32 crc_value;

	crc_value = crc32c(~0, (void *)nes_quad, sizeof (struct nes_v4_quad));



	/*

	 * With commit ef19454b ("[LIB] crc32c: Keep intermediate crc

	 * state in cpu order"), behavior of crc32c changes on

	 * big-endian platforms.  Our algorithm expects the previous

	 * behavior; otherwise we have RDMA connection establishment

	 * issue on big-endian.

	 */

	return cpu_to_le32(crc_value);

}



static inline void

set_wqe_64bit_value(__le32 *wqe_words, u32 index, u64 value)

{

drivers/infiniband/hw/nes/nes_cm.c

+6 −4
Original line number Diff line number Diff line
@@ -2320,6 +2320,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
	struct iw_cm_event cm_event;

	struct nes_hw_qp_wqe *wqe;

	struct nes_v4_quad nes_quad;

	u32 crc_value;

	int ret;



	ibqp = nes_get_qp(cm_id->device, conn_param->qpn);
@@ -2436,8 +2437,8 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
	nes_quad.TcpPorts[1]   = cm_id->local_addr.sin_port;



	/* Produce hash key */

	nesqp->hte_index = cpu_to_be32(

			crc32c(~0, (void *)&nes_quad, sizeof(nes_quad)) ^ 0xffffffff);

	crc_value = get_crc_value(&nes_quad);

	nesqp->hte_index = cpu_to_be32(crc_value ^ 0xffffffff);

	nes_debug(NES_DBG_CM, "HTE Index = 0x%08X, CRC = 0x%08X\n",

			nesqp->hte_index, nesqp->hte_index & adapter->hte_index_mask);
@@ -2751,6 +2752,7 @@ void cm_event_connected(struct nes_cm_event *event) 
	struct iw_cm_event cm_event;

	struct nes_hw_qp_wqe *wqe;

	struct nes_v4_quad nes_quad;

	u32 crc_value;

	int ret;



	/* get all our handles */
@@ -2828,8 +2830,8 @@ void cm_event_connected(struct nes_cm_event *event) 
	nes_quad.TcpPorts[1] = cm_id->local_addr.sin_port;



	/* Produce hash key */

	nesqp->hte_index = cpu_to_be32(

			crc32c(~0, (void *)&nes_quad, sizeof(nes_quad)) ^ 0xffffffff);

	crc_value = get_crc_value(&nes_quad);

	nesqp->hte_index = cpu_to_be32(crc_value ^ 0xffffffff);

	nes_debug(NES_DBG_CM, "HTE Index = 0x%08X, After CRC = 0x%08X\n",

			nesqp->hte_index, nesqp->hte_index & nesadapter->hte_index_mask);