Skip to content

Commit 2df5c60

Browse files
Juliet Kimdavem330
authored andcommitted
net/ibmvnic: Ignore H_FUNCTION return from H_EOI to tolerate XIVE mode
Reversion of commit 11d49ce (“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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 284f87d commit 2df5c60

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2881,7 +2881,10 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
28812881
u64 val = (0xff000000) | scrq->hw_irq;
28822882

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

0 commit comments

Comments
 (0)