diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h
index 54bef3cb6b..782272a3f4 100644
--- a/drivers/net/nfp/nfpcore/nfp_cpp.h
+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h
@@ -71,8 +71,8 @@ struct nfp_cpp_operations {
 	 */
 	int (*area_init)(struct nfp_cpp_area *area,
 			uint32_t dest,
-			unsigned long long address,
-			unsigned long size);
+			uint64_t address,
+			size_t size);
 	/*
 	 * Clean up a NFP CPP area before it is freed
 	 * NOTE: This is _not_ serialized
@@ -103,16 +103,16 @@ struct nfp_cpp_operations {
 	 */
 	int (*area_read)(struct nfp_cpp_area *area,
 			void *kernel_vaddr,
-			unsigned long offset,
-			unsigned int length);
+			uint32_t offset,
+			size_t length);
 	/*
 	 * Perform a write to a NFP CPP area
 	 * Serialized
 	 */
 	int (*area_write)(struct nfp_cpp_area *area,
 			const void *kernel_vaddr,
-			unsigned long offset,
-			unsigned int length);
+			uint32_t offset,
+			size_t length);
 };
 
 /*
@@ -398,7 +398,7 @@ int nfp_cpp_serial(struct nfp_cpp *cpp, const uint8_t **serial);
  * @return NFP CPP handle, or NULL on failure.
  */
 struct nfp_cpp_area *nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, unsigned long size);
+		uint64_t address, size_t size);
 
 /*
  * Allocate a NFP CPP area handle, as an offset into a CPP ID, by a named owner
@@ -411,8 +411,8 @@ struct nfp_cpp_area *nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t cpp_id,
  * @return NFP CPP handle, or NULL on failure.
  */
 struct nfp_cpp_area *nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,
-		uint32_t cpp_id, const char *name, unsigned long long address,
-		unsigned long size);
+		uint32_t cpp_id, const char *name, uint64_t address,
+		uint32_t size);
 
 /*
  * Free an allocated NFP CPP area handle
@@ -446,7 +446,7 @@ void nfp_cpp_area_release(struct nfp_cpp_area *area);
  * @return NFP CPP handle, or NULL on failure.
  */
 struct nfp_cpp_area *nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,
-		uint32_t cpp_id, unsigned long long address, unsigned long size);
+		uint32_t cpp_id, uint64_t address, size_t size);
 
 /*
  * Release the resources, then free the NFP CPP area handle
@@ -455,7 +455,8 @@ struct nfp_cpp_area *nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,
 void nfp_cpp_area_release_free(struct nfp_cpp_area *area);
 
 uint8_t *nfp_cpp_map_area(struct nfp_cpp *cpp, uint32_t cpp_id,
-		uint64_t addr, unsigned long size, struct nfp_cpp_area **area);
+		uint64_t addr, uint32_t size, struct nfp_cpp_area **area);
+
 /*
  * Return an IO pointer to the beginning of the NFP CPP area handle. The area
  * must be acquired with 'nfp_cpp_area_acquire()' before calling this operation.
@@ -478,7 +479,7 @@ void *nfp_cpp_area_mapped(struct nfp_cpp_area *area);
  * @return bytes read on success, negative value on failure.
  *
  */
-int nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,
+int nfp_cpp_area_read(struct nfp_cpp_area *area, uint32_t offset,
 		void *buffer, size_t length);
 
 /*
@@ -492,7 +493,7 @@ int nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,
  *
  * @return bytes written on success, negative value on failure.
  */
-int nfp_cpp_area_write(struct nfp_cpp_area *area, unsigned long offset,
+int nfp_cpp_area_write(struct nfp_cpp_area *area, uint32_t offset,
 		const void *buffer, size_t length);
 
 /*
@@ -547,7 +548,7 @@ const char *nfp_cpp_area_name(struct nfp_cpp_area *cpp_area);
  * @return bytes read on success, -1 on failure.
  */
 int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, void *kernel_vaddr, size_t length);
+		uint64_t address, void *kernel_vaddr, size_t length);
 
 /*
  * Write a block of data to a NFP CPP ID
@@ -561,9 +562,7 @@ int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,
  * @return bytes written on success, -1 on failure.
  */
 int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, const void *kernel_vaddr,
-		size_t length);
-
+		uint64_t address, const void *kernel_vaddr, size_t length);
 
 
 /*
@@ -593,7 +592,7 @@ int nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,
  *
  * @return 0 on success, or -1 on error.
  */
