Attachment 315160 Details for Bug 453680 – Rediffed, #ifdef added, off-by-one covered.

[patch] Rediffed, #ifdef added, off-by-one covered.

linux-2.6.18-96.el5-453680-3.diff (text/plain), 5.35 KB, created by Pete Zaitcev on 2008-08-27 23:53:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2008-08-27 23:53:23 UTC

Size: 5.35 KB

patch

obsolete

>diff -urp -X dontdiff linux-2.6.18-96.el5/arch/x86_64/kernel/pci-calgary.c linux-2.6.18-96.el5-453680/arch/x86_64/kernel/pci-calgary.c
>--- linux-2.6.18-96.el5/arch/x86_64/kernel/pci-calgary.c	2008-07-11 13:27:08.000000000 -0600
>+++ linux-2.6.18-96.el5-453680/arch/x86_64/kernel/pci-calgary.c	2008-08-27 12:54:40.000000000 -0600
>@@ -48,6 +48,7 @@ int use_calgary __read_mostly = 1;
> #else
> int use_calgary __read_mostly = 0;
> #endif /* CONFIG_CALGARY_DEFAULT_ENABLED */
>+const struct dma_mapping_ops* fallback_dma_ops;
> 
> #define PCI_DEVICE_ID_IBM_CALGARY 0x02a1
> #define PCI_DEVICE_ID_IBM_CALIOC2 0x0308
>@@ -406,20 +407,6 @@ static void calgary_unmap_sg(struct devi
> 	}
> }
> 
>-static int calgary_nontranslate_map_sg(struct device* dev,
>-	struct scatterlist *sg, int nelems, int direction)
>-{
>-	int i;
>-
>-	for (i = 0; i < nelems; i++ ) {
>-		struct scatterlist *s = &sg[i];
>-		BUG_ON(!s->page);
>-		s->dma_address = virt_to_bus(page_address(s->page) +s->offset);
>-		s->dma_length = s->length;
>-	}
>-	return nelems;
>-}
>-
> static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
> 	int nelems, int direction)
> {
>@@ -430,7 +417,7 @@ static int calgary_map_sg(struct device 
> 	int i;
> 
> 	if (!translation_enabled(tbl))
>-		return calgary_nontranslate_map_sg(dev, sg, nelems, direction);
>+		return fallback_dma_ops->map_sg(dev, sg, nelems, direction);
> 
> 	for (i = 0; i < nelems; i++ ) {
> 		struct scatterlist *s = &sg[i];
>@@ -473,13 +460,13 @@ static dma_addr_t calgary_map_single(str
> 	unsigned int npages;
> 	struct iommu_table *tbl = find_iommu_table(dev);
> 
>+	if (!translation_enabled(tbl))
>+		return fallback_dma_ops->map_single(dev, vaddr, size, direction);
>+
> 	uaddr = (unsigned long)vaddr;
> 	npages = num_dma_pages(uaddr, size);
> 
>-	if (translation_enabled(tbl))
>-		dma_handle = iommu_alloc(tbl, vaddr, npages, direction);
>-	else
>-		dma_handle = virt_to_bus(vaddr);
>+	dma_handle = iommu_alloc(tbl, vaddr, npages, direction);
> 
> 	return dma_handle;
> }
>@@ -490,8 +477,10 @@ static void calgary_unmap_single(struct 
> 	struct iommu_table *tbl = find_iommu_table(dev);
> 	unsigned int npages;
> 
>-	if (!translation_enabled(tbl))
>+	if (!translation_enabled(tbl)) {
>+		fallback_dma_ops->unmap_single(dev, dma_handle, size, direction);
> 		return;
>+	}
> 
> 	npages = num_dma_pages(dma_handle, size);
> 	iommu_free(tbl, dma_handle, npages);
>@@ -505,6 +494,9 @@ static void* calgary_alloc_coherent(stru
> 	unsigned int npages, order;
> 	struct iommu_table *tbl = find_iommu_table(dev);
> 
>+	if (!translation_enabled(tbl))
>+		return fallback_dma_ops->alloc_coherent(dev, size, dma_handle, flag);
>+
> 	size = PAGE_ALIGN(size); /* size rounded up to full pages */
> 	npages = size >> PAGE_SHIFT;
> 	order = get_order(size);
>@@ -515,15 +507,12 @@ static void* calgary_alloc_coherent(stru
> 		goto error;
> 	memset(ret, 0, size);
> 
>-	if (translation_enabled(tbl)) {
>-		/* set up tces to cover the allocated range */
>-		mapping = iommu_alloc(tbl, ret, npages, DMA_BIDIRECTIONAL);
>-		if (mapping == bad_dma_address)
>-			goto free;
>-
>-		*dma_handle = mapping;
>-	} else /* non translated slot */
>-		*dma_handle = virt_to_bus(ret);
>+	/* set up tces to cover the allocated range */
>+	mapping = iommu_alloc(tbl, ret, npages, DMA_BIDIRECTIONAL);
>+	if (mapping == bad_dma_address)
>+		goto free;
>+
>+	*dma_handle = mapping;
> 
> 	return ret;
> 
>diff -urp -X dontdiff linux-2.6.18-96.el5/arch/x86_64/kernel/pci-nommu.c linux-2.6.18-96.el5-453680/arch/x86_64/kernel/pci-nommu.c
>--- linux-2.6.18-96.el5/arch/x86_64/kernel/pci-nommu.c	2006-09-19 21:42:06.000000000 -0600
>+++ linux-2.6.18-96.el5-453680/arch/x86_64/kernel/pci-nommu.c	2008-08-27 12:57:51.000000000 -0600
>@@ -9,6 +9,7 @@
> #include <asm/proto.h>
> #include <asm/processor.h>
> #include <asm/dma.h>
>+#include <asm/calgary.h>
> 
> static int
> check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
>@@ -90,6 +91,11 @@ struct dma_mapping_ops nommu_dma_ops = {
> 
> void __init no_iommu_init(void)
> {
>+#ifdef CONFIG_CALGARY_IOMMU
>+	if (use_calgary && (end_pfn <= MAX_DMA32_PFN))
>+		fallback_dma_ops = &nommu_dma_ops;
>+#endif
>+
> 	if (dma_ops)
> 		return;
> 
>diff -urp -X dontdiff linux-2.6.18-96.el5/arch/x86_64/kernel/pci-swiotlb.c linux-2.6.18-96.el5-453680/arch/x86_64/kernel/pci-swiotlb.c
>--- linux-2.6.18-96.el5/arch/x86_64/kernel/pci-swiotlb.c	2006-09-19 21:42:06.000000000 -0600
>+++ linux-2.6.18-96.el5-453680/arch/x86_64/kernel/pci-swiotlb.c	2008-08-27 13:49:44.000000000 -0600
>@@ -7,6 +7,7 @@
> #include <asm/proto.h>
> #include <asm/swiotlb.h>
> #include <asm/dma.h>
>+#include <asm/calgary.h>
> 
> int swiotlb __read_mostly;
> EXPORT_SYMBOL(swiotlb);
>@@ -39,5 +40,12 @@ void pci_swiotlb_init(void)
> 		printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n");
> 		swiotlb_init();
> 		dma_ops = &swiotlb_dma_ops;
>+	} else {
>+#ifdef CONFIG_CALGARY_IOMMU
>+		if (use_calgary && (end_pfn > MAX_DMA32_PFN)) {
>+			swiotlb_init();
>+			fallback_dma_ops = &swiotlb_dma_ops;
>+		}
>+#endif
> 	}
> }
>diff -urp -X dontdiff linux-2.6.18-96.el5/include/asm-x86_64/calgary.h linux-2.6.18-96.el5-453680/include/asm-x86_64/calgary.h
>--- linux-2.6.18-96.el5/include/asm-x86_64/calgary.h	2008-07-11 13:27:08.000000000 -0600
>+++ linux-2.6.18-96.el5-453680/include/asm-x86_64/calgary.h	2008-08-26 17:54:10.000000000 -0600
>@@ -60,6 +60,7 @@ struct cal_chipset_ops {
> #define TCE_TABLE_SIZE_8M		7
> 
> extern int use_calgary;
>+extern const struct dma_mapping_ops* fallback_dma_ops;
> 
> #ifdef CONFIG_CALGARY_IOMMU
> extern int calgary_iommu_init(void);

Actions: View | Diff

Attachments on bug 453680: 310722 | 310723 | 315160 | 316513 | 316864 | 324530