Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2d858b authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Greg Kroah-Hartman
Browse files

net/ibmvnic: Fix EOI when running in XIVE mode. 



[ Upstream commit 11d49ce9f7946dfed4dcf5dbde865c78058b50ab ]

pSeries machines on POWER9 processors can run with the XICS (legacy)
interrupt mode or with the XIVE exploitation interrupt mode. These
interrupt contollers have different interfaces for interrupt
management : XICS uses hcalls and XIVE loads and stores on a page.
H_EOI being a XICS interface the enable_scrq_irq() routine can fail
when the machine runs in XIVE mode.

Fix that by calling the EOI handler of the interrupt chip.

Fixes: f23e0643 ("ibmvnic: Clear pending interrupt after device reset")
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f9d4e3c

drivers/net/ethernet/ibm/ibmvnic.c

+3 −5
Original line number Diff line number Diff line
@@ -2731,12 +2731,10 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter, 


	if (adapter->resetting &&

	    adapter->reset_reason == VNIC_RESET_MOBILITY) {

		u64 val = (0xff000000) | scrq->hw_irq;

		struct irq_desc *desc = irq_to_desc(scrq->irq);

		struct irq_chip *chip = irq_desc_get_chip(desc);



		rc = plpar_hcall_norets(H_EOI, val);

		if (rc)

			dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n",

				val, rc);

		chip->irq_eoi(&desc->irq_data);

	}



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