From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1905FA0C4B; Wed, 3 Nov 2021 01:55:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C4566426E0; Wed, 3 Nov 2021 01:53:25 +0100 (CET) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mails.dpdk.org (Postfix) with ESMTP id D00C2426D4 for ; Wed, 3 Nov 2021 01:53:21 +0100 (CET) Received: by mail-pj1-f47.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so220576pjc.4 for ; Tue, 02 Nov 2021 17:53:21 -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; bh=MM2CsuVgT0JcizeUZOsPgkdoN+ba49ylRgNgKcoEjPA=; b=YwyxoloM34/TMGpY3mhM1dhhluK8ZZpZcTGp/YXj294+rnb3Z2DFoN8AJMC5hqosLE DK1/T9uXHbyXoGaiRfelUC/9J69/RdQZyrhimgGxafoUhgaM2WgoXNleVHi1hMtJgt+R lStM4XPvAKcWekR2oJY5KfuPeP8Mw+u2yZpBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=MM2CsuVgT0JcizeUZOsPgkdoN+ba49ylRgNgKcoEjPA=; b=cn6wrGdUT8+bQzzCdKzeT1TLC+Est5Bs/Bqci3v7GwQnW6zTxkvlI5QwlrGTXTT57c 2v6N8pQ1naYye5ebseeEdfFA3Xzdwq4Ht4ybY/W1yX+qS7+I+yrjg0t6selEV/w/vyrl OHGfurCS9MR4YFQEcHnR9dqO43rG4QOpmdtYYg7GfDVRLXxAolXO5kn/dcGEk5ovFlyA ynYyFc6rNXemW6L6M+nMs6lQuT/7p2SZnPf85TG34X+Yo12jaksoC/54JXjVyfpAjOhX wZYrvI/ElopgRxoJ+OC0IJMu28SeO8B0jZba4PdhnuwwCLf1dNg4Rp2qJw/lWJiaOpfR 2jvw== X-Gm-Message-State: AOAM531q/qS1T4Y659smA0bCsdggX0QLzo9G5B7yo3peVZk1mYrR+SrN allqmE8gRY3yiA58vrbPxRESndSabusrauJKK1eKmKzzniR6IBPfUxqqiyKbUdmUU6yTyKcvp44 S4kN1dKJjBdr7srpqha6vMCtt3hTbJT8BQFd1b7+vrkaCXsta9AZWsKOzE352u9w= X-Google-Smtp-Source: ABdhPJyH7Bfjb78CVVEGKtKWmMjk46boXvucc0SJoXYjeQ+Y6qo4m6gF8I3iwhnyBPU9OS3hRMddpw== X-Received: by 2002:a17:902:b94a:b0:141:8454:d665 with SMTP id h10-20020a170902b94a00b001418454d665mr35114608pls.88.1635900800632; Tue, 02 Nov 2021 17:53:20 -0700 (PDT) Received: from localhost.localdomain ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id k2sm323450pfu.112.2021.11.02.17.53.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Nov 2021 17:53:19 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: Jay Ding , Steve Rempe , Farah Smith Date: Tue, 2 Nov 2021 17:52:51 -0700 Message-Id: <20211103005251.25524-21-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20211103005251.25524-1-ajit.khaparde@broadcom.com> References: <20211102040556.7840-1-venkatkumar.duvvuru@broadcom.com> <20211103005251.25524-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="00000000000023b36205cfd7d6eb" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH v4 20/20] net/bnxt: use enum for bank ID X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" --00000000000023b36205cfd7d6eb Content-Transfer-Encoding: 8bit From: Jay Ding Instead of integer, using enum tf_sram_bank_id for bank id in tf_set_sram_policy_parms. Add index check against the allocation of the meter instance for meter drop count because there is no reason to access it if the corresponding meter entry is not allocated. Signed-off-by: Jay Ding Reviewed-by: Steve Rempe Reviewed-by: Farah Smith Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_core/tf_core.h | 4 +- drivers/net/bnxt/tf_core/tf_device.h | 4 +- drivers/net/bnxt/tf_core/tf_device_p58.c | 10 ++-- drivers/net/bnxt/tf_core/tf_tbl.c | 75 ++++++++++++------------ 4 files changed, 47 insertions(+), 46 deletions(-) diff --git a/drivers/net/bnxt/tf_core/tf_core.h b/drivers/net/bnxt/tf_core/tf_core.h index b2886355fa..f891d7a48f 100644 --- a/drivers/net/bnxt/tf_core/tf_core.h +++ b/drivers/net/bnxt/tf_core/tf_core.h @@ -2520,7 +2520,7 @@ struct tf_set_sram_policy_parms { /** * [in] Array of Bank id for each truflow tbl type */ - uint8_t *bank_id; + enum tf_sram_bank_id bank_id[TF_TBL_TYPE_ACT_MODIFY_64B + 1]; }; /** @@ -2552,7 +2552,7 @@ struct tf_get_sram_policy_parms { /** * [out] Array of Bank id for each truflow tbl type */ - uint8_t bank_id[TF_TBL_TYPE_ACT_MODIFY_64B + 1]; + enum tf_sram_bank_id bank_id[TF_TBL_TYPE_ACT_MODIFY_64B + 1]; }; /** diff --git a/drivers/net/bnxt/tf_core/tf_device.h b/drivers/net/bnxt/tf_core/tf_device.h index 3d5de988c4..bfb5de4370 100644 --- a/drivers/net/bnxt/tf_core/tf_device.h +++ b/drivers/net/bnxt/tf_core/tf_device.h @@ -1116,7 +1116,7 @@ struct tf_dev_ops { * - (-EINVAL) on failure. */ int (*tf_dev_set_sram_policy)(enum tf_dir dir, - uint8_t *bank_id); + enum tf_sram_bank_id *bank_id); /** * Device specific function that gets the sram policy @@ -1132,7 +1132,7 @@ struct tf_dev_ops { * - (-EINVAL) on failure. */ int (*tf_dev_get_sram_policy)(enum tf_dir dir, - uint8_t *bank_id); + enum tf_sram_bank_id *bank_id); }; /** diff --git a/drivers/net/bnxt/tf_core/tf_device_p58.c b/drivers/net/bnxt/tf_core/tf_device_p58.c index 3c1c3a2de1..30c0af7eef 100644 --- a/drivers/net/bnxt/tf_core/tf_device_p58.c +++ b/drivers/net/bnxt/tf_core/tf_device_p58.c @@ -673,7 +673,7 @@ static int tf_dev_p58_get_sram_resources(void *q, return 0; } -int sram_bank_hcapi_type[] = { +static int sram_bank_hcapi_type[] = { CFA_RESOURCE_TYPE_P58_SRAM_BANK_0, CFA_RESOURCE_TYPE_P58_SRAM_BANK_1, CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, @@ -694,15 +694,15 @@ int sram_bank_hcapi_type[] = { * - (-EINVAL) on failure. */ static int tf_dev_p58_set_sram_policy(enum tf_dir dir, - uint8_t *bank_id) + enum tf_sram_bank_id *bank_id) { struct tf_rm_element_cfg *rm_cfg = tf_tbl_p58[dir]; uint8_t type; uint8_t parent[TF_SRAM_BANK_ID_MAX] = { 0xFF, 0xFF, 0xFF, 0xFF }; for (type = TF_TBL_TYPE_FULL_ACT_RECORD; - type < TF_TBL_TYPE_ACT_MODIFY_64B + 1; type++) { - if (bank_id[type] > 3) + type <= TF_TBL_TYPE_ACT_MODIFY_64B; type++) { + if (bank_id[type] >= TF_SRAM_BANK_ID_MAX) return -EINVAL; rm_cfg[type].hcapi_type = sram_bank_hcapi_type[bank_id[type]]; @@ -735,7 +735,7 @@ static int tf_dev_p58_set_sram_policy(enum tf_dir dir, * - (-EINVAL) on failure. */ static int tf_dev_p58_get_sram_policy(enum tf_dir dir, - uint8_t *bank_id) + enum tf_sram_bank_id *bank_id) { struct tf_rm_element_cfg *rm_cfg = tf_tbl_p58[dir]; uint8_t type; diff --git a/drivers/net/bnxt/tf_core/tf_tbl.c b/drivers/net/bnxt/tf_core/tf_tbl.c index 3fb22b52ac..f18e4ba346 100644 --- a/drivers/net/bnxt/tf_core/tf_tbl.c +++ b/drivers/net/bnxt/tf_core/tf_tbl.c @@ -307,28 +307,28 @@ tf_tbl_set(struct tf *tfp, } tbl_db = (struct tbl_rm_db *)tbl_db_ptr; - - /* Do not check meter drop counter because it is not allocated - * resources + /* Verify that the entry has been previously allocated. + * for meter drop counter, check the corresponding meter + * entry */ - if (parms->type != TF_TBL_TYPE_METER_DROP_CNT) { - /* Verify that the entry has been previously allocated */ - aparms.rm_db = tbl_db->tbl_db[parms->dir]; + aparms.rm_db = tbl_db->tbl_db[parms->dir]; + if (parms->type != TF_TBL_TYPE_METER_DROP_CNT) aparms.subtype = parms->type; - aparms.allocated = &allocated; - aparms.index = parms->idx; - rc = tf_rm_is_allocated(&aparms); - if (rc) - return rc; + else + aparms.subtype = TF_TBL_TYPE_METER_INST; + aparms.allocated = &allocated; + aparms.index = parms->idx; + rc = tf_rm_is_allocated(&aparms); + if (rc) + return rc; - if (allocated != TF_RM_ALLOCATED_ENTRY_IN_USE) { - TFP_DRV_LOG(ERR, - "%s, Invalid or not allocated, type:%s, idx:%d\n", - tf_dir_2_str(parms->dir), - tf_tbl_type_2_str(parms->type), - parms->idx); - return -EINVAL; - } + if (allocated != TF_RM_ALLOCATED_ENTRY_IN_USE) { + TFP_DRV_LOG(ERR, + "%s, Invalid or not allocated, type:%s, idx:%d\n", + tf_dir_2_str(parms->dir), + tf_tbl_type_2_str(parms->type), + parms->idx); + return -EINVAL; } /* Set the entry */ @@ -398,27 +398,28 @@ tf_tbl_get(struct tf *tfp, } tbl_db = (struct tbl_rm_db *)tbl_db_ptr; - /* Do not check meter drop counter because it is not allocated - * resources. + /* Verify that the entry has been previously allocated. + * for meter drop counter, check the corresponding meter + * entry */ - if (parms->type != TF_TBL_TYPE_METER_DROP_CNT) { - /* Verify that the entry has been previously allocated */ - aparms.rm_db = tbl_db->tbl_db[parms->dir]; + aparms.rm_db = tbl_db->tbl_db[parms->dir]; + if (parms->type != TF_TBL_TYPE_METER_DROP_CNT) aparms.subtype = parms->type; - aparms.index = parms->idx; - aparms.allocated = &allocated; - rc = tf_rm_is_allocated(&aparms); - if (rc) - return rc; + else + aparms.subtype = TF_TBL_TYPE_METER_INST; + aparms.index = parms->idx; + aparms.allocated = &allocated; + rc = tf_rm_is_allocated(&aparms); + if (rc) + return rc; - if (allocated != TF_RM_ALLOCATED_ENTRY_IN_USE) { - TFP_DRV_LOG(ERR, - "%s, Invalid or not allocated index, type:%s, idx:%d\n", - tf_dir_2_str(parms->dir), - tf_tbl_type_2_str(parms->type), - parms->idx); - return -EINVAL; - } + if (allocated != TF_RM_ALLOCATED_ENTRY_IN_USE) { + TFP_DRV_LOG(ERR, + "%s, Invalid or not allocated index, type:%s, idx:%d\n", + tf_dir_2_str(parms->dir), + tf_tbl_type_2_str(parms->type), + parms->idx); + return -EINVAL; } /* Set the entry */ -- 2.30.1 (Apple Git-130) --00000000000023b36205cfd7d6eb--