iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes

Browse Source
This commit is contained in:
Tony Lindgren 2011-07-04 07:40:05 -07:00
commit fdcc205fb9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-omap2/iommu2.c
View File

@ -225,8 +225,8 @@ static u32 omap2_get_pte_attr(struct iotlb_entry *e)
attr = e->mixed << 5; attr = e->mixed << 5;
attr |= e->endian; attr |= e->endian;
attr |= e->elsz >> 3; attr |= e->elsz >> 3;
attr <<= ((e->pgsz & MMU_CAM_PGSZ_4K) ? 0 : 6); attr <<= (((e->pgsz == MMU_CAM_PGSZ_4K) ||
(e->pgsz == MMU_CAM_PGSZ_64K)) ? 0 : 6);
return attr; return attr;
} }

2
arch/arm/mach-omap2/omap-iommu.c
View File

@ -67,7 +67,7 @@ static struct iommu_device omap4_devices[] = {
.pdata = { .pdata = {
.name = "ducati", .name = "ducati",
.nr_tlb_entries = 32, .nr_tlb_entries = 32,
.clk_name = "ducati_ick", .clk_name = "ipu_fck",
.da_start = 0x0, .da_start = 0x0,
.da_end = 0xFFFFF000, .da_end = 0xFFFFF000,
}, },

6
arch/arm/plat-omap/iovmm.c
View File

@ -72,7 +72,7 @@ static size_t sgtable_len(const struct sg_table *sgt)
for_each_sg(sgt->sgl, sg, sgt->nents, i) { for_each_sg(sgt->sgl, sg, sgt->nents, i) {
size_t bytes; size_t bytes;
bytes = sg_dma_len(sg); bytes = sg->length;
if (!iopgsz_ok(bytes)) { if (!iopgsz_ok(bytes)) {
pr_err("%s: sg[%d] not iommu pagesize(%x)\n", pr_err("%s: sg[%d] not iommu pagesize(%x)\n",
@ -198,7 +198,7 @@ static void *vmap_sg(const struct sg_table *sgt)
int err; int err;
pa = sg_phys(sg); pa = sg_phys(sg);
bytes = sg_dma_len(sg); bytes = sg->length;
BUG_ON(bytes != PAGE_SIZE); BUG_ON(bytes != PAGE_SIZE);
@ -476,7 +476,7 @@ static int map_iovm_area(struct iommu *obj, struct iovm_struct *new,
struct iotlb_entry e; struct iotlb_entry e;
pa = sg_phys(sg); pa = sg_phys(sg);
bytes = sg_dma_len(sg); bytes = sg->length;
flags &= ~IOVMF_PGSZ_MASK; flags &= ~IOVMF_PGSZ_MASK;
pgsz = bytes_to_iopgsz(bytes); pgsz = bytes_to_iopgsz(bytes);