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 A07FEA04F3 for ; Thu, 19 Dec 2019 15:37:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 94E871BF9F; Thu, 19 Dec 2019 15:37:37 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by dpdk.org (Postfix) with ESMTP id 0CE0E1BFA2 for ; Thu, 19 Dec 2019 15:37:36 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id d73so5682340wmd.1 for ; Thu, 19 Dec 2019 06:37:36 -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=CNSL6x6ZsVKFtMJe1WvB0hHW3wta4bVUKlyNUireOM0=; b=cavnMB8NV32ppvCIZQumdrq2Mms7s8KlmyIvDfQNP+PjdUaRlsaA0AMNWoNJ2g+IN2 AyFB6a7x/eEnZKwoq3+YTjSmXk9zAihXloSJKx8U109JA07+7F08Dhuy8wa4JOzUYMvm PRxKvcjhRa1rlvzJY0GaaKxryacMp0IdL6v2GYRVtYP+nn7nB32pB4rByontHl+ILpXV kdbLJaYf28hSadepqmGYj+XXnt3DvK696ixxklPdT5rMNZjz9spi+QHFdHy7P0u8cM8s 6DD8ajw7EozDu8xmkahvwkJ2WLTn1nM0XNf6gcAgUbJHqBgOuDJVg9PffaYdMQM7ZHHP WG1Q== 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=CNSL6x6ZsVKFtMJe1WvB0hHW3wta4bVUKlyNUireOM0=; b=VeZRf5xQqltNUmlvX4kOR1AWxFzc/AbVrdd6F8ut3LbBXjpxss8BbKf7xWwG3caa9E ial0OlHSlTPEEkKW1c8nzEDg3ISnTI+4+ciBtcLw0FL+yaP6Zwf2AEXo7PEnjBg/Km78 Y/e7XN/PieUGW+LF/y92rUDg3rnhjoP8rqktwHoYLg9D4RE9fmLKflI7VzM0tolQoZsI pdqcSuNT2PGc0oN03NvGhBRiDL02Yn8BFPwZBW9K7JPwHKIrSWOJGOqvsiS1KDQwJuCx NBv3AaD3Uu9PTBKghRqCxy2NcHhIgueLOSSxO5HdpHKI05WFzVlMQk4N6nhrX0xjw3hR LcLQ== X-Gm-Message-State: APjAAAWpquFCDZa19319vbBoFSLST44+NKvl+1x4ylPbSu+Cg2Pceceh h2Wje/QTFv9/k7nRhGuE+xszkota2Bo= X-Google-Smtp-Source: APXvYqyz5WKGXVTRckRshBWDVrY98YznLe9MJNtUVTlYH53Ba5msO+H3SKF2TFOocqequkTCB1XVIA== X-Received: by 2002:a1c:dcd5:: with SMTP id t204mr10953188wmg.34.1576766255617; Thu, 19 Dec 2019 06:37:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g9sm7058714wro.67.2019.12.19.06.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:35 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Lance Richardson , Ajit Khaparde , dpdk stable Date: Thu, 19 Dec 2019 14:33:35 +0000 Message-Id: <20191219143447.21506-68-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: move macro definitions to header file' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 56524e5288ea2d45160038195b5aee3bf4454f21 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 10 Oct 2019 15:14:32 +0530 Subject: [PATCH] net/bnxt: move macro definitions to header file [ upstream commit 9924dfd601fadeacb6c9968437cad8c6f853f77f ] Move device and vendor ids macro definition from bnxt_ethdev.c to bnxt.h. There is no functionality impact. Fixes: 882aa9c6e2e1 ("net/bnxt: move PCI device ids to the driver") Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 40 ++++++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_ethdev.c | 38 -------------------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 1fae24b801..3c29ee5d51 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -47,6 +47,46 @@ #include "bnxt_cpr.h" +/* Vendor ID */ +#define PCI_VENDOR_ID_BROADCOM 0x14E4 + +/* Device IDs */ +#define BROADCOM_DEV_ID_STRATUS_NIC_VF 0x1609 +#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614 +#define BROADCOM_DEV_ID_57414_VF 0x16c1 +#define BROADCOM_DEV_ID_57301 0x16c8 +#define BROADCOM_DEV_ID_57302 0x16c9 +#define BROADCOM_DEV_ID_57304_PF 0x16ca +#define BROADCOM_DEV_ID_57304_VF 0x16cb +#define BROADCOM_DEV_ID_57417_MF 0x16cc +#define BROADCOM_DEV_ID_NS2 0x16cd +#define BROADCOM_DEV_ID_57311 0x16ce +#define BROADCOM_DEV_ID_57312 0x16cf +#define BROADCOM_DEV_ID_57402 0x16d0 +#define BROADCOM_DEV_ID_57404 0x16d1 +#define BROADCOM_DEV_ID_57406_PF 0x16d2 +#define BROADCOM_DEV_ID_57406_VF 0x16d3 +#define BROADCOM_DEV_ID_57402_MF 0x16d4 +#define BROADCOM_DEV_ID_57407_RJ45 0x16d5 +#define BROADCOM_DEV_ID_57412 0x16d6 +#define BROADCOM_DEV_ID_57414 0x16d7 +#define BROADCOM_DEV_ID_57416_RJ45 0x16d8 +#define BROADCOM_DEV_ID_57417_RJ45 0x16d9 +#define BROADCOM_DEV_ID_5741X_VF 0x16dc +#define BROADCOM_DEV_ID_57412_MF 0x16de +#define BROADCOM_DEV_ID_57314 0x16df +#define BROADCOM_DEV_ID_57317_RJ45 0x16e0 +#define BROADCOM_DEV_ID_5731X_VF 0x16e1 +#define BROADCOM_DEV_ID_57417_SFP 0x16e2 +#define BROADCOM_DEV_ID_57416_SFP 0x16e3 +#define BROADCOM_DEV_ID_57317_SFP 0x16e4 +#define BROADCOM_DEV_ID_57404_MF 0x16e7 +#define BROADCOM_DEV_ID_57406_MF 0x16e8 +#define BROADCOM_DEV_ID_57407_SFP 0x16e9 +#define BROADCOM_DEV_ID_57407_MF 0x16ea +#define BROADCOM_DEV_ID_57414_MF 0x16ec +#define BROADCOM_DEV_ID_57416_MF 0x16ee + #define BNXT_MAX_MTU 9500 #define VLAN_TAG_SIZE 4 #define BNXT_MAX_LED 4 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 0813865edc..7610626306 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -58,44 +58,6 @@ static const char bnxt_version[] = "Broadcom Cumulus driver " DRV_MODULE_NAME "\n"; -#define PCI_VENDOR_ID_BROADCOM 0x14E4 - -#define BROADCOM_DEV_ID_STRATUS_NIC_VF 0x1609 -#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614 -#define BROADCOM_DEV_ID_57414_VF 0x16c1 -#define BROADCOM_DEV_ID_57301 0x16c8 -#define BROADCOM_DEV_ID_57302 0x16c9 -#define BROADCOM_DEV_ID_57304_PF 0x16ca -#define BROADCOM_DEV_ID_57304_VF 0x16cb -#define BROADCOM_DEV_ID_57417_MF 0x16cc -#define BROADCOM_DEV_ID_NS2 0x16cd -#define BROADCOM_DEV_ID_57311 0x16ce -#define BROADCOM_DEV_ID_57312 0x16cf -#define BROADCOM_DEV_ID_57402 0x16d0 -#define BROADCOM_DEV_ID_57404 0x16d1 -#define BROADCOM_DEV_ID_57406_PF 0x16d2 -#define BROADCOM_DEV_ID_57406_VF 0x16d3 -#define BROADCOM_DEV_ID_57402_MF 0x16d4 -#define BROADCOM_DEV_ID_57407_RJ45 0x16d5 -#define BROADCOM_DEV_ID_57412 0x16d6 -#define BROADCOM_DEV_ID_57414 0x16d7 -#define BROADCOM_DEV_ID_57416_RJ45 0x16d8 -#define BROADCOM_DEV_ID_57417_RJ45 0x16d9 -#define BROADCOM_DEV_ID_5741X_VF 0x16dc -#define BROADCOM_DEV_ID_57412_MF 0x16de -#define BROADCOM_DEV_ID_57314 0x16df -#define BROADCOM_DEV_ID_57317_RJ45 0x16e0 -#define BROADCOM_DEV_ID_5731X_VF 0x16e1 -#define BROADCOM_DEV_ID_57417_SFP 0x16e2 -#define BROADCOM_DEV_ID_57416_SFP 0x16e3 -#define BROADCOM_DEV_ID_57317_SFP 0x16e4 -#define BROADCOM_DEV_ID_57404_MF 0x16e7 -#define BROADCOM_DEV_ID_57406_MF 0x16e8 -#define BROADCOM_DEV_ID_57407_SFP 0x16e9 -#define BROADCOM_DEV_ID_57407_MF 0x16ea -#define BROADCOM_DEV_ID_57414_MF 0x16ec -#define BROADCOM_DEV_ID_57416_MF 0x16ee - static const struct rte_pci_id bnxt_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_STRATUS_NIC_VF) }, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.028911491 +0000 +++ 0068-net-bnxt-move-macro-definitions-to-header-file.patch 2019-12-19 14:32:26.153298777 +0000 @@ -1,96 +1,86 @@ -From 9924dfd601fadeacb6c9968437cad8c6f853f77f Mon Sep 17 00:00:00 2001 +From 56524e5288ea2d45160038195b5aee3bf4454f21 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 10 Oct 2019 15:14:32 +0530 Subject: [PATCH] net/bnxt: move macro definitions to header file +[ upstream commit 9924dfd601fadeacb6c9968437cad8c6f853f77f ] + Move device and vendor ids macro definition from bnxt_ethdev.c to bnxt.h. There is no functionality impact. Fixes: 882aa9c6e2e1 ("net/bnxt: move PCI device ids to the driver") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson Reviewed-by: Ajit Khaparde --- - drivers/net/bnxt/bnxt.h | 50 +++++++++++++++++++++++++++++++++ - drivers/net/bnxt/bnxt_ethdev.c | 51 ++-------------------------------- - 2 files changed, 53 insertions(+), 48 deletions(-) + drivers/net/bnxt/bnxt.h | 40 ++++++++++++++++++++++++++++++++++ + drivers/net/bnxt/bnxt_ethdev.c | 38 -------------------------------- + 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h -index 080365804c..189f693b06 100644 +index 1fae24b801..3c29ee5d51 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h -@@ -21,6 +21,56 @@ +@@ -47,6 +47,46 @@ + #include "bnxt_cpr.h" - #include "bnxt_util.h" +/* Vendor ID */ -+#define PCI_VENDOR_ID_BROADCOM 0x14E4 ++#define PCI_VENDOR_ID_BROADCOM 0x14E4 + +/* Device IDs */ -+#define BROADCOM_DEV_ID_STRATUS_NIC_VF1 0x1606 -+#define BROADCOM_DEV_ID_STRATUS_NIC_VF2 0x1609 -+#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614 -+#define BROADCOM_DEV_ID_57414_VF 0x16c1 -+#define BROADCOM_DEV_ID_57301 0x16c8 -+#define BROADCOM_DEV_ID_57302 0x16c9 -+#define BROADCOM_DEV_ID_57304_PF 0x16ca -+#define BROADCOM_DEV_ID_57304_VF 0x16cb -+#define BROADCOM_DEV_ID_57417_MF 0x16cc -+#define BROADCOM_DEV_ID_NS2 0x16cd -+#define BROADCOM_DEV_ID_57311 0x16ce -+#define BROADCOM_DEV_ID_57312 0x16cf -+#define BROADCOM_DEV_ID_57402 0x16d0 -+#define BROADCOM_DEV_ID_57404 0x16d1 -+#define BROADCOM_DEV_ID_57406_PF 0x16d2 -+#define BROADCOM_DEV_ID_57406_VF 0x16d3 -+#define BROADCOM_DEV_ID_57402_MF 0x16d4 -+#define BROADCOM_DEV_ID_57407_RJ45 0x16d5 -+#define BROADCOM_DEV_ID_57412 0x16d6 -+#define BROADCOM_DEV_ID_57414 0x16d7 -+#define BROADCOM_DEV_ID_57416_RJ45 0x16d8 -+#define BROADCOM_DEV_ID_57417_RJ45 0x16d9 -+#define BROADCOM_DEV_ID_5741X_VF 0x16dc -+#define BROADCOM_DEV_ID_57412_MF 0x16de -+#define BROADCOM_DEV_ID_57314 0x16df -+#define BROADCOM_DEV_ID_57317_RJ45 0x16e0 -+#define BROADCOM_DEV_ID_5731X_VF 0x16e1 -+#define BROADCOM_DEV_ID_57417_SFP 0x16e2 -+#define BROADCOM_DEV_ID_57416_SFP 0x16e3 -+#define BROADCOM_DEV_ID_57317_SFP 0x16e4 -+#define BROADCOM_DEV_ID_57404_MF 0x16e7 -+#define BROADCOM_DEV_ID_57406_MF 0x16e8 -+#define BROADCOM_DEV_ID_57407_SFP 0x16e9 -+#define BROADCOM_DEV_ID_57407_MF 0x16ea -+#define BROADCOM_DEV_ID_57414_MF 0x16ec -+#define BROADCOM_DEV_ID_57416_MF 0x16ee -+#define BROADCOM_DEV_ID_57508 0x1750 -+#define BROADCOM_DEV_ID_57504 0x1751 -+#define BROADCOM_DEV_ID_57502 0x1752 -+#define BROADCOM_DEV_ID_57500_VF1 0x1806 -+#define BROADCOM_DEV_ID_57500_VF2 0x1807 -+#define BROADCOM_DEV_ID_58802 0xd802 -+#define BROADCOM_DEV_ID_58804 0xd804 -+#define BROADCOM_DEV_ID_58808 0x16f0 -+#define BROADCOM_DEV_ID_58802_VF 0xd800 ++#define BROADCOM_DEV_ID_STRATUS_NIC_VF 0x1609 ++#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614 ++#define BROADCOM_DEV_ID_57414_VF 0x16c1 ++#define BROADCOM_DEV_ID_57301 0x16c8 ++#define BROADCOM_DEV_ID_57302 0x16c9 ++#define BROADCOM_DEV_ID_57304_PF 0x16ca ++#define BROADCOM_DEV_ID_57304_VF 0x16cb ++#define BROADCOM_DEV_ID_57417_MF 0x16cc ++#define BROADCOM_DEV_ID_NS2 0x16cd ++#define BROADCOM_DEV_ID_57311 0x16ce ++#define BROADCOM_DEV_ID_57312 0x16cf ++#define BROADCOM_DEV_ID_57402 0x16d0 ++#define BROADCOM_DEV_ID_57404 0x16d1 ++#define BROADCOM_DEV_ID_57406_PF 0x16d2 ++#define BROADCOM_DEV_ID_57406_VF 0x16d3 ++#define BROADCOM_DEV_ID_57402_MF 0x16d4 ++#define BROADCOM_DEV_ID_57407_RJ45 0x16d5 ++#define BROADCOM_DEV_ID_57412 0x16d6 ++#define BROADCOM_DEV_ID_57414 0x16d7 ++#define BROADCOM_DEV_ID_57416_RJ45 0x16d8 ++#define BROADCOM_DEV_ID_57417_RJ45 0x16d9 ++#define BROADCOM_DEV_ID_5741X_VF 0x16dc ++#define BROADCOM_DEV_ID_57412_MF 0x16de ++#define BROADCOM_DEV_ID_57314 0x16df ++#define BROADCOM_DEV_ID_57317_RJ45 0x16e0 ++#define BROADCOM_DEV_ID_5731X_VF 0x16e1 ++#define BROADCOM_DEV_ID_57417_SFP 0x16e2 ++#define BROADCOM_DEV_ID_57416_SFP 0x16e3 ++#define BROADCOM_DEV_ID_57317_SFP 0x16e4 ++#define BROADCOM_DEV_ID_57404_MF 0x16e7 ++#define BROADCOM_DEV_ID_57406_MF 0x16e8 ++#define BROADCOM_DEV_ID_57407_SFP 0x16e9 ++#define BROADCOM_DEV_ID_57407_MF 0x16ea ++#define BROADCOM_DEV_ID_57414_MF 0x16ec ++#define BROADCOM_DEV_ID_57416_MF 0x16ee + - #define BNXT_MAX_MTU 9574 + #define BNXT_MAX_MTU 9500 #define VLAN_TAG_SIZE 4 - #define BNXT_NUM_VLANS 2 + #define BNXT_MAX_LED 4 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 90a97fac1b..b58a875c7d 100644 +index 0813865edc..7610626306 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -32,54 +32,9 @@ static const char bnxt_version[] = - "Broadcom NetXtreme driver " DRV_MODULE_NAME; - int bnxt_logtype_driver; +@@ -58,44 +58,6 @@ + static const char bnxt_version[] = + "Broadcom Cumulus driver " DRV_MODULE_NAME "\n"; -#define PCI_VENDOR_ID_BROADCOM 0x14E4 - --#define BROADCOM_DEV_ID_STRATUS_NIC_VF1 0x1606 --#define BROADCOM_DEV_ID_STRATUS_NIC_VF2 0x1609 +-#define BROADCOM_DEV_ID_STRATUS_NIC_VF 0x1609 -#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614 -#define BROADCOM_DEV_ID_57414_VF 0x16c1 -#define BROADCOM_DEV_ID_57301 0x16c8 @@ -125,22 +115,10 @@ -#define BROADCOM_DEV_ID_57407_MF 0x16ea -#define BROADCOM_DEV_ID_57414_MF 0x16ec -#define BROADCOM_DEV_ID_57416_MF 0x16ee --#define BROADCOM_DEV_ID_57508 0x1750 --#define BROADCOM_DEV_ID_57504 0x1751 --#define BROADCOM_DEV_ID_57502 0x1752 --#define BROADCOM_DEV_ID_57500_VF1 0x1806 --#define BROADCOM_DEV_ID_57500_VF2 0x1807 --#define BROADCOM_DEV_ID_58802 0xd802 --#define BROADCOM_DEV_ID_58804 0xd804 --#define BROADCOM_DEV_ID_58808 0x16f0 --#define BROADCOM_DEV_ID_58802_VF 0xd800 - -+/* -+ * The set of PCI devices this driver supports -+ */ static const struct rte_pci_id bnxt_pci_id_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, - BROADCOM_DEV_ID_STRATUS_NIC_VF1) }, + BROADCOM_DEV_ID_STRATUS_NIC_VF) }, -- 2.20.1