d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto/snow3g: rename libsso reference due to library update

Browse Source 
The underlying libsso library that SNOW3G PMD uses has been updated,
so now it is called libsso_snow3g. Also, the path to the library
has been renamed to reflect this changes (now called LIBSSO_SNOW3G_PATH).

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Deepak Kumar Jain <deepak.k.jain@intel.com>
This commit is contained in:
Pablo de Lara 2016-06-20 15:44:52 +01:00 committed by Thomas Monjalon
parent 27a1c4714d
commit ba4d6c891c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/guides/cryptodevs/snow3g.rst
View File

@ -58,7 +58,7 @@ Installation
------------ ------------
To build DPDK with the SNOW3G_PMD the user is required to download To build DPDK with the SNOW3G_PMD the user is required to download
the export controlled ``libsso`` library, by requesting it from the export controlled ``libsso_snow3g`` library, by requesting it from
`<https://networkbuilders.intel.com/network-technologies/dpdk>`_, `<https://networkbuilders.intel.com/network-technologies/dpdk>`_,
and compiling it on their system before building DPDK:: and compiling it on their system before building DPDK::
@ -96,10 +96,10 @@ Initialization
In order to enable this virtual crypto PMD, user must: In order to enable this virtual crypto PMD, user must:
* Export the environmental variable LIBSSO_PATH with the path where * Export the environmental variable LIBSSO_SNOW3G_PATH with the path where
the library was extracted. the library was extracted.
* Build the LIBSSO library (explained in Installation section). * Build the LIBSSO_SNOW3G library (explained in Installation section).
* Set CONFIG_RTE_LIBRTE_PMD_SNOW3G=y in config/common_base. * Set CONFIG_RTE_LIBRTE_PMD_SNOW3G=y in config/common_base.

10
drivers/crypto/snow3g/Makefile
View File

@ -31,8 +31,8 @@
include $(RTE_SDK)/mk/rte.vars.mk include $(RTE_SDK)/mk/rte.vars.mk
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
ifeq ($(LIBSSO_PATH),) ifeq ($(LIBSSO_SNOW3G_PATH),)
$(error "Please define LIBSSO_PATH environment variable") $(error "Please define LIBSSO_SNOW3G_PATH environment variable")
endif endif
endif endif
@ -50,9 +50,9 @@ LIBABIVER := 1
EXPORT_MAP := rte_pmd_snow3g_version.map EXPORT_MAP := rte_pmd_snow3g_version.map
# external library include paths # external library include paths
CFLAGS += -I$(LIBSSO_PATH) CFLAGS += -I$(LIBSSO_SNOW3G_PATH)
CFLAGS += -I$(LIBSSO_PATH)/include CFLAGS += -I$(LIBSSO_SNOW3G_PATH)/include
CFLAGS += -I$(LIBSSO_PATH)/build CFLAGS += -I$(LIBSSO_SNOW3G_PATH)/build
# library source files # library source files
SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c

2
mk/rte.app.mk
View File

@ -134,7 +134,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -L$(AESNI_MULTI_BUFFER_LIB_PATH)
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_PATH)/build -lsso _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_SNOW3G_PATH)/build -lsso_snow3g
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -L$(LIBSSO_KASUMI_PATH)/build -lsso_kasumi _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -L$(LIBSSO_KASUMI_PATH)/build -lsso_kasumi
endif # CONFIG_RTE_LIBRTE_CRYPTODEV endif # CONFIG_RTE_LIBRTE_CRYPTODEV

6
scripts/test-build.sh
View File

@ -45,7 +45,7 @@ default_path=$PATH
# - DPDK_DEP_ZLIB (y/[n]) # - DPDK_DEP_ZLIB (y/[n])
# - DPDK_MAKE_JOBS (int) # - DPDK_MAKE_JOBS (int)
# - DPDK_NOTIFY (notify-send) # - DPDK_NOTIFY (notify-send)
# - LIBSSO_PATH # - LIBSSO_SNOW3G_PATH
# - LIBSSO_KASUMI_PATH # - LIBSSO_KASUMI_PATH
. $(dirname $(readlink -e $0))/load-devel-config.sh . $(dirname $(readlink -e $0))/load-devel-config.sh
@ -122,7 +122,7 @@ reset_env ()
unset DPDK_DEP_SZE unset DPDK_DEP_SZE
unset DPDK_DEP_ZLIB unset DPDK_DEP_ZLIB
unset AESNI_MULTI_BUFFER_LIB_PATH unset AESNI_MULTI_BUFFER_LIB_PATH
unset LIBSSO_PATH unset LIBSSO_SNOW3G_PATH
unset LIBSSO_KASUMI_PATH unset LIBSSO_KASUMI_PATH
unset PQOS_INSTALL_PATH unset PQOS_INSTALL_PATH
} }
@ -168,7 +168,7 @@ config () # <directory> <target> <options>
sed -ri 's,(PMD_AESNI_MB=)n,\1y,' $1/.config sed -ri 's,(PMD_AESNI_MB=)n,\1y,' $1/.config
test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \ test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
sed -ri 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config sed -ri 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
test -z "$LIBSSO_PATH" || \ test -z "$LIBSSO_SNOW3G_PATH" || \
sed -ri 's,(PMD_SNOW3G=)n,\1y,' $1/.config sed -ri 's,(PMD_SNOW3G=)n,\1y,' $1/.config
test -z "$LIBSSO_KASUMI_PATH" || \ test -z "$LIBSSO_KASUMI_PATH" || \
sed -ri 's,(PMD_KASUMI=)n,\1y,' $1/.config sed -ri 's,(PMD_KASUMI=)n,\1y,' $1/.config