From 60baeafa838f98a5ab1069716b8e41d28e155137 Mon Sep 17 00:00:00 2001 From: Iuliana Prodan Date: Thu, 13 Aug 2020 15:04:12 +0300 Subject: MLK-24420-3 crypto: caam - add ioctl calls for black keys and blobs generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Horia Geantă --- Documentation/ioctl/ioctl-number.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation/ioctl') 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 -- cgit v1.2.3