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

Commit 3ca4fbc8 authored by Sebastian Sanchez's avatar Sebastian Sanchez Committed by Doug Ledford
Browse files

IB/hfi1: Return SC2VL mappings to FM with VL15 instead of ILLEGAL_VL 



VL15 in the SC2VL table is used to indicate an invalid SC
for the FM, however, internally the driver remaps SCs from
VL15 to ILLEGAL_VL to prevent error counts. This mapping
confuses the FM when performing a sweep, making it return
a table mismatch error. Have SMA convert ILLEGAL_VL
to VL15 entries for the SC2VL table queries.

Reviewed-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarSebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent db730894

drivers/infiniband/hw/hfi1/mad.c

+25 −16
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2015, 2016 Intel Corporation.

 * Copyright(c) 2015-2017 Intel Corporation.

 *

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

 * redistributing this file, you may do so under either license.
@@ -1474,25 +1474,15 @@ static int __subn_set_opa_pkeytable(struct opa_smp *smp, u32 am, u8 *data, 
	return __subn_get_opa_pkeytable(smp, am, data, ibdev, port, resp_len);

}



static int get_sc2vlt_tables(struct hfi1_devdata *dd, void *data)

{

	u64 *val = data;



	*val++ = read_csr(dd, SEND_SC2VLT0);

	*val++ = read_csr(dd, SEND_SC2VLT1);

	*val++ = read_csr(dd, SEND_SC2VLT2);

	*val++ = read_csr(dd, SEND_SC2VLT3);

	return 0;

}



#define ILLEGAL_VL 12

/*

 * filter_sc2vlt changes mappings to VL15 to ILLEGAL_VL (except

 * for SC15, which must map to VL15). If we don't remap things this

 * way it is possible for VL15 counters to increment when we try to

 * send on a SC which is mapped to an invalid VL.

 * When getting the table convert ILLEGAL_VL back to VL15.

 */

static void filter_sc2vlt(void *data)

static void filter_sc2vlt(void *data, bool set)

{

	int i;

	u8 *pd = data;
@@ -1500,8 +1490,14 @@ static void filter_sc2vlt(void *data) 
	for (i = 0; i < OPA_MAX_SCS; i++) {

		if (i == 15)

			continue;



		if (set) {

			if ((pd[i] & 0x1f) == 0xf)

				pd[i] = ILLEGAL_VL;

		} else {

			if ((pd[i] & 0x1f) == ILLEGAL_VL)

				pd[i] = 0xf;

		}

	}

}
@@ -1509,7 +1505,7 @@ static int set_sc2vlt_tables(struct hfi1_devdata *dd, void *data) 
{

	u64 *val = data;



	filter_sc2vlt(data);

	filter_sc2vlt(data, true);



	write_csr(dd, SEND_SC2VLT0, *val++);

	write_csr(dd, SEND_SC2VLT1, *val++);
@@ -1521,6 +1517,19 @@ static int set_sc2vlt_tables(struct hfi1_devdata *dd, void *data) 
	return 0;

}



static int get_sc2vlt_tables(struct hfi1_devdata *dd, void *data)

{

	u64 *val = (u64 *)data;



	*val++ = read_csr(dd, SEND_SC2VLT0);

	*val++ = read_csr(dd, SEND_SC2VLT1);

	*val++ = read_csr(dd, SEND_SC2VLT2);

	*val++ = read_csr(dd, SEND_SC2VLT3);



	filter_sc2vlt((u64 *)data, false);

	return 0;

}



static int __subn_get_opa_sl_to_sc(struct opa_smp *smp, u32 am, u8 *data,

				   struct ib_device *ibdev, u8 port,

				   u32 *resp_len)