From c0ded849131598760a25e96ff368d035838af0b3 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Tue, 13 Aug 2019 12:50:16 +0530 Subject: [PATCH] common/dpaax: move shared sec HW code from dpaa2_sec The SEC HW code is being shared by multiple NXP based drivers. It is better to place it at a common place. Current users are: 1. DPAA2_SEC 2. DPAA_SEC 3. CAAM_JR Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal --- .../dpaa2_sec/hw => common/dpaax/caamflib}/compat.h | 0 .../{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/desc.h | 4 ++-- .../dpaa2_sec/hw => common/dpaax/caamflib}/desc/algo.h | 2 +- .../dpaa2_sec/hw => common/dpaax/caamflib}/desc/common.h | 2 +- .../dpaa2_sec/hw => common/dpaax/caamflib}/desc/ipsec.h | 2 +- .../dpaa2_sec/hw => common/dpaax/caamflib}/desc/pdcp.h | 2 +- .../{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta.h | 0 .../dpaax/caamflib}/rta/fifo_load_store_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/header_cmd.h | 0 .../dpaa2_sec/hw => common/dpaax/caamflib}/rta/jump_cmd.h | 0 .../dpaa2_sec/hw => common/dpaax/caamflib}/rta/key_cmd.h | 0 .../dpaa2_sec/hw => common/dpaax/caamflib}/rta/load_cmd.h | 0 .../dpaa2_sec/hw => common/dpaax/caamflib}/rta/math_cmd.h | 0 .../dpaa2_sec/hw => common/dpaax/caamflib}/rta/move_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/nfifo_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/operation_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/protocol_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/sec_run_time_asm.h | 4 ++-- .../hw => common/dpaax/caamflib}/rta/seq_in_out_ptr_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/signature_cmd.h | 0 .../hw => common/dpaax/caamflib}/rta/store_cmd.h | 0 drivers/crypto/caam_jr/Makefile | 3 +-- drivers/crypto/caam_jr/caam_jr.c | 4 ++-- drivers/crypto/caam_jr/caam_jr_hw.c | 5 ----- drivers/crypto/caam_jr/caam_jr_pvt.h | 2 +- drivers/crypto/caam_jr/caam_jr_uio.c | 5 ----- drivers/crypto/caam_jr/meson.build | 2 +- drivers/crypto/dpaa2_sec/Makefile | 1 + drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++--- drivers/crypto/dpaa2_sec/meson.build | 2 +- drivers/crypto/dpaa_sec/Makefile | 3 +-- drivers/crypto/dpaa_sec/dpaa_sec.c | 8 ++++---- drivers/crypto/dpaa_sec/meson.build | 3 ++- 33 files changed, 25 insertions(+), 35 deletions(-) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/compat.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/desc.h (99%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/desc/algo.h (99%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/desc/common.h (99%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/desc/ipsec.h (99%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/desc/pdcp.h (99%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/fifo_load_store_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/header_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/jump_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/key_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/load_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/math_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/move_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/nfifo_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/operation_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/protocol_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/sec_run_time_asm.h (99%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/seq_in_out_ptr_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/signature_cmd.h (100%) rename drivers/{crypto/dpaa2_sec/hw => common/dpaax/caamflib}/rta/store_cmd.h (100%) diff --git a/drivers/crypto/dpaa2_sec/hw/compat.h b/drivers/common/dpaax/caamflib/compat.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/compat.h rename to drivers/common/dpaax/caamflib/compat.h diff --git a/drivers/crypto/dpaa2_sec/hw/desc.h b/drivers/common/dpaax/caamflib/desc.h similarity index 99% rename from drivers/crypto/dpaa2_sec/hw/desc.h rename to drivers/common/dpaax/caamflib/desc.h index 667da971bf..e4139aaa9f 100644 --- a/drivers/crypto/dpaa2_sec/hw/desc.h +++ b/drivers/common/dpaax/caamflib/desc.h @@ -13,9 +13,9 @@ #ifndef __RTA_DESC_H__ #define __RTA_DESC_H__ -/* hw/compat.h is not delivered in kernel */ +/* compat.h is not delivered in kernel */ #ifndef __KERNEL__ -#include "hw/compat.h" +#include "compat.h" #endif extern enum rta_sec_era rta_sec_era; diff --git a/drivers/crypto/dpaa2_sec/hw/desc/algo.h b/drivers/common/dpaax/caamflib/desc/algo.h similarity index 99% rename from drivers/crypto/dpaa2_sec/hw/desc/algo.h rename to drivers/common/dpaax/caamflib/desc/algo.h index c41cb22922..83dbb80ce4 100644 --- a/drivers/crypto/dpaa2_sec/hw/desc/algo.h +++ b/drivers/common/dpaax/caamflib/desc/algo.h @@ -8,7 +8,7 @@ #ifndef __DESC_ALGO_H__ #define __DESC_ALGO_H__ -#include "hw/rta.h" +#include "rta.h" #include "common.h" /** diff --git a/drivers/crypto/dpaa2_sec/hw/desc/common.h b/drivers/common/dpaax/caamflib/desc/common.h similarity index 99% rename from drivers/crypto/dpaa2_sec/hw/desc/common.h rename to drivers/common/dpaax/caamflib/desc/common.h index 98425d8b29..816baacfdb 100644 --- a/drivers/crypto/dpaa2_sec/hw/desc/common.h +++ b/drivers/common/dpaax/caamflib/desc/common.h @@ -8,7 +8,7 @@ #ifndef __DESC_COMMON_H__ #define __DESC_COMMON_H__ -#include "hw/rta.h" +#include "rta.h" /** * DOC: Shared Descriptor Constructors - shared structures diff --git a/drivers/crypto/dpaa2_sec/hw/desc/ipsec.h b/drivers/common/dpaax/caamflib/desc/ipsec.h similarity index 99% rename from drivers/crypto/dpaa2_sec/hw/desc/ipsec.h rename to drivers/common/dpaax/caamflib/desc/ipsec.h index d1ffd7fd23..f33c68cc9d 100644 --- a/drivers/crypto/dpaa2_sec/hw/desc/ipsec.h +++ b/drivers/common/dpaax/caamflib/desc/ipsec.h @@ -8,7 +8,7 @@ #ifndef __DESC_IPSEC_H__ #define __DESC_IPSEC_H__ -#include "hw/rta.h" +#include "rta.h" #include "common.h" /** diff --git a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h similarity index 99% rename from drivers/crypto/dpaa2_sec/hw/desc/pdcp.h rename to drivers/common/dpaax/caamflib/desc/pdcp.h index b514914ecc..b5e2d24e47 100644 --- a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -6,7 +6,7 @@ #ifndef __DESC_PDCP_H__ #define __DESC_PDCP_H__ -#include "hw/rta.h" +#include "rta.h" #include "common.h" /** diff --git a/drivers/crypto/dpaa2_sec/hw/rta.h b/drivers/common/dpaax/caamflib/rta.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta.h rename to drivers/common/dpaax/caamflib/rta.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/fifo_load_store_cmd.h b/drivers/common/dpaax/caamflib/rta/fifo_load_store_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/fifo_load_store_cmd.h rename to drivers/common/dpaax/caamflib/rta/fifo_load_store_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/header_cmd.h b/drivers/common/dpaax/caamflib/rta/header_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/header_cmd.h rename to drivers/common/dpaax/caamflib/rta/header_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/jump_cmd.h b/drivers/common/dpaax/caamflib/rta/jump_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/jump_cmd.h rename to drivers/common/dpaax/caamflib/rta/jump_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/key_cmd.h b/drivers/common/dpaax/caamflib/rta/key_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/key_cmd.h rename to drivers/common/dpaax/caamflib/rta/key_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/load_cmd.h b/drivers/common/dpaax/caamflib/rta/load_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/load_cmd.h rename to drivers/common/dpaax/caamflib/rta/load_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/math_cmd.h b/drivers/common/dpaax/caamflib/rta/math_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/math_cmd.h rename to drivers/common/dpaax/caamflib/rta/math_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/move_cmd.h b/drivers/common/dpaax/caamflib/rta/move_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/move_cmd.h rename to drivers/common/dpaax/caamflib/rta/move_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/nfifo_cmd.h b/drivers/common/dpaax/caamflib/rta/nfifo_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/nfifo_cmd.h rename to drivers/common/dpaax/caamflib/rta/nfifo_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/operation_cmd.h b/drivers/common/dpaax/caamflib/rta/operation_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/operation_cmd.h rename to drivers/common/dpaax/caamflib/rta/operation_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/protocol_cmd.h b/drivers/common/dpaax/caamflib/rta/protocol_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/protocol_cmd.h rename to drivers/common/dpaax/caamflib/rta/protocol_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/sec_run_time_asm.h b/drivers/common/dpaax/caamflib/rta/sec_run_time_asm.h similarity index 99% rename from drivers/crypto/dpaa2_sec/hw/rta/sec_run_time_asm.h rename to drivers/common/dpaax/caamflib/rta/sec_run_time_asm.h index d8cdebd201..f40eaadea3 100644 --- a/drivers/crypto/dpaa2_sec/hw/rta/sec_run_time_asm.h +++ b/drivers/common/dpaax/caamflib/rta/sec_run_time_asm.h @@ -7,11 +7,11 @@ #ifndef __RTA_SEC_RUN_TIME_ASM_H__ #define __RTA_SEC_RUN_TIME_ASM_H__ -#include "hw/desc.h" +#include "desc.h" /* hw/compat.h is not delivered in kernel */ #ifndef __KERNEL__ -#include "hw/compat.h" +#include "compat.h" #endif /** diff --git a/drivers/crypto/dpaa2_sec/hw/rta/seq_in_out_ptr_cmd.h b/drivers/common/dpaax/caamflib/rta/seq_in_out_ptr_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/seq_in_out_ptr_cmd.h rename to drivers/common/dpaax/caamflib/rta/seq_in_out_ptr_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/signature_cmd.h b/drivers/common/dpaax/caamflib/rta/signature_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/signature_cmd.h rename to drivers/common/dpaax/caamflib/rta/signature_cmd.h diff --git a/drivers/crypto/dpaa2_sec/hw/rta/store_cmd.h b/drivers/common/dpaax/caamflib/rta/store_cmd.h similarity index 100% rename from drivers/crypto/dpaa2_sec/hw/rta/store_cmd.h rename to drivers/common/dpaax/caamflib/rta/store_cmd.h diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile index 0a8a2150be..c232a20ba3 100644 --- a/drivers/crypto/caam_jr/Makefile +++ b/drivers/crypto/caam_jr/Makefile @@ -17,9 +17,8 @@ CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include +CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr -#sharing the hw flib headers from dpaa2_sec pmd -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include # versioning export map diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index 6ceba18f1a..2fe18187a5 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -25,8 +25,8 @@ #include /* RTA header files */ -#include -#include +#include +#include #include #ifdef RTE_LIBRTE_PMD_CAAM_JR_DEBUG #define CAAM_JR_DBG 1 diff --git a/drivers/crypto/caam_jr/caam_jr_hw.c b/drivers/crypto/caam_jr/caam_jr_hw.c index 4a2b089955..4dc7089945 100644 --- a/drivers/crypto/caam_jr/caam_jr_hw.c +++ b/drivers/crypto/caam_jr/caam_jr_hw.c @@ -16,11 +16,6 @@ #include #include -/* RTA header files */ -#include -#include -#include - /* Used to retry resetting a job ring in SEC hardware. */ #define SEC_TIMEOUT 100000 diff --git a/drivers/crypto/caam_jr/caam_jr_pvt.h b/drivers/crypto/caam_jr/caam_jr_pvt.h index d32291b605..98cd4438aa 100644 --- a/drivers/crypto/caam_jr/caam_jr_pvt.h +++ b/drivers/crypto/caam_jr/caam_jr_pvt.h @@ -5,7 +5,7 @@ #ifndef CAAM_JR_PVT_H #define CAAM_JR_PVT_H -#include +#include #include /* NXP CAAM JR PMD device name */ diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c index afd75c9a62..b1bb44ca42 100644 --- a/drivers/crypto/caam_jr/caam_jr_uio.c +++ b/drivers/crypto/caam_jr/caam_jr_uio.c @@ -23,11 +23,6 @@ #include #include -/* RTA header files */ -#include -#include -#include - /* Prefix path to sysfs directory where UIO device attributes are exported. * Path for UIO device X is /sys/class/uio/uioX */ diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build index 4c66dd8446..825fefd75f 100644 --- a/drivers/crypto/caam_jr/meson.build +++ b/drivers/crypto/caam_jr/meson.build @@ -14,5 +14,5 @@ sources = files('caam_jr_capabilities.c', allow_experimental_apis = true -includes += include_directories('../dpaa2_sec/') includes += include_directories('../../bus/dpaa/include/') +includes += include_directories('../../common/dpaax/caamflib/') diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile index 9c6657e52b..1f288116ee 100644 --- a/drivers/crypto/dpaa2_sec/Makefile +++ b/drivers/crypto/dpaa2_sec/Makefile @@ -20,6 +20,7 @@ CFLAGS += -Wno-implicit-fallthrough endif endif +CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/ diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 1008164109..1fe088ad72 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -37,9 +37,9 @@ typedef uint64_t dma_addr_t; /* RTA header files */ -#include -#include -#include +#include +#include +#include /* Minimum job descriptor consists of a oneword job descriptor HEADER and * a pointer to the shared descriptor diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build index 23affa8a69..1b749186ce 100644 --- a/drivers/crypto/dpaa2_sec/meson.build +++ b/drivers/crypto/dpaa2_sec/meson.build @@ -14,4 +14,4 @@ sources = files('dpaa2_sec_dpseci.c', allow_experimental_apis = true -includes += include_directories('mc', 'hw') +includes += include_directories('mc', '../../common/dpaax/caamflib') diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile index 353c2549f6..abbcc86662 100644 --- a/drivers/crypto/dpaa_sec/Makefile +++ b/drivers/crypto/dpaa_sec/Makefile @@ -18,8 +18,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/ -#sharing the hw flib headers from dpaa2_sec pmd -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ +CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 211029fe50..7c37136fae 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -30,10 +30,10 @@ #include /* RTA header files */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build index 7b9a019b92..8744a05f05 100644 --- a/drivers/crypto/dpaa_sec/meson.build +++ b/drivers/crypto/dpaa_sec/meson.build @@ -11,4 +11,5 @@ sources = files('dpaa_sec.c') allow_experimental_apis = true -includes += include_directories('../dpaa2_sec/') +includes += include_directories('../../bus/dpaa/include') +includes += include_directories('../../common/dpaax/caamflib/') -- 2.20.1