-int nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,
+int nfp_cpp_area_readl(struct nfp_cpp_area *area, uint32_t offset,
 		uint32_t *value);
 
 /*
@@ -610,7 +609,7 @@ int nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,
  *
  * @return 0 on success, or -1 on error.
  */
-int nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,
+int nfp_cpp_area_writel(struct nfp_cpp_area *area, uint32_t offset,
 		uint32_t value);
 
 /*
@@ -627,7 +626,7 @@ int nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,
  *
  * @return 0 on success, or -1 on error.
  */
-int nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,
+int nfp_cpp_area_readq(struct nfp_cpp_area *area, uint32_t offset,
 		uint64_t *value);
 
 /*
@@ -644,7 +643,7 @@ int nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,
  *
  * @return 0 on success, or -1 on error.
  */
-int nfp_cpp_area_writeq(struct nfp_cpp_area *area, unsigned long offset,
+int nfp_cpp_area_writeq(struct nfp_cpp_area *area, uint32_t offset,
 		uint64_t value);
 
 /*
@@ -707,7 +706,7 @@ int nfp_xpb_waitlm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,
  * @return 0 on success, or -1 on failure.
  */
 int nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, uint32_t *value);
+		uint64_t address, uint32_t *value);
 
 /*
  * Write a 32-bit value to a NFP CPP ID
@@ -721,7 +720,7 @@ int nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id,
  *
  */
 int nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, uint32_t value);
+		uint64_t address, uint32_t value);
 
 /*
  * Read a 64-bit work from a NFP CPP ID
@@ -734,7 +733,7 @@ int nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id,
  * @return 0 on success, or -1 on failure.
  */
 int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, uint64_t *value);
+		uint64_t address, uint64_t *value);
 
 /*
  * Write a 64-bit value to a NFP CPP ID
@@ -747,7 +746,7 @@ int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,
  * @return 0 on success, or -1 on failure.
  */
 int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,
-		unsigned long long address, uint64_t value);
+		uint64_t address, uint64_t value);
 
 /*
  * Initialize a mutex location
@@ -768,7 +767,7 @@ int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,
  * @return 0 on success, negative value on failure.
  */
 int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,
-		unsigned long long address, uint32_t key_id);
+		uint64_t address, uint32_t key_id);
 
 /*
  * Create a mutex handle from an address controlled by a MU Atomic engine
@@ -788,7 +787,7 @@ int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,
  *                      failure.
  */
 struct nfp_cpp_mutex *nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,
-		unsigned long long address, uint32_t key_id);
+		uint64_t address, uint32_t key_id);
 
 /*
  * Get the NFP CPP handle the mutex was created with
diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
index 884cc84eaa..881f21bfd0 100644
--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
@@ -101,7 +101,7 @@ struct nfp_bar {
 	uint64_t base;		/* CPP address base */
 	uint64_t mask;		/* Bit mask of the bar */
 	uint32_t bitsize;	/* Bit size of the bar */
-	int index;
+	uint32_t index;
 	int lock;
 
 	char *csr;
@@ -400,8 +400,8 @@ struct nfp6000_area_priv {
 static int
 nfp6000_area_init(struct nfp_cpp_area *area,
 		uint32_t dest,
-		unsigned long long address,
-		unsigned long size)
+		uint64_t address,
+		size_t size)
 {
 	struct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area));
 	struct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);
