Commit 84e3b19a authored by Gary Leshner's avatar Gary Leshner Committed by Jason Gunthorpe
Browse files

IB/hfi1: Remove module parameter for KDETH qpns 

The module parameter for KDETH qpns is being removed in favor
of always using the default value of 0x80 as the qpn prefix.
Defines have been added for various KDETH values including
the prefix of 0x80.
The reserved range now starts at the base value for KDETH
qpns (0x80) and extends up to and including the last qpn for
other reserved QP prefixed types.
Adjust other QP prefixed define names to match KDETH defined
names.

Link: https://lore.kernel.org/r/20200511160600.173205.27508.stgit@awfm-01.aw.intel.com


Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarGary Leshner <Gary.S.Leshner@intel.com>
Signed-off-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 438d7dda

drivers/infiniband/hw/hfi1/chip.c

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

 * Copyright(c) 2015 - 2018 Intel Corporation.

 * Copyright(c) 2015 - 2020 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.
@@ -67,10 +67,6 @@ 
#include "debugfs.h"

#include "fault.h"



uint kdeth_qp;

module_param_named(kdeth_qp, kdeth_qp, uint, S_IRUGO);

MODULE_PARM_DESC(kdeth_qp, "Set the KDETH queue pair prefix");



uint num_vls = HFI1_MAX_VLS_SUPPORTED;

module_param(num_vls, uint, S_IRUGO);

MODULE_PARM_DESC(num_vls, "Set number of Virtual Lanes to use (1-8)");
@@ -14119,21 +14115,12 @@ static void init_early_variables(struct hfi1_devdata *dd) 


static void init_kdeth_qp(struct hfi1_devdata *dd)

{

	/* user changed the KDETH_QP */

	if (kdeth_qp != 0 && kdeth_qp >= 0xff) {

		/* out of range or illegal value */

		dd_dev_err(dd, "Invalid KDETH queue pair prefix, ignoring");

		kdeth_qp = 0;

	}

	if (kdeth_qp == 0)	/* not set, or failed range check */

		kdeth_qp = DEFAULT_KDETH_QP;



	write_csr(dd, SEND_BTH_QP,

		  (kdeth_qp & SEND_BTH_QP_KDETH_QP_MASK) <<

		  (RVT_KDETH_QP_PREFIX & SEND_BTH_QP_KDETH_QP_MASK) <<

		  SEND_BTH_QP_KDETH_QP_SHIFT);



	write_csr(dd, RCV_BTH_QP,

		  (kdeth_qp & RCV_BTH_QP_KDETH_QP_MASK) <<

		  (RVT_KDETH_QP_PREFIX & RCV_BTH_QP_KDETH_QP_MASK) <<

		  RCV_BTH_QP_KDETH_QP_SHIFT);

}

drivers/infiniband/hw/hfi1/common.h

+0 −7
Original line number Diff line number Diff line
@@ -72,13 +72,6 @@ 
 * compilation unit

 */



/*

 * If a packet's QP[23:16] bits match this value, then it is

 * a PSM packet and the hardware will expect a KDETH header

 * following the BTH.

 */

#define DEFAULT_KDETH_QP 0x80



/* driver/hw feature set bitmask */

#define HFI1_CAP_USER_SHIFT      24

#define HFI1_CAP_MASK            ((1UL << HFI1_CAP_USER_SHIFT) - 1)

drivers/infiniband/hw/hfi1/file_ops.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2015-2017 Intel Corporation.

 * Copyright(c) 2015-2020 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.
@@ -1264,7 +1264,7 @@ static int get_base_info(struct hfi1_filedata *fd, unsigned long arg, u32 len) 
	memset(&binfo, 0, sizeof(binfo));

	binfo.hw_version = dd->revision;

	binfo.sw_version = HFI1_KERN_SWVERSION;

	binfo.bthqp = kdeth_qp;

	binfo.bthqp = RVT_KDETH_QP_PREFIX;

	binfo.jkey = uctxt->jkey;

	/*

	 * If more than 64 contexts are enabled the allocated credit

drivers/infiniband/hw/hfi1/hfi.h

+1 −2
Original line number Diff line number Diff line 
#ifndef _HFI1_KERNEL_H

#define _HFI1_KERNEL_H

/*

 * Copyright(c) 2015-2018 Intel Corporation.

 * Copyright(c) 2015-2020 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.
@@ -2250,7 +2250,6 @@ extern int num_user_contexts; 
extern unsigned long n_krcvqs;

extern uint krcvqs[];

extern int krcvqsset;

extern uint kdeth_qp;

extern uint loopback;

extern uint quick_linkup;

extern uint rcv_intr_timeout;

drivers/infiniband/hw/hfi1/tid_rdma.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)

/*

 * Copyright(c) 2018 Intel Corporation.

 * Copyright(c) 2018 - 2020 Intel Corporation.

 *

 */
@@ -194,7 +194,7 @@ void tid_rdma_opfn_init(struct rvt_qp *qp, struct tid_rdma_params *p) 
{

	struct hfi1_qp_priv *priv = qp->priv;



	p->qp = (kdeth_qp << 16) | priv->rcd->ctxt;

	p->qp = (RVT_KDETH_QP_PREFIX << 16) | priv->rcd->ctxt;

	p->max_len = TID_RDMA_MAX_SEGMENT_SIZE;

	p->jkey = priv->rcd->jkey;

	p->max_read = TID_RDMA_MAX_READ_SEGS_PER_REQ;

CRA Git | Maintained and supported by SUSTech CRA and CCSE