[dpdk-stable] [PATCH 1/5] bus/dpaa: fix compilation warnings with clang

[dpdk-stable] [PATCH 1/5] bus/dpaa: fix compilation warnings with clang

[Hemant Agrawal]

fman.c:570:15: error: format specifies type 'unsigned short' but the
argument has type 'int' [-Werror,-Wformat]  __FILE__, __LINE__, __func__,

fman/netcfg_layer.c:80:1: error: unused function 'get_num_netcfg_interfaces
' [-Werror,-Wunused-function] get_num_netcfg_interfaces(char *str)

Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/dpaa/base/fman/fman.c         |  2 +-
 drivers/bus/dpaa/base/fman/netcfg_layer.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index 1dd1f91..bda62e0 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -566,7 +566,7 @@ fman_finish(void)
 		/* release the mapping */
 		_errno = munmap(__if->ccsr_map, __if->regs_size);
 		if (unlikely(_errno < 0))
-			fprintf(stderr, "%s:%hu:%s(): munmap() = %d (%s)\n",
+			fprintf(stderr, "%s:%d:%s(): munmap() = %d (%s)\n",
 				__FILE__, __LINE__, __func__,
 				-errno, strerror(errno));
 		printf("Tearing down %s\n", __if->node_path);
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 24186c9..3e956ce 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -76,22 +76,6 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
 }
 #endif /* RTE_LIBRTE_DPAA_DEBUG_DRIVER */
 
-static inline int
-get_num_netcfg_interfaces(char *str)
-{
-	char *pch;
-	uint8_t count = 0;
-
-	if (str == NULL)
-		return -EINVAL;
-	pch = strtok(str, ",");
-	while (pch != NULL) {
-		count++;
-		pch = strtok(NULL, ",");
-	}
-	return count;
-}
-
 struct netcfg_info *
 netcfg_acquire(void)
 {
-- 
2.7.4

Re: [dpdk-stable] [PATCH 1/5] bus/dpaa: fix compilation warnings with clang

[Shreyansh Jain]

On Thursday 25 January 2018 03:23 PM, Hemant Agrawal wrote:
> fman.c:570:15: error: format specifies type 'unsigned short' but the
> argument has type 'int' [-Werror,-Wformat]  __FILE__, __LINE__, __func__,
> 
> fman/netcfg_layer.c:80:1: error: unused function 'get_num_netcfg_interfaces
> ' [-Werror,-Wunused-function] get_num_netcfg_interfaces(char *str)
> 
> Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---

Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>

[dpdk-stable] [PATCH 2/5] bus/dpaa: fix unused function warning with clang

[Hemant Agrawal]

fman/netcfg_layer.c:80:1: error: unused function 'get_num_netcfg_interfaces
' [-Werror,-Wunused-function] get_num_netcfg_interfaces(char *str)

Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/dpaa/dpaa_bus.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index ba33566..1093b4d 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -63,12 +63,6 @@ dpaa_add_to_device_list(struct rte_dpaa_device *dev)
 	TAILQ_INSERT_TAIL(&rte_dpaa_bus.device_list, dev, next);
 }
 
-static inline void
-dpaa_remove_from_device_list(struct rte_dpaa_device *dev)
-{
-	TAILQ_INSERT_TAIL(&rte_dpaa_bus.device_list, dev, next);
-}
-
 /*
  * Reads the SEC device from DTS
  * Returns -1 if SEC devices not available, 0 otherwise
-- 
2.7.4

Re: [dpdk-stable] [PATCH 2/5] bus/dpaa: fix unused function warning with clang

[Shreyansh Jain]

On Thursday 25 January 2018 03:23 PM, Hemant Agrawal wrote:
> fman/netcfg_layer.c:80:1: error: unused function 'get_num_netcfg_interfaces
> ' [-Werror,-Wunused-function] get_num_netcfg_interfaces(char *str)
> 
> Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---

Acked-By: Shreyansh Jain <shreyansh.jain@nxp.com>

[dpdk-stable] [PATCH 3/5] crypto/dpaa2_sec: fix enum conversion for GCM

[Hemant Agrawal]

dpaa2_sec/dpaa2_sec_dpseci.c:1287:25: error: implicit conversion from
enumeration type 'enum rte_crypto_aead_algorithm' to different enumeration
type 'enum rte_crypto_cipher_algorithm' [-Werror,-Wenum-conversion]
                session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM;

Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR")
Cc: stable@dpdk.org
Cc: akhil.goyal@nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-
 drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index a67d979..80ceaa2 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1284,7 +1284,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
 	case RTE_CRYPTO_AEAD_AES_GCM:
 		aeaddata.algtype = OP_ALG_ALGSEL_AES;
 		aeaddata.algmode = OP_ALG_AAI_GCM;
-		session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM;
+		session->aead_alg = RTE_CRYPTO_AEAD_AES_GCM;
 		break;
 	case RTE_CRYPTO_AEAD_AES_CCM:
 		RTE_LOG(ERR, PMD, "Crypto: Unsupported AEAD alg %u\n",
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
index c76b082..e8ac95b 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
@@ -143,6 +143,7 @@ typedef struct dpaa2_sec_session_entry {
 	uint8_t dir;         /*!< Operation Direction */
 	enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/
 	enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/
