Commit 1994c313 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Jason Gunthorpe
Browse files

RDMA/hfi1: Consolidate software versions 

There is no need to have separate user and kernel software versions. There
is a single software that the kernel is compatible with.

Also remove the notion of a "kernel type" that is long since deprecated.

Link: https://lore.kernel.org/r/20220520183722.48973.60262.stgit@awfm-01.cornelisnetworks.com


Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 676bffa0

drivers/infiniband/hw/hfi1/common.h

+0 −17
Original line number Diff line number Diff line
@@ -137,23 +137,6 @@ 
#define HFI1_USER_SWVERSION ((HFI1_USER_SWMAJOR << HFI1_SWMAJOR_SHIFT) | \

			     HFI1_USER_SWMINOR)



#ifndef HFI1_KERN_TYPE

#define HFI1_KERN_TYPE 0

#endif



/*

 * Similarly, this is the kernel version going back to the user.  It's

 * slightly different, in that we want to tell if the driver was built as

 * part of a Intel release, or from the driver from openfabrics.org,

 * kernel.org, or a standard distribution, for support reasons.

 * The high bit is 0 for non-Intel and 1 for Intel-built/supplied.

 *

 * It's returned by the driver to the user code during initialization in the

 * spi_sw_version field of hfi1_base_info, so the user code can in turn

 * check for compatibility with the kernel.

*/

#define HFI1_KERN_SWVERSION ((HFI1_KERN_TYPE << 31) | HFI1_USER_SWVERSION)



/*

 * Diagnostics can send a packet by writing the following

 * struct to the diag packet special file.

drivers/infiniband/hw/hfi1/file_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,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.sw_version = HFI1_USER_SWVERSION;

	binfo.bthqp = RVT_KDETH_QP_PREFIX;

	binfo.jkey = uctxt->jkey;

	/*