Skip to content

Commit 11d49ce

Browse files
legoaterdavem330
authored andcommitted
net/ibmvnic: Fix EOI when running in XIVE mode.
pSeries machines on POWER9 processors can run with the XICS (legacy) interrupt mode or with the XIVE exploitation interrupt mode. These interrupt contollers have different interfaces for interrupt management : XICS uses hcalls and XIVE loads and stores on a page. H_EOI being a XICS interface the enable_scrq_irq() routine can fail when the machine runs in XIVE mode. Fix that by calling the EOI handler of the interrupt chip. Fixes: f23e064 ("ibmvnic: Clear pending interrupt after device reset") Signed-off-by: Cédric Le Goater <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c23936f commit 11d49ce

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,12 +2878,10 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
28782878

28792879
if (test_bit(0, &adapter->resetting) &&
28802880
adapter->reset_reason == VNIC_RESET_MOBILITY) {
2881-
u64 val = (0xff000000) | scrq->hw_irq;
2881+
struct irq_desc *desc = irq_to_desc(scrq->irq);
2882+
struct irq_chip *chip = irq_desc_get_chip(desc);
28822883

2883-
rc = plpar_hcall_norets(H_EOI, val);
2884-
if (rc)
2885-
dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n",
2886-
val, rc);
2884+
chip->irq_eoi(&desc->irq_data);
28872885
}
28882886

28892887
rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address,

0 commit comments

Comments
 (0)