Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94309/?format=api
{ "id": 94309, "url": "http://patches.dpdk.org/api/patches/94309/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210616175523.930678-5-lance.richardson@broadcom.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210616175523.930678-5-lance.richardson@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210616175523.930678-5-lance.richardson@broadcom.com", "date": "2021-06-16T17:55:23", "name": "[4/4] net/bnxt: remove dead code", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "44e14c4a00a524636d085cd9c9920c3a52182ab8", "submitter": { "id": 1323, "url": "http://patches.dpdk.org/api/people/1323/?format=api", "name": "Lance Richardson", "email": "lance.richardson@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210616175523.930678-5-lance.richardson@broadcom.com/mbox/", "series": [ { "id": 17364, "url": "http://patches.dpdk.org/api/series/17364/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17364", "date": "2021-06-16T17:55:19", "name": "net/bnxt: various fixes", "version": 1, "mbox": "http://patches.dpdk.org/series/17364/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/94309/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/94309/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E4CB5A0C43;\n\tWed, 16 Jun 2021 20:10:02 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D2607410DE;\n\tWed, 16 Jun 2021 20:10:02 +0200 (CEST)", "from mail-pg1-f173.google.com (mail-pg1-f173.google.com\n [209.85.215.173])\n by mails.dpdk.org (Postfix) with ESMTP id 1397040DFD\n for <dev@dpdk.org>; Wed, 16 Jun 2021 20:10:01 +0200 (CEST)", "by mail-pg1-f173.google.com with SMTP id w31so2650055pga.6\n for <dev@dpdk.org>; Wed, 16 Jun 2021 11:10:00 -0700 (PDT)", "from lrichardson-VirtualBox.dhcp.broadcom.net ([192.19.231.250])\n by smtp.gmail.com with ESMTPSA id q4sm2951401pfh.18.2021.06.16.11.09.56\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 16 Jun 2021 11:09:59 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version; bh=UvGqiOtNtjvveHyok6XrbTN+UtTkWGlywuO0CL34u24=;\n b=U6jJo8amHgoV1Fke1zzjkGtsHjwQBZ5rTGKi9dttXtPyiqNovDyPfBQ9Uj7xcrF1Pw\n KRBShQHSqp0ja2/8P4czg6Z/Y0Vs0Z3BpUUCG4AvvPyQwgDnAbM7n8FXW5azoHZMhAvk\n Hzr20eELJtuNWngcJFFvEz1blUzYOQgNKoC78=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version;\n bh=UvGqiOtNtjvveHyok6XrbTN+UtTkWGlywuO0CL34u24=;\n b=OHVuKgLhnnG7KOv0DT3L/v/wa8ZZMNvnUwsID8iPLeKMySSwgDmUqr2O7zu4Pm+2fM\n aus3yCoWwID8WiA/2ANfmz9OBFsdBhgahdzDe2uSIsOh/TbdErorJ6WoYTOh0kCWL9sS\n okjTfFkusjLVcsTAOaeruEbebsC7t/oiqzMNem7Q2l6HbM0AqMXkuca8tJNYkY3MwZa4\n h+WUEDNkeyCxI6ryga9mucagSCETGGeBb3ubcZyK9sqivfBUqyMqBHUDalKRWlBSC4XE\n CmiD4a5ohIHCeQlRSyC9aynPLhiYND0gTPpqBCwD0G9R3zwtjl/ccQKQKn5Tysbu/Wz0\n SKUw==", "X-Gm-Message-State": "AOAM531Pmazt3od/ko2g/PNTMBABaZZNH7Lyl4IFHCqQX9kcTkVqKBQl\n lijFwWdsEA8yFAWU9TqkIzxnfA==", "X-Google-Smtp-Source": "\n ABdhPJyqKGHif7KNbp7rLlhEN6zstk/A88GbsK08OPB9RpZqWSElkt/b3APOwDqi/wPajlS2rApKRQ==", "X-Received": "by 2002:a63:180c:: with SMTP id y12mr906984pgl.180.1623867000252;\n Wed, 16 Jun 2021 11:10:00 -0700 (PDT)", "From": "Lance Richardson <lance.richardson@broadcom.com>", "To": "Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Jerin Jacob <jerinj@marvell.com>, Ruifeng Wang <ruifeng.wang@arm.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Konstantin Ananyev <konstantin.ananyev@intel.com>", "Cc": "dev@dpdk.org", "Date": "Wed, 16 Jun 2021 13:55:23 -0400", "Message-Id": "<20210616175523.930678-5-lance.richardson@broadcom.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210616175523.930678-1-lance.richardson@broadcom.com>", "References": "<20210616175523.930678-1-lance.richardson@broadcom.com>", "MIME-Version": "1.0", "Content-Type": "multipart/signed; protocol=\"application/pkcs7-signature\";\n micalg=sha-256; boundary=\"000000000000bb0f2905c4e5ff6e\"", "X-Content-Filtered-By": "Mailman/MimeDel 2.1.29", "Subject": "[dpdk-dev] [PATCH 4/4] net/bnxt: remove dead code", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Code related to maintaining completion ring \"valid\" state is\nno longer needed, remove it.\n\nSigned-off-by: Lance Richardson <lance.richardson@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\nReviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>\n---\n drivers/net/bnxt/bnxt_cpr.h | 17 -----------------\n drivers/net/bnxt/bnxt_hwrm.c | 2 --\n drivers/net/bnxt/bnxt_ring.c | 1 -\n drivers/net/bnxt/bnxt_rxr.c | 11 -----------\n drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 3 ---\n drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 ---\n drivers/net/bnxt/bnxt_txr.c | 2 --\n 7 files changed, 39 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h\nindex 28c0a9049..2a56ec52c 100644\n--- a/drivers/net/bnxt/bnxt_cpr.h\n+++ b/drivers/net/bnxt/bnxt_cpr.h\n@@ -15,14 +15,6 @@ struct bnxt_db_info;\n \t(!!(rte_le_to_cpu_32(((struct cmpl_base *)(cmp))->info3_v) &\t\\\n \t CMPL_BASE_V) == !((raw_cons) & ((ring)->ring_size)))\n \n-#define CMPL_VALID(cmp, v)\t\t\t\t\t\t\\\n-\t(!!(rte_le_to_cpu_32(((struct cmpl_base *)(cmp))->info3_v) &\t\\\n-\t CMPL_BASE_V) == !(v))\n-\n-#define NQ_CMP_VALID(nqcmp, raw_cons, ring)\t\t\\\n-\t(!!((nqcmp)->v & rte_cpu_to_le_32(NQ_CN_V)) ==\t\\\n-\t !((raw_cons) & ((ring)->ring_size)))\n-\n #define CMP_TYPE(cmp)\t\t\t\t\t\t\\\n \t(((struct cmpl_base *)cmp)->type & CMPL_BASE_TYPE_MASK)\n \n@@ -35,18 +27,10 @@ struct bnxt_db_info;\n #define RING_CMP(ring, idx)\t((idx) & (ring)->ring_mask)\n #define RING_CMPL(ring_mask, idx)\t((idx) & (ring_mask))\n #define NEXT_CMP(idx)\t\tRING_CMP(ADV_RAW_CMP(idx, 1))\n-#define FLIP_VALID(cons, mask, val)\t((cons) >= (mask) ? !(val) : (val))\n \n #define DB_CP_REARM_FLAGS\t(DB_KEY_CP | DB_IDX_VALID)\n #define DB_CP_FLAGS\t\t(DB_KEY_CP | DB_IDX_VALID | DB_IRQ_DIS)\n \n-#define NEXT_CMPL(cpr, idx, v, inc)\tdo { \\\n-\t(idx) += (inc); \\\n-\tif (unlikely((idx) >= (cpr)->cp_ring_struct->ring_size)) { \\\n-\t\t(v) = !(v); \\\n-\t\t(idx) = 0; \\\n-\t} \\\n-} while (0)\n #define B_CP_DB_REARM(cpr, raw_cons)\t\t\t\t\t\\\n \trte_write32((DB_CP_REARM_FLAGS |\t\t\t\t\\\n \t\t DB_RING_IDX(&((cpr)->cp_db), raw_cons)),\t\t\\\n@@ -107,7 +91,6 @@ struct bnxt_cp_ring_info {\n \tuint32_t\t\thw_stats_ctx_id;\n \n \tstruct bnxt_ring\t*cp_ring_struct;\n-\tbool\t\t\tvalid;\n };\n \n #define RX_CMP_L2_ERRORS\t\t\t\t\t\t\\\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex 6eab2342f..9ec65ad22 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -2670,7 +2670,6 @@ void bnxt_free_nq_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)\n \tmemset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *\n \t\t\t\t sizeof(*cpr->cp_desc_ring));\n \tcpr->cp_raw_cons = 0;\n-\tcpr->valid = 0;\n }\n \n void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)\n@@ -2684,7 +2683,6 @@ void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)\n \tmemset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *\n \t\t\tsizeof(*cpr->cp_desc_ring));\n \tcpr->cp_raw_cons = 0;\n-\tcpr->valid = 0;\n }\n \n void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int queue_index)\ndiff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c\nindex 4a90ac264..cb18dfba7 100644\n--- a/drivers/net/bnxt/bnxt_ring.c\n+++ b/drivers/net/bnxt/bnxt_ring.c\n@@ -769,7 +769,6 @@ int bnxt_alloc_async_cp_ring(struct bnxt *bp)\n \t\treturn rc;\n \n \tcpr->cp_raw_cons = 0;\n-\tcpr->valid = 0;\n \tbnxt_set_db(bp, &cpr->cp_db, ring_type, 0,\n \t\t cp_ring->fw_ring_id, cp_ring->ring_mask);\n \ndiff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c\nindex 756a45ba9..0dee73af8 100644\n--- a/drivers/net/bnxt/bnxt_rxr.c\n+++ b/drivers/net/bnxt/bnxt_rxr.c\n@@ -297,9 +297,6 @@ static int bnxt_agg_bufs_valid(struct bnxt_cp_ring_info *cpr,\n \traw_cp_cons = ADV_RAW_CMP(raw_cp_cons, agg_bufs);\n \tlast_cp_cons = RING_CMP(cpr->cp_ring_struct, raw_cp_cons);\n \tagg_cmpl = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[last_cp_cons];\n-\tcpr->valid = FLIP_VALID(raw_cp_cons,\n-\t\t\t\tcpr->cp_ring_struct->ring_mask,\n-\t\t\t\tcpr->valid);\n \treturn CMP_VALID(agg_cmpl, raw_cp_cons, cpr->cp_ring_struct);\n }\n \n@@ -898,10 +895,6 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,\n \tif (!CMP_VALID(rxcmp1, tmp_raw_cons, cpr->cp_ring_struct))\n \t\treturn -EBUSY;\n \n-\tcpr->valid = FLIP_VALID(cp_cons,\n-\t\t\t\tcpr->cp_ring_struct->ring_mask,\n-\t\t\t\tcpr->valid);\n-\n \tif (cmp_type == RX_TPA_START_CMPL_TYPE_RX_TPA_START ||\n \t cmp_type == RX_TPA_START_V2_CMPL_TYPE_RX_TPA_START_V2) {\n \t\tbnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,\n@@ -1086,10 +1079,6 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \n \t\tif (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))\n \t\t\tbreak;\n-\t\tcpr->valid = FLIP_VALID(cons,\n-\t\t\t\t\tcpr->cp_ring_struct->ring_mask,\n-\t\t\t\t\tcpr->valid);\n-\n \t\tif (CMP_TYPE(rxcmp) == CMPL_BASE_TYPE_HWRM_DONE) {\n \t\t\tPMD_DRV_LOG(ERR, \"Rx flush done\\n\");\n \t\t} else if ((CMP_TYPE(rxcmp) >= CMPL_BASE_TYPE_RX_TPA_START_V2) &&\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\nindex b4e920256..263e6ec3c 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\n@@ -296,8 +296,6 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \n \t\trxq->rxrearm_nb += nb_rx_pkts;\n \t\tcpr->cp_raw_cons += 2 * nb_rx_pkts;\n-\t\tcpr->valid =\n-\t\t\t!!(cpr->cp_raw_cons & cpr->cp_ring_struct->ring_size);\n \t\tbnxt_db_cq(cpr);\n \t}\n \n@@ -353,7 +351,6 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)\n \t\traw_cons = NEXT_RAW_CMP(raw_cons);\n \t} while (nb_tx_pkts < ring_mask);\n \n-\tcpr->valid = !!(raw_cons & cp_ring_struct->ring_size);\n \tif (nb_tx_pkts) {\n \t\tif (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)\n \t\t\tbnxt_tx_cmp_vec_fast(txq, nb_tx_pkts);\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\nindex c479697ac..9a53d1fba 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n@@ -277,8 +277,6 @@ recv_burst_vec_sse(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \n \t\trxq->rxrearm_nb += nb_rx_pkts;\n \t\tcpr->cp_raw_cons += 2 * nb_rx_pkts;\n-\t\tcpr->valid =\n-\t\t\t!!(cpr->cp_raw_cons & cpr->cp_ring_struct->ring_size);\n \t\tbnxt_db_cq(cpr);\n \t}\n \n@@ -334,7 +332,6 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)\n \t\traw_cons = NEXT_RAW_CMP(raw_cons);\n \t} while (nb_tx_pkts < ring_mask);\n \n-\tcpr->valid = !!(raw_cons & cp_ring_struct->ring_size);\n \tif (nb_tx_pkts) {\n \t\tif (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)\n \t\t\tbnxt_tx_cmp_vec_fast(txq, nb_tx_pkts);\ndiff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c\nindex 54eaab34a..8eb949399 100644\n--- a/drivers/net/bnxt/bnxt_txr.c\n+++ b/drivers/net/bnxt/bnxt_txr.c\n@@ -474,8 +474,6 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq)\n \t\traw_cons = NEXT_RAW_CMP(raw_cons);\n \t} while (nb_tx_pkts < ring_mask);\n \n-\tcpr->valid = !!(raw_cons & cp_ring_struct->ring_size);\n-\n \tif (nb_tx_pkts) {\n \t\tif (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)\n \t\t\tbnxt_tx_cmp_fast(txq, nb_tx_pkts);\n", "prefixes": [ "4/4" ] }