mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 21:22:09 -04:00
Merge "arm64: Remove cpu_soft_reset() prototype"
This commit is contained in:
qctecmdr
Gerrit - the friendly Code Review server
commit
00a0a5045c
10 changed files with 570 additions and 568 deletions
|
|
@ -20,8 +20,6 @@ extern void cpu_cache_off(void);
|
|||
extern void cpu_do_idle(void);
|
||||
extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
|
||||
extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
|
||||
void cpu_soft_restart(phys_addr_t cpu_reset,
|
||||
unsigned long addr) __attribute__((noreturn));
|
||||
extern void cpu_do_suspend(struct cpu_suspend_ctx *ptr);
|
||||
extern u64 cpu_do_resume(phys_addr_t ptr, u64 idmap_ttbr);
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2107,7 +2107,7 @@ struct ipa_ioc_query_intf_rx_props {
|
|||
struct ipa_ioc_nat_alloc_mem {
|
||||
char dev_name[IPA_RESOURCE_NAME_MAX];
|
||||
size_t size;
|
||||
off_t offset;
|
||||
__kernel_off_t offset;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -2118,7 +2118,7 @@ struct ipa_ioc_nat_alloc_mem {
|
|||
*/
|
||||
struct ipa_ioc_nat_ipv6ct_table_alloc {
|
||||
size_t size;
|
||||
off_t offset;
|
||||
__kernel_off_t offset;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ struct kgsl_devinfo {
|
|||
* number 200, 205, 220, etc...
|
||||
*/
|
||||
unsigned int gpu_id;
|
||||
size_t gmem_sizebytes;
|
||||
__kernel_size_t gmem_sizebytes;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -343,7 +343,7 @@ enum kgsl_timestamp_type {
|
|||
/*
|
||||
* kgsl_capabilities_properties returns a list of supported properties.
|
||||
* If the user passes 0 for 'count' the kernel will set it to the number of
|
||||
* supported properties. The list is expected to be 'count * sizeof(uint32_t)'
|
||||
* supported properties. The list is expected to be 'count * sizeof(__u32)'
|
||||
* bytes long. The kernel will return the actual number of entries copied into
|
||||
* list via 'count'.
|
||||
*/
|
||||
|
|
@ -372,18 +372,18 @@ struct kgsl_capabilities {
|
|||
|
||||
struct kgsl_shadowprop {
|
||||
unsigned long gpuaddr;
|
||||
size_t size;
|
||||
__kernel_size_t size;
|
||||
unsigned int flags; /* contains KGSL_FLAGS_ values */
|
||||
};
|
||||
|
||||
struct kgsl_qdss_stm_prop {
|
||||
uint64_t gpuaddr;
|
||||
uint64_t size;
|
||||
__u64 gpuaddr;
|
||||
__u64 size;
|
||||
};
|
||||
|
||||
struct kgsl_qtimer_prop {
|
||||
uint64_t gpuaddr;
|
||||
uint64_t size;
|
||||
__u64 gpuaddr;
|
||||
__u64 size;
|
||||
};
|
||||
|
||||
struct kgsl_version {
|
||||
|
|
@ -394,8 +394,8 @@ struct kgsl_version {
|
|||
};
|
||||
|
||||
struct kgsl_sp_generic_mem {
|
||||
uint64_t local;
|
||||
uint64_t pvt;
|
||||
__u64 local;
|
||||
__u64 pvt;
|
||||
};
|
||||
|
||||
struct kgsl_ucode_version {
|
||||
|
|
@ -471,7 +471,7 @@ struct kgsl_context_property_fault {
|
|||
struct kgsl_ibdesc {
|
||||
unsigned long gpuaddr;
|
||||
unsigned long __pad;
|
||||
size_t sizedwords;
|
||||
__kernel_size_t sizedwords;
|
||||
unsigned int ctrl;
|
||||
};
|
||||
|
||||
|
|
@ -491,11 +491,11 @@ struct kgsl_ibdesc {
|
|||
* execution time
|
||||
*/
|
||||
struct kgsl_cmdbatch_profiling_buffer {
|
||||
uint64_t wall_clock_s;
|
||||
uint64_t wall_clock_ns;
|
||||
uint64_t gpu_ticks_queued;
|
||||
uint64_t gpu_ticks_submitted;
|
||||
uint64_t gpu_ticks_retired;
|
||||
__u64 wall_clock_s;
|
||||
__u64 wall_clock_ns;
|
||||
__u64 gpu_ticks_queued;
|
||||
__u64 gpu_ticks_submitted;
|
||||
__u64 gpu_ticks_retired;
|
||||
};
|
||||
|
||||
/* ioctls */
|
||||
|
|
@ -515,7 +515,7 @@ struct kgsl_cmdbatch_profiling_buffer {
|
|||
struct kgsl_device_getproperty {
|
||||
unsigned int type;
|
||||
void __user *value;
|
||||
size_t sizebytes;
|
||||
__kernel_size_t sizebytes;
|
||||
};
|
||||
|
||||
#define IOCTL_KGSL_DEVICE_GETPROPERTY \
|
||||
|
|
@ -631,8 +631,8 @@ struct kgsl_drawctxt_destroy {
|
|||
struct kgsl_map_user_mem {
|
||||
int fd;
|
||||
unsigned long gpuaddr; /*output param */
|
||||
size_t len;
|
||||
size_t offset;
|
||||
__kernel_size_t len;
|
||||
__kernel_size_t offset;
|
||||
unsigned long hostptr; /*input param */
|
||||
enum kgsl_user_mem_type memtype;
|
||||
unsigned int flags;
|
||||
|
|
@ -778,7 +778,7 @@ struct kgsl_cmdwindow_write {
|
|||
|
||||
struct kgsl_gpumem_alloc {
|
||||
unsigned long gpuaddr; /* output param */
|
||||
size_t size;
|
||||
__kernel_size_t size;
|
||||
unsigned int flags;
|
||||
};
|
||||
|
||||
|
|
@ -787,7 +787,7 @@ struct kgsl_gpumem_alloc {
|
|||
|
||||
struct kgsl_cff_syncmem {
|
||||
unsigned long gpuaddr;
|
||||
size_t len;
|
||||
__kernel_size_t len;
|
||||
unsigned int __pad[2]; /* For future binary compatibility */
|
||||
};
|
||||
|
||||
|
|
@ -805,7 +805,7 @@ struct kgsl_timestamp_event {
|
|||
unsigned int timestamp; /* Timestamp to trigger event on */
|
||||
unsigned int context_id; /* Context for the timestamp */
|
||||
void __user *priv; /* Pointer to the event specific blob */
|
||||
size_t len; /* Size of the event specific blob */
|
||||
__kernel_size_t len; /* Size of the event specific blob */
|
||||
};
|
||||
|
||||
#define IOCTL_KGSL_TIMESTAMP_EVENT_OLD \
|
||||
|
|
@ -860,8 +860,8 @@ struct kgsl_timestamp_event_fence {
|
|||
struct kgsl_gpumem_alloc_id {
|
||||
unsigned int id;
|
||||
unsigned int flags;
|
||||
size_t size;
|
||||
size_t mmapsize;
|
||||
__kernel_size_t size;
|
||||
__kernel_size_t mmapsize;
|
||||
unsigned long gpuaddr;
|
||||
/* private: reserved for future use*/
|
||||
unsigned long __pad[2];
|
||||
|
|
@ -906,8 +906,8 @@ struct kgsl_gpumem_get_info {
|
|||
unsigned long gpuaddr;
|
||||
unsigned int id;
|
||||
unsigned int flags;
|
||||
size_t size;
|
||||
size_t mmapsize;
|
||||
__kernel_size_t size;
|
||||
__kernel_size_t mmapsize;
|
||||
unsigned long useraddr;
|
||||
/* private: reserved for future use*/
|
||||
unsigned long __pad[4];
|
||||
|
|
@ -934,8 +934,8 @@ struct kgsl_gpumem_sync_cache {
|
|||
unsigned long gpuaddr;
|
||||
unsigned int id;
|
||||
unsigned int op;
|
||||
size_t offset;
|
||||
size_t length;
|
||||
__kernel_size_t offset;
|
||||
__kernel_size_t length;
|
||||
};
|
||||
|
||||
#define KGSL_GPUMEM_CACHE_CLEAN (1 << 0)
|
||||
|
|
@ -1111,7 +1111,7 @@ struct kgsl_cmd_syncpoint_fence {
|
|||
struct kgsl_cmd_syncpoint {
|
||||
int type;
|
||||
void __user *priv;
|
||||
size_t size;
|
||||
__kernel_size_t size;
|
||||
};
|
||||
|
||||
/* Flag to indicate that the cmdlist may contain memlists */
|
||||
|
|
@ -1165,7 +1165,7 @@ struct kgsl_device_constraint {
|
|||
unsigned int type;
|
||||
unsigned int context_id;
|
||||
void __user *data;
|
||||
size_t size;
|
||||
__kernel_size_t size;
|
||||
};
|
||||
|
||||
/* Constraint Type*/
|
||||
|
|
@ -1266,8 +1266,8 @@ struct kgsl_syncsource_signal_fence {
|
|||
* @id: ID of the GPU object to sync
|
||||
*/
|
||||
struct kgsl_cff_sync_gpuobj {
|
||||
uint64_t offset;
|
||||
uint64_t length;
|
||||
__u64 offset;
|
||||
__u64 length;
|
||||
unsigned int id;
|
||||
};
|
||||
|
||||
|
|
@ -1285,13 +1285,13 @@ struct kgsl_cff_sync_gpuobj {
|
|||
* @metadata: Pointer to the user specified metadata to store for the object
|
||||
*/
|
||||
struct kgsl_gpuobj_alloc {
|
||||
uint64_t size;
|
||||
uint64_t flags;
|
||||
uint64_t va_len;
|
||||
uint64_t mmapsize;
|
||||
__u64 size;
|
||||
__u64 flags;
|
||||
__u64 va_len;
|
||||
__u64 mmapsize;
|
||||
unsigned int id;
|
||||
unsigned int metadata_len;
|
||||
uint64_t metadata;
|
||||
__u64 metadata;
|
||||
};
|
||||
|
||||
/* Let the user know that this header supports the gpuobj metadata */
|
||||
|
|
@ -1311,8 +1311,8 @@ struct kgsl_gpuobj_alloc {
|
|||
* @len: Length of the data passed in priv
|
||||
*/
|
||||
struct kgsl_gpuobj_free {
|
||||
uint64_t flags;
|
||||
uint64_t priv;
|
||||
__u64 flags;
|
||||
__u64 __user priv;
|
||||
unsigned int id;
|
||||
unsigned int type;
|
||||
unsigned int len;
|
||||
|
|
@ -1355,11 +1355,11 @@ struct kgsl_gpu_event_fence {
|
|||
* id - GPU object ID of the object to query
|
||||
*/
|
||||
struct kgsl_gpuobj_info {
|
||||
uint64_t gpuaddr;
|
||||
uint64_t flags;
|
||||
uint64_t size;
|
||||
uint64_t va_len;
|
||||
uint64_t va_addr;
|
||||
__u64 gpuaddr;
|
||||
__u64 flags;
|
||||
__u64 size;
|
||||
__u64 va_len;
|
||||
__u64 va_addr;
|
||||
unsigned int id;
|
||||
};
|
||||
|
||||
|
|
@ -1375,9 +1375,9 @@ struct kgsl_gpuobj_info {
|
|||
* @id: Returns the ID of the new GPU object
|
||||
*/
|
||||
struct kgsl_gpuobj_import {
|
||||
uint64_t priv;
|
||||
uint64_t priv_len;
|
||||
uint64_t flags;
|
||||
__u64 __user priv;
|
||||
__u64 priv_len;
|
||||
__u64 flags;
|
||||
unsigned int type;
|
||||
unsigned int id;
|
||||
};
|
||||
|
|
@ -1395,7 +1395,7 @@ struct kgsl_gpuobj_import_dma_buf {
|
|||
* @virtaddr: Virtual address of the object to import
|
||||
*/
|
||||
struct kgsl_gpuobj_import_useraddr {
|
||||
uint64_t virtaddr;
|
||||
__u64 virtaddr;
|
||||
};
|
||||
|
||||
#define IOCTL_KGSL_GPUOBJ_IMPORT \
|
||||
|
|
@ -1410,8 +1410,8 @@ struct kgsl_gpuobj_import_useraddr {
|
|||
*/
|
||||
|
||||
struct kgsl_gpuobj_sync_obj {
|
||||
uint64_t offset;
|
||||
uint64_t length;
|
||||
__u64 offset;
|
||||
__u64 length;
|
||||
unsigned int id;
|
||||
unsigned int op;
|
||||
};
|
||||
|
|
@ -1424,7 +1424,7 @@ struct kgsl_gpuobj_sync_obj {
|
|||
*/
|
||||
|
||||
struct kgsl_gpuobj_sync {
|
||||
uint64_t objs;
|
||||
__u64 __user objs;
|
||||
unsigned int obj_len;
|
||||
unsigned int count;
|
||||
};
|
||||
|
|
@ -1441,9 +1441,9 @@ struct kgsl_gpuobj_sync {
|
|||
* @id - GPU command object ID
|
||||
*/
|
||||
struct kgsl_command_object {
|
||||
uint64_t offset;
|
||||
uint64_t gpuaddr;
|
||||
uint64_t size;
|
||||
__u64 offset;
|
||||
__u64 gpuaddr;
|
||||
__u64 size;
|
||||
unsigned int flags;
|
||||
unsigned int id;
|
||||
};
|
||||
|
|
@ -1455,8 +1455,8 @@ struct kgsl_command_object {
|
|||
* @type: type of sync point defined here
|
||||
*/
|
||||
struct kgsl_command_syncpoint {
|
||||
uint64_t priv;
|
||||
uint64_t size;
|
||||
__u64 __user priv;
|
||||
__u64 size;
|
||||
unsigned int type;
|
||||
};
|
||||
|
||||
|
|
@ -1476,14 +1476,14 @@ struct kgsl_command_syncpoint {
|
|||
* @timestamp: Timestamp for the submitted commands
|
||||
*/
|
||||
struct kgsl_gpu_command {
|
||||
uint64_t flags;
|
||||
uint64_t cmdlist;
|
||||
__u64 flags;
|
||||
__u64 __user cmdlist;
|
||||
unsigned int cmdsize;
|
||||
unsigned int numcmds;
|
||||
uint64_t objlist;
|
||||
__u64 __user objlist;
|
||||
unsigned int objsize;
|
||||
unsigned int numobjs;
|
||||
uint64_t synclist;
|
||||
__u64 __user synclist;
|
||||
unsigned int syncsize;
|
||||
unsigned int numsyncs;
|
||||
unsigned int context_id;
|
||||
|
|
@ -1511,7 +1511,7 @@ struct kgsl_gpu_command {
|
|||
* returned back.
|
||||
*/
|
||||
struct kgsl_preemption_counters_query {
|
||||
uint64_t counters;
|
||||
__u64 __user counters;
|
||||
unsigned int size_user;
|
||||
unsigned int size_priority_level;
|
||||
unsigned int max_priority_level;
|
||||
|
|
@ -1535,8 +1535,8 @@ struct kgsl_preemption_counters_query {
|
|||
#define KGSL_GPUOBJ_SET_INFO_TYPE (1 << 1)
|
||||
|
||||
struct kgsl_gpuobj_set_info {
|
||||
uint64_t flags;
|
||||
uint64_t metadata;
|
||||
__u64 flags;
|
||||
__u64 metadata;
|
||||
unsigned int id;
|
||||
unsigned int metadata_len;
|
||||
unsigned int type;
|
||||
|
|
@ -1553,9 +1553,9 @@ struct kgsl_gpuobj_set_info {
|
|||
* @id: Returned ID for this allocation
|
||||
*/
|
||||
struct kgsl_sparse_phys_alloc {
|
||||
uint64_t size;
|
||||
uint64_t pagesize;
|
||||
uint64_t flags;
|
||||
__u64 size;
|
||||
__u64 pagesize;
|
||||
__u64 flags;
|
||||
unsigned int id;
|
||||
};
|
||||
|
||||
|
|
@ -1582,10 +1582,10 @@ struct kgsl_sparse_phys_free {
|
|||
* @gpuaddr: Returned GPU address for this allocation
|
||||
*/
|
||||
struct kgsl_sparse_virt_alloc {
|
||||
uint64_t size;
|
||||
uint64_t pagesize;
|
||||
uint64_t flags;
|
||||
uint64_t gpuaddr;
|
||||
__u64 size;
|
||||
__u64 pagesize;
|
||||
__u64 flags;
|
||||
__u64 gpuaddr;
|
||||
unsigned int id;
|
||||
};
|
||||
|
||||
|
|
@ -1612,10 +1612,10 @@ struct kgsl_sparse_virt_free {
|
|||
* @id: Physical ID to bind (bind only)
|
||||
*/
|
||||
struct kgsl_sparse_binding_object {
|
||||
uint64_t virtoffset;
|
||||
uint64_t physoffset;
|
||||
uint64_t size;
|
||||
uint64_t flags;
|
||||
__u64 virtoffset;
|
||||
__u64 physoffset;
|
||||
__u64 size;
|
||||
__u64 flags;
|
||||
unsigned int id;
|
||||
};
|
||||
|
||||
|
|
@ -1628,7 +1628,7 @@ struct kgsl_sparse_binding_object {
|
|||
*
|
||||
*/
|
||||
struct kgsl_sparse_bind {
|
||||
uint64_t list;
|
||||
__u64 __user list;
|
||||
unsigned int id;
|
||||
unsigned int size;
|
||||
unsigned int count;
|
||||
|
|
@ -1652,9 +1652,9 @@ struct kgsl_sparse_bind {
|
|||
* @id: Virtual ID to bind/unbind
|
||||
*/
|
||||
struct kgsl_gpu_sparse_command {
|
||||
uint64_t flags;
|
||||
uint64_t sparselist;
|
||||
uint64_t synclist;
|
||||
__u64 flags;
|
||||
__u64 __user sparselist;
|
||||
__u64 __user synclist;
|
||||
unsigned int sparsesize;
|
||||
unsigned int numsparse;
|
||||
unsigned int syncsize;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
#ifndef _UAPI_MSM_RMNET_H_
|
||||
#define _UAPI_MSM_RMNET_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/* Bitmap macros for RmNET driver operation mode. */
|
||||
#define RMNET_MODE_NONE (0x00)
|
||||
#define RMNET_MODE_LLP_ETH (0x01)
|
||||
|
|
@ -101,52 +103,52 @@
|
|||
#endif
|
||||
|
||||
struct rmnet_ioctl_extended_s {
|
||||
uint32_t extended_ioctl;
|
||||
__u32 extended_ioctl;
|
||||
union {
|
||||
uint32_t data; /* Generic data field for most extended IOCTLs */
|
||||
__u32 data; /* Generic data field for most extended IOCTLs */
|
||||
|
||||
/* Return values for
|
||||
* RMNET_IOCTL_GET_DRIVER_NAME
|
||||
* RMNET_IOCTL_GET_DFLT_CONTROL_CHANNEL
|
||||
*/
|
||||
int8_t if_name[IFNAMSIZ];
|
||||
__s8 if_name[IFNAMSIZ];
|
||||
|
||||
/* Input values for the RMNET_IOCTL_ADD_MUX_CHANNEL IOCTL */
|
||||
struct {
|
||||
uint32_t mux_id;
|
||||
int8_t vchannel_name[IFNAMSIZ];
|
||||
__u32 mux_id;
|
||||
__s8 vchannel_name[IFNAMSIZ];
|
||||
} rmnet_mux_val;
|
||||
|
||||
/* Input values for the RMNET_IOCTL_FLOW_CONTROL IOCTL */
|
||||
struct {
|
||||
uint8_t flow_mode;
|
||||
uint8_t mux_id;
|
||||
__u8 flow_mode;
|
||||
__u8 mux_id;
|
||||
} flow_control_prop;
|
||||
|
||||
/* Return values for RMNET_IOCTL_GET_EP_PAIR */
|
||||
struct {
|
||||
uint32_t consumer_pipe_num;
|
||||
uint32_t producer_pipe_num;
|
||||
__u32 consumer_pipe_num;
|
||||
__u32 producer_pipe_num;
|
||||
} ipa_ep_pair;
|
||||
|
||||
struct {
|
||||
uint32_t __data; /* Placeholder for legacy data*/
|
||||
uint32_t agg_size;
|
||||
uint32_t agg_count;
|
||||
__u32 __data; /* Placeholder for legacy data*/
|
||||
__u32 agg_size;
|
||||
__u32 agg_count;
|
||||
} ingress_format;
|
||||
|
||||
/* Input values for the RMNET_IOCTL_SET_OFFLOAD */
|
||||
struct {
|
||||
uint32_t flags;
|
||||
uint8_t mux_id;
|
||||
__u32 flags;
|
||||
__u8 mux_id;
|
||||
} offload_params;
|
||||
} u;
|
||||
};
|
||||
|
||||
struct rmnet_ioctl_data_s {
|
||||
union {
|
||||
uint32_t operation_mode;
|
||||
uint32_t tcm_handle;
|
||||
__u32 operation_mode;
|
||||
__u32 tcm_handle;
|
||||
} u;
|
||||
};
|
||||
|
||||
|
|
@ -157,13 +159,13 @@ struct rmnet_ioctl_data_s {
|
|||
struct QMI_QOS_HDR_S {
|
||||
unsigned char version;
|
||||
unsigned char flags;
|
||||
uint32_t flow_id;
|
||||
__u32 flow_id;
|
||||
} __attribute((__packed__));
|
||||
|
||||
/* QMI QoS 8-byte header. */
|
||||
struct qmi_qos_hdr8_s {
|
||||
struct QMI_QOS_HDR_S hdr;
|
||||
uint8_t reserved[2];
|
||||
__u8 reserved[2];
|
||||
} __attribute((__packed__));
|
||||
|
||||
#endif /* _UAPI_MSM_RMNET_H_ */
|
||||
|
|
|
|||
|
|
@ -101,10 +101,10 @@ enum qcedev_sha_alg_enum {
|
|||
*/
|
||||
struct buf_info {
|
||||
union {
|
||||
uint32_t offset;
|
||||
uint8_t *vaddr;
|
||||
__u32 offset;
|
||||
__u8 *vaddr;
|
||||
};
|
||||
uint32_t len;
|
||||
__u32 len;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -183,19 +183,19 @@ struct qcedev_pmem_info {
|
|||
* data array to 0.
|
||||
*/
|
||||
struct qcedev_cipher_op_req {
|
||||
uint8_t use_pmem;
|
||||
__u8 use_pmem;
|
||||
union {
|
||||
struct qcedev_pmem_info pmem;
|
||||
struct qcedev_vbuf_info vbuf;
|
||||
};
|
||||
uint32_t entries;
|
||||
uint32_t data_len;
|
||||
uint8_t in_place_op;
|
||||
uint8_t enckey[QCEDEV_MAX_KEY_SIZE];
|
||||
uint32_t encklen;
|
||||
uint8_t iv[QCEDEV_MAX_IV_SIZE];
|
||||
uint32_t ivlen;
|
||||
uint32_t byteoffset;
|
||||
__u32 entries;
|
||||
__u32 data_len;
|
||||
__u8 in_place_op;
|
||||
__u8 enckey[QCEDEV_MAX_KEY_SIZE];
|
||||
__u32 encklen;
|
||||
__u8 iv[QCEDEV_MAX_IV_SIZE];
|
||||
__u32 ivlen;
|
||||
__u32 byteoffset;
|
||||
enum qcedev_cipher_alg_enum alg;
|
||||
enum qcedev_cipher_mode_enum mode;
|
||||
enum qcedev_oper_enum op;
|
||||
|
|
@ -214,12 +214,12 @@ struct qcedev_cipher_op_req {
|
|||
*/
|
||||
struct qcedev_sha_op_req {
|
||||
struct buf_info data[QCEDEV_MAX_BUFFERS];
|
||||
uint32_t entries;
|
||||
uint32_t data_len;
|
||||
uint8_t digest[QCEDEV_MAX_SHA_DIGEST];
|
||||
uint32_t diglen;
|
||||
uint8_t *authkey;
|
||||
uint32_t authklen;
|
||||
__u32 entries;
|
||||
__u32 data_len;
|
||||
__u8 digest[QCEDEV_MAX_SHA_DIGEST];
|
||||
__u32 diglen;
|
||||
__u8 *authkey;
|
||||
__u32 authklen;
|
||||
enum qcedev_sha_alg_enum alg;
|
||||
};
|
||||
|
||||
|
|
@ -243,11 +243,11 @@ struct qfips_verify_t {
|
|||
* each fd in fd[].
|
||||
*/
|
||||
struct qcedev_map_buf_req {
|
||||
int32_t fd[QCEDEV_MAX_BUFFERS];
|
||||
uint32_t num_fds;
|
||||
uint32_t fd_size[QCEDEV_MAX_BUFFERS];
|
||||
uint32_t fd_offset[QCEDEV_MAX_BUFFERS];
|
||||
uint64_t buf_vaddr[QCEDEV_MAX_BUFFERS];
|
||||
__s32 fd[QCEDEV_MAX_BUFFERS];
|
||||
__u32 num_fds;
|
||||
__u32 fd_size[QCEDEV_MAX_BUFFERS];
|
||||
__u32 fd_offset[QCEDEV_MAX_BUFFERS];
|
||||
__u64 buf_vaddr[QCEDEV_MAX_BUFFERS];
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -256,8 +256,8 @@ struct qcedev_map_buf_req {
|
|||
* num_fds (IN): Number of fds in fd[].
|
||||
*/
|
||||
struct qcedev_unmap_buf_req {
|
||||
int32_t fd[QCEDEV_MAX_BUFFERS];
|
||||
uint32_t num_fds;
|
||||
__s32 fd[QCEDEV_MAX_BUFFERS];
|
||||
__u32 num_fds;
|
||||
};
|
||||
|
||||
struct file;
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
* @sb_size - shared buffer size
|
||||
*/
|
||||
struct qseecom_register_listener_req {
|
||||
uint32_t listener_id; /* in */
|
||||
int32_t ifd_data_fd; /* in */
|
||||
__u32 listener_id; /* in */
|
||||
__s32 ifd_data_fd; /* in */
|
||||
void *virt_sb_base; /* in */
|
||||
uint32_t sb_size; /* in */
|
||||
__u32 sb_size; /* in */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -55,8 +55,8 @@ struct qseecom_send_cmd_req {
|
|||
* @cmd_buf_offset - command buffer offset
|
||||
*/
|
||||
struct qseecom_ion_fd_info {
|
||||
int32_t fd;
|
||||
uint32_t cmd_buf_offset;
|
||||
__s32 fd;
|
||||
__u32 cmd_buf_offset;
|
||||
};
|
||||
/*
|
||||
* struct qseecom_send_modfd_cmd_req - for send command ioctl request
|
||||
|
|
@ -100,18 +100,18 @@ struct qseecom_send_resp_req {
|
|||
* @app_arch - Architecture of the image, i.e. 32bit or 64bit app
|
||||
*/
|
||||
struct qseecom_load_img_req {
|
||||
uint32_t mdt_len; /* in */
|
||||
uint32_t img_len; /* in */
|
||||
int32_t ifd_data_fd; /* in */
|
||||
__u32 mdt_len; /* in */
|
||||
__u32 img_len; /* in */
|
||||
__s32 ifd_data_fd; /* in */
|
||||
char img_name[MAX_APP_NAME_SIZE]; /* in */
|
||||
uint32_t app_arch; /* in */
|
||||
uint32_t app_id; /* out*/
|
||||
__u32 app_arch; /* in */
|
||||
__u32 app_id; /* out*/
|
||||
};
|
||||
|
||||
struct qseecom_set_sb_mem_param_req {
|
||||
int32_t ifd_data_fd; /* in */
|
||||
__s32 ifd_data_fd; /* in */
|
||||
void *virt_sb_base; /* in */
|
||||
uint32_t sb_len; /* in */
|
||||
__u32 sb_len; /* in */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -129,12 +129,12 @@ struct qseecom_qseos_version_req {
|
|||
*/
|
||||
struct qseecom_qseos_app_load_query {
|
||||
char app_name[MAX_APP_NAME_SIZE]; /* in */
|
||||
uint32_t app_id; /* out */
|
||||
uint32_t app_arch;
|
||||
__u32 app_id; /* out */
|
||||
__u32 app_arch;
|
||||
};
|
||||
|
||||
struct qseecom_send_svc_cmd_req {
|
||||
uint32_t cmd_id;
|
||||
__u32 cmd_id;
|
||||
void *cmd_req_buf; /* in */
|
||||
unsigned int cmd_req_len; /* in */
|
||||
void *resp_buf; /* in/out */
|
||||
|
|
@ -194,11 +194,11 @@ struct qseecom_is_es_activated_req {
|
|||
* @direction - 0=encrypt, 1=decrypt
|
||||
*/
|
||||
struct qseecom_mdtp_cipher_dip_req {
|
||||
uint8_t *in_buf;
|
||||
uint32_t in_buf_size;
|
||||
uint8_t *out_buf;
|
||||
uint32_t out_buf_size;
|
||||
uint32_t direction;
|
||||
__u8 *in_buf;
|
||||
__u32 in_buf_size;
|
||||
__u8 *out_buf;
|
||||
__u32 out_buf_size;
|
||||
__u32 direction;
|
||||
};
|
||||
|
||||
enum qseecom_bandwidth_request_mode {
|
||||
|
|
@ -223,27 +223,27 @@ struct qseecom_send_modfd_listener_resp {
|
|||
|
||||
struct qseecom_qteec_req {
|
||||
void *req_ptr;
|
||||
uint32_t req_len;
|
||||
__u32 req_len;
|
||||
void *resp_ptr;
|
||||
uint32_t resp_len;
|
||||
__u32 resp_len;
|
||||
};
|
||||
|
||||
struct qseecom_qteec_modfd_req {
|
||||
void *req_ptr;
|
||||
uint32_t req_len;
|
||||
__u32 req_len;
|
||||
void *resp_ptr;
|
||||
uint32_t resp_len;
|
||||
__u32 resp_len;
|
||||
struct qseecom_ion_fd_info ifd_data[MAX_ION_FD];
|
||||
};
|
||||
|
||||
struct qseecom_sg_entry {
|
||||
uint32_t phys_addr;
|
||||
uint32_t len;
|
||||
__u32 phys_addr;
|
||||
__u32 len;
|
||||
};
|
||||
|
||||
struct qseecom_sg_entry_64bit {
|
||||
uint64_t phys_addr;
|
||||
uint32_t len;
|
||||
__u64 phys_addr;
|
||||
__u32 len;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/*
|
||||
|
|
@ -256,9 +256,9 @@ struct qseecom_sg_entry_64bit {
|
|||
|
||||
struct qseecom_sg_list_buf_hdr_64bit {
|
||||
struct qseecom_sg_entry_64bit blank_entry; /* must be all 0 */
|
||||
uint32_t version; /* sg list buf format version */
|
||||
uint64_t new_buf_phys_addr; /* PA of new buffer */
|
||||
uint32_t nents_total; /* Total number of SG entries */
|
||||
__u32 version; /* sg list buf format version */
|
||||
__u64 new_buf_phys_addr; /* PA of new buffer */
|
||||
__u32 nents_total; /* Total number of SG entries */
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define QSEECOM_SG_LIST_BUF_HDR_SZ_64BIT \
|
||||
|
|
@ -290,10 +290,10 @@ struct qseecom_ce_info_req {
|
|||
};
|
||||
|
||||
struct qseecom_ice_key_data_t {
|
||||
uint8_t key[ICE_KEY_SIZE];
|
||||
uint32_t key_len;
|
||||
uint8_t salt[ICE_SALT_SIZE];
|
||||
uint32_t salt_len;
|
||||
__u8 key[ICE_KEY_SIZE];
|
||||
__u32 key_len;
|
||||
__u8 salt[ICE_SALT_SIZE];
|
||||
__u32 salt_len;
|
||||
};
|
||||
|
||||
#define SG_ENTRY_SZ sizeof(struct qseecom_sg_entry)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
#ifndef _RMNET_DATA_H_
|
||||
#define _RMNET_DATA_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/* Constants */
|
||||
#define RMNET_LOCAL_LOGICAL_ENDPOINT -1
|
||||
|
||||
|
|
@ -34,37 +36,37 @@
|
|||
#define RMNET_NETLINK_MSG_RETURNDATA 2
|
||||
|
||||
struct rmnet_nl_msg_s {
|
||||
uint16_t reserved;
|
||||
uint16_t message_type;
|
||||
uint16_t reserved2:14;
|
||||
uint16_t crd:2;
|
||||
__u16 reserved;
|
||||
__u16 message_type;
|
||||
__u16 reserved2:14;
|
||||
__u16 crd:2;
|
||||
union {
|
||||
uint16_t arg_length;
|
||||
uint16_t return_code;
|
||||
__u16 arg_length;
|
||||
__u16 return_code;
|
||||
};
|
||||
union {
|
||||
uint8_t data[RMNET_NL_DATA_MAX_LEN];
|
||||
__u8 data[RMNET_NL_DATA_MAX_LEN];
|
||||
struct {
|
||||
uint8_t dev[RMNET_MAX_STR_LEN];
|
||||
uint32_t flags;
|
||||
uint16_t agg_size;
|
||||
uint16_t agg_count;
|
||||
uint8_t tail_spacing;
|
||||
__u8 dev[RMNET_MAX_STR_LEN];
|
||||
__u32 flags;
|
||||
__u16 agg_size;
|
||||
__u16 agg_count;
|
||||
__u8 tail_spacing;
|
||||
} data_format;
|
||||
struct {
|
||||
uint8_t dev[RMNET_MAX_STR_LEN];
|
||||
int32_t ep_id;
|
||||
uint8_t operating_mode;
|
||||
uint8_t next_dev[RMNET_MAX_STR_LEN];
|
||||
__u8 dev[RMNET_MAX_STR_LEN];
|
||||
__s32 ep_id;
|
||||
__u8 operating_mode;
|
||||
__u8 next_dev[RMNET_MAX_STR_LEN];
|
||||
} local_ep_config;
|
||||
struct {
|
||||
uint32_t id;
|
||||
uint8_t vnd_name[RMNET_MAX_STR_LEN];
|
||||
__u32 id;
|
||||
__u8 vnd_name[RMNET_MAX_STR_LEN];
|
||||
} vnd;
|
||||
struct {
|
||||
uint32_t id;
|
||||
uint32_t map_flow_id;
|
||||
uint32_t tc_flow_id;
|
||||
__u32 id;
|
||||
__u32 map_flow_id;
|
||||
__u32 tc_flow_id;
|
||||
} flow_control;
|
||||
};
|
||||
};
|
||||
|
|
@ -96,7 +98,7 @@ enum rmnet_netlink_message_types_e {
|
|||
/* RMNET_NETLINK_SET_LINK_EGRESS_DATA_FORMAT - Sets the egress data
|
||||
* format for a particular
|
||||
* link.
|
||||
* Args: uint32_t egress_flags
|
||||
* Args: __u32 egress_flags
|
||||
* char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* Returns: status code
|
||||
*/
|
||||
|
|
@ -106,14 +108,14 @@ enum rmnet_netlink_message_types_e {
|
|||
* format for a particular
|
||||
* link.
|
||||
* Args: char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* Returns: 4-bytes data: uint32_t egress_flags
|
||||
* Returns: 4-bytes data: __u32 egress_flags
|
||||
*/
|
||||
RMNET_NETLINK_GET_LINK_EGRESS_DATA_FORMAT,
|
||||
|
||||
/* RMNET_NETLINK_SET_LINK_INGRESS_DATA_FORMAT - Sets the ingress data
|
||||
* format for a particular
|
||||
* link.
|
||||
* Args: uint32_t ingress_flags
|
||||
* Args: __u32 ingress_flags
|
||||
* char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* Returns: status code
|
||||
*/
|
||||
|
|
@ -123,7 +125,7 @@ enum rmnet_netlink_message_types_e {
|
|||
* format for a particular
|
||||
* link.
|
||||
* Args: char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* Returns: 4-bytes data: uint32_t ingress_flags
|
||||
* Returns: 4-bytes data: __u32 ingress_flags
|
||||
*/
|
||||
RMNET_NETLINK_GET_LINK_INGRESS_DATA_FORMAT,
|
||||
|
||||
|
|
@ -131,8 +133,8 @@ enum rmnet_netlink_message_types_e {
|
|||
* configuration for a particular
|
||||
* link.
|
||||
* Args: char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* int32_t logical_ep_id, valid values are -1 through 31
|
||||
* uint8_t rmnet_mode: one of none, vnd, bridged
|
||||
* __s32 logical_ep_id, valid values are -1 through 31
|
||||
* __u8 rmnet_mode: one of none, vnd, bridged
|
||||
* char[] egress_dev_name: Egress device if operating in bridge mode
|
||||
* Returns: status code
|
||||
*/
|
||||
|
|
@ -142,7 +144,7 @@ enum rmnet_netlink_message_types_e {
|
|||
* configuration for a particular
|
||||
* link.
|
||||
* Args: char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* int32_t logical_ep_id, valid values are -1 through 31
|
||||
* __s32 logical_ep_id, valid values are -1 through 31
|
||||
* Returns: status code
|
||||
*/
|
||||
RMNET_NETLINK_UNSET_LOGICAL_EP_CONFIG,
|
||||
|
|
@ -151,14 +153,14 @@ enum rmnet_netlink_message_types_e {
|
|||
* configuration for a particular
|
||||
* link.
|
||||
* Args: char[] dev_name: Null terminated ASCII string, max length: 15
|
||||
* int32_t logical_ep_id, valid values are -1 through 31
|
||||
* Returns: uint8_t rmnet_mode: one of none, vnd, bridged
|
||||
* __s32 logical_ep_id, valid values are -1 through 31
|
||||
* Returns: __u8 rmnet_mode: one of none, vnd, bridged
|
||||
* char[] egress_dev_name: Egress device
|
||||
*/
|
||||
RMNET_NETLINK_GET_LOGICAL_EP_CONFIG,
|
||||
|
||||
/* RMNET_NETLINK_NEW_VND - Creates a new virtual network device node
|
||||
* Args: int32_t node number
|
||||
* Args: __s32 node number
|
||||
* Returns: status code
|
||||
*/
|
||||
RMNET_NETLINK_NEW_VND,
|
||||
|
|
@ -166,35 +168,35 @@ enum rmnet_netlink_message_types_e {
|
|||
/* RMNET_NETLINK_NEW_VND_WITH_PREFIX - Creates a new virtual network
|
||||
* device node with the specified
|
||||
* prefix for the device name
|
||||
* Args: int32_t node number
|
||||
* Args: __s32 node number
|
||||
* char[] vnd_name - Use as prefix
|
||||
* Returns: status code
|
||||
*/
|
||||
RMNET_NETLINK_NEW_VND_WITH_PREFIX,
|
||||
|
||||
/* RMNET_NETLINK_GET_VND_NAME - Gets the string name of a VND from ID
|
||||
* Args: int32_t node number
|
||||
* Args: __s32 node number
|
||||
* Returns: char[] vnd_name
|
||||
*/
|
||||
RMNET_NETLINK_GET_VND_NAME,
|
||||
|
||||
/* RMNET_NETLINK_FREE_VND - Removes virtual network device node
|
||||
* Args: int32_t node number
|
||||
* Args: __s32 node number
|
||||
* Returns: status code
|
||||
*/
|
||||
RMNET_NETLINK_FREE_VND,
|
||||
|
||||
/* RMNET_NETLINK_ADD_VND_TC_FLOW - Add flow control handle on VND
|
||||
* Args: int32_t node number
|
||||
* uint32_t MAP Flow Handle
|
||||
* uint32_t TC Flow Handle
|
||||
* Args: __s32 node number
|
||||
* __u32 MAP Flow Handle
|
||||
* __u32 TC Flow Handle
|
||||
* Returns: status code
|
||||
*/
|
||||
RMNET_NETLINK_ADD_VND_TC_FLOW,
|
||||
|
||||
/* RMNET_NETLINK_DEL_VND_TC_FLOW - Removes flow control handle on VND
|
||||
* Args: int32_t node number
|
||||
* uint32_t MAP Flow Handle
|
||||
* Args: __s32 node number
|
||||
* __u32 MAP Flow Handle
|
||||
* Returns: status code
|
||||
*/
|
||||
RMNET_NETLINK_DEL_VND_TC_FLOW,
|
||||
|
|
@ -203,7 +205,7 @@ enum rmnet_netlink_message_types_e {
|
|||
* RMNET_NETLINK_NEW_VND_WITH_NAME - Creates a new virtual network
|
||||
* device node with the specified
|
||||
* device name
|
||||
* Args: int32_t node number
|
||||
* Args: __s32 node number
|
||||
* char[] vnd_name - Use as name
|
||||
* Returns: status code
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#ifndef _UAPI_SPCOM_H_
|
||||
#define _UAPI_SPCOM_H_
|
||||
|
||||
#include <linux/types.h> /* uint32_t, bool */
|
||||
#include <linux/types.h> /* __u32, bool */
|
||||
#ifndef BIT
|
||||
#define BIT(x) (1 << x)
|
||||
#endif
|
||||
|
|
@ -75,14 +75,14 @@ enum spcom_poll_events {
|
|||
/* Common Command structure between User Space and spcom driver, on write() */
|
||||
struct spcom_user_command {
|
||||
enum spcom_cmd_id cmd_id;
|
||||
uint32_t arg;
|
||||
__u32 arg;
|
||||
} __packed;
|
||||
|
||||
/* Command structure between User Space and spcom driver, on write() */
|
||||
struct spcom_send_command {
|
||||
enum spcom_cmd_id cmd_id;
|
||||
uint32_t timeout_msec;
|
||||
uint32_t buf_size;
|
||||
__u32 timeout_msec;
|
||||
__u32 buf_size;
|
||||
char buf[0]; /* Variable buffer size - must be last field */
|
||||
} __packed;
|
||||
|
||||
|
|
@ -91,39 +91,39 @@ struct spcom_user_create_channel_command {
|
|||
enum spcom_cmd_id cmd_id;
|
||||
char ch_name[SPCOM_CHANNEL_NAME_SIZE];
|
||||
#define SPCOM_IS_SHARABLE_SUPPORTED
|
||||
bool is_sharable;
|
||||
_Bool is_sharable;
|
||||
} __packed;
|
||||
|
||||
/* Command structure between userspace spcomlib and spcom driver, on write() */
|
||||
#define SPCOM_USER_RESTART_SP_CMD
|
||||
struct spcom_user_restart_sp_command {
|
||||
enum spcom_cmd_id cmd_id;
|
||||
uint32_t arg;
|
||||
__u32 arg;
|
||||
#define SPCOM_IS_UPDATED_SUPPORETED
|
||||
uint32_t is_updated;
|
||||
__u32 is_updated;
|
||||
} __packed;
|
||||
|
||||
/* maximum ION buf for send-modfied-command */
|
||||
#define SPCOM_MAX_ION_BUF 4
|
||||
|
||||
struct spcom_ion_info {
|
||||
int32_t fd; /* ION buffer File Descriptor, set -1 for invalid fd */
|
||||
uint32_t buf_offset; /* virtual address offset in request/response */
|
||||
__s32 fd; /* ION buffer File Descriptor, set -1 for invalid fd */
|
||||
__u32 buf_offset; /* virtual address offset in request/response */
|
||||
};
|
||||
|
||||
/* Pass this FD to unlock all ION buffer for the specific channel */
|
||||
#define SPCOM_ION_FD_UNLOCK_ALL 0xFFFF
|
||||
|
||||
struct spcom_ion_handle {
|
||||
int32_t fd; /* File Descriptor associated with the buffer */
|
||||
__s32 fd; /* File Descriptor associated with the buffer */
|
||||
};
|
||||
|
||||
/* Command structure between User Space and spcom driver, on write() */
|
||||
struct spcom_user_send_modified_command {
|
||||
enum spcom_cmd_id cmd_id;
|
||||
struct spcom_ion_info ion_info[SPCOM_MAX_ION_BUF];
|
||||
uint32_t timeout_msec;
|
||||
uint32_t buf_size;
|
||||
__u32 timeout_msec;
|
||||
__u32 buf_size;
|
||||
char buf[0]; /* Variable buffer size - must be last field */
|
||||
} __packed;
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ enum spcom_poll_cmd_id {
|
|||
|
||||
struct spcom_poll_param {
|
||||
/* input parameters */
|
||||
bool wait;
|
||||
_Bool wait;
|
||||
enum spcom_poll_cmd_id cmd_id;
|
||||
/* output parameter */
|
||||
int retval;
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
#define NUM_SPU_UEFI_APPS 3
|
||||
|
||||
struct spss_ioc_set_fw_cmac {
|
||||
uint32_t cmac[4];
|
||||
uint32_t app_cmacs[NUM_SPU_UEFI_APPS][4];
|
||||
__u32 cmac[4];
|
||||
__u32 app_cmacs[NUM_SPU_UEFI_APPS][4];
|
||||
} __packed;
|
||||
|
||||
#define SPSS_IOC_SET_FW_CMAC \
|
||||
|
|
|
|||
Loading…
Reference in a new issue