From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D1B7A04DD for ; Wed, 28 Oct 2020 11:49:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5F192C9D6; Wed, 28 Oct 2020 11:49:31 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id 896F3C9D6 for ; Wed, 28 Oct 2020 11:49:28 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id v5so4102914wmh.1 for ; Wed, 28 Oct 2020 03:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aG386/YAGQV4jjg+Yv1CUocFL/S2poG9qe/x2+OztG8=; b=DJ1JOtkeCbCDgjb7s9jt4xLIIgktmljJbjgem/iPvTREwiopFNBcXJdxqxyuQ2kB3g +T33rg0LLqW6goDcNvEkE2bbUL2fAj7V53oe9uzU3AOKUJj0WbBaeJv/Wnbx2yjkGB3c sj+MjGMKYpghJ8IxrhRcrJl6BcYh92UViD8WsfU44zRMUD2OBJkn7Y2wN4Y7McpMLVNW U4bW9nwSCva4rcNs+iphvGOo0SHRRgYbUl6yAS6WH3ljW9QeDk9B5xjCzF2meWYsZcD6 V102fZ9d9IQfNh157sFLK7jWlXTc2kp43snxVdrqJdEUzt2D00Hy6l37GyVasd62aJ1b OqYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aG386/YAGQV4jjg+Yv1CUocFL/S2poG9qe/x2+OztG8=; b=pxk8rpvhQKjYGHqfUqSNyzEw1nAiCRYQ4kiIRTOnm+WKO5uNE+qNJRkxeO4HZtEbst yhQAh11A3vTJfq7iUGMfUREE7SN2k6n94W7GxVMo8ECpYg+5G3hdOpIn3NFEfpf6OFFr VCLX3TcJFyfh4Vh8JQwb6nr7vDaucEnO/XpJR6r/GjvOOD0/srdVYfEml4w9m27RdUUS yG+sKyks+BjoGc1wCW+XSkOn4tfIFnfZrHAAfWIicz3nFYcRKiFW8F162pBVd78ni7Me nGB+jiFnnCnvnPHVeZwsOLD8qGYgaQTpLr0pln5ImvtlKsjpBGXdwmEvSz9o6iabMj7N uN4A== X-Gm-Message-State: AOAM533airC6aIANMGwcsej4uLWC48F69TjOHt31OjroSoS1WmLTCX16 vbRClcjsF6LqriUhoFVOYOQcBu+9qKu2BGVO X-Google-Smtp-Source: ABdhPJyGAfl2vHD26vlmi4q+Lx4bTSvTPJmGq+Y+s8lkLEBm8e6aKHzOUAiL/D3GlQTNhDgTtiXa+A== X-Received: by 2002:a7b:c345:: with SMTP id l5mr7417275wmj.123.1603882167258; Wed, 28 Oct 2020 03:49:27 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b5sm6243271wrs.97.2020.10.28.03.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:26 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyun Wang Cc: dpdk stable Date: Wed, 28 Oct 2020 10:43:42 +0000 Message-Id: <20201028104606.3504127-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hinic/base: fix clock definition with glibc version' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From 4f5ef8332e825cf809ab38364c7cc3b3a9220e41 Mon Sep 17 00:00:00 2001 From: Xiaoyun Wang Date: Mon, 14 Sep 2020 22:31:46 +0800 Subject: [PATCH] net/hinic/base: fix clock definition with glibc version [ upstream commit 9b5f64904b1fb01310e94a6c884b4a7f8e51b3a0 ] Sync the repair of patch("fix compile error for old glibc caused by CLOCK_MONOTONIC_RAW") in the community. Fixes: efeed0894e9c ("net/hinic/base: avoid system time jump") Signed-off-by: Xiaoyun Wang --- drivers/net/hinic/base/hinic_compat.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/hinic/base/hinic_compat.h b/drivers/net/hinic/base/hinic_compat.h index 341aa056ba..473a273b6b 100644 --- a/drivers/net/hinic/base/hinic_compat.h +++ b/drivers/net/hinic/base/hinic_compat.h @@ -198,11 +198,17 @@ static inline u32 readl(const volatile void *addr) #define spin_lock(spinlock_prt) rte_spinlock_lock(spinlock_prt) #define spin_unlock(spinlock_prt) rte_spinlock_unlock(spinlock_prt) +#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */ +#define CLOCK_TYPE CLOCK_MONOTONIC_RAW +#else +#define CLOCK_TYPE CLOCK_MONOTONIC +#endif + static inline unsigned long clock_gettime_ms(void) { struct timespec tv; - (void)clock_gettime(CLOCK_MONOTONIC, &tv); + (void)clock_gettime(CLOCK_TYPE, &tv); return (unsigned long)tv.tv_sec * 1000 + (unsigned long)tv.tv_nsec / 1000000; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.731888717 +0000 +++ 0063-net-hinic-base-fix-clock-definition-with-glibc-versi.patch 2020-10-28 10:35:11.532830435 +0000 @@ -1,13 +1,14 @@ -From 9b5f64904b1fb01310e94a6c884b4a7f8e51b3a0 Mon Sep 17 00:00:00 2001 +From 4f5ef8332e825cf809ab38364c7cc3b3a9220e41 Mon Sep 17 00:00:00 2001 From: Xiaoyun Wang Date: Mon, 14 Sep 2020 22:31:46 +0800 Subject: [PATCH] net/hinic/base: fix clock definition with glibc version +[ upstream commit 9b5f64904b1fb01310e94a6c884b4a7f8e51b3a0 ] + Sync the repair of patch("fix compile error for old glibc caused by CLOCK_MONOTONIC_RAW") in the community. Fixes: efeed0894e9c ("net/hinic/base: avoid system time jump") -Cc: stable@dpdk.org Signed-off-by: Xiaoyun Wang --- @@ -15,10 +16,10 @@ 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/hinic/base/hinic_compat.h b/drivers/net/hinic/base/hinic_compat.h -index 7036b031c5..6dd210ec06 100644 +index 341aa056ba..473a273b6b 100644 --- a/drivers/net/hinic/base/hinic_compat.h +++ b/drivers/net/hinic/base/hinic_compat.h -@@ -166,11 +166,17 @@ static inline u32 readl(const volatile void *addr) +@@ -198,11 +198,17 @@ static inline u32 readl(const volatile void *addr) #define spin_lock(spinlock_prt) rte_spinlock_lock(spinlock_prt) #define spin_unlock(spinlock_prt) rte_spinlock_unlock(spinlock_prt)