Skip to contentSkip to conversation

iommu-helpers.h patch

PATCH rubisher 2 participants 4 messages Dec 22, 2007 – Jan 9, 2008

lore
Share & tools
lore

rubisher

author
#0 lore raw

Hello *,

This seems to be missed a while ago ;-)

drivers-parisc-iommu-helpers.h-git20071218.new renamed from drivers-parisc-iommu-helpers.h-git20071218 +1 -1
@@ -29,7 +29,7 @@
 		long size;
 
 		DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
-			   (unsigned long)sg_dma_address(startsg), cnt,
+			   (unsigned long)sg_dma_address(startsg), size,
 			   sg_virt_addr(startsg), startsg->length
 		);

=== <> ===

Cheers,

	r.
#1 lore raw
Quoted 9 lines · rubisher

Hello *,

This seems to be missed a while ago ;-)

--- drivers-parisc-iommu-helpers.h-git20071218 2007-12-21
19:02:38.000000000 +0000
+++ drivers-parisc-iommu-helpers.h-git20071218.new 2007-12-22
13:39:04.000000000 +0000

drivers-parisc-iommu-helpers.h-git20071218.new line 32

Quoted 5 lines
drivers-parisc-iommu-helpers.h-git20071218.new renamed from drivers-parisc-iommu-helpers.h-git20071218 +1 -1
@@ -29,7 +29,7 @@
 		long size;
 
 		DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
-			   (unsigned long)sg_dma_address(startsg), cnt,
+			   (unsigned long)sg_dma_address(startsg), size,

Sorry - but this is wrong. "size" isn't initialized until later. "cnt" was the thing I needed/wanted dumped.

cheers,
grant

Quoted 10 lines
drivers-parisc-iommu-helpers.h-git20071218.new renamed from drivers-parisc-iommu-helpers.h-git20071218 +0 -0
 			   sg_virt_addr(startsg), startsg->length
 		);

=== <> ===

Cheers,

	r.

-
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#2 lore raw
Quoted 12 lines · Grant Grundler
Quoted 11 lines · rubisher

Hello *,

This seems to be missed a while ago ;-)

--- drivers-parisc-iommu-helpers.h-git20071218 2007-12-21
19:02:38.000000000 +0000
+++ drivers-parisc-iommu-helpers.h-git20071218.new 2007-12-22
13:39:04.000000000 +0000

drivers-parisc-iommu-helpers.h-git20071218.new renamed from drivers-parisc-iommu-helpers.h-git20071218 +0 -0
@@ -29,7 +29,7 @@
 		long size;
Quoted 5 lines

drivers-parisc-iommu-helpers.h-git20071218.new line 32

Quoted 3 lines
drivers-parisc-iommu-helpers.h-git20071218.new renamed from drivers-parisc-iommu-helpers.h-git20071218 +1 -1
 		DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
-			   (unsigned long)sg_dma_address(startsg), cnt,
+			   (unsigned long)sg_dma_address(startsg), size,

Sorry - but this is wrong. "size" isn't initialized until later.

Agree with you: size is initialized later.

Anyway cnt variable was gone:

# grep cnt drivers/parisc/iommu-helpers.h
                           (unsigned long)sg_dma_address(startsg), cnt,

and imo it was with this patch:
<http://cvs.parisc-linux.org/linux-2.6/drivers/parisc/ccio-dma.c?r1=1.11&r2=1.12&makepatch=1&diff_format=u>

the interesting hunk's part was:
- int cnt = sg_dma_len(startsg);
- sg_dma_len(startsg) = 0;
+ unsigned long vaddr;
+ long size;

DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
(unsigned long)sg_dma_address(startsg), cnt, sg_virt_addr(startsg), startsg->length
);

+

(and make a kernel with DEBUG_CCIO_RUN_SG failed with an error at this place, so we need to patch ;-)

Quoted 2 lines

"cnt" was the thing I needed/wanted dumped.

So may be something like:

                DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
-                          (unsigned long)sg_dma_address(startsg), cnt,
+                          (unsigned long)sg_dma_address(startsg), sg_dma_len(startsg),
                           sg_virt_addr(startsg), startsg->length
                );

Tx,

	r.
Quoted 15 lines

cheers,
grant

Quoted 10 lines
drivers-parisc-iommu-helpers.h-git20071218.new renamed from drivers-parisc-iommu-helpers.h-git20071218 +0 -0
 			   sg_virt_addr(startsg), startsg->length
 		);

=== <> ===

Cheers,

	r.

-
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 3 lines · rubisher

Anyway cnt variable was gone:

# grep cnt drivers/parisc/iommu-helpers.h
                           (unsigned long)sg_dma_address(startsg), cnt,

oh! that's definitely wrong too then...

Review

Quoted 5 lines

the interesting hunk's part was:

(quoted diff) +2 -2
-		int cnt = sg_dma_len(startsg);
-		sg_dma_len(startsg) = 0;
+		unsigned long vaddr;
+		long size;

Yup...

Quoted 10 lines

(and make a kernel with DEBUG_CCIO_RUN_SG failed with an error at this place, so we need to patch ;-)

Quoted 1 line

"cnt" was the thing I needed/wanted dumped.

So may be something like:

                DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
(quoted diff) +1 -1
-                          (unsigned long)sg_dma_address(startsg), cnt,
+                          (unsigned long)sg_dma_address(startsg),

sg_dma_len(startsg),

Quoted 2 lines
                           sg_virt_addr(startsg), startsg->length
                );

Yeah, that would be better I think.

grant