+ x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     x86_64: Don't warn for overflow in nommu case when dma_mask is < 32bit

has been added to the -mm tree.  Its filename is

     x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this


From: "Andi Kleen" <ak@xxxxxxx>

This triggers for b44's 1GB DMA workaround which tries to map first and then
bounces.

The 32bit heuristic is reasonable because the IOMMU doesn't attempt to handle
< 32bit masks anyways.

Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/x86_64/kernel/pci-nommu.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -puN arch/x86_64/kernel/pci-nommu.c~x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit arch/x86_64/kernel/pci-nommu.c
--- devel/arch/x86_64/kernel/pci-nommu.c~x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit	2006-05-15 21:43:17.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/pci-nommu.c	2006-05-15 21:43:17.000000000 -0700
@@ -12,9 +12,10 @@ static int
 check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
 {
         if (hwdev && bus + size > *hwdev->dma_mask) {
-		printk(KERN_ERR
-		    "nommu_%s: overflow %Lx+%lu of device mask %Lx\n",
-	       name, (long long)bus, size, (long long)*hwdev->dma_mask);
+		if (*hwdev->dma_mask >= 0xffffffffULL)
+			printk(KERN_ERR
+			    "nommu_%s: overflow %Lx+%lu of device mask %Lx\n",
+	       			name, (long long)bus, size, (long long)*hwdev->dma_mask);
 		return 0;
 	}
 	return 1;
_

Patches currently in -mm which might be from ak@xxxxxxx are

x86_64-check-for-bad-dma-address-in-b44-1gb-dma-workaround.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit.patch
i386-x86_64-force-pci=noacpi-on-hp.patch
x86_64-fix-memory-hotadd-heuristics.patch
x86_64-dont-schedule-on-exception.patch
git-acpi.patch
git-agpgart.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix-fix-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86_64-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86_64-fix-fix.patch
x86_64-mm-serialize-assign_irq_vector-use-of-static-variables-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux