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

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

IB/ipath: fix handling of kpiobufs 



Change comment: no longer imply that user can set ipath_kpiobufs to zero.
Actually set ipath_kpiobufs from parameter. Previously only altered
per-device ipath_lastport_piobuf, which was over-written in chip init.

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

drivers/infiniband/hw/ipath/ipath_init_chip.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -691,7 +691,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) 
	dd->ipath_pioavregs = ALIGN(val, sizeof(u64) * BITS_PER_BYTE / 2)

	dd->ipath_pioavregs = ALIGN(val, sizeof(u64) * BITS_PER_BYTE / 2)

		/ (sizeof(u64) * BITS_PER_BYTE / 2);

		/ (sizeof(u64) * BITS_PER_BYTE / 2);

	if (ipath_kpiobufs == 0) {

	if (ipath_kpiobufs == 0) {

		/* not set by user, or set explictly to default  */

		/* not set by user (this is default) */

		if ((dd->ipath_piobcnt2k + dd->ipath_piobcnt4k) > 128)

		if ((dd->ipath_piobcnt2k + dd->ipath_piobcnt4k) > 128)

			kpiobufs = 32;

			kpiobufs = 32;

		else

		else
@@ -950,6 +950,7 @@ static int ipath_set_kpiobufs(const char *str, struct kernel_param *kp) 
			dd->ipath_piobcnt2k + dd->ipath_piobcnt4k - val;

			dd->ipath_piobcnt2k + dd->ipath_piobcnt4k - val;

	}

	}





	ipath_kpiobufs = val;

	ret = 0;

	ret = 0;

bail:

bail:

	spin_unlock_irqrestore(&ipath_devs_lock, flags);

	spin_unlock_irqrestore(&ipath_devs_lock, flags);