diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-11-24 12:32:58 +0200 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-08 17:55:25 +0530 |
| commit | c0d4b78b3abe5b7a5db7f870eb762b9e0fe2693f (patch) | |
| tree | d646b00dddd480539ecd732328d8abe0fa54743e /include | |
| parent | f8539561c2f789682e29f34365c164a5ef9a2bc3 (diff) | |
video: tegra: host: Support for right shift on reloc patches
Some hardware architectures require that only select MSB bits be
supplied to them for addresses. They do the reverse transformation while
accessing the actual memory.
Bug 857531
Change-Id: I215f099ff0ee86daff1c1eb1e5b70edf8ae856d9
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/66654
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: Shashank Garg <sgarg@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvhost_ioctl.h | 12 | ||||
| -rw-r--r-- | include/trace/events/nvhost.h | 12 |
2 files changed, 15 insertions, 9 deletions
diff --git a/include/linux/nvhost_ioctl.h b/include/linux/nvhost_ioctl.h index 31ff22f45fb9..a1fc0b7cd247 100644 --- a/include/linux/nvhost_ioctl.h +++ b/include/linux/nvhost_ioctl.h @@ -48,7 +48,8 @@ struct nvhost_submit_hdr { #define NVHOST_SUBMIT_VERSION_V0 0x0 #define NVHOST_SUBMIT_VERSION_V1 0x1 -#define NVHOST_SUBMIT_VERSION_MAX_SUPPORTED NVHOST_SUBMIT_VERSION_V1 +#define NVHOST_SUBMIT_VERSION_V2 0x2 +#define NVHOST_SUBMIT_VERSION_MAX_SUPPORTED NVHOST_SUBMIT_VERSION_V2 /* version 1 header (used with ioctl() submit interface) */ struct nvhost_submit_hdr_ext { @@ -75,6 +76,10 @@ struct nvhost_reloc { __u32 target_offset; }; +struct nvhost_reloc_shift { + __u32 shift; +}; + struct nvhost_waitchk { __u32 mem; __u32 offset; @@ -188,8 +193,11 @@ struct nvhost_ctrl_module_regrdwr_args { #define NVHOST_IOCTL_CTRL_SYNCPT_WAITEX \ _IOWR(NVHOST_IOCTL_MAGIC, 6, struct nvhost_ctrl_syncpt_waitex_args) +#define NVHOST_IOCTL_CTRL_GET_VERSION \ + _IOR(NVHOST_IOCTL_MAGIC, 7, struct nvhost_get_param_args) + #define NVHOST_IOCTL_CTRL_LAST \ - _IOC_NR(NVHOST_IOCTL_CTRL_SYNCPT_WAITEX) + _IOC_NR(NVHOST_IOCTL_CTRL_GET_VERSION) #define NVHOST_IOCTL_CTRL_MAX_ARG_SIZE \ sizeof(struct nvhost_ctrl_module_regrdwr_args) diff --git a/include/trace/events/nvhost.h b/include/trace/events/nvhost.h index a0184440a09c..6c266b9f2ea4 100644 --- a/include/trace/events/nvhost.h +++ b/include/trace/events/nvhost.h @@ -172,23 +172,21 @@ TRACE_EVENT(nvhost_channel_write_cmdbuf_data, __entry->cmdbuf ? __entry->words * 4 : 0)) ); -TRACE_EVENT(nvhost_channel_write_relocs, - TP_PROTO(const char *name, u32 relocs), +TRACE_EVENT(nvhost_channel_write_reloc, + TP_PROTO(const char *name), - TP_ARGS(name, relocs), + TP_ARGS(name), TP_STRUCT__entry( __field(const char *, name) - __field(u32, relocs) ), TP_fast_assign( __entry->name = name; - __entry->relocs = relocs; ), - TP_printk("name=%s, relocs=%u", - __entry->name, __entry->relocs) + TP_printk("name=%s", + __entry->name) ); TRACE_EVENT(nvhost_channel_write_waitchks, |