From 92a45f4a324db6ae89b33e192c473cc242b4257f Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Wed, 14 Jun 2023 02:20:25 +0000 Subject: Add cryptodev device 4xxx QAT_4xxx is integrated QAT device on SPR platform. Signed-off-by: xinfeng zhao Signed-off-by: Yulong Pei Change-Id: If1d4b3d72a2c66855ac8c1c42516f0cb78bdfab2 (cherry picked from commit 32ff893acec8731f1e4edcdcb9bff71c338adf97) --- resources/libraries/python/Constants.py | 1 + resources/libraries/python/DUTSetup.py | 9 +++++++-- resources/libraries/robot/shared/default.robot | 4 ++-- resources/libraries/robot/shared/suite_setup.robot | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index cf7922f06f..92a16e6b8b 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -458,6 +458,7 @@ class Constants: # TODO CSIT-1481: Crypto HW should be read from topology file instead. NIC_NAME_TO_CRYPTO_HW = { + u"Intel-E810CQ": u"HW_4xxx", u"Intel-E822CQ": u"HW_C4xxx", u"Intel-X710": u"HW_DH895xcc", u"Intel-XL710": u"HW_DH895xcc", diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 2485fbb904..e715f48a76 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -253,7 +253,8 @@ class DUTSetup: initialize or remove VFs on QAT. :param node: DUT node. - :crypto_type: Crypto device type - HW_DH895xcc, HW_C3xxx or HW_C4xxx. + :crypto_type: Crypto device type - HW_DH895xcc, HW_C3xxx, HW_C4xxx + or HW_4xxx. :param numvfs: Number of VFs to initialize, 0 - disable the VFs. :param force_init: If True then try to initialize to specific value. :type node: dict @@ -281,7 +282,8 @@ class DUTSetup: """Init Crypto QAT device virtual functions on DUT. :param node: DUT node. - :crypto_type: Crypto device type - HW_DH895xcc, HW_C3xxx or HW_C4xxx. + :crypto_type: Crypto device type - HW_DH895xcc, HW_C3xxx, HW_C4xxx + or HW_4xxx. :param numvfs: Number of VFs to initialize, 0 - disable the VFs. :type node: dict :type crypto_type: string @@ -298,6 +300,9 @@ class DUTSetup: elif crypto_type == u"HW_C4xxx": kernel_mod = u"qat_c4xxx" kernel_drv = u"c4xxx" + elif crypto_type == u"HW_4xxx": + kernel_mod = u"qat_4xxx" + kernel_drv = u"4xxx" else: raise RuntimeError( f"Unsupported crypto device type on {node[u'host']}" diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index ad1cabb6c1..fabb44067b 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -101,8 +101,8 @@ | | ... | try to initialize/disable. | | | | ... | *Arguments:* -| | ... | - crypto_type - Crypto device type - HW_DH895xcc or HW_C3xxx; default -| | ... | value: HW_DH895xcc. Type: string +| | ... | - crypto_type - Crypto device type - HW_DH895xcc, HW_C3xxx, HW_C4xxx +| | ... | or HW_4xxx; default value: HW_DH895xcc. Type: string | | ... | - numvfs - Number of VFs to initialize, 0 - disable the VFs; default | | ... | value: ${32} Type: integer | | ... | - force_init - Force to initialize. Type: boolean diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot index 201470fff0..66efa34e69 100644 --- a/resources/libraries/robot/shared/suite_setup.robot +++ b/resources/libraries/robot/shared/suite_setup.robot @@ -279,6 +279,7 @@ | | ... | '${crypto_type}' == 'HW_DH895xcc' | ${32} | | ... | '${crypto_type}' == 'HW_C3xxx' | ${16} | | ... | '${crypto_type}' == 'HW_C4xxx' | ${128} +| | ... | '${crypto_type}' == 'HW_4xxx' | ${16} | | Configure crypto device on all DUTs | ${crypto_type} | numvfs=${numvfs} | | ... | force_init=${True} | | Configure kernel module on all DUTs | vfio_pci | force_load=${True} -- cgit 1.2.3-korg