Commit 9d8e2767 authored Aug 21, 2015 by Daniel Axtens Committed by Michael Ellerman Aug 27, 2015

cxl: Remove racy attempt to force EEH invocation in reset



cxl_reset currently PERSTs the slot, and then repeatedly tries to
read MMIO space in order to kick off EEH.

There are 2 problems with this: it's unnecessary, and it's racy.

It's unnecessary because the PERST will bring down the PHB link.
That will be picked up by the CAPP, which will send out an HMI.
Skiboot, noticing an HMI from the CAPP, will send an OPAL
notification to the kernel, which will trigger EEH recovery.

It's also racy: the EEH recovery triggered by the CAPP will
eventually cause the MMIO space to have its mapping invalidated
and the pointer NULLed out. This races with our attempt to read
the MMIO space. This is causing OOPSes in testing.

Simply drop all the attempts to force EEH detection, and trust
that Skiboot will send the notification and that we'll act on it.
The Skiboot code to send the EEH notification has been in Skiboot
for as long as CAPP recovery has been supported, so we don't need
to worry about breaking obscure setups with ancient firmware.

Cc: Ryan Grimm <grimm@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Fixes: 62fa19d4 ("cxl: Add ability to reset the card")
Signed-off-by: Daniel Axtens <dja@axtens.net>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent a6897f39

drivers/misc/cxl/pci.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -876,8 +876,6 @@ int cxl_reset(struct cxl *adapter)
		{
		struct pci_dev *dev = to_pci_dev(adapter->dev.parent);
		int rc;
		int i;
		u32 val;

		if (adapter->perst_same_image) {
		dev_warn(&dev->dev,
		@@ -895,20 +893,6 @@ int cxl_reset(struct cxl *adapter)
		return rc;
		}

		/* the PERST done above fences the PHB. So, reset depends on EEH
		* to unbind the driver, tell Sapphire to reinit the PHB, and rebind
		* the driver. Do an mmio read explictly to ensure EEH notices the
		* fenced PHB. Retry for a few seconds before giving up. */
		i = 0;
		while (((val = mmio_read32be(adapter->p1_mmio)) != 0xffffffff) &&
		(i < 5)) {
		msleep(500);
		i++;
		}

		if (val != 0xffffffff)
		dev_err(&dev->dev, "cxl: PERST failed to trigger EEH\n");

		return rc;
		}

Admin message