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 1916FA04F3 for ; Thu, 19 Dec 2019 15:37:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 11DB21BF7D; Thu, 19 Dec 2019 15:37:31 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 2A8C41BF9A for ; Thu, 19 Dec 2019 15:37:28 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id d73so5681826wmd.1 for ; Thu, 19 Dec 2019 06:37:28 -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=08xU61OljIUjgZnHnrrhE6J7pBXRwt2ykQ72qfG1zDo=; b=YMnYBezoi9Zp/gNh5XZNezHQILd8qpn2x0egJ3If1vpDHOkrXIWcGU/2gghIMQgZx/ 3NkVzRsW55K2myMHMaZROjUWQiF3o6xmWzLxex6mcNdqqrnYbObiG+isgLTbLPhjuLIB E5zbQr/A32inCpkeORzX1SCDl94P/FHN3qa+p85nGct0C5JMiCL8sRKJcpcgh+Pqo3XS gxsSOZd/B6UVC3FmXFVWr46K4RW7FDRvJg3AUyZUcEzuCvI0QTE4VrEzE2qTmCrJOxE5 14JFTdWo511rsRqgVOv3qwiH4kYgki+RHAwmmKcTRMD9cg2ladBNPUP+xuK0lEZdI8RX ziZw== 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=08xU61OljIUjgZnHnrrhE6J7pBXRwt2ykQ72qfG1zDo=; b=NhGYyjZ4DLdUedDD5uuiG8K1ojeTwPkJXbO+0D75/kGm4zQ7v7iZ/7QE8NwgIVTW4k OSYztPUq/7tYhxkE0/VgLbw7mpsUKR5Sylm+CMpFyyURPiyRIXkGGwMHTWsXawUJHCN3 Mv/K6FlJMpP16lBlfRxr5UlPkmYzSA32heL4EKE19nyRlbf/yg/FuiZpuhjssUpmilWn EN52xuu5bMhbANJJSa7xWzFjkhvuyIbC6q8TZfDVZfSImj8DsWeqGYjGAPvY4DNBfsbs QnJnZ9EBRK1UbppXD1ktjUIscPSQAYXFpIV/ZX5yGWiY5v1/3PxC8EFUC5W9IwLID7K5 kFdQ== X-Gm-Message-State: APjAAAX1wZFaljwhF9WQY6P8bvJrLFO33RhkwFki0SIbICrGlyK7iVoO Zjc6kVyCVakJAT3/akYNe3hvVvLcjmY= X-Google-Smtp-Source: APXvYqwAnj3fTpAcaZv+UNRY6VXjlaR2wVtrkdbL5blwNC5QvzUC+zMD19ukfh71lPZtH17yQaYBjw== X-Received: by 2002:a7b:cd11:: with SMTP id f17mr10696402wmj.48.1576766247844; Thu, 19 Dec 2019 06:37:27 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e18sm6542005wrw.70.2019.12.19.06.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:27 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Thu, 19 Dec 2019 14:33:30 +0000 Message-Id: <20191219143447.21506-63-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: fix coding style' 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 d0a23459242dfab490d296a4bcb58a13f6eb527a Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Oct 2019 18:41:52 -0700 Subject: [PATCH] net/bnxt: fix coding style [ upstream commit 996355970d3dbc1a7d3751a8cf63c1869b120638 ] - Remove unnecessary new line - Remove unnecessary blank lines - Align rte_* header file inclusion at one place Fixes: 37d6161a68ba ("net/bnxt: add ring group alloc/free") Fixes: ec77c6298301 ("net/bnxt: add stats context allocation") Signed-off-by: Kalesh AP Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 1 - drivers/net/bnxt/bnxt_hwrm.c | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index f1bac2fcaa..0813865edc 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2348,7 +2348,6 @@ bnxt_parse_fdir_filter(struct bnxt *bp, return -EINVAL; } - if (fdir_mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN) { rte_memcpy(filter->dst_macaddr, fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index a8d7c487f9..25b392eb4a 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "bnxt.h" #include "bnxt_filter.h" @@ -51,8 +52,6 @@ #include "bnxt_vnic.h" #include "hsi_struct_def_dpdk.h" -#include - struct bnxt_plcmodes_cfg { uint32_t flags; uint16_t jumbo_thresh; @@ -1005,8 +1004,7 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) HWRM_CHECK_RESULT(); - bp->grp_info[idx].fw_grp_id = - rte_le_to_cpu_16(resp->ring_group_id); + bp->grp_info[idx].fw_grp_id = rte_le_to_cpu_16(resp->ring_group_id); HWRM_UNLOCK(); @@ -1064,8 +1062,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, req.update_period_ms = rte_cpu_to_le_32(0); - req.stats_dma_addr = - rte_cpu_to_le_64(cpr->hw_stats_map); + req.stats_dma_addr = rte_cpu_to_le_64(cpr->hw_stats_map); rc = bnxt_hwrm_send_message(bp, &req, sizeof(req)); @@ -2937,7 +2934,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx, stats->q_errors[idx] += rte_le_to_cpu_64(resp->tx_err_pkts); } - HWRM_UNLOCK(); return rc; @@ -3536,7 +3532,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp, HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_DST_ID; req.dst_id = rte_cpu_to_le_16(dst_id); - if (filter->ip_addr_type) { req.ip_addr_type = filter->ip_addr_type; enables |= -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.830799557 +0000 +++ 0063-net-bnxt-fix-coding-style.patch 2019-12-19 14:32:26.141298539 +0000 @@ -1,15 +1,16 @@ -From 996355970d3dbc1a7d3751a8cf63c1869b120638 Mon Sep 17 00:00:00 2001 +From d0a23459242dfab490d296a4bcb58a13f6eb527a Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Oct 2019 18:41:52 -0700 Subject: [PATCH] net/bnxt: fix coding style +[ upstream commit 996355970d3dbc1a7d3751a8cf63c1869b120638 ] + - Remove unnecessary new line - Remove unnecessary blank lines - Align rte_* header file inclusion at one place Fixes: 37d6161a68ba ("net/bnxt: add ring group alloc/free") Fixes: ec77c6298301 ("net/bnxt: add stats context allocation") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Signed-off-by: Ajit Khaparde @@ -19,10 +20,10 @@ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 39bc06c6c7..90a97fac1b 100644 +index f1bac2fcaa..0813865edc 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -3002,7 +3002,6 @@ bnxt_parse_fdir_filter(struct bnxt *bp, +@@ -2348,7 +2348,6 @@ bnxt_parse_fdir_filter(struct bnxt *bp, return -EINVAL; } @@ -31,10 +32,10 @@ rte_memcpy(filter->dst_macaddr, fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index f94fdde2b1..5b430b9415 100644 +index a8d7c487f9..25b392eb4a 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -11,6 +11,7 @@ +@@ -39,6 +39,7 @@ #include #include #include @@ -42,16 +43,16 @@ #include "bnxt.h" #include "bnxt_filter.h" -@@ -23,8 +24,6 @@ +@@ -51,8 +52,6 @@ #include "bnxt_vnic.h" #include "hsi_struct_def_dpdk.h" -#include - - #define HWRM_SPEC_CODE_1_8_3 0x10803 - #define HWRM_VERSION_1_9_1 0x10901 - #define HWRM_VERSION_1_9_2 0x10903 -@@ -1483,8 +1482,7 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) + struct bnxt_plcmodes_cfg { + uint32_t flags; + uint16_t jumbo_thresh; +@@ -1005,8 +1004,7 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) HWRM_CHECK_RESULT(); @@ -61,7 +62,7 @@ HWRM_UNLOCK(); -@@ -1542,8 +1540,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, +@@ -1064,8 +1062,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, req.update_period_ms = rte_cpu_to_le_32(0); @@ -69,17 +70,17 @@ - rte_cpu_to_le_64(cpr->hw_stats_map); + req.stats_dma_addr = rte_cpu_to_le_64(cpr->hw_stats_map); - rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); + rc = bnxt_hwrm_send_message(bp, &req, sizeof(req)); -@@ -3633,7 +3630,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx, - stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_bcast_bytes); +@@ -2937,7 +2934,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx, + stats->q_errors[idx] += rte_le_to_cpu_64(resp->tx_err_pkts); } - HWRM_UNLOCK(); return rc; -@@ -4218,7 +4214,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp, +@@ -3536,7 +3532,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp, HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_DST_ID; req.dst_id = rte_cpu_to_le_16(dst_id);