d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/sys/opencrypto: enable armv8crypto on aarch64

Browse Source 
This change makes required modifications in runtests to also only require the
aesni module on Intel (i386/amd64) platforms, as it is an Intel specific
module.

MFC after:	1 month
MFC to:		^/stable/12 (support not present on ^/stable/11)
Submitted by:	Greg V <greg@unrelenting.technology>
Differential Revision:	https://reviews.freebsd.org/D21018
This commit is contained in:
ngie 2019-08-10 15:53:42 +00:00
parent b654b03de4
commit 6125c63e8c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/sys/opencrypto/cryptotest.py
View File

@ -50,9 +50,9 @@ def katg(base, glob):
raise unittest.SkipTest("Missing %s test vectors" % (base))
return iglob(os.path.join(katdir, base, glob))
aesmodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
aesmodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
desmodules = [ 'cryptosoft0', ]
shamodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
shamodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
def GenTestCase(cname):
try:
@ -500,6 +500,7 @@ def runSHA1HMACWithParser(self, parser):
cryptosoft = GenTestCase('cryptosoft0')
aesni = GenTestCase('aesni0')
armv8crypto = GenTestCase('armv8crypto0')
ccr = GenTestCase('ccr0')
ccp = GenTestCase('ccp0')

14
tests/sys/opencrypto/runtests.sh
View File

@ -60,7 +60,19 @@ cleanup_tests()
}
trap cleanup_tests EXIT INT TERM
for required_module in nexus/aesni cryptodev; do
cpu_type="$(uname -p)"
cpu_module=
case ${cpu_type} in
aarch64)
cpu_module=nexus/armv8crypto
;;
amd64|i386)
cpu_module=nexus/aesni
;;
esac
for required_module in $cpu_module cryptodev; do
if ! kldstat -q -m $required_module; then
module_to_load=${required_module#nexus/}
if ! kldload ${module_to_load}; then