Pull ARM driver updates from Arnd Bergmann: "There are a few separately maintained driver subsystems that we merge through the SoC tree, notable changes are: - Memory controller updates, mainly for Tegra and Mediatek SoCs, and clarifications for the memory controller DT bindings - SCMI firmware interface updates, in particular a new transport based on OPTEE and support for atomic operations. - Cleanups to the TEE subsystem, refactoring its memory management For SoC specific drivers without a separate subsystem, changes include - Smaller updates and fixes for TI, AT91/SAMA5, Qualcomm and NXP Layerscape SoCs. - Driver support for Microchip SAMA5D29, Tesla FSD, Renesas RZ/G2L, and Qualcomm SM8450. - Better power management on Mediatek MT81xx, NXP i.MX8MQ and older NVIDIA Tegra chips" * tag 'arm-drivers-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (154 commits) ARM: spear: fix typos in comments soc/microchip: fix invalid free in mpfs_sys_controller_delete soc: s4: Add support for power domains controller dt-bindings: power: add Amlogic s4 power domains bindings ARM: at91: add support in soc driver for new SAMA5D29 soc: mediatek: mmsys: add sw0_rst_offset in mmsys driver data dt-bindings: memory: renesas,rpc-if: Document RZ/V2L SoC memory: emif: check the pointer temp in get_device_details() memory: emif: Add check for setup_interrupts dt-bindings: arm: mediatek: mmsys: add support for MT8186 dt-bindings: mediatek: add compatible for MT8186 pwrap soc: mediatek: pwrap: add pwrap driver for MT8186 SoC soc: mediatek: mmsys: add mmsys reset control for MT8186 soc: mediatek: mtk-infracfg: Disable ACP on MT8192 soc: ti: k3-socinfo: Add AM62x JTAG ID soc: mediatek: add MTK mutex support for MT8186 soc: mediatek: mmsys: add mt8186 mmsys routing table soc: mediatek: pm-domains: Add support for mt8186 dt-bindings: power: Add MT8186 power domains soc: mediatek: pm-domains: Add support for mt8195 ...
Showing the changes to security (1 of 124 files). Show all
Unified · Split
| @@ -70,17 +70,15 @@ static int trusted_tee_seal(struct trusted_key_payload *p, char *datablob) · 69 unmodified lines | |||
| 70 | memset(&inv_arg, 0, sizeof(inv_arg)); | 70 | memset(&inv_arg, 0, sizeof(inv_arg)); |
| 71 | memset(¶m, 0, sizeof(param)); | 71 | memset(¶m, 0, sizeof(param)); |
| 72 | 72 | ||
| 73 | reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->key, | 73 | reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->key, |
| 74 | p->key_len, TEE_SHM_DMA_BUF | | 74 | p->key_len); |
| 75 | TEE_SHM_KERNEL_MAPPED); | ||
| 76 | if (IS_ERR(reg_shm_in)) { | 75 | if (IS_ERR(reg_shm_in)) { |
| 77 | dev_err(pvt_data.dev, "key shm register failed\n"); | 76 | dev_err(pvt_data.dev, "key shm register failed\n"); |
| 78 | return PTR_ERR(reg_shm_in); | 77 | return PTR_ERR(reg_shm_in); |
| 79 | } | 78 | } |
| 80 | 79 | ||
| 81 | reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob, | 80 | reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob, |
| 82 | sizeof(p->blob), TEE_SHM_DMA_BUF | | 81 | sizeof(p->blob)); |
| 83 | TEE_SHM_KERNEL_MAPPED); | ||
| 84 | if (IS_ERR(reg_shm_out)) { | 82 | if (IS_ERR(reg_shm_out)) { |
| 85 | dev_err(pvt_data.dev, "blob shm register failed\n"); | 83 | dev_err(pvt_data.dev, "blob shm register failed\n"); |
| 86 | ret = PTR_ERR(reg_shm_out); | 84 | ret = PTR_ERR(reg_shm_out); |
| @@ -131,17 +129,15 @@ static int trusted_tee_unseal(struct trusted_key_payload *p, char *datablob) · 44 unmodified lines | |||
| 131 | memset(&inv_arg, 0, sizeof(inv_arg)); | 129 | memset(&inv_arg, 0, sizeof(inv_arg)); |
| 132 | memset(¶m, 0, sizeof(param)); | 130 | memset(¶m, 0, sizeof(param)); |
| 133 | 131 | ||
| 134 | reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob, | 132 | reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob, |
| 135 | p->blob_len, TEE_SHM_DMA_BUF | | 133 | p->blob_len); |
| 136 | TEE_SHM_KERNEL_MAPPED); | ||
| 137 | if (IS_ERR(reg_shm_in)) { | 134 | if (IS_ERR(reg_shm_in)) { |
| 138 | dev_err(pvt_data.dev, "blob shm register failed\n"); | 135 | dev_err(pvt_data.dev, "blob shm register failed\n"); |
| 139 | return PTR_ERR(reg_shm_in); | 136 | return PTR_ERR(reg_shm_in); |
| 140 | } | 137 | } |
| 141 | 138 | ||
| 142 | reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->key, | 139 | reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->key, |
| 143 | sizeof(p->key), TEE_SHM_DMA_BUF | | 140 | sizeof(p->key)); |
| 144 | TEE_SHM_KERNEL_MAPPED); | ||
| 145 | if (IS_ERR(reg_shm_out)) { | 141 | if (IS_ERR(reg_shm_out)) { |
| 146 | dev_err(pvt_data.dev, "key shm register failed\n"); | 142 | dev_err(pvt_data.dev, "key shm register failed\n"); |
| 147 | ret = PTR_ERR(reg_shm_out); | 143 | ret = PTR_ERR(reg_shm_out); |
| @@ -192,8 +188,7 @@ static int trusted_tee_get_random(unsigned char *key, size_t key_len) · 44 unmodified lines | |||
| 192 | memset(&inv_arg, 0, sizeof(inv_arg)); | 188 | memset(&inv_arg, 0, sizeof(inv_arg)); |
| 193 | memset(¶m, 0, sizeof(param)); | 189 | memset(¶m, 0, sizeof(param)); |
| 194 | 190 | ||
| 195 | reg_shm = tee_shm_register(pvt_data.ctx, (unsigned long)key, key_len, | 191 | reg_shm = tee_shm_register_kernel_buf(pvt_data.ctx, key, key_len); |
| 196 | TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED); | ||
| 197 | if (IS_ERR(reg_shm)) { | 192 | if (IS_ERR(reg_shm)) { |
| 198 | dev_err(pvt_data.dev, "key shm register failed\n"); | 193 | dev_err(pvt_data.dev, "key shm register failed\n"); |
| 199 | return PTR_ERR(reg_shm); | 194 | return PTR_ERR(reg_shm); |