summaryrefslogtreecommitdiff
path: root/Documentation/ioctl
diff options
context:
space:
mode:
authorIuliana Prodan <iuliana.prodan@nxp.com>2020-08-13 15:04:12 +0300
committerIuliana Prodan <iuliana.prodan@nxp.com>2020-08-13 18:16:20 +0300
commit60baeafa838f98a5ab1069716b8e41d28e155137 (patch)
tree1fff95c466a568de00495453667b68f414080bd4 /Documentation/ioctl
parent84287c5d3b804d50399fd2cb29be6133d13d5d32 (diff)
MLK-24420-3 crypto: caam - add ioctl calls for black keys and blobs generation
This patch adds the Kernel support for the caam-keygen user-space application. It has two IOCTL calls for key and blob generation and import a black key from a blob. This support is included in CRYPTO_DEV_FSL_CAAM_TK_API (tagged key support). Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Diffstat (limited to 'Documentation/ioctl')
-rw-r--r--Documentation/ioctl/ioctl-number.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/ioctl/ioctl-number.rst b/Documentation/ioctl/ioctl-number.rst
index c1f0d574fec6..30b228007f62 100644
--- a/Documentation/ioctl/ioctl-number.rst
+++ b/Documentation/ioctl/ioctl-number.rst
@@ -158,7 +158,8 @@ Code Seq# Include File Comments
'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict!
'I' 40-4F linux/mISDNif.h conflict!
'J' 00-1F drivers/scsi/gdth_ioctl.h
-'K' all linux/kd.h
+'K' all linux/kd.h conflict!
+'K' 00-01 linux/caam_keygen.h conflict! caam driver
'L' 00-1F linux/loop.h conflict!
'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict!
'L' 20-2F linux/lightnvm.h