* [Patch] iommu/vt-d: fix bug in handling multiple RMRRs for the same PCI device
@ 2014-06-20 7:08 Jiang Liu
2014-06-20 12:23 ` Joerg Roedel
0 siblings, 1 reply; 2+ messages in thread
From: Jiang Liu @ 2014-06-20 7:08 UTC (permalink / raw)
To: Joerg Roedel, David Woodhouse
Cc: Jiang Liu, iommu, linux-pci, linux-hotplug, linux-kernel
Function dmar_iommu_notify_scope_dev() makes a wrong assumption that
there's one RMRR for each PCI device at most, which causes DMA failure
on some HP platforms. So enhance dmar_iommu_notify_scope_dev() to
handle multiple RMRRs for the same PCI device.
Fixbug: https://bugzilla.novell.com/show_bug.cgi?id‡9482
Cc: <stable@vger.kernel.org> # 3.15
Reported-by: Tom Mingarelli <thomas.mingarelli@hp.com>
Tested-by: Linda Knippers <linda.knippers@hp.com>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
drivers/iommu/intel-iommu.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 6bb32773c3ac..51b6b77dc3e5 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3816,14 +3816,11 @@ int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info)
((void *)rmrr) + rmrr->header.length,
rmrr->segment, rmrru->devices,
rmrru->devices_cnt);
- if (ret > 0)
- break;
- else if(ret < 0)
+ if(ret < 0)
return ret;
} else if (info->event = BUS_NOTIFY_DEL_DEVICE) {
- if (dmar_remove_dev_scope(info, rmrr->segment,
- rmrru->devices, rmrru->devices_cnt))
- break;
+ dmar_remove_dev_scope(info, rmrr->segment,
+ rmrru->devices, rmrru->devices_cnt);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Patch] iommu/vt-d: fix bug in handling multiple RMRRs for the same PCI device
2014-06-20 7:08 [Patch] iommu/vt-d: fix bug in handling multiple RMRRs for the same PCI device Jiang Liu
@ 2014-06-20 12:23 ` Joerg Roedel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Roedel @ 2014-06-20 12:23 UTC (permalink / raw)
To: Jiang Liu; +Cc: David Woodhouse, iommu, linux-pci, linux-hotplug, linux-kernel
On Fri, Jun 20, 2014 at 03:08:06PM +0800, Jiang Liu wrote:
> Function dmar_iommu_notify_scope_dev() makes a wrong assumption that
> there's one RMRR for each PCI device at most, which causes DMA failure
> on some HP platforms. So enhance dmar_iommu_notify_scope_dev() to
> handle multiple RMRRs for the same PCI device.
>
> Fixbug: https://bugzilla.novell.com/show_bug.cgi?id‡9482
>
> Cc: <stable@vger.kernel.org> # 3.15
> Reported-by: Tom Mingarelli <thomas.mingarelli@hp.com>
> Tested-by: Linda Knippers <linda.knippers@hp.com>
> Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Applied to iommu/fixes, thans Jiang.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-20 12:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-20 7:08 [Patch] iommu/vt-d: fix bug in handling multiple RMRRs for the same PCI device Jiang Liu
2014-06-20 12:23 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).