History

Merge tag 'asoc-v5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.16 This is an unusually large set of updates, mostly a large crop of unusually big drivers coupled with extensive overhauls of existing code. There's a SH change here for the DAI format terminology, the change is straightforward and the SH maintainers don't seem very active. - A new version of the audio graph card which supports a wider range of systems. - Move of the Cirrus DSP framework into drivers/firmware to allow for future use by non-audio DSPs. - Several conversions to YAML DT bindings. - Continuing cleanups to the SOF and Intel code. - A very big overhaul of the cs42l42 driver, correcting many problems. - Support for AMD Vangogh and Yelow Cap, Cirrus CS35L41, Maxim MAX98520 and MAX98360A, Mediatek MT8195, Nuvoton NAU8821, nVidia Tegra210, NXP i.MX8ULP, Qualcomm AudioReach, Realtek ALC5682I-VS, RT5682S, and RT9120 and Rockchip RV1126 and RK3568

Takashi Iwai committed 5 years ago

Commit a0292f32 parents 8f27b68 318a54c1901 files · +63368 −17400Browse files

Showing the changes to include/uapi (8 of 1901 files). Show all

Unified · Split

8 files
  1. include/uapi/linux/android/binder.h +7 −0
  2. include/uapi/linux/cifs/cifs_mount.h +0 −1
  3. include/uapi/linux/hyperv.h +1 −1
  4. include/uapi/linux/io_uring.h +7 −1
  5. include/uapi/linux/xfrm.h +9 −6
  6. include/uapi/misc/habanalabs.h +2 −4
  7. include/uapi/sound/snd_ar_tokens.h +208 −0
  8. include/uapi/sound/sof/tokens.h +1 −0
