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

[ Upstream commit 284f87d2f3871247d08a2b6a24466ae905079913 ]

This reverts commit 11d49ce9f7946dfed4dcf5dbde865c78058b50ab
(“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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 8a1916443235a46eb388c550f8b883c310c0ac5d..abfd990ba4d87585fe2a7a9b970b1f6b4bed6884 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -2731,10 +2731,12 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
 
        if (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,