+	enum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/
 	union {
 		struct {
 			uint8_t *data;	/**< pointer to key data */
-- 
2.7.4

[dpdk-stable] [PATCH 4/5] crypto/dpaa_sec: fix enum conversion for GCM

[Hemant Agrawal]

dpaa_sec/dpaa_sec.h:297:13: error: implicit conversion from enumeration
type 'enum rte_crypto_aead_algorithm' to different enumeration type 'enum
rte_crypto_auth_algorithm' [-Werror,-Wenum-conversion]
	.algo = RTE_CRYPTO_AEAD_AES_GCM,

Fixes: c3e85bdcc6e6 ("crypto/dpaa_sec: add crypto driver for NXP DPAA platform")
Cc: stable@dpdk.org
Cc: akhil.goyal@nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/crypto/dpaa_sec/dpaa_sec.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h
index c53d9ae..f45b36c 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.h
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h
@@ -293,7 +293,7 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
 		{.sym = {
 			.xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
-			{.auth = {
+			{.aead = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-- 
2.7.4

[dpdk-stable] [PATCH 1/5] bus/dpaa: fix compilation warnings with clang

[Hemant Agrawal]

fman.c:570:15: error: format specifies type 'unsigned short' but the
argument has type 'int' [-Werror,-Wformat]  __FILE__, __LINE__, __func__,

fman/netcfg_layer.c:80:1: error: unused function 'get_num_netcfg_interfaces
' [-Werror,-Wunused-function] get_num_netcfg_interfaces(char *str)

Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/dpaa/base/fman/fman.c         |  2 +-
 drivers/bus/dpaa/base/fman/netcfg_layer.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index 1dd1f91..bda62e0 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -566,7 +566,7 @@ fman_finish(void)
 		/* release the mapping */
 		_errno = munmap(__if->ccsr_map, __if->regs_size);
 		if (unlikely(_errno < 0))
-			fprintf(stderr, "%s:%hu:%s(): munmap() = %d (%s)\n",
+			fprintf(stderr, "%s:%d:%s(): munmap() = %d (%s)\n",
 				__FILE__, __LINE__, __func__,
 				-errno, strerror(errno));
 		printf("Tearing down %s\n", __if->node_path);
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 24186c9..3e956ce 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -76,22 +76,6 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
 }
 #endif /* RTE_LIBRTE_DPAA_DEBUG_DRIVER */
 
-static inline int
-get_num_netcfg_interfaces(char *str)
-{
-	char *pch;
-	uint8_t count = 0;
-
-	if (str == NULL)
-		return -EINVAL;
-	pch = strtok(str, ",");
-	while (pch != NULL) {
-		count++;
-		pch = strtok(NULL, ",");
-	}
-	return count;
-}
-
 struct netcfg_info *
 netcfg_acquire(void)
 {
-- 
2.7.4

[dpdk-stable] [PATCH 3/5] crypto/dpaa2_sec: fix enum conversion for GCM

[Hemant Agrawal]

dpaa2_sec/dpaa2_sec_dpseci.c:1287:25: error: implicit conversion from
enumeration type 'enum rte_crypto_aead_algorithm' to different enumeration
type 'enum rte_crypto_cipher_algorithm' [-Werror,-Wenum-conversion]
                session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM;

Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR")
Cc: stable@dpdk.org
Cc: akhil.goyal@nxp.com

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-
 drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index a67d979..80ceaa2 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1284,7 +1284,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
 	case RTE_CRYPTO_AEAD_AES_GCM:
 		aeaddata.algtype = OP_ALG_ALGSEL_AES;
 		aeaddata.algmode = OP_ALG_AAI_GCM;
-		session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM;
+		session->aead_alg = RTE_CRYPTO_AEAD_AES_GCM;
 		break;
 	case RTE_CRYPTO_AEAD_AES_CCM:
 		RTE_LOG(ERR, PMD, "Crypto: Unsupported AEAD alg %u\n",
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
index c76b082..e8ac95b 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
@@ -143,6 +143,7 @@ typedef struct dpaa2_sec_session_entry {
 	uint8_t dir;         /*!< Operation Direction */
 	enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/
 	enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/
+	enum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/
 	union {
 		struct {
 			uint8_t *data;	/**< pointer to key data */
-- 
2.7.4