patch 'eal/x86: add AMD vendor check for TSC calibration' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/11/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/83776248bca6d7eeb077bb7f25dad6c806b8f989

Thanks.

Kevin

---
>From 83776248bca6d7eeb077bb7f25dad6c806b8f989 Mon Sep 17 00:00:00 2001
From: Sivaprasad Tummala <sivaprasad.tummala at amd.com>
Date: Wed, 22 Nov 2023 23:27:30 -0800
Subject: [PATCH] eal/x86: add AMD vendor check for TSC calibration

[ upstream commit 31d72ff4dc7c057366153e9918ac92bf9123a3bc ]

AMD Epyc processors doesn't support get_tsc_freq_arch().
The patch allows graceful return to allow fallback to
alternate TSC calibration.

Fixes: 3dbc565e81a0 ("timer: honor arch-specific TSC frequency query")

Signed-off-by: Sivaprasad Tummala <sivaprasad.tummala at amd.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 lib/eal/x86/rte_cycles.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/eal/x86/rte_cycles.c b/lib/eal/x86/rte_cycles.c
index edd9621abb..2a601d7035 100644
--- a/lib/eal/x86/rte_cycles.c
+++ b/lib/eal/x86/rte_cycles.c
@@ -7,5 +7,8 @@
 #include <cpuid.h>
 
-#include <rte_common.h>
+#define x86_vendor_amd(t1, t2, t3)        \
+	((t1 == 0x68747541) && /* htuA */   \
+	 (t2 == 0x444d4163) && /* DMAc */   \
+	 (t3 == 0x69746e65))   /* itne */
 
 #include "eal_private.h"
@@ -92,4 +95,16 @@ get_tsc_freq_arch(void)
 	int32_t ret;
 
+#ifdef RTE_TOOLCHAIN_MSVC
+	__cpuid(cpuinfo, 0);
+	a = cpuinfo[0];
+	b = cpuinfo[1];
+	c = cpuinfo[2];
+	d = cpuinfo[3];
+#else
+	__cpuid(0, a, b, c, d);
+#endif
+	if (x86_vendor_amd(b, c, d))
+		return 0;
+
 	/*
 	 * Time Stamp Counter and Nominal Core Crystal Clock
-- 
2.43.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 14:08:54.981404678 +0000
+++ 0010-eal-x86-add-AMD-vendor-check-for-TSC-calibration.patch	2024-03-05 14:08:54.620520686 +0000
@@ -1 +1 @@
-From 31d72ff4dc7c057366153e9918ac92bf9123a3bc Mon Sep 17 00:00:00 2001
+From 83776248bca6d7eeb077bb7f25dad6c806b8f989 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 31d72ff4dc7c057366153e9918ac92bf9123a3bc ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16,2 +17,2 @@
- lib/eal/x86/rte_cycles.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ lib/eal/x86/rte_cycles.c | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
@@ -20 +21 @@
-index 69ed59b4f0..f147a5231d 100644
+index edd9621abb..2a601d7035 100644
@@ -23,2 +24,2 @@
-@@ -11,4 +11,8 @@
- #endif
+@@ -7,5 +7,8 @@
+ #include <cpuid.h>
@@ -25,0 +27 @@
+-#include <rte_common.h>
@@ -32 +34 @@
-@@ -111,4 +115,16 @@ get_tsc_freq_arch(void)
+@@ -92,4 +95,16 @@ get_tsc_freq_arch(void)