mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
[POWERPC] PS3: Fix DMA scatter-gather
Add the missing pieces to support DMA scatter-gather on the PS3 system bus. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
97ec167599
commit
35063bb2ea
1 changed files with 21 additions and 2 deletions
|
@ -272,10 +272,29 @@ static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
|
|||
static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
|
||||
enum dma_data_direction direction)
|
||||
{
|
||||
struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
|
||||
int i;
|
||||
|
||||
#if defined(CONFIG_PS3_DYNAMIC_DMA)
|
||||
BUG_ON("do");
|
||||
return -EPERM;
|
||||
#else
|
||||
for (i = 0; i < nents; i++, sg++) {
|
||||
int result = ps3_dma_map(dev->d_region,
|
||||
page_to_phys(sg->page) + sg->offset, sg->length,
|
||||
&sg->dma_address);
|
||||
|
||||
if (result) {
|
||||
pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
|
||||
__func__, __LINE__, result);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
sg->dma_length = sg->length;
|
||||
}
|
||||
|
||||
return nents;
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,
|
||||
|
@ -288,7 +307,7 @@ static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,
|
|||
|
||||
static int ps3_dma_supported(struct device *_dev, u64 mask)
|
||||
{
|
||||
return 1;
|
||||
return mask >= DMA_32BIT_MASK;
|
||||
}
|
||||
|
||||
static struct dma_mapping_ops ps3_dma_ops = {
|
||||
|
|
Loading…
Reference in a new issue