* x86-64 Calgary IOMMU update for 2.6.21
@ 2007-02-06 14:16 muli
2007-02-06 14:16 ` [PATCH 1/1] x86-64 Calgary: robustify bad_dma_address handling muli
0 siblings, 1 reply; 2+ messages in thread
From: muli @ 2007-02-06 14:16 UTC (permalink / raw)
To: ak; +Cc: linux-kernel, discuss, muli, jdmason
Hi Andi,
This patch should go into mainline in the next x86-64 update.
Thanks,
Muli
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] x86-64 Calgary: robustify bad_dma_address handling
2007-02-06 14:16 x86-64 Calgary IOMMU update for 2.6.21 muli
@ 2007-02-06 14:16 ` muli
0 siblings, 0 replies; 2+ messages in thread
From: muli @ 2007-02-06 14:16 UTC (permalink / raw)
To: ak; +Cc: linux-kernel, discuss, muli, jdmason
From: Muli Ben-Yehuda <muli@il.ibm.com>
- set bad_dma_address explicitly to 0x0
- reserve 32 pages from bad_dma_address and up
- WARN_ON() a driver feeding us bad_dma_address
Thanks to Leo Duran <leo.duran@amd.com> for the suggestion.
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Leo Duran <leo.duran@amd.com>
Cc: Job Mason <jdmason@kudzu.us>
---
arch/x86_64/kernel/pci-calgary.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 3d65b1d..04480c3 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -138,6 +138,8 @@ static const unsigned long phb_debug_off
#define PHB_DEBUG_STUFF_OFFSET 0x0020
+#define EMERGENCY_PAGES 32 /* = 128KB */
+
unsigned int specified_table_size = TCE_TABLE_SIZE_UNSPECIFIED;
static int translate_empty_slots __read_mostly = 0;
static int calgary_detected __read_mostly = 0;
@@ -296,6 +298,16 @@ static void __iommu_free(struct iommu_ta
{
unsigned long entry;
unsigned long badbit;
+ unsigned long badend;
+
+ /* were we called with bad_dma_address? */
+ badend = bad_dma_address + (EMERGENCY_PAGES * PAGE_SIZE);
+ if (unlikely((dma_addr >= bad_dma_address) && (dma_addr < badend))) {
+ printk(KERN_ERR "Calgary: driver tried unmapping bad DMA "
+ "address 0x%Lx\n", dma_addr);
+ WARN_ON(1);
+ return;
+ }
entry = dma_addr >> PAGE_SHIFT;
@@ -656,8 +668,8 @@ static void __init calgary_reserve_regio
u64 start;
struct iommu_table *tbl = dev->sysdata;
- /* reserve bad_dma_address in case it's a legal address */
- iommu_range_reserve(tbl, bad_dma_address, 1);
+ /* reserve EMERGENCY_PAGES from bad_dma_address and up */
+ iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES);
/* avoid the BIOS/VGA first 640KB-1MB region */
start = (640 * 1024);
@@ -1176,6 +1188,7 @@ int __init calgary_iommu_init(void)
}
force_iommu = 1;
+ bad_dma_address = 0x0;
dma_ops = &calgary_dma_ops;
return 0;
--
1.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-06 14:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-06 14:16 x86-64 Calgary IOMMU update for 2.6.21 muli
2007-02-06 14:16 ` [PATCH 1/1] x86-64 Calgary: robustify bad_dma_address handling muli
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).