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

Commit e20d5838 authored by Dean Luick's avatar Dean Luick Committed by Roland Dreier
Browse files

IB/qib: Add a qib driver version 



Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 979570e0

drivers/infiniband/hw/qib/qib_common.h

+13 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ struct qib_base_info { 


#ifndef QIB_KERN_TYPE

#define QIB_KERN_TYPE 0

#define QIB_IDSTR "QLogic kernel.org driver"

#endif



/*
@@ -301,6 +300,19 @@ struct qib_base_info { 
*/

#define QIB_KERN_SWVERSION ((QIB_KERN_TYPE << 31) | QIB_USER_SWVERSION)



/*

 * Define the driver version number.  This is something that refers only

 * to the driver itself, not the software interfaces it supports.

 */

#define QIB_DRIVER_VERSION_BASE "1.11"



/* create the final driver version string */

#ifdef QIB_IDSTR

#define QIB_DRIVER_VERSION QIB_DRIVER_VERSION_BASE " " QIB_IDSTR

#else

#define QIB_DRIVER_VERSION QIB_DRIVER_VERSION_BASE

#endif



/*

 * If the unit is specified via open, HCA choice is fixed.  If port is

 * specified, it's also fixed.  Otherwise we try to spread contexts

drivers/infiniband/hw/qib/qib_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 * The size has to be longer than this string, so we can append

 * board/chip information to it in the init code.

 */

const char ib_qib_version[] = QIB_IDSTR "\n";

const char ib_qib_version[] = QIB_DRIVER_VERSION "\n";



DEFINE_SPINLOCK(qib_devs_lock);

LIST_HEAD(qib_dev_list);
@@ -65,6 +65,7 @@ MODULE_PARM_DESC(compat_ddr_negotiate, 
MODULE_LICENSE("Dual BSD/GPL");

MODULE_AUTHOR("QLogic <support@qlogic.com>");

MODULE_DESCRIPTION("QLogic IB driver");

MODULE_VERSION(QIB_DRIVER_VERSION);



/*

 * QIB_PIO_MAXIBHDR is the max IB header size allowed for in our

drivers/infiniband/hw/qib/qib_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ int qib_register_ib_device(struct qib_devdata *dd) 
	ibdev->dma_ops = &qib_dma_mapping_ops;



	snprintf(ibdev->node_desc, sizeof(ibdev->node_desc),

		 QIB_IDSTR " %s", init_utsname()->nodename);

		 "QLogic Infiniband HCA %s", init_utsname()->nodename);



	ret = ib_register_device(ibdev, qib_create_port_files);

	if (ret)