浏览代码

[POWERPC] Read back MSI message in rtas_setup_msi_irqs() so restore works

There are plans afoot to use pci_restore_msi_state() to restore MSI
state after a device reset.  In order for this to work for the RTAS MSI
backend, we need to read back the MSI message from config space after
it has been setup by firmware.

This should be sufficient for restoring the MSI state after a device
reset, however we will need to revisit this for suspend to disk if that
is ever implemented on pseries.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Michael Ellerman 17 年之前
父节点
当前提交
1db3e890ae
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      arch/powerpc/platforms/pseries/msi.c

+ 6 - 0
arch/powerpc/platforms/pseries/msi.c

@@ -171,6 +171,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 	struct pci_dn *pdn;
 	struct pci_dn *pdn;
 	int hwirq, virq, i, rc;
 	int hwirq, virq, i, rc;
 	struct msi_desc *entry;
 	struct msi_desc *entry;
+	struct msi_msg msg;
 
 
 	pdn = get_pdn(pdev);
 	pdn = get_pdn(pdev);
 	if (!pdn)
 	if (!pdn)
@@ -213,6 +214,11 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 
 
 		dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq);
 		dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq);
 		set_irq_msi(virq, entry);
 		set_irq_msi(virq, entry);
+
+		/* Read config space back so we can restore after reset */
+		read_msi_msg(virq, &msg);
+		entry->msg = msg;
+
 		unmask_msi_irq(virq);
 		unmask_msi_irq(virq);
 	}
 	}