Pull crypto updates from Herbert Xu: "API: - crypto_destroy_tfm now ignores errors as well as NULL pointers Algorithms: - Add explicit curve IDs in ECDH algorithm names - Add NIST P384 curve parameters - Add ECDSA Drivers: - Add support for Green Sardine in ccp - Add ecdh/curve25519 to hisilicon/hpre - Add support for AM64 in sa2ul" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (184 commits) fsverity: relax build time dependency on CRYPTO_SHA256 fscrypt: relax Kconfig dependencies for crypto API algorithms crypto: camellia - drop duplicate "depends on CRYPTO" crypto: s5p-sss - consistently use local 'dev' variable in probe() crypto: s5p-sss - remove unneeded local variable initialization crypto: s5p-sss - simplify getting of_device_id match data ccp: ccp - add support for Green Sardine crypto: ccp - Make ccp_dev_suspend and ccp_dev_resume void functions crypto: octeontx2 - add support for OcteonTX2 98xx CPT block. crypto: chelsio/chcr - Remove useless MODULE_VERSION crypto: ux500/cryp - Remove duplicate argument crypto: chelsio - remove unused function crypto: sa2ul - Add support for AM64 crypto: sa2ul - Support for per channel coherency dt-bindings: crypto: ti,sa2ul: Add new compatible for AM64 crypto: hisilicon - enable new error types for QM crypto: hisilicon - add new error type for SEC crypto: hisilicon - support new error types for ZIP crypto: hisilicon - dynamic configuration 'err_info' crypto: doc - fix kernel-doc notation in chacha.c and af_alg.c ...
Showing the changes to include/uapi (1 of 209 files). Show all
Unified · Split
| @@ -16,6 +16,7 @@ struct hisi_qp_ctx { · 15 unmodified lines | |||
| 16 | 16 | ||
| 17 | #define HISI_QM_API_VER_BASE "hisi_qm_v1" | 17 | #define HISI_QM_API_VER_BASE "hisi_qm_v1" |
| 18 | #define HISI_QM_API_VER2_BASE "hisi_qm_v2" | 18 | #define HISI_QM_API_VER2_BASE "hisi_qm_v2" |
| 19 | #define HISI_QM_API_VER3_BASE "hisi_qm_v3" | ||
| 19 | 20 | ||
| 20 | /* UACCE_CMD_QM_SET_QP_CTX: Set qp algorithm type */ | 21 | /* UACCE_CMD_QM_SET_QP_CTX: Set qp algorithm type */ |
| 21 | #define UACCE_CMD_QM_SET_QP_CTX _IOWR('H', 10, struct hisi_qp_ctx) | 22 | #define UACCE_CMD_QM_SET_QP_CTX _IOWR('H', 10, struct hisi_qp_ctx) |