Home » Mailing list archives » linux-kernel » 2007 » October » 23

[PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15

Previous thread: [PATCH] [POWERPC] Fix fallout from sg_page changes by Dale Farnsworth on Tuesday, October 23, 2007 - 10:53 am. (3 messages)

Next thread: [PATCH] Add eeprom_bad_csum_allow module option to e1000. by Adam Jackson on Tuesday, October 23, 2007 - 10:58 am. (25 messages)
[view original message]
From: Grant Likely <grant.likely@...>
To: <linux-kernel@...>, <Jens@...>, <Axboe
Subject: [PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15
Date: Tuesday, October 23, 2007 - 11:20 am

From: Grant Likely <grant.likely@secretlab.ca>


Fixup for commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15.  Changes to

dma_map_sg where done in asm-x86/dma-mapping_32.h, but were not mirrored

in include/asm-powerpc/dma-mapping.h


Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

---


Linus, I cannot build an arch/powerpc kernel without this patch.


Cheers,

g.


 include/asm-powerpc/dma-mapping.h |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h

index 65be95d..fd33ce4 100644

--- a/include/asm-powerpc/dma-mapping.h

+++ b/include/asm-powerpc/dma-mapping.h

@@ -285,9 +285,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,

 	BUG_ON(direction == DMA_NONE);


 	for_each_sg(sgl, sg, nents, i) {

-		BUG_ON(!sg->page);

+		BUG_ON(!sg_page(sg));

 		__dma_sync_page(sg->page, sg->offset, sg->length, direction);

-		sg->dma_address = page_to_bus(sg->page) + sg->offset;

+		sg->dma_address = sg_phys(sg);

 	}


 	return nents;


-
[view original message]
From: Grant Likely <grant.likely@...>
To: <linux-kernel@...>, Jens Axboe <axboe@...>, <linuxppc-dev@...>, Linus Torvalds <torvalds@...>, <paulus@...>
Subject: Re: [PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15
Date: Tuesday, October 23, 2007 - 11:35 am

Oops, ignore this patch.  It's doesn't change all the references, it

uses the wrong method for calculating dma_address and 2 other people

have already sent the fix for this.


/me puts on a paper bag


--

Grant Likely, B.Sc., P.Eng.

Secret Lab Technologies Ltd.

grant.likely@secretlab.ca

(403) 399-0195

-
[view original message]
From: Josh Boyer <jwboyer@...>
To: Grant Likely <grant.likely@...>
Cc: <linux-kernel@...>, <Jens@...>, <Axboe
Subject: Re: [PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15
Date: Tuesday, October 23, 2007 - 11:27 am

On Tue, 23 Oct 2007 09:20:25 -0600


Olof Johansson already sent a patch out for this that had some other

fixes in it.  I think Jens already applied it to his tree.


josh

-
Previous thread: [PATCH] [POWERPC] Fix fallout from sg_page changes by Dale Farnsworth on Tuesday, October 23, 2007 - 10:53 am. (3 messages)

Next thread: [PATCH] Add eeprom_bad_csum_allow module option to e1000. by Adam Jackson on Tuesday, October 23, 2007 - 10:58 am. (25 messages)