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

Commit cf5b60aa authored by Dave Olson's avatar Dave Olson Committed by Roland Dreier
Browse files

IB/ipath: Use faster put_tid_2 routine after initialization 



At one time the ipath_minrev field was initialized prior to the
ipath_init_iba6120_funcs call, but that is no longer the case, so the
slower put_tid routine was always being used.

Signed-off-by: default avatarDave Olson <dave.olson@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent f17fddc9

drivers/infiniband/hw/ipath/ipath_iba6120.c

+13 −7
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ static const struct ipath_hwerror_msgs ipath_6120_hwerror_msgs[] = { 
		        << INFINIPATH_HWE_TXEMEMPARITYERR_SHIFT)



static int ipath_pe_txe_recover(struct ipath_devdata *);

static void ipath_pe_put_tid_2(struct ipath_devdata *, u64 __iomem *,

			       u32, unsigned long);



/**

 * ipath_pe_handle_hwerrors - display hardware errors.
@@ -555,8 +557,11 @@ static int ipath_pe_boardname(struct ipath_devdata *dd, char *name, 
		ipath_dev_err(dd, "Unsupported InfiniPath hardware revision %u.%u!\n",

			      dd->ipath_majrev, dd->ipath_minrev);

		ret = 1;

	} else

	} else {

		ret = 0;

		if (dd->ipath_minrev >= 2)

			dd->ipath_f_put_tid = ipath_pe_put_tid_2;

	}



	return ret;

}
@@ -1220,7 +1225,7 @@ static void ipath_pe_clear_tids(struct ipath_devdata *dd, unsigned port) 
		 port * dd->ipath_rcvtidcnt * sizeof(*tidbase));



	for (i = 0; i < dd->ipath_rcvtidcnt; i++)

		ipath_pe_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EXPECTED,

		dd->ipath_f_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EXPECTED,

				 tidinv);



	tidbase = (u64 __iomem *)
@@ -1229,7 +1234,7 @@ static void ipath_pe_clear_tids(struct ipath_devdata *dd, unsigned port) 
		 port * dd->ipath_rcvegrcnt * sizeof(*tidbase));



	for (i = 0; i < dd->ipath_rcvegrcnt; i++)

		ipath_pe_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EAGER,

		dd->ipath_f_put_tid(dd, &tidbase[i], RCVHQ_RCV_TYPE_EAGER,

				 tidinv);

}
@@ -1395,9 +1400,10 @@ void ipath_init_iba6120_funcs(struct ipath_devdata *dd) 
	dd->ipath_f_quiet_serdes = ipath_pe_quiet_serdes;

	dd->ipath_f_bringup_serdes = ipath_pe_bringup_serdes;

	dd->ipath_f_clear_tids = ipath_pe_clear_tids;

	if (dd->ipath_minrev >= 2)

		dd->ipath_f_put_tid = ipath_pe_put_tid_2;

	else

	/*

	 * this may get changed after we read the chip revision,

	 * but we start with the safe version for all revs

	 */

	dd->ipath_f_put_tid = ipath_pe_put_tid;

	dd->ipath_f_cleanup = ipath_setup_pe_cleanup;

	dd->ipath_f_setextled = ipath_setup_pe_setextled;