summaryrefslogtreecommitdiff
path: root/sm8150
diff options
context:
space:
mode:
Diffstat (limited to 'sm8150')
-rw-r--r--sm8150/kernel-headers/linux/msm_ipa.h23
-rw-r--r--sm8150/kernel-headers/linux/msm_kgsl.h1
-rw-r--r--sm8150/kernel-headers/linux/msm_mdp_ext.h1
-rw-r--r--sm8150/kernel-headers/sound/compress_offload.h2
-rw-r--r--sm8150/kernel-headers/sound/compress_params.h3
-rw-r--r--sm8150/original-kernel-headers/linux/msm_ipa.h59
-rw-r--r--sm8150/original-kernel-headers/linux/msm_kgsl.h1
-rw-r--r--sm8150/original-kernel-headers/linux/msm_mdp_ext.h3
-rw-r--r--sm8150/original-kernel-headers/sound/compress_offload.h3
-rw-r--r--sm8150/original-kernel-headers/sound/compress_params.h3
10 files changed, 95 insertions, 4 deletions
diff --git a/sm8150/kernel-headers/linux/msm_ipa.h b/sm8150/kernel-headers/linux/msm_ipa.h
index 618bc170d..9c21eecd5 100644
--- a/sm8150/kernel-headers/linux/msm_ipa.h
+++ b/sm8150/kernel-headers/linux/msm_ipa.h
@@ -404,7 +404,13 @@ enum ipa_peripheral_event {
};
#define WIGIG_FST_SWITCH (WIGIG_CLIENT_CONNECT + 1)
#define WIGIG_EVENT_MAX (WIGIG_FST_SWITCH + 1)
-#define IPA_EVENT_MAX_NUM (WIGIG_EVENT_MAX)
+enum ipa_sockv5_event {
+ IPA_SOCKV5_ADD = WIGIG_EVENT_MAX,
+ IPA_SOCKV5_DEL,
+ IPA_SOCKV5_EVENT_MAX
+#define IPA_SOCKV5_EVENT_MAX IPA_SOCKV5_EVENT_MAX
+};
+#define IPA_EVENT_MAX_NUM (IPA_SOCKV5_EVENT_MAX)
#define IPA_EVENT_MAX ((int) IPA_EVENT_MAX_NUM)
enum ipa_rm_resource_name {
IPA_RM_RESOURCE_Q6_PROD = 0,
@@ -1106,6 +1112,21 @@ struct ipa_wan_msg {
uint32_t ipv4_addr_gw;
uint32_t ipv6_addr_gw[IPA_WAN_MSG_IPv6_ADDR_GW_LEN];
};
+struct ipacm_socksv5_info {
+ enum ipa_ip_type ip_type;
+ uint32_t ipv4_src;
+ uint32_t ipv4_dst;
+ uint32_t ipv6_src[4];
+ uint32_t ipv6_dst[4];
+ uint16_t src_port;
+ uint16_t dst_port;
+ uint16_t index;
+};
+struct ipa_socksv5_msg {
+ struct ipacm_socksv5_info ul_in;
+ struct ipacm_socksv5_info dl_in;
+ uint16_t handle;
+};
struct ipa_ioc_rm_dependency {
enum ipa_rm_resource_name resource_name;
enum ipa_rm_resource_name depends_on_name;
diff --git a/sm8150/kernel-headers/linux/msm_kgsl.h b/sm8150/kernel-headers/linux/msm_kgsl.h
index 978b3638a..4a65bc4c7 100644
--- a/sm8150/kernel-headers/linux/msm_kgsl.h
+++ b/sm8150/kernel-headers/linux/msm_kgsl.h
@@ -213,6 +213,7 @@ enum kgsl_timestamp_type {
#define KGSL_PROP_SPEED_BIN 0x25
#define KGSL_PROP_GAMING_BIN 0x26
#define KGSL_PROP_CONTEXT_PROPERTY 0x28
+#define KGSL_PROP_MACROTILING_CHANNELS 0x29
struct kgsl_shadowprop {
unsigned long gpuaddr;
size_t size;
diff --git a/sm8150/kernel-headers/linux/msm_mdp_ext.h b/sm8150/kernel-headers/linux/msm_mdp_ext.h
index 952c11bea..444d04463 100644
--- a/sm8150/kernel-headers/linux/msm_mdp_ext.h
+++ b/sm8150/kernel-headers/linux/msm_mdp_ext.h
@@ -42,6 +42,7 @@
#define MDP_LAYER_ENABLE_QSEED3_SCALE 0x800
#define MDP_LAYER_MULTIRECT_ENABLE 0x1000
#define MDP_LAYER_MULTIRECT_PARALLEL_MODE 0x2000
+#define MDP_LAYER_SECURE_CAMERA_SESSION 0x4000
#define MDP_DESTSCALER_ENABLE 0x1
#define MDP_DESTSCALER_SCALE_UPDATE 0x2
#define MDP_DESTSCALER_ENHANCER_UPDATE 0x4
diff --git a/sm8150/kernel-headers/sound/compress_offload.h b/sm8150/kernel-headers/sound/compress_offload.h
index 853dcc4fc..18bc3da53 100644
--- a/sm8150/kernel-headers/sound/compress_offload.h
+++ b/sm8150/kernel-headers/sound/compress_offload.h
@@ -71,6 +71,8 @@ struct snd_compr_audio_info {
#define SNDRV_COMPRESS_RENDER_MODE_TTP 2
#define SNDRV_COMPRESS_CLK_REC_MODE_NONE 0
#define SNDRV_COMPRESS_CLK_REC_MODE_AUTO 1
+#define SNDRV_COMPRESS_TIMESTAMP_VALID 0x00000000
+#define SNDRV_COMPRESS_TIMESTAMP_CONTINUE 0x00000001
enum sndrv_compress_latency_mode {
SNDRV_COMPRESS_LEGACY_LATENCY_MODE = 0,
SNDRV_COMPRESS_LOW_LATENCY_MODE = 1,
diff --git a/sm8150/kernel-headers/sound/compress_params.h b/sm8150/kernel-headers/sound/compress_params.h
index e951bea4f..96bcb9611 100644
--- a/sm8150/kernel-headers/sound/compress_params.h
+++ b/sm8150/kernel-headers/sound/compress_params.h
@@ -311,6 +311,7 @@ struct snd_codec_metadata {
__u32 length;
__u32 offset;
__u64 timestamp;
- __u32 reserved[4];
+ __u32 flags;
+ __u32 reserved[3];
};
#endif
diff --git a/sm8150/original-kernel-headers/linux/msm_ipa.h b/sm8150/original-kernel-headers/linux/msm_ipa.h
index 170c8b06d..102217890 100644
--- a/sm8150/original-kernel-headers/linux/msm_ipa.h
+++ b/sm8150/original-kernel-headers/linux/msm_ipa.h
@@ -719,7 +719,14 @@ enum ipa_peripheral_event {
#define WIGIG_FST_SWITCH (WIGIG_CLIENT_CONNECT + 1)
#define WIGIG_EVENT_MAX (WIGIG_FST_SWITCH + 1)
-#define IPA_EVENT_MAX_NUM (WIGIG_EVENT_MAX)
+enum ipa_sockv5_event {
+ IPA_SOCKV5_ADD = WIGIG_EVENT_MAX,
+ IPA_SOCKV5_DEL,
+ IPA_SOCKV5_EVENT_MAX
+#define IPA_SOCKV5_EVENT_MAX IPA_SOCKV5_EVENT_MAX
+};
+
+#define IPA_EVENT_MAX_NUM (IPA_SOCKV5_EVENT_MAX)
#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)
/**
@@ -2460,6 +2467,56 @@ struct ipa_wan_msg {
};
/**
+ * struct ipacm_socksv5_info - To hold information about socksv5 connections
+ * @ip_type: ip type
+ * @ipv4_src: ipv4 src address
+ * @ipv4_dst: ipv4 dst address
+ * @ipv6_src: ipv6 src address
+ * @ipv6_dst: ipv6 dst address
+ * @src_port: src port number
+ * @dst_port: dst port number
+ * @index: the uc activation tbl index
+ */
+
+struct ipacm_socksv5_info {
+ /* ip-type */
+ enum ipa_ip_type ip_type;
+
+ /* ipv4 */
+ uint32_t ipv4_src;
+ uint32_t ipv4_dst;
+
+ /* ipv6 */
+ uint32_t ipv6_src[4];
+ uint32_t ipv6_dst[4];
+
+ /* 2B src/dst port */
+ uint16_t src_port;
+ uint16_t dst_port;
+
+ /* uc-tbl index */
+ uint16_t index;
+};
+
+/**
+ * struct ipa_socksv5_msg - To hold information about socksv5 client
+ * @ul_in: uplink connection info
+ * @dl_in: downlink connection info
+ * @handle: used for ipacm to distinguish connections
+ *
+ * CnE need to pass the name of default wan iface when connected/disconnected.
+ * CNE need to pass the gw info in wlan AP+STA mode.
+ * netmgr need to pass the name of wan eMBMS iface when connected.
+ */
+struct ipa_socksv5_msg {
+ struct ipacm_socksv5_info ul_in;
+ struct ipacm_socksv5_info dl_in;
+
+ /* handle (index) */
+ uint16_t handle;
+};
+
+/**
* struct ipa_ioc_rm_dependency - parameters for add/delete dependency
* @resource_name: name of dependent resource
* @depends_on_name: name of its dependency
diff --git a/sm8150/original-kernel-headers/linux/msm_kgsl.h b/sm8150/original-kernel-headers/linux/msm_kgsl.h
index 04a097a94..80e73c4aa 100644
--- a/sm8150/original-kernel-headers/linux/msm_kgsl.h
+++ b/sm8150/original-kernel-headers/linux/msm_kgsl.h
@@ -338,6 +338,7 @@ enum kgsl_timestamp_type {
#define KGSL_PROP_SPEED_BIN 0x25
#define KGSL_PROP_GAMING_BIN 0x26
#define KGSL_PROP_CONTEXT_PROPERTY 0x28
+#define KGSL_PROP_MACROTILING_CHANNELS 0x29
struct kgsl_shadowprop {
diff --git a/sm8150/original-kernel-headers/linux/msm_mdp_ext.h b/sm8150/original-kernel-headers/linux/msm_mdp_ext.h
index b8ab5dd32..cf9078f3f 100644
--- a/sm8150/original-kernel-headers/linux/msm_mdp_ext.h
+++ b/sm8150/original-kernel-headers/linux/msm_mdp_ext.h
@@ -96,6 +96,9 @@
*/
#define MDP_LAYER_MULTIRECT_PARALLEL_MODE 0x2000
+/* Flag indicates that layer is associated with secure camera session */
+
+#define MDP_LAYER_SECURE_CAMERA_SESSION 0x4000
/*
* DESTINATION SCALER FLAG CONFIGURATION
*/
diff --git a/sm8150/original-kernel-headers/sound/compress_offload.h b/sm8150/original-kernel-headers/sound/compress_offload.h
index e83c4185a..5f0fd5ebb 100644
--- a/sm8150/original-kernel-headers/sound/compress_offload.h
+++ b/sm8150/original-kernel-headers/sound/compress_offload.h
@@ -141,6 +141,9 @@ struct snd_compr_audio_info {
#define SNDRV_COMPRESS_CLK_REC_MODE_NONE 0
#define SNDRV_COMPRESS_CLK_REC_MODE_AUTO 1
+#define SNDRV_COMPRESS_TIMESTAMP_VALID 0x00000000
+#define SNDRV_COMPRESS_TIMESTAMP_CONTINUE 0x00000001
+
enum sndrv_compress_latency_mode {
SNDRV_COMPRESS_LEGACY_LATENCY_MODE = 0,
SNDRV_COMPRESS_LOW_LATENCY_MODE = 1,
diff --git a/sm8150/original-kernel-headers/sound/compress_params.h b/sm8150/original-kernel-headers/sound/compress_params.h
index ac164e037..b9bb321a8 100644
--- a/sm8150/original-kernel-headers/sound/compress_params.h
+++ b/sm8150/original-kernel-headers/sound/compress_params.h
@@ -556,7 +556,8 @@ struct snd_codec_metadata {
__u32 length;
__u32 offset;
__u64 timestamp;
- __u32 reserved[4];
+ __u32 flags;
+ __u32 reserved[3];
};
#endif