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

Commit 8ee887d7 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/qib: Fix over-scheduling of QSFP work 



Don't over-schedule QSFP work on driver initialization.  It could end
up being run simultaneously on two different CPUs resulting in bad
EEPROM reads.  In combination with setting the physical IB link state
prior to the IBC being brought out of reset, this can cause the link
state machine to start training early with wrong settings.

Signed-off-by: default avatarMitko Haralanov <mitko@qlogic.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@qlogic.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 042f36e1

drivers/infiniband/hw/qib/qib_iba7322.c

+8 −8
Original line number Diff line number Diff line
@@ -2307,19 +2307,11 @@ static int qib_7322_bringup_serdes(struct qib_pportdata *ppd) 
		SYM_LSB(IBCCtrlA_0, MaxPktLen);

	ppd->cpspec->ibcctrl_a = ibc; /* without linkcmd or linkinitcmd! */



	/* initially come up waiting for TS1, without sending anything. */

	val = ppd->cpspec->ibcctrl_a | (QLOGIC_IB_IBCC_LINKINITCMD_DISABLE <<

		QLOGIC_IB_IBCC_LINKINITCMD_SHIFT);



	ppd->cpspec->ibcctrl_a = val;

	/*

	 * Reset the PCS interface to the serdes (and also ibc, which is still

	 * in reset from above).  Writes new value of ibcctrl_a as last step.

	 */

	qib_7322_mini_pcs_reset(ppd);

	qib_write_kreg(dd, kr_scratch, 0ULL);

	/* clear the linkinit cmds */

	ppd->cpspec->ibcctrl_a &= ~SYM_MASK(IBCCtrlA_0, LinkInitCmd);



	if (!ppd->cpspec->ibcctrl_b) {

		unsigned lse = ppd->link_speed_enabled;
@@ -2385,6 +2377,14 @@ static int qib_7322_bringup_serdes(struct qib_pportdata *ppd) 
	ppd->cpspec->ibcctrl_a |= SYM_MASK(IBCCtrlA_0, IBLinkEn);

	set_vls(ppd);



	/* initially come up DISABLED, without sending anything. */

	val = ppd->cpspec->ibcctrl_a | (QLOGIC_IB_IBCC_LINKINITCMD_DISABLE <<

					QLOGIC_IB_IBCC_LINKINITCMD_SHIFT);

	qib_write_kreg_port(ppd, krp_ibcctrl_a, val);

	qib_write_kreg(dd, kr_scratch, 0ULL);

	/* clear the linkinit cmds */

	ppd->cpspec->ibcctrl_a = val & ~SYM_MASK(IBCCtrlA_0, LinkInitCmd);



	/* be paranoid against later code motion, etc. */

	spin_lock_irqsave(&dd->cspec->rcvmod_lock, flags);

	ppd->p_rcvctrl |= SYM_MASK(RcvCtrl_0, RcvIBPortEnable);

drivers/infiniband/hw/qib/qib_qsfp.c

+0 −12
Original line number Diff line number Diff line
@@ -480,18 +480,6 @@ void qib_qsfp_init(struct qib_qsfp_data *qd, 
	udelay(20); /* Generous RST dwell */



	dd->f_gpio_mod(dd, mask, mask, mask);

	/* Spec says module can take up to two seconds! */

	mask = QSFP_GPIO_MOD_PRS_N;

	if (qd->ppd->hw_pidx)

		mask <<= QSFP_GPIO_PORT2_SHIFT;



	/* Do not try to wait here. Better to let event handle it */

	if (!qib_qsfp_mod_present(qd->ppd))

		goto bail;

	/* We see a module, but it may be unwise to look yet. Just schedule */

	qd->t_insert = get_jiffies_64();

	queue_work(ib_wq, &qd->work);

bail:

	return;

}