History

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC-related driver updates from Olof Johansson: "Various driver updates for platforms. A bulk of this is smaller fixes or cleanups, but some of the new material this time around is: - Support for Nvidia Tegra234 SoC - Ring accelerator support for TI AM65x - PRUSS driver for TI platforms - Renesas support for R-Car V3U SoC - Reset support for Cortex-M4 processor on i.MX8MQ There are also new socinfo entries for a handful of different SoCs and platforms" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (131 commits) drm/mediatek: reduce clear event soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api soc: mediatek: cmdq: add jump function soc: mediatek: cmdq: add write_s_mask value function soc: mediatek: cmdq: add write_s value function soc: mediatek: cmdq: add read_s function soc: mediatek: cmdq: add write_s_mask function soc: mediatek: cmdq: add write_s function soc: mediatek: cmdq: add address shift in jump soc: mediatek: mtk-infracfg: Fix kerneldoc soc: amlogic: pm-domains: use always-on flag reset: sti: reset-syscfg: fix struct description warnings reset: imx7: add the cm4 reset for i.MX8MQ dt-bindings: reset: imx8mq: add m4 reset reset: Fix and extend kerneldoc reset: reset-zynqmp: Added support for Versal platform dt-bindings: reset: Updated binding for Versal reset driver reset: imx7: Support module build soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk soc: fsl: qman: convert to use be32_add_cpu() ...

Linus Torvalds committed 6 years ago

Commit 2e368dd2 parents e731f31 9f7f269117 files · +3901 −912Browse files

Showing the changes to include/uapi/linux (1 of 117 files). Show all

Unified · Split

include/uapi/linux/tee.h+13−0
@@ -51,6 +51,9 @@ · 50 unmodified lines
51#define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */51#define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */
52#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */52#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */
53#define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */53#define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */
54#define TEE_GEN_CAP_MEMREF_NULL (1 << 3)/* NULL MemRef support */
55
56#define TEE_MEMREF_NULL (__u64)(-1) /* NULL MemRef Buffer */
54 57
55/*58/*
56 * TEE Implementation ID59 * TEE Implementation ID
@@ -200,6 +203,16 @@ struct tee_ioctl_buf_data { · 143 unmodified lines
200 * a part of a shared memory by specifying an offset (@a) and size (@b) of203 * a part of a shared memory by specifying an offset (@a) and size (@b) of
201 * the object. To supply the entire shared memory object set the offset204 * the object. To supply the entire shared memory object set the offset
202 * (@a) to 0 and size (@b) to the previously returned size of the object.205 * (@a) to 0 and size (@b) to the previously returned size of the object.
206 *
207 * A client may need to present a NULL pointer in the argument
208 * passed to a trusted application in the TEE.
209 * This is also a requirement in GlobalPlatform Client API v1.0c
210 * (section 3.2.5 memory references), which can be found at
211 * http://www.globalplatform.org/specificationsdevice.asp
212 *
213 * If a NULL pointer is passed to a TA in the TEE, the (@c)
214 * IOCTL parameters value must be set to TEE_MEMREF_NULL indicating a NULL
215 * memory reference.
203 */216 */
204struct tee_ioctl_param {217struct tee_ioctl_param {
205 __u64 attr;218 __u64 attr;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t