Revert "net/ibmvnic: Fix EOI when running in XIVE mode"

This reverts commit 4e5bf9e99a5580b610ac523eea76f79d490e9746
(“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 <julietk@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index f59d9a8e35e2e7343cd31f017dc3e8fd5f958b96..2b073a3c0b8474370e1ac072548bd68d0e4f7471 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -2878,10 +2878,12 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
 
        if (test_bit(0, &adapter->resetting) &&
            adapter->reset_reason == VNIC_RESET_MOBILITY) {
-               struct irq_desc *desc = irq_to_desc(scrq->irq);
-               struct irq_chip *chip = irq_desc_get_chip(desc);
+               u64 val = (0xff000000) | scrq->hw_irq;
 
-               chip->irq_eoi(&desc->irq_data);
+               rc = plpar_hcall_norets(H_EOI, val);
+               if (rc)
+                       dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n",
+                               val, rc);
        }
 
        rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address,