lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Cell fixup DMA offset for new southbridge

Browse Source 
This patch makes the Cell DMA code work on both the Spider and the Axon
south bridges by turning cell_dma_valid into a variable instead of a
constant. This is a temporary patch until we have full iommu support.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2006-11-11 17:25:09 +11:00
committed by Paul Mackerras
parent 4c9d2800be
commit d03f387eb3
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/platforms/cell/iommu.c
View File

@@ -46,6 +46,8 @@
#include "iommu.h" #include "iommu.h"
static dma_addr_t cell_dma_valid = SPIDER_DMA_VALID;
static inline unsigned long static inline unsigned long
get_iopt_entry(unsigned long real_address, unsigned long ioid, get_iopt_entry(unsigned long real_address, unsigned long ioid,
unsigned long prot) unsigned long prot)
@@ -423,7 +425,7 @@ static void *cell_alloc_coherent(struct device *hwdev, size_t size,
ret = (void *)__get_free_pages(flag, get_order(size)); ret = (void *)__get_free_pages(flag, get_order(size));
if (ret != NULL) { if (ret != NULL) {
memset(ret, 0, size); memset(ret, 0, size);
*dma_handle = virt_to_abs(ret) | CELL_DMA_VALID; *dma_handle = virt_to_abs(ret) | cell_dma_valid;
} }
return ret; return ret;
} }
@@ -437,7 +439,7 @@ static void cell_free_coherent(struct device *hwdev, size_t size,
static dma_addr_t cell_map_single(struct device *hwdev, void *ptr, static dma_addr_t cell_map_single(struct device *hwdev, void *ptr,
size_t size, enum dma_data_direction direction) size_t size, enum dma_data_direction direction)
{ {
return virt_to_abs(ptr) | CELL_DMA_VALID; return virt_to_abs(ptr) | cell_dma_valid;
} }
static void cell_unmap_single(struct device *hwdev, dma_addr_t dma_addr, static void cell_unmap_single(struct device *hwdev, dma_addr_t dma_addr,
@@ -452,7 +454,7 @@ static int cell_map_sg(struct device *hwdev, struct scatterlist *sg,
for (i = 0; i < nents; i++, sg++) { for (i = 0; i < nents; i++, sg++) {
sg->dma_address = (page_to_phys(sg->page) + sg->offset) sg->dma_address = (page_to_phys(sg->page) + sg->offset)
| CELL_DMA_VALID; | cell_dma_valid;
sg->dma_length = sg->length; sg->dma_length = sg->length;
} }
@@ -483,6 +485,12 @@ void cell_init_iommu(void)
{ {
int setup_bus = 0; int setup_bus = 0;
/* If we have an Axon bridge, clear the DMA valid mask. This is fairly
* hackish but will work well enough until we have proper iommu code.
*/
if (of_find_node_by_name(NULL, "axon"))
cell_dma_valid = 0;
if (of_find_node_by_path("/mambo")) { if (of_find_node_by_path("/mambo")) {
pr_info("Not using iommu on systemsim\n"); pr_info("Not using iommu on systemsim\n");
} else { } else {

8
arch/powerpc/platforms/cell/iommu.h
View File

@@ -53,9 +53,11 @@ enum {
IOC_ST_ORIGIN = 0x918, IOC_ST_ORIGIN = 0x918,
IOC_CONF = 0x930, IOC_CONF = 0x930,
/* The high bit needs to be set on every DMA address, /* The high bit needs to be set on every DMA address when using
only 2GB are addressable */ * a spider bridge and only 2GB are addressable with the current
CELL_DMA_VALID = 0x80000000, * iommu code.
*/
SPIDER_DMA_VALID = 0x80000000,
CELL_DMA_MASK = 0x7fffffff, CELL_DMA_MASK = 0x7fffffff,
}; };