From patchwork Sat Oct 10 04:05:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 80256 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9E11A04BC; Sat, 10 Oct 2020 06:11:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8AF8B1D70F; Sat, 10 Oct 2020 06:07:53 +0200 (CEST) Received: from mail-oi1-f225.google.com (mail-oi1-f225.google.com [209.85.167.225]) by dpdk.org (Postfix) with ESMTP id 7B8F01D6AE for ; Sat, 10 Oct 2020 06:07:45 +0200 (CEST) Received: by mail-oi1-f225.google.com with SMTP id z26so12343118oih.12 for ; Fri, 09 Oct 2020 21:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DiwToIxbh+1ELIlUO1EQBDYlGl/1CGMgwO8BzvnzS4I=; b=f2L6rdFFicpoEBAqFyIE35TB5Gw6y5o8c7quAtEX21qm26bAn30p+NbhkIa3p4/Ilj aSGGdVYmEk62CxWdbXD2z2iXdFNHRpJ+8EVXvOWSt0ftHHJ9yCqAzVXgGyXds0F05ayQ xG7w4uVd33TQHt6bPWOamOhUQaTqfwnaiSF2g= 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=DiwToIxbh+1ELIlUO1EQBDYlGl/1CGMgwO8BzvnzS4I=; b=E1W8cH2gkveNxGqQvCeetYp49HcGUOY8pBEGXOQsFDK5BXxgMktP6TPGJ3sdGMTUGS 5BEKIpyGzoibx4h8s3zoyQT5wgHF/hb1xeB9jNDJUpctiqQni6+dWnytXNNlgyNnGEYY a9s4/xW2lXAjG117dvMExPafgO5hrkePp3lvPDjC1KRrwG9Rk4GxKL/VQHU/ToKNz9s7 Z9a6n45K+WOsRW2CJgh0brZODtbEIB55fZuSfPyzjy2maI8mqBGSTUo7TfNEHGfgVWAy 7t7AunL9SbVrgF40r15/zJjJEMVHVDF+Kt9s09B7CNOm7zMouAdU3C62zuWPG/hxkK3O ZUGQ== X-Gm-Message-State: AOAM532GqfUhBDnA6fyWDyge7eJoUxMUnHPTdNK2L9w4uH2pmoQcvahT D6egjNuaD4/2PLtQ0S/DQm/jK89t+Qm1F0OlkC6Ntq7P7Z7uAgiHi0q78CU/9FgrCFV/9VvUPzN d+u2v6XS37vt4zZ3bWFkyI3wRMIlHg3VNa82/lZAEp2GQOBB+DSZXcq2LDXmnrZ50PnwVcLQXOw bjYA== X-Google-Smtp-Source: ABdhPJzTp/EHRuL15QLMk/Z63HP2m2kvKy04HjBjb5MQK5pNMqd+LtmD4tYURK7Tqt0eu7BSQq3UhCl2foH8 X-Received: by 2002:aca:3c87:: with SMTP id j129mr4708327oia.72.1602302863743; Fri, 09 Oct 2020 21:07:43 -0700 (PDT) Received: from localhost.localdomain ([192.19.223.252]) by smtp-relay.gmail.com with ESMTPS id 67sm1555892oop.24.2020.10.09.21.07.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Oct 2020 21:07:43 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Ajit Khaparde To: dev@dpdk.org Cc: Mike Baucom , Kishore Padmanabha Date: Fri, 9 Oct 2020 21:05:20 -0700 Message-Id: <20201010040520.63049-12-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20201009111130.10422-1-somnath.kotur@broadcom.com> References: <20201009111130.10422-1-somnath.kotur@broadcom.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 11/12] net/bnxt: remove flow db table type from templates X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Mike Baucom FDB type is now driven by the caller, not the template. So remove it. Signed-off-by: Mike Baucom Reviewed-by: Ajit Khaparde Reviewed-by: Kishore Padmanabha --- .../tf_ulp/ulp_template_db_stingray_act.c | 18 ++--- .../tf_ulp/ulp_template_db_stingray_class.c | 69 +++++++------------ .../bnxt/tf_ulp/ulp_template_db_wh_plus_act.c | 18 ++--- .../tf_ulp/ulp_template_db_wh_plus_class.c | 69 +++++++------------ drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 1 - 5 files changed, 58 insertions(+), 117 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c index 68e4d8e59..2237ffb94 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c @@ -12,38 +12,32 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_act_tmpl_list[] = { [1] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 0, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 0 }, [2] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 3, - .start_tbl_idx = 6, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 6 }, [3] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 3, - .start_tbl_idx = 9, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 9 }, [4] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 12, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 12 }, [5] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 18, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 18 }, [6] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 24, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 24 } }; diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c index 1fa364e29..62b940daa 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c @@ -12,140 +12,117 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_class_tmpl_list[] = { [1] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 0, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 0 }, [2] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 7, - .start_tbl_idx = 6, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 6 }, [3] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 7, - .start_tbl_idx = 13, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 13 }, [4] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 7, - .start_tbl_idx = 20, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 20 }, [5] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 1, - .start_tbl_idx = 27, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 27 }, [6] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 28, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 28 }, [7] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 33, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 33 }, [8] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 38, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 38 }, [9] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 44, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 44 }, [10] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 50, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 50 }, [11] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 56, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 56 }, [12] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 62, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 62 }, [13] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 67, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 67 }, [14] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 72, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 72 }, [15] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 77, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 77 }, [16] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 82, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 82 }, [17] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 87, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 87 }, [18] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 92, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 92 }, [19] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 98, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 98 }, [20] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 104, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 104 }, [21] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 6, - .start_tbl_idx = 110, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 110 }, [22] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 116, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 116 }, [23] = { .device_name = BNXT_ULP_DEVICE_ID_STINGRAY, .num_tbls = 5, - .start_tbl_idx = 121, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 121 } }; diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c index 381278ee9..39e8ec40b 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c @@ -12,38 +12,32 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[] = { [1] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 0, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 0 }, [2] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 3, - .start_tbl_idx = 6, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 6 }, [3] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 3, - .start_tbl_idx = 9, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 9 }, [4] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 12, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 12 }, [5] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 18, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 18 }, [6] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 24, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 24 } }; diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c index 7024658ce..470d91ce2 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c @@ -12,140 +12,117 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_class_tmpl_list[] = { [1] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 0, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 0 }, [2] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 7, - .start_tbl_idx = 6, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 6 }, [3] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 7, - .start_tbl_idx = 13, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 13 }, [4] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 7, - .start_tbl_idx = 20, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 20 }, [5] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 1, - .start_tbl_idx = 27, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_DEFAULT + .start_tbl_idx = 27 }, [6] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 28, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 28 }, [7] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 33, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 33 }, [8] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 38, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 38 }, [9] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 44, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 44 }, [10] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 50, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 50 }, [11] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 56, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 56 }, [12] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 62, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 62 }, [13] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 67, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 67 }, [14] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 72, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 72 }, [15] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 77, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 77 }, [16] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 82, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 82 }, [17] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 87, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 87 }, [18] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 92, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 92 }, [19] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 98, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 98 }, [20] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 104, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 104 }, [21] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 6, - .start_tbl_idx = 110, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 110 }, [22] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 116, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 116 }, [23] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, .num_tbls = 5, - .start_tbl_idx = 121, - .flow_db_table_type = BNXT_ULP_FDB_TYPE_REGULAR + .start_tbl_idx = 121 } }; diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h index 107a06a3d..69bb61e11 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h @@ -175,7 +175,6 @@ struct bnxt_ulp_mapper_tbl_list_info { uint32_t device_name; uint32_t start_tbl_idx; uint32_t num_tbls; - enum bnxt_ulp_fdb_type flow_db_table_type; }; struct bnxt_ulp_mapper_tbl_info {