Commit 2df5c60e authored Nov 20, 2019 by Juliet Kim Committed by David S. Miller Nov 20, 2019

net/ibmvnic: Ignore H_FUNCTION return from H_EOI to tolerate XIVE mode



Reversion of commit 11d49ce9
(“net/ibmvnic: Fix EOI when running in XIVE mode.”) leaves us
calling H_EOI even in XIVE mode. That will fail with H_FUNCTION
because H_EOI is not supported in that mode. That failure is
harmless. Ignore it so we can use common code for both XICS and
XIVE.

Signed-off-by: Juliet Kim <julietk@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 284f87d2

drivers/net/ethernet/ibm/ibmvnic.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2881,7 +2881,10 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
		u64 val = (0xff000000) \| scrq->hw_irq;

		rc = plpar_hcall_norets(H_EOI, val);
		if (rc)
		/* H_EOI would fail with rc = H_FUNCTION when running
		* in XIVE mode which is expected, but not an error.
		*/
		if (rc && (rc != H_FUNCTION))
		dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n",
		val, rc);
		}

Admin message