iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/ibmvnic: Cleanup workaround doing an EOI after partition migration

Browse Source 
There were a fair amount of changes to workaround a firmware bug leaving
a pending interrupt after migration of the ibmvnic device :

commit 2df5c60e19 ("net/ibmvnic: Ignore H_FUNCTION return from H_EOI
       		    to tolerate XIVE mode")
commit 284f87d2f3 ("Revert "net/ibmvnic: Fix EOI when running in
       		    XIVE mode"")
commit 11d49ce9f7 ("net/ibmvnic: Fix EOI when running in XIVE mode.")
commit f23e0643cd ("ibmvnic: Clear pending interrupt after device reset")

Here is the final one taking into account the XIVE interrupt mode.

Cc: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
Cc: Dany Madden <drt@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cédric Le Goater
2022-02-18 09:07:08 +01:00
committed by David S. Miller
parent aaae162aeb
commit 7ea0c16a74
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/ethernet/ibm/ibmvnic.c
View File

@@ -60,6 +60,7 @@
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/xive.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/firmware.h> #include <asm/firmware.h>
@@ -3562,6 +3563,30 @@ static int disable_scrq_irq(struct ibmvnic_adapter *adapter,
return rc; return rc;
} }
/* We can not use the IRQ chip EOI handler because that has the
* unintended effect of changing the interrupt priority.
*/
static void ibmvnic_xics_eoi(struct device *dev, struct ibmvnic_sub_crq_queue *scrq)
{
u64 val = 0xff000000 | scrq->hw_irq;
unsigned long rc;
rc = plpar_hcall_norets(H_EOI, val);
if (rc)
dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n", val, rc);
}
/* Due to a firmware bug, the hypervisor can send an interrupt to a
* transmit or receive queue just prior to a partition migration.
* Force an EOI after migration.
*/
static void ibmvnic_clear_pending_interrupt(struct device *dev,
struct ibmvnic_sub_crq_queue *scrq)
{
if (!xive_enabled())
ibmvnic_xics_eoi(dev, scrq);
}
static int enable_scrq_irq(struct ibmvnic_adapter *adapter, static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
struct ibmvnic_sub_crq_queue *scrq) struct ibmvnic_sub_crq_queue *scrq)
{ {
@@ -3575,15 +3600,7 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
if (test_bit(0, &adapter->resetting) && if (test_bit(0, &adapter->resetting) &&
adapter->reset_reason == VNIC_RESET_MOBILITY) { adapter->reset_reason == VNIC_RESET_MOBILITY) {
u64 val = (0xff000000) | scrq->hw_irq; ibmvnic_clear_pending_interrupt(dev, scrq);
rc = plpar_hcall_norets(H_EOI, val);
/* H_EOI would fail with rc = H_FUNCTION when running
* in XIVE mode which is expected, but not an error.
*/
if (rc && (rc != H_FUNCTION))
dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n",
val, rc);
} }
rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address, rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address,