Merge ODP v1.45.0.0HEADv1.45.0.0_DPDK_22.11master

Merge ODP linux-generic v1.45.0.0 into linux-dpdk.

12 files changed, 38 insertions, 59 deletions

diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c
index 9211df002..124f1d184 100644
--- a/platform/linux-generic/arch/x86/cpu_flags.c
+++ b/platform/linux-generic/arch/x86/cpu_flags.c
@@ -1,12 +1,11 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * Copyright (c) 2023, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
 /* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ * Copyright (c) 2023 Nokia
+ *
  * Copyright(c) 2010-2015 Intel Corporation
+ *   - lib/eal/x86/include/rte_cpuflags.h
+ *   - lib/eal/x86/rte_cpuflags.c
+ *   - lib/eal/x86/rte_cpuid.h
  */
 
 #include "cpu_flags.h"
diff --git a/platform/linux-generic/arch/x86/cpu_flags.h b/platform/linux-generic/arch/x86/cpu_flags.h
index 8d485dbfa..8f6be6813 100644
--- a/platform/linux-generic/arch/x86/cpu_flags.h
+++ b/platform/linux-generic/arch/x86/cpu_flags.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
  */
 
 #ifndef ODP_PLAT_CPU_FLAGS_H_
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h
index 9224af9a0..ad93cc816 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
  */
 
 #ifndef ODP_API_ABI_CPU_H_
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h
index 4b542a577..066945e7b 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h
@@ -1,8 +1,6 @@
-/* Copyright (c) 2018, Linaro Limited
- * Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ * Copyright (c) 2021 Nokia
  */
 
 #ifndef ODP_ARCH_CPU_INLINES_H_
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h
index ccc5f0f36..9e6d9f278 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
  */
 
 #ifndef ODP_ARCH_CPU_RDTSC_H_
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/hash_crc32.h b/platform/linux-generic/arch/x86/odp/api/abi/hash_crc32.h
index c2c71bcb7..576b68f20 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/hash_crc32.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/hash_crc32.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
  */
 
 #ifndef ODP_API_ABI_HASH_CRC32_H_
@@ -11,6 +9,7 @@
 extern "C" {
 #endif
 
+#include <odp/api/std_types.h>
 #include <stdint.h>
 
 uint32_t _odp_hash_crc32_generic(const void *data, uint32_t data_len,
@@ -34,23 +33,23 @@ static inline uint32_t _odp_hash_crc32c(const void *data, uint32_t data_len,
 
 #ifdef __x86_64__
 	for (i = 0; i < data_len / 8; i++) {
-		init_val = (uint32_t)__builtin_ia32_crc32di(init_val, *(const uint64_t *)pd);
+		init_val = (uint32_t)__builtin_ia32_crc32di(init_val, *(const odp_una_u64_t *)pd);
 		pd += 8;
 	}
 
 	if (data_len & 0x4) {
-		init_val = __builtin_ia32_crc32si(init_val, *(const uint32_t *)pd);
+		init_val = __builtin_ia32_crc32si(init_val, *(const odp_una_u32_t *)pd);
 		pd += 4;
 	}
 #else
 	for (i = 0; i < data_len / 4; i++) {
-		init_val = __builtin_ia32_crc32si(init_val, *(const uint32_t *)pd);
+		init_val = __builtin_ia32_crc32si(init_val, *(const odp_una_u32_t *)pd);
 		pd += 4;
 	}
 #endif
 
 	if (data_len & 0x2) {
-		init_val = __builtin_ia32_crc32hi(init_val, *(const uint16_t *)pd);
+		init_val = __builtin_ia32_crc32hi(init_val, *(const odp_una_u16_t *)pd);
 		pd += 2;
 	}
 
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/time_cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/time_cpu.h
index baf79ad3f..74b6eb740 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/time_cpu.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/time_cpu.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
  */
 
 #ifndef ODP_ARCH_TIME_CPU_H_
diff --git a/platform/linux-generic/arch/x86/odp/api/abi/time_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/time_inlines.h
index 331d1996f..eed571027 100644
--- a/platform/linux-generic/arch/x86/odp/api/abi/time_inlines.h
+++ b/platform/linux-generic/arch/x86/odp/api/abi/time_inlines.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2023, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
  */
 
 #include <odp/api/abi/time_cpu_inlines.h>
diff --git a/platform/linux-generic/arch/x86/odp_cpu.h b/platform/linux-generic/arch/x86/odp_cpu.h
index 8f8f22daf..2282285fc 100644
--- a/platform/linux-generic/arch/x86/odp_cpu.h
+++ b/platform/linux-generic/arch/x86/odp_cpu.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
  */
 
 #ifndef ODP_X86_CPU_H_
diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c
index 2624af0f6..4950f0bad 100644
--- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c
+++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c
@@ -1,7 +1,5 @@
-/* Copyright (c) 2015-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Linaro Limited
  */
 
 #include <odp/api/cpu.h>
diff --git a/platform/linux-generic/arch/x86/odp_random.h b/platform/linux-generic/arch/x86/odp_random.h
index 54628038e..14551f47e 100644
--- a/platform/linux-generic/arch/x86/odp_random.h
+++ b/platform/linux-generic/arch/x86/odp_random.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2021, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
  */
 
 /*
diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
index 3cbdb2037..0a5aedfcc 100644
--- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
@@ -1,11 +1,10 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * Copyright (c) 2023, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ * Copyright (c) 2023 Nokia
  */
 
 #include <odp_sysinfo_internal.h>
+#include <odp_string_internal.h>
 #include "cpu_flags.h"
 #include <string.h>
 
@@ -49,8 +48,8 @@ int _odp_cpuinfo_parser(FILE *file, system_info_t *sysinfo)
 			if (pos_end != NULL)
 				*(pos_end - 1) = '\0';
 
-			strncpy(sysinfo->model_str[id], pos + 2,
-				MODEL_STR_SIZE - 1);
+			_odp_strcpy(sysinfo->model_str[id], pos + 2,
+				    MODEL_STR_SIZE);
 
 			if (sysinfo->cpu_hz_max[id]) {
 				freq_set = true;