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

Commit b55f4f06 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: simplify debugging code after ipath_core and ib_ipath merger 



Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 34b2aafe

drivers/infiniband/hw/ipath/ipath_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ const char *ipath_get_unit_name(int unit) 
 * The size has to be longer than this string, so we can append

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

 */

const char ipath_core_version[] = IPATH_IDSTR "\n";

const char ib_ipath_version[] = IPATH_IDSTR "\n";



static struct idr unit_table;

DEFINE_SPINLOCK(ipath_devs_lock);
@@ -1847,7 +1847,7 @@ static int __init infinipath_init(void) 
{

	int ret;



	ipath_dbg(KERN_INFO DRIVER_LOAD_MSG "%s", ipath_core_version);

	ipath_dbg(KERN_INFO DRIVER_LOAD_MSG "%s", ib_ipath_version);



	/*

	 * These must be called before the driver is registered with

drivers/infiniband/hw/ipath/ipath_kernel.h

+2 −2
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static inline u32 ipath_read_creg32(const struct ipath_devdata *dd, 


struct device_driver;



extern const char ipath_core_version[];

extern const char ib_ipath_version[];



int ipath_driver_create_group(struct device_driver *);

void ipath_driver_remove_group(struct device_driver *);
@@ -815,7 +815,7 @@ const char *ipath_get_unit_name(int unit); 


extern struct mutex ipath_mutex;



#define IPATH_DRV_NAME		"ipath_core"

#define IPATH_DRV_NAME		"ib_ipath"

#define IPATH_MAJOR		233

#define IPATH_USER_MINOR_BASE	0

#define IPATH_SMA_MINOR		128

drivers/infiniband/hw/ipath/ipath_keys.c

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/io.h>



#include "ipath_verbs.h"

#include "ipath_kernel.h"



/**

 * ipath_alloc_lkey - allocate an lkey
@@ -60,7 +61,7 @@ int ipath_alloc_lkey(struct ipath_lkey_table *rkt, struct ipath_mregion *mr) 
		r = (r + 1) & (rkt->max - 1);

		if (r == n) {

			spin_unlock_irqrestore(&rkt->lock, flags);

			_VERBS_INFO("LKEY table full\n");

			ipath_dbg(KERN_INFO "LKEY table full\n");

			ret = 0;

			goto bail;

		}

drivers/infiniband/hw/ipath/ipath_qp.c

+5 −5
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void ipath_free_all_qps(struct ipath_qp_table *qpt) 
				free_qpn(qpt, qp->ibqp.qp_num);

			if (!atomic_dec_and_test(&qp->refcount) ||

			    !ipath_destroy_qp(&qp->ibqp))

				_VERBS_INFO("QP memory leak!\n");

				ipath_dbg(KERN_INFO "QP memory leak!\n");

			qp = nqp;

		}

	}
@@ -362,7 +362,7 @@ void ipath_error_qp(struct ipath_qp *qp) 
	struct ipath_ibdev *dev = to_idev(qp->ibqp.device);

	struct ib_wc wc;



	_VERBS_INFO("QP%d/%d in error state\n",

	ipath_dbg(KERN_INFO "QP%d/%d in error state\n",

		  qp->ibqp.qp_num, qp->remote_qpn);



	spin_lock(&dev->pending_lock);
@@ -945,7 +945,7 @@ void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc) 
	struct ipath_ibdev *dev = to_idev(qp->ibqp.device);

	struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);



	_VERBS_INFO("Send queue error on QP%d/%d: err: %d\n",

	ipath_dbg(KERN_INFO "Send queue error on QP%d/%d: err: %d\n",

		  qp->ibqp.qp_num, qp->remote_qpn, wc->status);



	spin_lock(&dev->pending_lock);

drivers/infiniband/hw/ipath/ipath_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int ipath_parse_ushort(const char *str, unsigned short *valp) 
static ssize_t show_version(struct device_driver *dev, char *buf)

{

	/* The string printed here is already newline-terminated. */

	return scnprintf(buf, PAGE_SIZE, "%s", ipath_core_version);

	return scnprintf(buf, PAGE_SIZE, "%s", ib_ipath_version);

}



static ssize_t show_num_units(struct device_driver *dev, char *buf)