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 A7FC3A0524 for ; Fri, 5 Feb 2021 12:31:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FB37188945; Fri, 5 Feb 2021 12:31:07 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id AEC62188945 for ; Fri, 5 Feb 2021 12:31:06 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id u14so5628385wmq.4 for ; Fri, 05 Feb 2021 03:31:06 -0800 (PST) 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=EkeQqdVkUhnHmaHIZRhj00N2TxZRZbYeMVE1y4BTdP0=; b=l//PGu/w3xJPN41rDXkZFvwUM4/JCHMJAq4zeTd9tmNGeCYEtrl9vcC+zycUB9BMdy LxdhB4zSoyK5lK5+aQnK5IAEDUQy6gcnTUfMo6gPsPG98fT6J5iLbGzKsbG+AtfUGbJX u9Os555vIs9hsTUj5OI9IlsKWvuykTVbScxymUkOVVbhhao58TbKenyzRkmvb4UihDdi 35TOXOIPS1ZZIUDU6VepNZLm/KhnZdy/Nzv1aYJJ0sUq9SwBtT7nxN2drddqXeKlGSoK f1087Zl84cYIEIVg2BbZp0QnloXLj562u8+z80PMVgQlL0fG/WQbrWVm1f4Rv/eV3xJQ grGQ== 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=EkeQqdVkUhnHmaHIZRhj00N2TxZRZbYeMVE1y4BTdP0=; b=uLnctsA0CoNfgzcrSB1KD4RUF3FVepdQeSwzBPAbkUz0HoAcgjkwDlA/m3J302bZBA puR7jsjJNFLDlShfU0/qLzV7yc4UhM2zvrX6ZAoc+GCt4ELpqgVKvMI+rJhODnDhP8zr 0UPhnbeg3Bqb84qi1KfgceO47PJSotAePgx8lynPhKlPzCEqeUPp+Co4mE9Pr3wmomZQ KkUq4Bhw09C/+JIt/3e5PByL01r4cvfQkdtr5jGQip5KAaYW2fUVFFK4TH7j2XybfIUZ /ckR8TKk4HeZJl4rST3wgfbYXky/0blm5yZYPFDkshXLYOWmcRJ/uWL8ZfiJR6LfT5oC vqaQ== X-Gm-Message-State: AOAM531PX49/xWhjxPyzvfIr+Oor6QOLkZr3HZuHgsIi2qZ/uHisQlAU ogWI4V5UG8xILhtcBXV5zAM= X-Google-Smtp-Source: ABdhPJyGgcnMQOTevab8a4J2cuUOKqwGfU20W3RqMeOtZOxWTCYvZQiu2djtBtJMqiMwNkUTQXf3cw== X-Received: by 2002:a1c:ed10:: with SMTP id l16mr3238499wmh.36.1612524666511; Fri, 05 Feb 2021 03:31:06 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s64sm9114586wms.21.2021.02.05.03.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:05 -0800 (PST) From: luca.boccassi@gmail.com To: Tal Shnaiderman Cc: Matan Azrad , dpdk stable Date: Fri, 5 Feb 2021 11:16:40 +0000 Message-Id: <20210205111920.1272063-114-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix pointer cast on Windows' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6c89a5d52f4a0d95726b9b837419ff3f20cefbaa Thanks. Luca Boccassi --- >From 6c89a5d52f4a0d95726b9b837419ff3f20cefbaa Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Thu, 7 Jan 2021 13:45:45 +0200 Subject: [PATCH] common/mlx5: fix pointer cast on Windows [ upstream commit 5a90a6e40db6e712fd9dc12dedd14d8feb690ff3 ] While compiling with clang 11 the callers of the __mlx5_bit_off macro warns on the cast of pointers to unsigned long which is a smaller int type in Windows. warning: cast to smaller integer type 'unsigned long' from 'u8 (*)[16]' [-Wpointer-to-int-cast] To resolve it the type is changed to uintptr_t to be compatible for both Linux and Windows. Fixes: 865a0c15672c ("net/mlx5: add Direct Verbs prepare function") Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_prm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 58d180486e..6f5e5dc5f6 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -600,7 +600,7 @@ typedef uint8_t u8; #define __mlx5_nullp(typ) ((struct mlx5_ifc_##typ##_bits *)0) #define __mlx5_bit_sz(typ, fld) sizeof(__mlx5_nullp(typ)->fld) -#define __mlx5_bit_off(typ, fld) ((unsigned int)(unsigned long) \ +#define __mlx5_bit_off(typ, fld) ((unsigned int)(uintptr_t) \ (&(__mlx5_nullp(typ)->fld))) #define __mlx5_dw_bit_off(typ, fld) (32 - __mlx5_bit_sz(typ, fld) - \ (__mlx5_bit_off(typ, fld) & 0x1f)) -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:34.332577887 +0000 +++ 0114-common-mlx5-fix-pointer-cast-on-Windows.patch 2021-02-05 11:18:28.986694539 +0000 @@ -1 +1 @@ -From 5a90a6e40db6e712fd9dc12dedd14d8feb690ff3 Mon Sep 17 00:00:00 2001 +From 6c89a5d52f4a0d95726b9b837419ff3f20cefbaa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5a90a6e40db6e712fd9dc12dedd14d8feb690ff3 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 7d5cf961b1..9e2d1d0c81 100644 +index 58d180486e..6f5e5dc5f6 100644 @@ -29 +30 @@ -@@ -601,7 +601,7 @@ typedef uint8_t u8; +@@ -600,7 +600,7 @@ typedef uint8_t u8;