Skip to content

Commit 284f87d

Browse files
Juliet Kimdavem330
authored andcommitted
Revert "net/ibmvnic: Fix EOI when running in XIVE mode"
This reverts commit 11d49ce (“net/ibmvnic: Fix EOI when running in XIVE mode.”) since that has the unintended effect of changing the interrupt priority and emits warning when running in legacy XICS mode. Signed-off-by: Juliet Kim <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a20ee51 commit 284f87d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,10 +2878,12 @@ 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-
struct irq_desc *desc = irq_to_desc(scrq->irq);
2882-
struct irq_chip *chip = irq_desc_get_chip(desc);
2881+
u64 val = (0xff000000) | scrq->hw_irq;
28832882

2884-
chip->irq_eoi(&desc->irq_data);
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);
28852887
}
28862888

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

0 commit comments

Comments
 (0)