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 5D173A051C for ; Tue, 11 Feb 2020 12:41:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 56A4E1C00F; Tue, 11 Feb 2020 12:41:15 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by dpdk.org (Postfix) with ESMTP id BEF5C1BFFF for ; Tue, 11 Feb 2020 12:41:14 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id y17so11942740wrh.5 for ; Tue, 11 Feb 2020 03:41:14 -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=q/VLjkw8Fx7ZgfVqNxbpTuGo4SeLBRnj7h2Eu+wfnAw=; b=V0kWXE/3m5d9Ilqsm2fWRIvqYoplFWir1ejb/DvPjdMxEN0HmxLhwLfTpcZOGtSprk Lj4qj3tZyXm+QAJaJEqvPdjlwM9qIoZ/0gVcAU05of4kHVYyvG9asorNCHsw9PtqPmjw fXWFzIazFgOkbReDKv/CRtVWbNZXl8CVjvjmwPjLwj146pHrSPw9QoEt8AaFijBpsr+V lbA6Orch/GeLL7SFy1TzuJpECBXJDbAUrov8Y8WcFCLnaPEolMYnVosDXBf4eUnu0Qfp c8kC+hdBlY6F9pVdn6rTfe2K126vkg5OB7AZ2EDz/2ouTQS6mRd/rxaOtgB6lH1KAhNi 0YZw== 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=q/VLjkw8Fx7ZgfVqNxbpTuGo4SeLBRnj7h2Eu+wfnAw=; b=Rktar81/vlZFBONxTSayJ4BP8DuVp5NMVtT80k+YPl4d9B9lQSIuzwWdI6XicLAdCU 0xYD84LHbfUWUYuQrSR0Ab/i78DN1teCTXT92dNTa90EPebeVSb+A3Q0tfEtEe0E3KCG ocgYK3/2I3let/sSUkC7rcjbK+/ST33x1QsWaRcU1hTXOgVNZONzICaj1iFLbE2b1I7y S9w7cVCNs0LhoThRGLjEx+345K3FAm7/Dz/a1GNig90Rz5JEK84uAvbvZWI9/a3F4Tem YrendwvvJyl41Ti6XmmExEdbnVo1qGxLivObmZHFCrscTwo6jTnWNiEfGW0Y4H+CLCTa WzGA== X-Gm-Message-State: APjAAAUKd22NlqU04og5nS2XYuqG+a5V47W8m3t9zpkvigSaBTNTw4gr HvFasCeSJzurI3NvHlwfYVI= X-Google-Smtp-Source: APXvYqxPXbt/Bk37ht1SZ+q2KGauh8yf3zHE3RXrY8qnewp26hZNHOHWY3NR3HxEoVZCB/pUPqIsHQ== X-Received: by 2002:a5d:6b82:: with SMTP id n2mr8750972wrx.153.1581421273410; Tue, 11 Feb 2020 03:41:13 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x132sm5712666wmg.0.2020.02.11.03.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:41:12 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Santoshkumar Karanappa Rastapur , Ajit Khaparde , Somnath Kotur , dpdk stable Date: Tue, 11 Feb 2020 11:21:50 +0000 Message-Id: <20200211112216.3929-164-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: remove unnecessary structure variable' has been queued to stable release 19.11.1 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.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/13/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 d7a5c9f001b1c4272063db5bb6a0a36b9bd9c735 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 28 Jan 2020 12:59:20 +0530 Subject: [PATCH] net/bnxt: remove unnecessary structure variable [ upstream commit 6dc26050e42821e7604b4160768197d7668d2439 ] This change could help in reducing the size of bnxt PMD private data structure by converting a uint8_t variable to use bit map flag. Fixes: 5cd0e2889c43 ("net/bnxt: support NIC Partitioning") Reviewed-by: Santoshkumar Karanappa Rastapur Reviewed-by: Ajit Khaparde Signed-off-by: Somnath Kotur Signed-off-by: Kalesh AP --- drivers/net/bnxt/bnxt.h | 4 ++-- drivers/net/bnxt/bnxt_hwrm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 265c63a3e7..397d1cd843 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -523,12 +523,13 @@ struct bnxt { #define BNXT_FLAG_FW_CAP_ERR_RECOVER_RELOAD BIT(21) #define BNXT_FLAG_EXT_STATS_SUPPORTED BIT(22) #define BNXT_FLAG_NEW_RM BIT(23) +#define BNXT_FLAG_NPAR_PF BIT(24) #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS BIT(25) #define BNXT_FLAG_ADV_FLOW_MGMT BIT(26) #define BNXT_FLAG_FW_CAP_HOT_RESET BIT(27) #define BNXT_PF(bp) (!((bp)->flags & BNXT_FLAG_VF)) #define BNXT_VF(bp) ((bp)->flags & BNXT_FLAG_VF) -#define BNXT_NPAR(bp) ((bp)->port_partition_type) +#define BNXT_NPAR(bp) ((bp)->flags & BNXT_FLAG_NPAR_PF) #define BNXT_MH(bp) ((bp)->flags & BNXT_FLAG_MULTI_HOST) #define BNXT_SINGLE_PF(bp) (BNXT_PF(bp) && !BNXT_NPAR(bp) && !BNXT_MH(bp)) #define BNXT_USE_CHIMP_MB 0 //For non-CFA commands, everything uses Chimp. @@ -644,7 +645,6 @@ struct bnxt { #define BNXT_OUTER_TPID_BD_SHFT 16 uint32_t outer_tpid_bd; struct bnxt_pf_info pf; - uint8_t port_partition_type; uint8_t dev_stopped; uint8_t vxlan_port_cnt; uint8_t geneve_port_cnt; diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 6309a61c06..45d56316fc 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -2957,10 +2957,10 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) case HWRM_FUNC_QCFG_OUTPUT_PORT_PARTITION_TYPE_NPAR1_5: case HWRM_FUNC_QCFG_OUTPUT_PORT_PARTITION_TYPE_NPAR2_0: /* FALLTHROUGH */ - bp->port_partition_type = resp->port_partition_type; + bp->flags |= BNXT_FLAG_NPAR_PF; break; default: - bp->port_partition_type = 0; + bp->flags &= ~BNXT_FLAG_NPAR_PF; break; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.312165125 +0000 +++ 0164-net-bnxt-remove-unnecessary-structure-variable.patch 2020-02-11 11:17:38.780008452 +0000 @@ -1,13 +1,14 @@ -From 6dc26050e42821e7604b4160768197d7668d2439 Mon Sep 17 00:00:00 2001 +From d7a5c9f001b1c4272063db5bb6a0a36b9bd9c735 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 28 Jan 2020 12:59:20 +0530 Subject: [PATCH] net/bnxt: remove unnecessary structure variable +[ upstream commit 6dc26050e42821e7604b4160768197d7668d2439 ] + This change could help in reducing the size of bnxt PMD private data structure by converting a uint8_t variable to use bit map flag. Fixes: 5cd0e2889c43 ("net/bnxt: support NIC Partitioning") -Cc: stable@dpdk.org Reviewed-by: Santoshkumar Karanappa Rastapur Reviewed-by: Ajit Khaparde @@ -19,17 +20,17 @@ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h -index 95f1f1a20e..434ce2829e 100644 +index 265c63a3e7..397d1cd843 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h -@@ -520,12 +520,13 @@ struct bnxt { - #define BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED BIT(18) - #define BNXT_FLAG_EXT_STATS_SUPPORTED BIT(19) - #define BNXT_FLAG_NEW_RM BIT(20) -+#define BNXT_FLAG_NPAR_PF BIT(21) - #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS BIT(22) - #define BNXT_FLAG_ADV_FLOW_MGMT BIT(23) - #define BNXT_FLAG_RX_VECTOR_PKT_MODE BIT(24) +@@ -523,12 +523,13 @@ struct bnxt { + #define BNXT_FLAG_FW_CAP_ERR_RECOVER_RELOAD BIT(21) + #define BNXT_FLAG_EXT_STATS_SUPPORTED BIT(22) + #define BNXT_FLAG_NEW_RM BIT(23) ++#define BNXT_FLAG_NPAR_PF BIT(24) + #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS BIT(25) + #define BNXT_FLAG_ADV_FLOW_MGMT BIT(26) + #define BNXT_FLAG_FW_CAP_HOT_RESET BIT(27) #define BNXT_PF(bp) (!((bp)->flags & BNXT_FLAG_VF)) #define BNXT_VF(bp) ((bp)->flags & BNXT_FLAG_VF) -#define BNXT_NPAR(bp) ((bp)->port_partition_type) @@ -37,7 +38,7 @@ #define BNXT_MH(bp) ((bp)->flags & BNXT_FLAG_MULTI_HOST) #define BNXT_SINGLE_PF(bp) (BNXT_PF(bp) && !BNXT_NPAR(bp) && !BNXT_MH(bp)) #define BNXT_USE_CHIMP_MB 0 //For non-CFA commands, everything uses Chimp. -@@ -647,7 +648,6 @@ struct bnxt { +@@ -644,7 +645,6 @@ struct bnxt { #define BNXT_OUTER_TPID_BD_SHFT 16 uint32_t outer_tpid_bd; struct bnxt_pf_info pf; @@ -46,10 +47,10 @@ uint8_t vxlan_port_cnt; uint8_t geneve_port_cnt; diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index 460cc48942..f325aff828 100644 +index 6309a61c06..45d56316fc 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -2952,10 +2952,10 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) +@@ -2957,10 +2957,10 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) case HWRM_FUNC_QCFG_OUTPUT_PORT_PARTITION_TYPE_NPAR1_5: case HWRM_FUNC_QCFG_OUTPUT_PORT_PARTITION_TYPE_NPAR2_0: /* FALLTHROUGH */