@@ -501,8 +501,8 @@ nfp6000_area_iomem(struct nfp_cpp_area *area)
 static int
 nfp6000_area_read(struct nfp_cpp_area *area,
 		void *kernel_vaddr,
-		unsigned long offset,
-		unsigned int length)
+		uint32_t offset,
+		size_t length)
 {
 	uint64_t *wrptr64 = kernel_vaddr;
 	const volatile uint64_t *rdptr64;
@@ -510,7 +510,7 @@ nfp6000_area_read(struct nfp_cpp_area *area,
 	uint32_t *wrptr32 = kernel_vaddr;
 	const volatile uint32_t *rdptr32;
 	int width;
-	unsigned int n;
+	size_t n;
 	bool is_64;
 
 	priv = nfp_cpp_area_priv(area);
@@ -571,8 +571,8 @@ nfp6000_area_read(struct nfp_cpp_area *area,
 static int
 nfp6000_area_write(struct nfp_cpp_area *area,
 		const void *kernel_vaddr,
-		unsigned long offset,
-		unsigned int length)
+		uint32_t offset,
+		size_t length)
 {
 	const uint64_t *rdptr64 = kernel_vaddr;
 	uint64_t *wrptr64;
@@ -580,7 +580,7 @@ nfp6000_area_write(struct nfp_cpp_area *area,
 	struct nfp6000_area_priv *priv;
 	uint32_t *wrptr32;
 	int width;
-	unsigned int n;
+	size_t n;
 	bool is_64;
 
 	priv = nfp_cpp_area_priv(area);
@@ -752,7 +752,7 @@ static int
 nfp6000_set_barsz(struct rte_pci_device *dev,
 		struct nfp_pcie_user *desc)
 {
-	unsigned long tmp;
+	uint64_t tmp;
 	int i = 0;
 
 	tmp = dev->mem_resource[0].len;
diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c
index f764208a9a..627d4eaa5d 100644
--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c
+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c
@@ -169,8 +169,8 @@ struct nfp_cpp_area *
 nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,
 		uint32_t dest,
 		const char *name,
-		unsigned long long address,
-		unsigned long size)
+		uint64_t address,
+		uint32_t size)
 {
 	struct nfp_cpp_area *area;
 	uint64_t tmp64 = (uint64_t)address;
@@ -184,7 +184,7 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,
 	if (err < 0)
 		return NULL;
 
-	address = (unsigned long long)tmp64;
+	address = tmp64;
 
 	if (name == NULL)
 		name = "";
@@ -213,8 +213,8 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,
 struct nfp_cpp_area *
 nfp_cpp_area_alloc(struct nfp_cpp *cpp,
 		uint32_t dest,
-		unsigned long long address,
-		unsigned long size)
+		uint64_t address,
+		size_t size)
 {
 	return nfp_cpp_area_alloc_with_name(cpp, dest, NULL, address, size);
 }
@@ -237,8 +237,8 @@ nfp_cpp_area_alloc(struct nfp_cpp *cpp,
 struct nfp_cpp_area *
 nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,
 		uint32_t destination,
-		unsigned long long address,
-		unsigned long size)
+		uint64_t address,
+		size_t size)
 {
 	struct nfp_cpp_area *area;
 
@@ -352,7 +352,7 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area)
  */
 int
 nfp_cpp_area_read(struct nfp_cpp_area *area,
-		unsigned long offset,
+		uint32_t offset,
 		void *kernel_vaddr,
 		size_t length)
 {
@@ -378,7 +378,7 @@ nfp_cpp_area_read(struct nfp_cpp_area *area,
  */
 int
 nfp_cpp_area_write(struct nfp_cpp_area *area,
-		unsigned long offset,
+		uint32_t offset,
 		const void *kernel_vaddr,
 		size_t length)
 {
@@ -461,7 +461,7 @@ nfp_xpb_to_cpp(struct nfp_cpp *cpp,
 
 int
 nfp_cpp_area_readl(struct nfp_cpp_area *area,
-		unsigned long offset,
+		uint32_t offset,
 		uint32_t *value)
 {
 	int sz;
@@ -475,7 +475,7 @@ nfp_cpp_area_readl(struct nfp_cpp_area *area,
 
 int
 nfp_cpp_area_writel(struct nfp_cpp_area *area,
-		unsigned long offset,
+		uint32_t offset,
 		uint32_t value)
 {
 	int sz;
@@ -487,7 +487,7 @@ nfp_cpp_area_writel(struct nfp_cpp_area *area,
 
 int
 nfp_cpp_area_readq(struct nfp_cpp_area *area,
-		unsigned long offset,
+		uint32_t offset,
 		uint64_t *value)
 {
 	int sz;
@@ -501,7 +501,7 @@ nfp_cpp_area_readq(struct nfp_cpp_area *area,
 
 int
 nfp_cpp_area_writeq(struct nfp_cpp_area *area,
-		unsigned long offset,
+		uint32_t offset,
 		uint64_t value)
 {
 	int sz;
@@ -515,7 +515,7 @@ nfp_cpp_area_writeq(struct nfp_cpp_area *area,
 int
 nfp_cpp_readl(struct nfp_cpp *cpp,
 		uint32_t cpp_id,
-		unsigned long long address,
+		uint64_t address,
 		uint32_t *value)
 {
 	int sz;
@@ -530,7 +530,7 @@ nfp_cpp_readl(struct nfp_cpp *cpp,
 int
 nfp_cpp_writel(struct nfp_cpp *cpp,
 		uint32_t cpp_id,
-		unsigned long long address,
+		uint64_t address,
 		uint32_t value)
 {
 	int sz;
@@ -544,7 +544,7 @@ nfp_cpp_writel(struct nfp_cpp *cpp,
 int
 nfp_cpp_readq(struct nfp_cpp *cpp,
 		uint32_t cpp_id,
-		unsigned long long address,
+		uint64_t address,
 		uint64_t *value)
 {
 	int sz;
@@ -559,7 +559,7 @@ nfp_cpp_readq(struct nfp_cpp *cpp,
 int
 nfp_cpp_writeq(struct nfp_cpp *cpp,
 		uint32_t cpp_id,
-		unsigned long long address,
+		uint64_t address,
 		uint64_t value)
 {
 	int sz;
@@ -758,7 +758,7 @@ nfp_xpb_waitlm(struct nfp_cpp *cpp,
 int
 nfp_cpp_read(struct nfp_cpp *cpp,
 		uint32_t destination,
-		unsigned long long address,
+		uint64_t address,
 		void *kernel_vaddr,
 		size_t length)
 {
@@ -788,7 +788,7 @@ nfp_cpp_read(struct nfp_cpp *cpp,
 int
 nfp_cpp_write(struct nfp_cpp *cpp,
 		uint32_t destination,
-		unsigned long long address,
+		uint64_t address,
 		const void *kernel_vaddr,
 		size_t length)
 {
@@ -902,7 +902,7 @@ uint8_t *
 nfp_cpp_map_area(struct nfp_cpp *cpp,
 		uint32_t cpp_id,
 		uint64_t addr,
-		unsigned long size,
+		uint32_t size,
 		struct nfp_cpp_area **area)
 {
 	uint8_t *res;
diff --git a/drivers/net/nfp/nfpcore/nfp_crc.c b/drivers/net/nfp/nfpcore/nfp_crc.c
index 2cd8866253..68f27f8c68 100644
--- a/drivers/net/nfp/nfpcore/nfp_crc.c
+++ b/drivers/net/nfp/nfpcore/nfp_crc.c
@@ -14,7 +14,7 @@ nfp_crc32_be_generic(uint32_t crc,
 		size_t len,
 		uint32_t polynomial)
 {
-	int i;
+	uint32_t i;
 	while (len--) {
 		crc ^= *p++ << 24;
 		for (i = 0; i < 8; i++)
diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c
index 047e755416..697361da4d 100644
--- a/drivers/net/nfp/nfpcore/nfp_mutex.c
+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c
@@ -28,16 +28,16 @@ struct nfp_cpp_mutex {
 	struct nfp_cpp *cpp;
 	uint8_t target;
 	uint16_t depth;
-	unsigned long long address;
+	uint64_t address;
 	uint32_t key;
-	unsigned int usage;
+	uint32_t usage;
 	struct nfp_cpp_mutex *prev, *next;
 };
 
 static int
 _nfp_cpp_mutex_validate(uint32_t model,
 		int *target,
-		unsigned long long address)
+		uint64_t address)
 {
 	/* Address must be 64-bit aligned */
 	if ((address & 7) != 0)
@@ -76,7 +76,7 @@ _nfp_cpp_mutex_validate(uint32_t model,
 int
 nfp_cpp_mutex_init(struct nfp_cpp *cpp,
 		int target,
-		unsigned long long address,
+		uint64_t address,
 		uint32_t key)
 {
 	uint32_t model = nfp_cpp_model(cpp);
@@ -119,7 +119,7 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp,
 struct nfp_cpp_mutex *
 nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,
 		int target,
-		unsigned long long address,
+		uint64_t address,
 		uint32_t key)
 {
 	uint32_t model = nfp_cpp_model(cpp);
@@ -269,7 +269,7 @@ nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex)
 		if (err < 0 && err != -EBUSY)
 			return err;
 		if (time(NULL) >= warn_at) {
-			PMD_DRV_LOG(ERR, "Warning: waiting for NFP mutex usage:%u depth:%hd] target:%d addr:%llx key:%08x]",
+			PMD_DRV_LOG(ERR, "Warning: waiting for NFP mutex usage:%u depth:%hd] target:%d addr:%lx key:%08x]",
 					mutex->usage, mutex->depth, mutex->target,
 					mutex->address, mutex->key);
 			warn_at = time(NULL) + 60;
diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c
index fa65956baa..2412dc0e00 100644
--- a/drivers/net/nfp/nfpcore/nfp_nffw.c
+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c
@@ -68,7 +68,7 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi)
 static int
 nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)
 {
-	unsigned int mode, addr40;
+	uint32_t mode, addr40;
 	uint32_t xpbaddr, imbcppat;
 	int err;
 
@@ -84,7 +84,7 @@ nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)
 	return nfp_cppat_mu_locality_lsb(mode, addr40);
 }
 
-static unsigned int
+static uint32_t
 nffw_res_fwinfos(struct nfp_nffw_info_data *fwinf,
 		struct nffw_fwinfo **arr)
 {
@@ -184,7 +184,7 @@ static struct nffw_fwinfo *
 nfp_nffw_info_fwid_first(struct nfp_nffw_info *state)
 {
 	struct nffw_fwinfo *fwinfo;
-	unsigned int cnt, i;
+	uint32_t cnt, i;
 
 	cnt = nffw_res_fwinfos(&state->fwinf, &fwinfo);
 	if (cnt == 0)
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c
index 4f476f6f2b..87eed3d951 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c
@@ -34,7 +34,7 @@ nfp_nsp_config_entries(struct nfp_nsp *state)
 	return state->entries;
 }
 
-unsigned int
+uint32_t
 nfp_nsp_config_idx(struct nfp_nsp *state)
 {
 	return state->idx;
@@ -43,7 +43,7 @@ nfp_nsp_config_idx(struct nfp_nsp *state)
 void
 nfp_nsp_config_set_state(struct nfp_nsp *state,
 		void *entries,
-		unsigned int idx)
+		uint32_t idx)
 {
 	state->entries = entries;
 	state->idx = idx;
@@ -59,12 +59,12 @@ nfp_nsp_config_clear_state(struct nfp_nsp *state)
 static void
 nfp_nsp_print_extended_error(uint32_t ret_val)
 {
-	int i;
+	uint32_t i;
 
 	if (ret_val == 0)
 		return;
 
-	for (i = 0; i < (int)RTE_DIM(nsp_errors); i++)
+	for (i = 0; i < RTE_DIM(nsp_errors); i++)
 		if (ret_val == (uint32_t)nsp_errors[i].code)
 			PMD_DRV_LOG(ERR, "err msg: %s", nsp_errors[i].msg);
 }
@@ -171,7 +171,7 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp,
 		uint64_t val)
 {
 	struct timespec wait;
-	int count;
+	uint32_t count;
 	int err;
 
 	wait.tv_sec = 0;
@@ -297,7 +297,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,
 		unsigned int out_size)
 {
 	struct nfp_cpp *cpp = nsp->cpp;
-	unsigned int max_size;
+	size_t max_size;
 	uint64_t reg, cpp_buf;
 	int ret, err;
 	uint32_t cpp_id;
@@ -316,7 +316,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,
 
 	max_size = RTE_MAX(in_size, out_size);
 	if (FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M < max_size) {
-		PMD_DRV_LOG(ERR, "NSP: default buffer too small for command 0x%04x (%llu < %u)",
+		PMD_DRV_LOG(ERR, "NSP: default buffer too small for command 0x%04x (%llu < %lu)",
 				code, FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M, max_size);
 		return -EINVAL;
 	}
@@ -361,7 +361,7 @@ int
 nfp_nsp_wait(struct nfp_nsp *state)
 {
 	struct timespec wait;
-	int count;
+	uint32_t count;
 	int err;
 
 	wait.tv_sec = 0;
@@ -401,7 +401,7 @@ nfp_nsp_mac_reinit(struct nfp_nsp *state)
 int
 nfp_nsp_load_fw(struct nfp_nsp *state,
 		void *buf,
-		unsigned int size)
+		size_t size)
 {
 	return nfp_nsp_command_buf(state, SPCODE_FW_LOAD, size, buf, size,
 			NULL, 0);
@@ -410,7 +410,7 @@ nfp_nsp_load_fw(struct nfp_nsp *state,
 int
 nfp_nsp_read_eth_table(struct nfp_nsp *state,
 		void *buf,
-		unsigned int size)
+		size_t size)
 {
 	return nfp_nsp_command_buf(state, SPCODE_ETH_RESCAN, size, NULL, 0,
 			buf, size);
@@ -419,7 +419,7 @@ nfp_nsp_read_eth_table(struct nfp_nsp *state,
 int
 nfp_nsp_write_eth_table(struct nfp_nsp *state,
 		const void *buf,
-		unsigned int size)
+		size_t size)
 {
 	return nfp_nsp_command_buf(state, SPCODE_ETH_CONTROL, size, buf, size,
 			NULL, 0);
@@ -428,7 +428,7 @@ nfp_nsp_write_eth_table(struct nfp_nsp *state,
 int
 nfp_nsp_read_identify(struct nfp_nsp *state,
 		void *buf,
-		unsigned int size)
+		size_t size)
 {
 	return nfp_nsp_command_buf(state, SPCODE_NSP_IDENTIFY, size, NULL, 0,
 			buf, size);
@@ -436,9 +436,9 @@ nfp_nsp_read_identify(struct nfp_nsp *state,
 
 int
 nfp_nsp_read_sensors(struct nfp_nsp *state,
-		unsigned int sensor_mask,
+		uint32_t sensor_mask,
 		void *buf,
-		unsigned int size)
+		size_t size)
 {
 	return nfp_nsp_command_buf(state, SPCODE_NSP_SENSORS, sensor_mask, NULL,
 			0, buf, size);
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h
index 1e2deaabb4..edb56e26ca 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.h
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h
@@ -110,11 +110,11 @@ uint16_t nfp_nsp_get_abi_ver_major(struct nfp_nsp *state);
 uint16_t nfp_nsp_get_abi_ver_minor(struct nfp_nsp *state);
 int nfp_nsp_wait(struct nfp_nsp *state);
 int nfp_nsp_device_soft_reset(struct nfp_nsp *state);
-int nfp_nsp_load_fw(struct nfp_nsp *state, void *buf, unsigned int size);
+int nfp_nsp_load_fw(struct nfp_nsp *state, void *buf, size_t size);
 int nfp_nsp_mac_reinit(struct nfp_nsp *state);
-int nfp_nsp_read_identify(struct nfp_nsp *state, void *buf, unsigned int size);
-int nfp_nsp_read_sensors(struct nfp_nsp *state, unsigned int sensor_mask,
-		void *buf, unsigned int size);
+int nfp_nsp_read_identify(struct nfp_nsp *state, void *buf, size_t size);
+int nfp_nsp_read_sensors(struct nfp_nsp *state, uint32_t sensor_mask,
+		void *buf, size_t size);
 
 static inline int
 nfp_nsp_has_mac_reinit(struct nfp_nsp *state)
@@ -188,17 +188,17 @@ enum nfp_eth_fec {
  * @fec_modes_supported:	bitmap of FEC modes supported
  */
 struct nfp_eth_table {
-	unsigned int count;
-	unsigned int max_index;
+	uint32_t count;
+	uint32_t max_index;
 	struct nfp_eth_table_port {
-		unsigned int eth_index;
-		unsigned int index;
-		unsigned int nbi;
-		unsigned int base;
-		unsigned int lanes;
-		unsigned int speed;
-
-		unsigned int interface;
+		uint32_t eth_index;
+		uint32_t index;
+		uint32_t nbi;
+		uint32_t base;
+		uint32_t lanes;
+		uint32_t speed;
+
+		uint32_t interface;
 		enum nfp_eth_media media;
 
 		enum nfp_eth_fec fec;
@@ -218,51 +218,50 @@ struct nfp_eth_table {
 		/* Computed fields */
 		uint8_t port_type;
 
-		unsigned int port_lanes;
+		uint32_t port_lanes;
 
 		int is_split;
 
-		unsigned int fec_modes_supported;
+		uint32_t fec_modes_supported;
 	} ports[];
 };
 
 struct nfp_eth_table *nfp_eth_read_ports(struct nfp_cpp *cpp);
 
-int nfp_eth_set_mod_enable(struct nfp_cpp *cpp, unsigned int idx, int enable);
-int nfp_eth_set_configured(struct nfp_cpp *cpp, unsigned int idx,
-		int configed);
-int nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode);
+int nfp_eth_set_mod_enable(struct nfp_cpp *cpp, uint32_t idx, int enable);
+int nfp_eth_set_configured(struct nfp_cpp *cpp, uint32_t idx, int configed);
+int nfp_eth_set_fec(struct nfp_cpp *cpp, uint32_t idx, enum nfp_eth_fec mode);
 
-int nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, unsigned int size);
+int nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, size_t size);
 int nfp_nsp_write_eth_table(struct nfp_nsp *state, const void *buf,
-		unsigned int size);
+		size_t size);
 void nfp_nsp_config_set_state(struct nfp_nsp *state, void *entries,
-		unsigned int idx);
+		uint32_t idx);
 void nfp_nsp_config_clear_state(struct nfp_nsp *state);
 void nfp_nsp_config_set_modified(struct nfp_nsp *state, int modified);
 void *nfp_nsp_config_entries(struct nfp_nsp *state);
 int nfp_nsp_config_modified(struct nfp_nsp *state);
-unsigned int nfp_nsp_config_idx(struct nfp_nsp *state);
+uint32_t nfp_nsp_config_idx(struct nfp_nsp *state);
 
 static inline int
 nfp_eth_can_support_fec(struct nfp_eth_table_port *eth_port)
 {
-	return !!eth_port->fec_modes_supported;
+	return eth_port->fec_modes_supported != 0;
 }
 
-static inline unsigned int
+static inline uint32_t
 nfp_eth_supported_fec_modes(struct nfp_eth_table_port *eth_port)
 {
 	return eth_port->fec_modes_supported;
 }
 
-struct nfp_nsp *nfp_eth_config_start(struct nfp_cpp *cpp, unsigned int idx);
+struct nfp_nsp *nfp_eth_config_start(struct nfp_cpp *cpp, uint32_t idx);
 int nfp_eth_config_commit_end(struct nfp_nsp *nsp);
 void nfp_eth_config_cleanup_end(struct nfp_nsp *nsp);
 
 int __nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode);
-int __nfp_eth_set_speed(struct nfp_nsp *nsp, unsigned int speed);
-int __nfp_eth_set_split(struct nfp_nsp *nsp, unsigned int lanes);
+int __nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed);
+int __nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes);
 
 /**
  * struct nfp_nsp_identify - NSP static information
@@ -298,6 +297,6 @@ enum nfp_nsp_sensor_id {
 };
 
 int nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum nfp_nsp_sensor_id id,
-		long *val);
+		uint32_t *val);
 
 #endif
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c
index 28dba27124..31677b66e6 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c
@@ -75,7 +75,7 @@ struct nfp_sensors {
 int
 nfp_hwmon_read_sensor(struct nfp_cpp *cpp,
 		enum nfp_nsp_sensor_id id,
-		long *val)
+		uint32_t *val)
 {
 	struct nfp_sensors s;
 	struct nfp_nsp *nsp;
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
index 51bd57033e..5492840aa1 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
@@ -124,7 +124,7 @@ union eth_table_entry {
 
 static const struct {
 	enum nfp_eth_rate rate;
-	unsigned int speed;
+	uint32_t speed;
 } nsp_eth_rate_tbl[] = {
 	{ RATE_INVALID,	0, },
 	{ RATE_10M,	SPEED_10, },
@@ -134,24 +134,24 @@ static const struct {
 	{ RATE_25G,	SPEED_25000, },
 };
 
-static unsigned int
+static uint32_t
 nfp_eth_rate2speed(enum nfp_eth_rate rate)
 {
-	int i;
+	uint32_t i;
 
-	for (i = 0; i < (int)RTE_DIM(nsp_eth_rate_tbl); i++)
+	for (i = 0; i < RTE_DIM(nsp_eth_rate_tbl); i++)
 		if (nsp_eth_rate_tbl[i].rate == rate)
 			return nsp_eth_rate_tbl[i].speed;
 
 	return 0;
 }
 
-static unsigned int
-nfp_eth_speed2rate(unsigned int speed)
+static enum nfp_eth_rate
+nfp_eth_speed2rate(uint32_t speed)
 {
-	int i;
+	uint32_t i;
 
-	for (i = 0; i < (int)RTE_DIM(nsp_eth_rate_tbl); i++)
+	for (i = 0; i < RTE_DIM(nsp_eth_rate_tbl); i++)
 		if (nsp_eth_rate_tbl[i].speed == speed)
 			return nsp_eth_rate_tbl[i].rate;
 
@@ -162,7 +162,7 @@ static void
 nfp_eth_copy_mac_reverse(uint8_t *dst,
 		const uint8_t *src)
 {
-	int i;
+	uint32_t i;
 
 	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
 		dst[RTE_ETHER_ADDR_LEN - i - 1] = src[i];
@@ -171,11 +171,11 @@ nfp_eth_copy_mac_reverse(uint8_t *dst,
 static void
 nfp_eth_port_translate(struct nfp_nsp *nsp,
 		const union eth_table_entry *src,
-		unsigned int index,
+		uint32_t index,
 		struct nfp_eth_table_port *dst)
 {
-	unsigned int rate;
-	unsigned int fec;
+	uint32_t rate;
+	uint32_t fec;
 	uint64_t port, state;
 
 	port = rte_le_to_cpu_64(src->port);
@@ -224,7 +224,7 @@ nfp_eth_port_translate(struct nfp_nsp *nsp,
 static void
 nfp_eth_calc_port_geometry(struct nfp_eth_table *table)
 {
-	unsigned int i, j;
+	uint32_t i, j;
 
 	for (i = 0; i < table->count; i++) {
 		table->max_index = RTE_MAX(table->max_index,
@@ -269,7 +269,9 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)
 	union eth_table_entry *entries;
 	struct nfp_eth_table *table;
 	uint32_t table_sz;
-	int i, j, ret, cnt = 0;
+	uint32_t i;
+	uint32_t j;
+	int ret, cnt = 0;
 	const struct rte_ether_addr *mac;
 
 	entries = malloc(NSP_ETH_TABLE_SIZE);
@@ -319,7 +321,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)
 	}
 
 	nfp_eth_calc_port_geometry(table);
-	for (i = 0; i < (int)table->count; i++)
+	for (i = 0; i < table->count; i++)
 		nfp_eth_calc_port_type(&table->ports[i]);
 
 	free(entries);
@@ -358,7 +360,7 @@ nfp_eth_read_ports(struct nfp_cpp *cpp)
 
 struct nfp_nsp *
 nfp_eth_config_start(struct nfp_cpp *cpp,
-		unsigned int idx)
+		uint32_t idx)
 {
 	union eth_table_entry *entries;
 	struct nfp_nsp *nsp;
@@ -452,7 +454,7 @@ nfp_eth_config_commit_end(struct nfp_nsp *nsp)
  */
 int
 nfp_eth_set_mod_enable(struct nfp_cpp *cpp,
-		unsigned int idx,
+		uint32_t idx,
 		int enable)
 {
 	union eth_table_entry *entries;
@@ -494,7 +496,7 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp,
  */
 int
 nfp_eth_set_configured(struct nfp_cpp *cpp,
-		unsigned int idx,
+		uint32_t idx,
 		int configed)
 {
 	union eth_table_entry *entries;
@@ -532,14 +534,14 @@ nfp_eth_set_configured(struct nfp_cpp *cpp,
 
 static int
 nfp_eth_set_bit_config(struct nfp_nsp *nsp,
-		unsigned int raw_idx,
+		uint32_t raw_idx,
 		const uint64_t mask,
-		const unsigned int shift,
-		unsigned int val,
+		const uint32_t shift,
+		uint32_t val,
 		const uint64_t ctrl_bit)
 {
 	union eth_table_entry *entries = nfp_nsp_config_entries(nsp);
-	unsigned int idx = nfp_nsp_config_idx(nsp);
+	uint32_t idx = nfp_nsp_config_idx(nsp);
 	uint64_t reg;
 
 	/*
@@ -623,7 +625,7 @@ __nfp_eth_set_fec(struct nfp_nsp *nsp,
  */
 int
 nfp_eth_set_fec(struct nfp_cpp *cpp,
-		unsigned int idx,
+		uint32_t idx,
 		enum nfp_eth_fec mode)
 {
 	struct nfp_nsp *nsp;
@@ -656,7 +658,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp,
  */
 int
 __nfp_eth_set_speed(struct nfp_nsp *nsp,
-		unsigned int speed)
+		uint32_t speed)
 {
 	enum nfp_eth_rate rate;
 
@@ -682,7 +684,7 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp,
  */
 int
 __nfp_eth_set_split(struct nfp_nsp *nsp,
-		unsigned int lanes)
+		uint32_t lanes)
 {
 	return NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT,
 			NSP_ETH_PORT_LANES, lanes, NSP_ETH_CTRL_SET_LANES);
diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c
index 57089c770f..9dd4832779 100644
--- a/drivers/net/nfp/nfpcore/nfp_resource.c
+++ b/drivers/net/nfp/nfpcore/nfp_resource.c
@@ -156,7 +156,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp,
 	struct nfp_resource *res;
 	int err;
 	struct timespec wait;
-	int count;
+	uint16_t count;
 
 	res = malloc(sizeof(*res));
 	if (res == NULL)
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c
index aa3b7a483e..243d3c9ce5 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c
@@ -382,7 +382,7 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,
 uint8_t *
 nfp_rtsym_map(struct nfp_rtsym_table *rtbl,
 		const char *name,
-		unsigned int min_size,
+		uint32_t min_size,
 		struct nfp_cpp_area **area)
 {
 	int ret;
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h
index 30768f1ccf..e7295258b3 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h
@@ -56,5 +56,5 @@ const struct nfp_rtsym *nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl,
 uint64_t nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name,
 		int *error);
 uint8_t *nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,
-		unsigned int min_size, struct nfp_cpp_area **area);
+		uint32_t min_size, struct nfp_cpp_area **area);
 #endif
