projects
/
linux-flexiantxendom0.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iommu/amd: Make sure IOMMU interrupts are re-enabled on resume
[linux-flexiantxendom0.git]
/
drivers
/
iommu
/
amd_iommu_init.c
diff --git
a/drivers/iommu/amd_iommu_init.c
b/drivers/iommu/amd_iommu_init.c
index
5c74179
..
20d5852
100644
(file)
--- a/
drivers/iommu/amd_iommu_init.c
+++ b/
drivers/iommu/amd_iommu_init.c
@@
-1033,8
+1033,9
@@
static int iommu_setup_msi(struct amd_iommu *iommu)
{
int r;
{
int r;
- if (pci_enable_msi(iommu->dev))
- return 1;
+ r = pci_enable_msi(iommu->dev);
+ if (r)
+ return r;
r = request_threaded_irq(iommu->dev->irq,
amd_iommu_int_handler,
r = request_threaded_irq(iommu->dev->irq,
amd_iommu_int_handler,
@@
-1044,24
+1045,33
@@
static int iommu_setup_msi(struct amd_iommu *iommu)
if (r) {
pci_disable_msi(iommu->dev);
if (r) {
pci_disable_msi(iommu->dev);
- return 1;
+ return r;
}
iommu->int_enabled = true;
}
iommu->int_enabled = true;
- iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
return 0;
}
static int iommu_init_msi(struct amd_iommu *iommu)
{
return 0;
}
static int iommu_init_msi(struct amd_iommu *iommu)
{
+ int ret;
+
if (iommu->int_enabled)
if (iommu->int_enabled)
- return 0;
+ goto enable_faults;
if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
- return iommu_setup_msi(iommu);
+ ret = iommu_setup_msi(iommu);
+ else
+ ret = -ENODEV;
- return 1;
+ if (ret)
+ return ret;
+
+enable_faults:
+ iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
+
+ return 0;
}
/****************************************************************************
}
/****************************************************************************