tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
Looks like the iommu framework does not have generic functions
exported for all the needs yet. The hardware specific functions
are defined in files like intel-iommu.h and amd-iommu.h. Follow
the same standard for omap-iommu.h.
This is needed because we are removing plat and mach includes
for ARM common zImage support. Further work should continue
in the iommu framework context as only pure platform data will
be communicated from arch/arm/*omap*/* code to the iommu
framework.
Cc: Ido Yariv <ido@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Cc: linux-media@vger.kernel.org
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
+107
-103
+1
arch/arm/mach-omap2/iommu2.c
+1
arch/arm/mach-omap2/iommu2.c
+2
-8
arch/arm/plat-omap/include/plat/iommu.h
+2
-8
arch/arm/plat-omap/include/plat/iommu.h
···
216
216
#define MMU_RAM_PADDR_SHIFT 12
217
217
#define MMU_RAM_PADDR_MASK \
218
218
((~0UL >> MMU_RAM_PADDR_SHIFT) << MMU_RAM_PADDR_SHIFT)
219
-
#define MMU_RAM_ENDIAN_SHIFT 9
219
+
220
220
#define MMU_RAM_ENDIAN_MASK (1 << MMU_RAM_ENDIAN_SHIFT)
221
-
#define MMU_RAM_ENDIAN_BIG (1 << MMU_RAM_ENDIAN_SHIFT)
222
-
#define MMU_RAM_ENDIAN_LITTLE (0 << MMU_RAM_ENDIAN_SHIFT)
223
-
#define MMU_RAM_ELSZ_SHIFT 7
224
221
#define MMU_RAM_ELSZ_MASK (3 << MMU_RAM_ELSZ_SHIFT)
225
-
#define MMU_RAM_ELSZ_8 (0 << MMU_RAM_ELSZ_SHIFT)
222
+
226
223
#define MMU_RAM_ELSZ_16 (1 << MMU_RAM_ELSZ_SHIFT)
227
224
#define MMU_RAM_ELSZ_32 (2 << MMU_RAM_ELSZ_SHIFT)
228
225
#define MMU_RAM_ELSZ_NONE (3 << MMU_RAM_ELSZ_SHIFT)
···
265
268
int (*isr)(struct omap_iommu *obj, u32 da, u32 iommu_errs,
266
269
void *priv),
267
270
void *isr_priv);
268
-
269
-
extern void omap_iommu_save_ctx(struct device *dev);
270
-
extern void omap_iommu_restore_ctx(struct device *dev);
271
271
272
272
extern int omap_install_iommu_arch(const struct iommu_functions *ops);
273
273
extern void omap_uninstall_iommu_arch(const struct iommu_functions *ops);
-89
arch/arm/plat-omap/include/plat/iovmm.h
-89
arch/arm/plat-omap/include/plat/iovmm.h
···
1
-
/*
2
-
* omap iommu: simple virtual address space management
3
-
*
4
-
* Copyright (C) 2008-2009 Nokia Corporation
5
-
*
6
-
* Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
7
-
*
8
-
* This program is free software; you can redistribute it and/or modify
9
-
* it under the terms of the GNU General Public License version 2 as
10
-
* published by the Free Software Foundation.
11
-
*/
12
-
13
-
#ifndef __IOMMU_MMAP_H
14
-
#define __IOMMU_MMAP_H
15
-
16
-
#include <linux/iommu.h>
17
-
18
-
struct iovm_struct {
19
-
struct omap_iommu *iommu; /* iommu object which this belongs to */
20
-
u32 da_start; /* area definition */
21
-
u32 da_end;
22
-
u32 flags; /* IOVMF_: see below */
23
-
struct list_head list; /* linked in ascending order */
24
-
const struct sg_table *sgt; /* keep 'page' <-> 'da' mapping */
25
-
void *va; /* mpu side mapped address */
26
-
};
27
-
28
-
/*
29
-
* IOVMF_FLAGS: attribute for iommu virtual memory area(iovma)
30
-
*
31
-
* lower 16 bit is used for h/w and upper 16 bit is for s/w.
32
-
*/
33
-
#define IOVMF_SW_SHIFT 16
34
-
35
-
/*
36
-
* iovma: h/w flags derived from cam and ram attribute
37
-
*/
38
-
#define IOVMF_CAM_MASK (~((1 << 10) - 1))
39
-
#define IOVMF_RAM_MASK (~IOVMF_CAM_MASK)
40
-
41
-
#define IOVMF_PGSZ_MASK (3 << 0)
42
-
#define IOVMF_PGSZ_1M MMU_CAM_PGSZ_1M
43
-
#define IOVMF_PGSZ_64K MMU_CAM_PGSZ_64K
44
-
#define IOVMF_PGSZ_4K MMU_CAM_PGSZ_4K
45
-
#define IOVMF_PGSZ_16M MMU_CAM_PGSZ_16M
46
-
47
-
#define IOVMF_ENDIAN_MASK (1 << 9)
48
-
#define IOVMF_ENDIAN_BIG MMU_RAM_ENDIAN_BIG
49
-
#define IOVMF_ENDIAN_LITTLE MMU_RAM_ENDIAN_LITTLE
50
-
51
-
#define IOVMF_ELSZ_MASK (3 << 7)
52
-
#define IOVMF_ELSZ_8 MMU_RAM_ELSZ_8
53
-
#define IOVMF_ELSZ_16 MMU_RAM_ELSZ_16
54
-
#define IOVMF_ELSZ_32 MMU_RAM_ELSZ_32
55
-
#define IOVMF_ELSZ_NONE MMU_RAM_ELSZ_NONE
56
-
57
-
#define IOVMF_MIXED_MASK (1 << 6)
58
-
#define IOVMF_MIXED MMU_RAM_MIXED
59
-
60
-
/*
61
-
* iovma: s/w flags, used for mapping and umapping internally.
62
-
*/
63
-
#define IOVMF_MMIO (1 << IOVMF_SW_SHIFT)
64
-
#define IOVMF_ALLOC (2 << IOVMF_SW_SHIFT)
65
-
#define IOVMF_ALLOC_MASK (3 << IOVMF_SW_SHIFT)
66
-
67
-
/* "superpages" is supported just with physically linear pages */
68
-
#define IOVMF_DISCONT (1 << (2 + IOVMF_SW_SHIFT))
69
-
#define IOVMF_LINEAR (2 << (2 + IOVMF_SW_SHIFT))
70
-
#define IOVMF_LINEAR_MASK (3 << (2 + IOVMF_SW_SHIFT))
71
-
72
-
#define IOVMF_DA_FIXED (1 << (4 + IOVMF_SW_SHIFT))
73
-
74
-
75
-
extern struct iovm_struct *omap_find_iovm_area(struct device *dev, u32 da);
76
-
extern u32
77
-
omap_iommu_vmap(struct iommu_domain *domain, struct device *dev, u32 da,
78
-
const struct sg_table *sgt, u32 flags);
79
-
extern struct sg_table *omap_iommu_vunmap(struct iommu_domain *domain,
80
-
struct device *dev, u32 da);
81
-
extern u32
82
-
omap_iommu_vmalloc(struct iommu_domain *domain, struct device *dev,
83
-
u32 da, size_t bytes, u32 flags);
84
-
extern void
85
-
omap_iommu_vfree(struct iommu_domain *domain, struct device *dev,
86
-
const u32 da);
87
-
extern void *omap_da_to_va(struct device *dev, u32 da);
88
-
89
-
#endif /* __IOMMU_MMAP_H */
+1
-1
drivers/iommu/omap-iommu-debug.c
+1
-1
drivers/iommu/omap-iommu-debug.c
+1
drivers/iommu/omap-iommu.c
+1
drivers/iommu/omap-iommu.c
+45
-1
drivers/iommu/omap-iovmm.c
+45
-1
drivers/iommu/omap-iovmm.c
···
17
17
#include <linux/device.h>
18
18
#include <linux/scatterlist.h>
19
19
#include <linux/iommu.h>
20
+
#include <linux/omap-iommu.h>
20
21
21
22
#include <asm/cacheflush.h>
22
23
#include <asm/mach/map.h>
23
24
24
25
#include <plat/iommu.h>
25
-
#include <plat/iovmm.h>
26
26
27
27
#include "omap-iopgtable.h"
28
+
29
+
/*
30
+
* IOVMF_FLAGS: attribute for iommu virtual memory area(iovma)
31
+
*
32
+
* lower 16 bit is used for h/w and upper 16 bit is for s/w.
33
+
*/
34
+
#define IOVMF_SW_SHIFT 16
35
+
36
+
/*
37
+
* iovma: h/w flags derived from cam and ram attribute
38
+
*/
39
+
#define IOVMF_CAM_MASK (~((1 << 10) - 1))
40
+
#define IOVMF_RAM_MASK (~IOVMF_CAM_MASK)
41
+
42
+
#define IOVMF_PGSZ_MASK (3 << 0)
43
+
#define IOVMF_PGSZ_1M MMU_CAM_PGSZ_1M
44
+
#define IOVMF_PGSZ_64K MMU_CAM_PGSZ_64K
45
+
#define IOVMF_PGSZ_4K MMU_CAM_PGSZ_4K
46
+
#define IOVMF_PGSZ_16M MMU_CAM_PGSZ_16M
47
+
48
+
#define IOVMF_ENDIAN_MASK (1 << 9)
49
+
#define IOVMF_ENDIAN_BIG MMU_RAM_ENDIAN_BIG
50
+
51
+
#define IOVMF_ELSZ_MASK (3 << 7)
52
+
#define IOVMF_ELSZ_16 MMU_RAM_ELSZ_16
53
+
#define IOVMF_ELSZ_32 MMU_RAM_ELSZ_32
54
+
#define IOVMF_ELSZ_NONE MMU_RAM_ELSZ_NONE
55
+
56
+
#define IOVMF_MIXED_MASK (1 << 6)
57
+
#define IOVMF_MIXED MMU_RAM_MIXED
58
+
59
+
/*
60
+
* iovma: s/w flags, used for mapping and umapping internally.
61
+
*/
62
+
#define IOVMF_MMIO (1 << IOVMF_SW_SHIFT)
63
+
#define IOVMF_ALLOC (2 << IOVMF_SW_SHIFT)
64
+
#define IOVMF_ALLOC_MASK (3 << IOVMF_SW_SHIFT)
65
+
66
+
/* "superpages" is supported just with physically linear pages */
67
+
#define IOVMF_DISCONT (1 << (2 + IOVMF_SW_SHIFT))
68
+
#define IOVMF_LINEAR (2 << (2 + IOVMF_SW_SHIFT))
69
+
#define IOVMF_LINEAR_MASK (3 << (2 + IOVMF_SW_SHIFT))
70
+
71
+
#define IOVMF_DA_FIXED (1 << (4 + IOVMF_SW_SHIFT))
28
72
29
73
static struct kmem_cache *iovm_area_cachep;
30
74
+1
drivers/media/platform/omap3isp/isp.c
+1
drivers/media/platform/omap3isp/isp.c
+1
-3
drivers/media/platform/omap3isp/isp.h
+1
-3
drivers/media/platform/omap3isp/isp.h
···
31
31
#include <media/v4l2-device.h>
32
32
#include <linux/device.h>
33
33
#include <linux/io.h>
34
+
#include <linux/iommu.h>
34
35
#include <linux/platform_device.h>
35
36
#include <linux/wait.h>
36
-
#include <linux/iommu.h>
37
-
#include <plat/iommu.h>
38
-
#include <plat/iovmm.h>
39
37
40
38
#include "ispstat.h"
41
39
#include "ispccdc.h"
+1
drivers/media/platform/omap3isp/ispccdc.c
+1
drivers/media/platform/omap3isp/ispccdc.c
+1
drivers/media/platform/omap3isp/ispstat.c
+1
drivers/media/platform/omap3isp/ispstat.c
+1
-1
drivers/media/platform/omap3isp/ispvideo.c
+1
-1
drivers/media/platform/omap3isp/ispvideo.c
···
27
27
#include <linux/clk.h>
28
28
#include <linux/mm.h>
29
29
#include <linux/module.h>
30
+
#include <linux/omap-iommu.h>
30
31
#include <linux/pagemap.h>
31
32
#include <linux/scatterlist.h>
32
33
#include <linux/sched.h>
···
36
35
#include <media/v4l2-dev.h>
37
36
#include <media/v4l2-ioctl.h>
38
37
#include <plat/iommu.h>
39
-
#include <plat/iovmm.h>
40
38
#include <plat/omap-pm.h>
41
39
42
40
#include "ispvideo.h"
+52
include/linux/omap-iommu.h
+52
include/linux/omap-iommu.h
···
1
+
/*
2
+
* omap iommu: simple virtual address space management
3
+
*
4
+
* Copyright (C) 2008-2009 Nokia Corporation
5
+
*
6
+
* Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
7
+
*
8
+
* This program is free software; you can redistribute it and/or modify
9
+
* it under the terms of the GNU General Public License version 2 as
10
+
* published by the Free Software Foundation.
11
+
*/
12
+
13
+
#ifndef _INTEL_IOMMU_H_
14
+
#define _INTEL_IOMMU_H_
15
+
16
+
struct iovm_struct {
17
+
struct omap_iommu *iommu; /* iommu object which this belongs to */
18
+
u32 da_start; /* area definition */
19
+
u32 da_end;
20
+
u32 flags; /* IOVMF_: see below */
21
+
struct list_head list; /* linked in ascending order */
22
+
const struct sg_table *sgt; /* keep 'page' <-> 'da' mapping */
23
+
void *va; /* mpu side mapped address */
24
+
};
25
+
26
+
#define MMU_RAM_ENDIAN_SHIFT 9
27
+
#define MMU_RAM_ENDIAN_LITTLE (0 << MMU_RAM_ENDIAN_SHIFT)
28
+
#define MMU_RAM_ELSZ_8 (0 << MMU_RAM_ELSZ_SHIFT)
29
+
#define IOVMF_ENDIAN_LITTLE MMU_RAM_ENDIAN_LITTLE
30
+
#define MMU_RAM_ELSZ_SHIFT 7
31
+
#define IOVMF_ELSZ_8 MMU_RAM_ELSZ_8
32
+
33
+
struct iommu_domain;
34
+
35
+
extern struct iovm_struct *omap_find_iovm_area(struct device *dev, u32 da);
36
+
extern u32
37
+
omap_iommu_vmap(struct iommu_domain *domain, struct device *dev, u32 da,
38
+
const struct sg_table *sgt, u32 flags);
39
+
extern struct sg_table *omap_iommu_vunmap(struct iommu_domain *domain,
40
+
struct device *dev, u32 da);
41
+
extern u32
42
+
omap_iommu_vmalloc(struct iommu_domain *domain, struct device *dev,
43
+
u32 da, size_t bytes, u32 flags);
44
+
extern void
45
+
omap_iommu_vfree(struct iommu_domain *domain, struct device *dev,
46
+
const u32 da);
47
+
extern void *omap_da_to_va(struct device *dev, u32 da);
48
+
49
+
extern void omap_iommu_save_ctx(struct device *dev);
50
+
extern void omap_iommu_restore_ctx(struct device *dev);
51
+
52
+
#endif