diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/plat-omap/iopgtable.h | |
parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'arch/arm/plat-omap/iopgtable.h')
-rw-r--r-- | arch/arm/plat-omap/iopgtable.h | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/arch/arm/plat-omap/iopgtable.h b/arch/arm/plat-omap/iopgtable.h index 37dac434c7a1..ab23b6a140fd 100644 --- a/arch/arm/plat-omap/iopgtable.h +++ b/arch/arm/plat-omap/iopgtable.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * omap iommu: pagetable definitions | 2 | * omap iommu: pagetable definitions |
3 | * | 3 | * |
4 | * Copyright (C) 2008-2009 Nokia Corporation | 4 | * Copyright (C) 2008-2010 Nokia Corporation |
5 | * | 5 | * |
6 | * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 6 | * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com> |
7 | * | 7 | * |
@@ -13,26 +13,52 @@ | |||
13 | #ifndef __PLAT_OMAP_IOMMU_H | 13 | #ifndef __PLAT_OMAP_IOMMU_H |
14 | #define __PLAT_OMAP_IOMMU_H | 14 | #define __PLAT_OMAP_IOMMU_H |
15 | 15 | ||
16 | /* | ||
17 | * "L2 table" address mask and size definitions. | ||
18 | */ | ||
16 | #define IOPGD_SHIFT 20 | 19 | #define IOPGD_SHIFT 20 |
17 | #define IOPGD_SIZE (1 << IOPGD_SHIFT) | 20 | #define IOPGD_SIZE (1UL << IOPGD_SHIFT) |
18 | #define IOPGD_MASK (~(IOPGD_SIZE - 1)) | 21 | #define IOPGD_MASK (~(IOPGD_SIZE - 1)) |
19 | #define IOSECTION_MASK IOPGD_MASK | ||
20 | #define PTRS_PER_IOPGD (1 << (32 - IOPGD_SHIFT)) | ||
21 | #define IOPGD_TABLE_SIZE (PTRS_PER_IOPGD * sizeof(u32)) | ||
22 | 22 | ||
23 | #define IOSUPER_SIZE (IOPGD_SIZE << 4) | 23 | /* |
24 | * "section" address mask and size definitions. | ||
25 | */ | ||
26 | #define IOSECTION_SHIFT 20 | ||
27 | #define IOSECTION_SIZE (1UL << IOSECTION_SHIFT) | ||
28 | #define IOSECTION_MASK (~(IOSECTION_SIZE - 1)) | ||
29 | |||
30 | /* | ||
31 | * "supersection" address mask and size definitions. | ||
32 | */ | ||
33 | #define IOSUPER_SHIFT 24 | ||
34 | #define IOSUPER_SIZE (1UL << IOSUPER_SHIFT) | ||
24 | #define IOSUPER_MASK (~(IOSUPER_SIZE - 1)) | 35 | #define IOSUPER_MASK (~(IOSUPER_SIZE - 1)) |
25 | 36 | ||
37 | #define PTRS_PER_IOPGD (1UL << (32 - IOPGD_SHIFT)) | ||
38 | #define IOPGD_TABLE_SIZE (PTRS_PER_IOPGD * sizeof(u32)) | ||
39 | |||
40 | /* | ||
41 | * "small page" address mask and size definitions. | ||
42 | */ | ||
26 | #define IOPTE_SHIFT 12 | 43 | #define IOPTE_SHIFT 12 |
27 | #define IOPTE_SIZE (1 << IOPTE_SHIFT) | 44 | #define IOPTE_SIZE (1UL << IOPTE_SHIFT) |
28 | #define IOPTE_MASK (~(IOPTE_SIZE - 1)) | 45 | #define IOPTE_MASK (~(IOPTE_SIZE - 1)) |
29 | #define IOPAGE_MASK IOPTE_MASK | ||
30 | #define PTRS_PER_IOPTE (1 << (IOPGD_SHIFT - IOPTE_SHIFT)) | ||
31 | #define IOPTE_TABLE_SIZE (PTRS_PER_IOPTE * sizeof(u32)) | ||
32 | 46 | ||
33 | #define IOLARGE_SIZE (IOPTE_SIZE << 4) | 47 | /* |
48 | * "large page" address mask and size definitions. | ||
49 | */ | ||
50 | #define IOLARGE_SHIFT 16 | ||
51 | #define IOLARGE_SIZE (1UL << IOLARGE_SHIFT) | ||
34 | #define IOLARGE_MASK (~(IOLARGE_SIZE - 1)) | 52 | #define IOLARGE_MASK (~(IOLARGE_SIZE - 1)) |
35 | 53 | ||
54 | #define PTRS_PER_IOPTE (1UL << (IOPGD_SHIFT - IOPTE_SHIFT)) | ||
55 | #define IOPTE_TABLE_SIZE (PTRS_PER_IOPTE * sizeof(u32)) | ||
56 | |||
57 | #define IOPAGE_MASK IOPTE_MASK | ||
58 | |||
59 | /* | ||
60 | * some descriptor attributes. | ||
61 | */ | ||
36 | #define IOPGD_TABLE (1 << 0) | 62 | #define IOPGD_TABLE (1 << 0) |
37 | #define IOPGD_SECTION (2 << 0) | 63 | #define IOPGD_SECTION (2 << 0) |
38 | #define IOPGD_SUPER (1 << 18 | 2 << 0) | 64 | #define IOPGD_SUPER (1 << 18 | 2 << 0) |
@@ -40,12 +66,14 @@ | |||
40 | #define IOPTE_SMALL (2 << 0) | 66 | #define IOPTE_SMALL (2 << 0) |
41 | #define IOPTE_LARGE (1 << 0) | 67 | #define IOPTE_LARGE (1 << 0) |
42 | 68 | ||
69 | /* to find an entry in a page-table-directory */ | ||
43 | #define iopgd_index(da) (((da) >> IOPGD_SHIFT) & (PTRS_PER_IOPGD - 1)) | 70 | #define iopgd_index(da) (((da) >> IOPGD_SHIFT) & (PTRS_PER_IOPGD - 1)) |
44 | #define iopgd_offset(obj, da) ((obj)->iopgd + iopgd_index(da)) | 71 | #define iopgd_offset(obj, da) ((obj)->iopgd + iopgd_index(da)) |
45 | 72 | ||
46 | #define iopte_paddr(iopgd) (*iopgd & ~((1 << 10) - 1)) | 73 | #define iopte_paddr(iopgd) (*iopgd & ~((1 << 10) - 1)) |
47 | #define iopte_vaddr(iopgd) ((u32 *)phys_to_virt(iopte_paddr(iopgd))) | 74 | #define iopte_vaddr(iopgd) ((u32 *)phys_to_virt(iopte_paddr(iopgd))) |
48 | 75 | ||
76 | /* to find an entry in the second-level page table. */ | ||
49 | #define iopte_index(da) (((da) >> IOPTE_SHIFT) & (PTRS_PER_IOPTE - 1)) | 77 | #define iopte_index(da) (((da) >> IOPTE_SHIFT) & (PTRS_PER_IOPTE - 1)) |
50 | #define iopte_offset(iopgd, da) (iopte_vaddr(iopgd) + iopte_index(da)) | 78 | #define iopte_offset(iopgd, da) (iopte_vaddr(iopgd) + iopte_index(da)) |
51 | 79 | ||