diff options
| author | Juliet Kim <julietk@linux.vnet.ibm.com> | 2019-11-20 10:50:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-27 17:37:40 +0200 |
| commit | 747c7d5ac0d0e6ab483f6ba7e9039c103d66f032 (patch) | |
| tree | c0eabf708f8e7a8f3437175abd64fe3be9744617 | |
| parent | f8ed06a6531b75032be629ae9679c6256b281dc3 (diff) | |
| download | linux-747c7d5ac0d0e6ab483f6ba7e9039c103d66f032.tar.gz linux-747c7d5ac0d0e6ab483f6ba7e9039c103d66f032.tar.bz2 linux-747c7d5ac0d0e6ab483f6ba7e9039c103d66f032.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 8a1916443235..abfd990ba4d8 100644 --- 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, |