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 45F52A0527 for ; Wed, 25 Nov 2020 10:03:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3EEBFC958; Wed, 25 Nov 2020 10:03:23 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id 9E584C952 for ; Wed, 25 Nov 2020 10:03:21 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id 10so1291958wml.2 for ; Wed, 25 Nov 2020 01:03:21 -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=9lQe2NK7vjydaYHMJO3CU6YB9LxFkGmvDF3Putbj+Io=; b=eXWTN6n0/I56sDnfxnVcsV2ss+RYfQSJc6qWgBek6o2kWVqau4mKJFZef4bN5cHrqR phaNVe8NYwoOmfzEmgpACDGXs9gY85BefdRA8IES014Wk/YdCr8bjlKEm8UdtVdpP880 RtPpNU7WTIjmUsEQ6zS8HFzcu25FsYLvEb2OXSIqSVIguDSH7dc9teLTndB4MSJwMQnk Gt7DuR/r/oH2o33TgpzHWs3TY8H4zqmlWpmNZWr/YFd/pMRYuqWcWzKnAvQz7rIzqzCR lwXvgN4iR9C1Q6DnMRqZnkoTeKj61obqZyyRyYg3Z/A2daCicQFgyPDKshLcx13ndbP8 srDw== 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=9lQe2NK7vjydaYHMJO3CU6YB9LxFkGmvDF3Putbj+Io=; b=QLGFaqxKW7JUYJ9L6gC0XTYFW6DXHsfDtt0mGsrORbfy8HV+1Ibt8IA8sXMNvupQj1 0LrYOvQNRfNzIFt3Wla8Yj6AdxSvEB9uR9Olsd2XHZv7UzEwtMWsQPqfzu29L/oXqRqk mSFU2sNciCCDXQWCzF5rljfRjY9ZPoUNTp9WluQ6WaxxaE6/zt/96RpzhGTtvc+Gf6vk /n1ub9cOmgKeE1/OJmME0E5fKzjE4OeJu9Ojyc2ti/ies/qckZFvZvQ7NmNvDcHddE1x EnUR6Mn6kR5whd1A6FP/z1rzzPMDU7H37l2EHRh3AFk/OYT4ZD3YK4U8DobHfDXCaYJ1 b96w== X-Gm-Message-State: AOAM530oEGU1mLCSPgaEXi4KZskVnLWOdS9KDGBE8aMs9+ZkwvzHoZHI V+GS+dY2/3bmkvK3JF54AfVl/EJumB5BTw== X-Google-Smtp-Source: ABdhPJwP2iv0FilMSmafQMpeGiGzlzHUTvpAor12IwkRzpvTs7iW/KX9sG5iCLv8Z/KzLpLnbZ6bMw== X-Received: by 2002:a05:600c:2512:: with SMTP id d18mr2740986wma.153.1606295000411; Wed, 25 Nov 2020 01:03:20 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u5sm3299595wml.13.2020.11.25.01.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:19 -0800 (PST) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Viacheslav Ovsiienko , dpdk stable Date: Wed, 25 Nov 2020 09:02:49 +0000 Message-Id: <20201125090258.21457-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125090258.21457-1-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> <20201125090258.21457-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix name for ConnectX VF device ID' 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 11/26/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. 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/6de0c15edd6b76efd780ac5998ebcc4cdb0cf166 Thanks. Luca Boccassi --- >From 6de0c15edd6b76efd780ac5998ebcc4cdb0cf166 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Thu, 19 Nov 2020 10:06:10 +0200 Subject: [PATCH] common/mlx5: fix name for ConnectX VF device ID [ upstream commit 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b ] Starting ConnectX-6 Dx, the VF device ID is generic and not per chip. https://pci-ids.ucw.cz/v2.2/pci.ids 101e ConnectX Family mlx5Gen Virtual Function This means that all will have the same VF device ID. Fixes: 5fc66630bed5 ("net/mlx5: add ConnectX6-DX device ID") Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5.c | 4 ++-- drivers/net/mlx5/mlx5.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index f2327903eb..36e69379fa 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -3389,7 +3389,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF: case PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF: case PCI_DEVICE_ID_MELLANOX_CONNECTX6VF: - case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF: + case PCI_DEVICE_ID_MELLANOX_CONNECTXVF: dev_config.vf = 1; break; default: @@ -3572,7 +3572,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF) + PCI_DEVICE_ID_MELLANOX_CONNECTXVF) }, { .vendor_id = 0 diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index d2e4f446f4..206c8e9fa8 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -57,7 +57,7 @@ enum { PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b, PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c, PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e, + PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e, }; /* Request types for IPC. */ -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:36.858866071 +0000 +++ 0007-common-mlx5-fix-name-for-ConnectX-VF-device-ID.patch 2020-11-24 16:50:36.561496146 +0000 @@ -1 +1 @@ -From 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b Mon Sep 17 00:00:00 2001 +From 6de0c15edd6b76efd780ac5998ebcc4cdb0cf166 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3ea12cad7165facd6bc8c4fa1cbc734ccbc71d2b ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,24 +21,9 @@ - drivers/common/mlx5/mlx5_common.h | 2 +- - drivers/net/mlx5/linux/mlx5_os.c | 2 +- - drivers/net/mlx5/mlx5.c | 2 +- - drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h -index 10a0851794..a484b74b9c 100644 ---- a/drivers/common/mlx5/mlx5_common.h -+++ b/drivers/common/mlx5/mlx5_common.h -@@ -131,7 +131,7 @@ enum { - PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b, - PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d, -- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e, -+ PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e, - PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF = 0xa2d6, - PCI_DEVICE_ID_MELLANOX_CONNECTX6LX = 0x101f, - PCI_DEVICE_ID_MELLANOX_CONNECTX7 = 0x1021, -diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c -index 00f793bc57..5a6ae790a7 100644 ---- a/drivers/net/mlx5/linux/mlx5_os.c -+++ b/drivers/net/mlx5/linux/mlx5_os.c -@@ -2113,7 +2113,7 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, + drivers/net/mlx5/mlx5.c | 4 ++-- + drivers/net/mlx5/mlx5.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c +index f2327903eb..36e69379fa 100644 +--- a/drivers/net/mlx5/mlx5.c ++++ b/drivers/net/mlx5/mlx5.c +@@ -3389,7 +3389,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, @@ -49 +35 @@ - dev_config_vf = 1; + dev_config.vf = 1; @@ -52,5 +38 @@ -diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c -index ede5fd44ab..db7e8d708c 100644 ---- a/drivers/net/mlx5/mlx5.c -+++ b/drivers/net/mlx5/mlx5.c -@@ -2035,7 +2035,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { +@@ -3572,7 +3572,7 @@ static const struct rte_pci_id mlx5_pci_id_map[] = { @@ -64,14 +46,14 @@ - RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, -diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c -index 1502abdc89..b64f364eb7 100644 ---- a/drivers/vdpa/mlx5/mlx5_vdpa.c -+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c -@@ -824,7 +824,7 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = { - }, - { - RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, -- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF) -+ PCI_DEVICE_ID_MELLANOX_CONNECTXVF) - }, - { - RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, + .vendor_id = 0 +diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h +index d2e4f446f4..206c8e9fa8 100644 +--- a/drivers/net/mlx5/mlx5.h ++++ b/drivers/net/mlx5/mlx5.h +@@ -57,7 +57,7 @@ enum { + PCI_DEVICE_ID_MELLANOX_CONNECTX6 = 0x101b, + PCI_DEVICE_ID_MELLANOX_CONNECTX6VF = 0x101c, + PCI_DEVICE_ID_MELLANOX_CONNECTX6DX = 0x101d, +- PCI_DEVICE_ID_MELLANOX_CONNECTX6DXVF = 0x101e, ++ PCI_DEVICE_ID_MELLANOX_CONNECTXVF = 0x101e, + }; + + /* Request types for IPC. */