Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ed455e authored by Jens Axboe's avatar Jens Axboe
Browse files

PS3: sg chaining support 



Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 9b6eccfc

arch/powerpc/platforms/ps3/system-bus.c

+4 −3
Original line number Diff line number Diff line
@@ -616,17 +616,18 @@ static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr, 
	}

}



static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sg, int nents,

	enum dma_data_direction direction)

static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sgl,

	int nents, enum dma_data_direction direction)

{

#if defined(CONFIG_PS3_DYNAMIC_DMA)

	BUG_ON("do");

	return -EPERM;

#else

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	struct scatterlist *sg;

	int i;



	for (i = 0; i < nents; i++, sg++) {

	for_each_sg(sgl, sg, nents, i) {

		int result = ps3_dma_map(dev->d_region,

			page_to_phys(sg->page) + sg->offset, sg->length,

					 &sg->dma_address, 0);

include/asm-powerpc/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/cache.h>

/* need struct page definitions */

#include <linux/mm.h>

#include <asm/scatterlist.h>

#include <linux/scatterlist.h>

#include <asm/io.h>



#define DMA_ERROR_CODE		(~(dma_addr_t)0x0)