include/uapi/linux/android/binder.h+7−0
@@ -225,7 +225,14 @@ struct binder_freeze_info { · 224 unmodified lines
225225
226226 struct binder_frozen_status_info {
227227 __u32 pid;
228+
229+ /* process received sync transactions since last frozen
230+ * bit 0: received sync transaction after being frozen
231+ * bit 1: new pending sync transaction during freezing
232+ */
228233 __u32 sync_recv;
234+
235+ /* process received async transactions since last frozen */
229236 __u32 async_recv;
230237 };
231238
include/uapi/linux/cifs/cifs_mount.h+0−1
@@ -1,6 +1,5 @@
11 /* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
22 /*
3− * include/uapi/linux/cifs/cifs_mount.h
43 *
54 * Author(s): Scott Lovenberg (scott.lovenberg@gmail.com)
65 *
include/uapi/linux/hyperv.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #ifndef _UAPI_HYPERV_H
2727 #define _UAPI_HYPERV_H
2828
29−#include <linux/uuid.h>
29+#include <linux/types.h>
3030
3131 /*
3232 * Framework version for util services.
include/uapi/linux/io_uring.h+7−1
@@ -317,13 +317,19 @@ enum { · 316 unmodified lines
317317 IORING_REGISTER_IOWQ_AFF = 17,
318318 IORING_UNREGISTER_IOWQ_AFF = 18,
319319
320− /* set/get max number of workers */
320+ /* set/get max number of io-wq workers */
321321 IORING_REGISTER_IOWQ_MAX_WORKERS = 19,
322322
323323 /* this goes last */
324324 IORING_REGISTER_LAST
325325 };
326326
327+/* io-wq worker categories */
328+enum {
329+ IO_WQ_BOUND,
330+ IO_WQ_UNBOUND,
331+};
332+
327333 /* deprecated, see struct io_uring_rsrc_update */
328334 struct io_uring_files_update {
329335 __u32 offset;
include/uapi/linux/xfrm.h+9−6
@@ -213,13 +213,13 @@ enum { · 212 unmodified lines
213213 XFRM_MSG_GETSPDINFO,
214214 #define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
215215
216+ XFRM_MSG_MAPPING,
217+#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
218+
216219 XFRM_MSG_SETDEFAULT,
217220 #define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT
218221 XFRM_MSG_GETDEFAULT,
219222 #define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT
220−
221− XFRM_MSG_MAPPING,
222−#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
223223 __XFRM_MSG_MAX
224224 };
225225 #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -514,9 +514,12 @@ struct xfrm_user_offload { · 288 unmodified lines
514514 #define XFRM_OFFLOAD_INBOUND 2
515515
516516 struct xfrm_userpolicy_default {
517−#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8)
518− __u8 dirmask;
519− __u8 action;
517+#define XFRM_USERPOLICY_UNSPEC 0
518+#define XFRM_USERPOLICY_BLOCK 1
519+#define XFRM_USERPOLICY_ACCEPT 2
520+ __u8 in;
521+ __u8 fwd;
522+ __u8 out;
520523 };
521524
522525 #ifndef __KERNEL__
include/uapi/misc/habanalabs.h+2−4
@@ -917,7 +917,6 @@ struct hl_wait_cs_in { · 916 unmodified lines
917917 #define HL_WAIT_CS_STATUS_BUSY 1
918918 #define HL_WAIT_CS_STATUS_TIMEDOUT 2
919919 #define HL_WAIT_CS_STATUS_ABORTED 3
920−#define HL_WAIT_CS_STATUS_INTERRUPTED 4
921920
922921 #define HL_WAIT_CS_STATUS_FLAG_GONE 0x1
923922 #define HL_WAIT_CS_STATUS_FLAG_TIMESTAMP_VLD 0x2
@@ -1286,7 +1285,8 @@ struct hl_debug_args { · 362 unmodified lines
12861285 * EIO - The CS was aborted (usually because the device was reset)
12871286 * ENODEV - The device wants to do hard-reset (so user need to close FD)
12881287 *
1289− * The driver also returns a custom define inside the IOCTL which can be:
1288+ * The driver also returns a custom define in case the IOCTL call returned 0.
1289+ * The define can be one of the following:
12901290 *
12911291 * HL_WAIT_CS_STATUS_COMPLETED - The CS has been completed successfully (0)
12921292 * HL_WAIT_CS_STATUS_BUSY - The CS is still executing (0)
@@ -1294,8 +1294,6 @@ struct hl_debug_args { · 1 unmodified line
12941294 * (ETIMEDOUT)
12951295 * HL_WAIT_CS_STATUS_ABORTED - The CS was aborted, usually because the
12961296 * device was reset (EIO)
1297− * HL_WAIT_CS_STATUS_INTERRUPTED - Waiting for the CS was interrupted (EINTR)
1298− *
12991297 */
13001298
13011299 #define HL_IOCTL_WAIT_CS \
include/uapi/sound/snd_ar_tokens.h+208−0
@@ -0,0 +1,208 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
3+#ifndef __SND_AR_TOKENS_H__
4+#define __SND_AR_TOKENS_H__
5+
6+#define APM_SUB_GRAPH_PERF_MODE_LOW_POWER 0x1
7+#define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY 0x2
8+
9+#define APM_SUB_GRAPH_DIRECTION_TX 0x1
10+#define APM_SUB_GRAPH_DIRECTION_RX 0x2
11+
12+/** Scenario ID Audio Playback */
13+#define APM_SUB_GRAPH_SID_AUDIO_PLAYBACK 0x1
14+/* Scenario ID Audio Record */
15+#define APM_SUB_GRAPH_SID_AUDIO_RECORD 0x2
16+/* Scenario ID Voice call. */
17+#define APM_SUB_GRAPH_SID_VOICE_CALL 0x3
18+
19+/* container capability ID Pre/Post Processing (PP) */
20+#define APM_CONTAINER_CAP_ID_PP 0x1
21+/* container capability ID Compression/Decompression (CD) */
22+#define APM_CONTAINER_CAP_ID_CD 0x2
23+/* container capability ID End Point(EP) */
24+#define APM_CONTAINER_CAP_ID_EP 0x3
25+/* container capability ID Offload (OLC) */
26+#define APM_CONTAINER_CAP_ID_OLC 0x4
27+
28+/* container graph position Stream */
29+#define APM_CONT_GRAPH_POS_STREAM 0x1
30+/* container graph position Per Stream Per Device*/
31+#define APM_CONT_GRAPH_POS_PER_STR_PER_DEV 0x2
32+/* container graph position Stream-Device */
33+#define APM_CONT_GRAPH_POS_STR_DEV 0x3
34+/* container graph position Global Device */
35+#define APM_CONT_GRAPH_POS_GLOBAL_DEV 0x4
36+
37+#define APM_PROC_DOMAIN_ID_MDSP 0x1
38+#define APM_PROC_DOMAIN_ID_ADSP 0x2
39+#define APM_PROC_DOMAIN_ID_SDSP 0x4
40+#define APM_PROC_DOMAIN_ID_CDSP 0x5
41+
42+#define PCM_INTERLEAVED 1
43+#define PCM_DEINTERLEAVED_PACKED 2
44+#define PCM_DEINTERLEAVED_UNPACKED 3
45+#define AR_I2S_WS_SRC_EXTERNAL 0
46+#define AR_I2S_WS_SRC_INTERNAL 1
47+
48+enum ar_event_types {
49+ AR_EVENT_NONE = 0,
50+ AR_PGA_DAPM_EVENT
51+};
52+
53+/*
54+ * Kcontrol IDs
55+ */
56+#define SND_SOC_AR_TPLG_FE_BE_GRAPH_CTL_MIX 256
57+#define SND_SOC_AR_TPLG_VOL_CTL 257
58+
59+/**
60+ * %AR_TKN_U32_SUB_GRAPH_INSTANCE_ID: Sub Graph Instance Id
61+ *
62+ * %AR_TKN_U32_SUB_GRAPH_PERF_MODE: Performance mode of subgraph
63+ * APM_SUB_GRAPH_PERF_MODE_LOW_POWER = 1,
64+ * APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY = 2
65+ *
66+ * %AR_TKN_U32_SUB_GRAPH_DIRECTION: Direction of subgraph
67+ * APM_SUB_GRAPH_DIRECTION_TX = 1,
68+ * APM_SUB_GRAPH_DIRECTION_RX = 2
69+ *
70+ * %AR_TKN_U32_SUB_GRAPH_SCENARIO_ID: Scenario ID for subgraph
71+ * APM_SUB_GRAPH_SID_AUDIO_PLAYBACK = 1,
72+ * APM_SUB_GRAPH_SID_AUDIO_RECORD = 2,
73+ * APM_SUB_GRAPH_SID_VOICE_CALL = 3
74+ *
75+ * %AR_TKN_U32_CONTAINER_INSTANCE_ID: Container Instance ID
76+ *
77+ * %AR_TKN_U32_CONTAINER_CAPABILITY_ID: Container capability ID
78+ * APM_CONTAINER_CAP_ID_PP = 1,
79+ * APM_CONTAINER_CAP_ID_CD = 2,
80+ * APM_CONTAINER_CAP_ID_EP = 3,
81+ * APM_CONTAINER_CAP_ID_OLC = 4
82+ *
83+ * %AR_TKN_U32_CONTAINER_STACK_SIZE: Stack size in the container.
84+ *
85+ * %AR_TKN_U32_CONTAINER_GRAPH_POS: Graph Position
86+ * APM_CONT_GRAPH_POS_STREAM = 1,
87+ * APM_CONT_GRAPH_POS_PER_STR_PER_DEV = 2,
88+ * APM_CONT_GRAPH_POS_STR_DEV = 3,
89+ * APM_CONT_GRAPH_POS_GLOBAL_DEV = 4
90+ *
91+ * %AR_TKN_U32_CONTAINER_PROC_DOMAIN: Processor domain of container
92+ * APM_PROC_DOMAIN_ID_MDSP = 1,
93+ * APM_PROC_DOMAIN_ID_ADSP = 2,
94+ * APM_PROC_DOMAIN_ID_SDSP = 4,
95+ * APM_PROC_DOMAIN_ID_CDSP = 5
96+ *
97+ * %AR_TKN_U32_MODULE_ID: Module ID
98+ *
99+ * %AR_TKN_U32_MODULE_INSTANCE_ID: Module Instance ID.
100+ *
101+ * %AR_TKN_U32_MODULE_MAX_IP_PORTS: Module maximum input ports
102+ *
103+ * %AR_TKN_U32_MODULE_MAX_OP_PORTS: Module maximum output ports.
104+ *
105+ * %AR_TKN_U32_MODULE_IN_PORTS: Number of in ports
106+ *
107+ * %AR_TKN_U32_MODULE_OUT_PORTS: Number of out ports.
108+ *
109+ * %AR_TKN_U32_MODULE_SRC_OP_PORT_ID: Source module output port ID
110+ *
111+ * %AR_TKN_U32_MODULE_DST_IN_PORT_ID: Destination module input port ID
112+ *
113+ * %AR_TKN_U32_MODULE_HW_IF_IDX: Interface index types for I2S/LPAIF
114+ *
115+ * %AR_TKN_U32_MODULE_HW_IF_TYPE: Interface type
116+ * LPAIF = 0,
117+ * LPAIF_RXTX = 1,
118+ * LPAIF_WSA = 2,
119+ * LPAIF_VA = 3,
120+ * LPAIF_AXI = 4
121+ *
122+ * %AR_TKN_U32_MODULE_FMT_INTERLEAVE: PCM Interleaving
123+ * PCM_INTERLEAVED = 1,
124+ * PCM_DEINTERLEAVED_PACKED = 2,
125+ * PCM_DEINTERLEAVED_UNPACKED = 3
126+ *
127+ * %AR_TKN_U32_MODULE_FMT_DATA: data format
128+ * FIXED POINT = 1,
129+ * IEC60958 PACKETIZED = 3,
130+ * IEC60958 PACKETIZED NON LINEAR = 8,
131+ * COMPR OVER PCM PACKETIZED = 7,
132+ * IEC61937 PACKETIZED = 2,
133+ * GENERIC COMPRESSED = 5
134+ *
135+ * %AR_TKN_U32_MODULE_FMT_SAMPLE_RATE: sample rate
136+ *
137+ * %AR_TKN_U32_MODULE_FMT_BIT_DEPTH: bit depth
138+ *
139+ * %AR_TKN_U32_MODULE_SD_LINE_IDX: I2S serial data line idx
140+ * I2S_SD0 = 1,
141+ * I2S_SD1 = 2,
142+ * I2S_SD2 = 3,
143+ * I2S_SD3 = 4,
144+ * I2S_QUAD01 = 5,
145+ * I2S_QUAD23 = 6,
146+ * I2S_6CHS = 7,
147+ * I2S_8CHS = 8
148+ *
149+ * %AR_TKN_U32_MODULE_WS_SRC: Word Select Source
150+ * AR_I2S_WS_SRC_EXTERNAL = 0,
151+ * AR_I2S_WS_SRC_INTERNAL = 1,
152+ *
153+ * %AR_TKN_U32_MODULE_FRAME_SZ_FACTOR: Frame size factor
154+ *
155+ * %AR_TKN_U32_MODULE_LOG_CODE: Log Module Code
156+ *
157+ * %AR_TKN_U32_MODULE_LOG_TAP_POINT_ID: logging tap point of this module
158+ *
159+ * %AR_TKN_U32_MODULE_LOG_MODE: logging mode
160+ * LOG_WAIT = 0,
161+ * LOG_IMMEDIATELY = 1
162+ *
163+ * %AR_TKN_DAI_INDEX: dai index
164+ *
165+ */
166+
167+/* DAI Tokens */
168+#define AR_TKN_DAI_INDEX 1
169+/* SUB GRAPH Tokens */
170+#define AR_TKN_U32_SUB_GRAPH_INSTANCE_ID 2
171+#define AR_TKN_U32_SUB_GRAPH_PERF_MODE 3
172+#define AR_TKN_U32_SUB_GRAPH_DIRECTION 4
173+#define AR_TKN_U32_SUB_GRAPH_SCENARIO_ID 5
174+
175+/* Container Tokens */
176+#define AR_TKN_U32_CONTAINER_INSTANCE_ID 100
177+#define AR_TKN_U32_CONTAINER_CAPABILITY_ID 101
178+#define AR_TKN_U32_CONTAINER_STACK_SIZE 102
179+#define AR_TKN_U32_CONTAINER_GRAPH_POS 103
180+#define AR_TKN_U32_CONTAINER_PROC_DOMAIN 104
181+
182+/* Module Tokens */
183+#define AR_TKN_U32_MODULE_ID 200
184+#define AR_TKN_U32_MODULE_INSTANCE_ID 201
185+#define AR_TKN_U32_MODULE_MAX_IP_PORTS 202
186+#define AR_TKN_U32_MODULE_MAX_OP_PORTS 203
187+#define AR_TKN_U32_MODULE_IN_PORTS 204
188+#define AR_TKN_U32_MODULE_OUT_PORTS 205
189+#define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206
190+#define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207
191+#define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208
192+#define AR_TKN_U32_MODULE_DST_INSTANCE_ID 209
193+
194+
195+#define AR_TKN_U32_MODULE_HW_IF_IDX 250
196+#define AR_TKN_U32_MODULE_HW_IF_TYPE 251
197+#define AR_TKN_U32_MODULE_FMT_INTERLEAVE 252
198+#define AR_TKN_U32_MODULE_FMT_DATA 253
199+#define AR_TKN_U32_MODULE_FMT_SAMPLE_RATE 254
200+#define AR_TKN_U32_MODULE_FMT_BIT_DEPTH 255
201+#define AR_TKN_U32_MODULE_SD_LINE_IDX 256
202+#define AR_TKN_U32_MODULE_WS_SRC 257
203+#define AR_TKN_U32_MODULE_FRAME_SZ_FACTOR 258
204+#define AR_TKN_U32_MODULE_LOG_CODE 259
205+#define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID 260
206+#define AR_TKN_U32_MODULE_LOG_MODE 261
207+
208+#endif /* __SND_AR_TOKENS_H__ */
include/uapi/sound/sof/tokens.h+1−0
@@ -51,6 +51,7 @@ · 50 unmodified lines
5151 #define SOF_TKN_SCHED_CORE 203
5252 #define SOF_TKN_SCHED_FRAMES 204
5353 #define SOF_TKN_SCHED_TIME_DOMAIN 205
54+#define SOF_TKN_SCHED_DYNAMIC_PIPELINE 206
5455
5556 /* volume */
5657 #define SOF_TKN_VOLUME_RAMP_STEP_TYPE 250