From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E943043829 for ; Tue, 5 Mar 2024 16:35:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E339B410FB; Tue, 5 Mar 2024 16:35:17 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C4002402A8 for ; Tue, 5 Mar 2024 16:35:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8e3aMhdk8pGHZGz93QQaQlG5yGMwaOfcJ4T5ynpzDYU=; b=M7UNl8tXRWUrAOGnX8isUZUWeAtnrqSKoCWYuMzkCVYOX90LmX3vKWsjUjq5xlT35vkNyF YoE4D985swpYse+cAuZXrERyNROPjXbsciocT+ZmlItKjRWcX/02Gcvj+FPuzEkR8zUTA5 gTi/9RhmxGyVst+Y5TZiAHUwfEEjGJM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-100-HRT65DC4OOykzVCZxB1hkw-1; Tue, 05 Mar 2024 10:35:12 -0500 X-MC-Unique: HRT65DC4OOykzVCZxB1hkw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9586E18188B1; Tue, 5 Mar 2024 15:35:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id B38DE2022BD2; Tue, 5 Mar 2024 15:35:11 +0000 (UTC) From: Kevin Traynor To: Sivaprasad Tummala Cc: Ferruh Yigit , dpdk stable Subject: patch 'eal/x86: add AMD vendor check for TSC calibration' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:43 +0000 Message-ID: <20240305153449.263666-10-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Ferruh Yigit --- 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 -#include +#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@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 @@ -25,0 +27 @@ +-#include @@ -32 +34 @@ -@@ -111,4 +115,16 @@ get_tsc_freq_arch(void) +@@ -92,4 +95,16 @@ get_tsc_freq_arch(void)