Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/6640/?format=api
{ "id": 6640, "url": "https://patches.dpdk.org/api/patches/6640/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1438098424-30515-3-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "https://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": "<1438098424-30515-3-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1438098424-30515-3-git-send-email-thomas.monjalon@6wind.com", "date": "2015-07-28T15:47:02", "name": "[dpdk-dev,2/4] bnx2x: fix build with debug enabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b7078db6dd84857d48e8fabdd178ce0580e9836e", "submitter": { "id": 1, "url": "https://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1438098424-30515-3-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/6640/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/6640/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 11994C46E;\n\tTue, 28 Jul 2015 17:48:32 +0200 (CEST)", "from mail-wi0-f178.google.com (mail-wi0-f178.google.com\n\t[209.85.212.178]) by dpdk.org (Postfix) with ESMTP id 1C3EFC32E\n\tfor <dev@dpdk.org>; Tue, 28 Jul 2015 17:48:29 +0200 (CEST)", "by wibxm9 with SMTP id xm9so163403427wib.0\n\tfor <dev@dpdk.org>; Tue, 28 Jul 2015 08:48:28 -0700 (PDT)", "from XPS13.dev.6wind.com (6wind.net2.nerim.net. [213.41.151.210])\n\tby smtp.gmail.com with ESMTPSA id\n\thn2sm33861596wjc.45.2015.07.28.08.48.27\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 28 Jul 2015 08:48:28 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-type:content-transfer-encoding;\n\tbh=+hfhTKk48XhJjKb3sa4o0hAadzGDlauU+FHT2j9WVqw=;\n\tb=WEBXhV5CpfT1v7kRnXdATPF/68BiwoYgzesUf/39PIfPuqBNRbbbWqJOa2t0e27fax\n\t9GIGqYnW0oXIgZ1stPvy3LIhJfUQidAubMjVwF7x5Zmi/+uPHCwdnpZJCFxT8QHwlF0D\n\tbpch6eH1ecN62vC9++oGviom6p4msSvvA0elCsxF54Fc3iTGyYubpvycnOjh4VBejQtV\n\ts85UAfyTntIuKzuMm+x1kVQqjEkeCCPW8flFOPViK1PJ5BaRDG2J87qG9+903d5NC5mP\n\tY0uAXN5erZG8fQ1vJY5QLkvJAkAJeXnWjkiDucgd5Bk9rzV/Zk4M6YHyZFdsQ/VIZPdQ\n\tLgvA==", "X-Gm-Message-State": "ALoCoQnhvGCLC6dRqUbHkDs9l24ngwbtg0C8s4+v/ZXcrG5niUi9kLWCPeWwmYVCvJnXFXlr/ba0", "X-Received": "by 10.180.77.193 with SMTP id u1mr36066532wiw.50.1438098508874; \n\tTue, 28 Jul 2015 08:48:28 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "Stephen Hemminger <stephen@networkplumber.org>", "Date": "Tue, 28 Jul 2015 17:47:02 +0200", "Message-Id": "<1438098424-30515-3-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.4.2", "In-Reply-To": "<1438098424-30515-1-git-send-email-thomas.monjalon@6wind.com>", "References": "<1438098424-30515-1-git-send-email-thomas.monjalon@6wind.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Cc": "dev@dpdk.org", "Subject": "[dpdk-dev] [PATCH 2/4] bnx2x: fix build with debug enabled", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Build log:\n\terror: unused variable ‘cid’\n\terror: ‘RTE_LOG_WARN’ undeclared\n\terror: expected ‘)’ before ‘sc’\n\nThere were unused variables defined for debug but not used in debug log because\nit was ifdef'ed a the wrong condition (RTE_LIBRTE_BNX2X_DEBUG_DRIVER).\n\nThe warning were using WARN instead of WARNING.\n\nSome debug messages had some extra parameters.\n\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n drivers/net/bnx2x/bnx2x.c | 22 +++++++++++-----------\n drivers/net/bnx2x/bnx2x_logs.h | 2 +-\n drivers/net/bnx2x/ecore_init.h | 3 +--\n drivers/net/bnx2x/ecore_sp.c | 12 ++++--------\n 4 files changed, 17 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c\nindex 8aa9dd5..342bcb1 100644\n--- a/drivers/net/bnx2x/bnx2x.c\n+++ b/drivers/net/bnx2x/bnx2x.c\n@@ -4042,7 +4042,7 @@ static void bnx2x_attn_int_deasserted0(struct bnx2x_softc *sc, uint32_t attn)\n \t\tval &= ~AEU_INPUTS_ATTN_BITS_SPIO5;\n \t\tREG_WR(sc, reg_offset, val);\n \n-\t\tPMD_DRV_LOG(WARN, \"SPIO5 hw attention\");\n+\t\tPMD_DRV_LOG(WARNING, \"SPIO5 hw attention\");\n \n /* Fan failure attention */\n \t\telink_hw_reset_phy(&sc->link_params);\n@@ -4577,7 +4577,7 @@ int bnx2x_intr_legacy(struct bnx2x_softc *sc, int scan_fp)\n \t}\n \n \tif (unlikely(status)) {\n-\t\tPMD_DRV_LOG(WARN,\n+\t\tPMD_DRV_LOG(WARNING,\n \t\t\t \"Unexpected fastpath status (0x%08x)!\", status);\n \t}\n \n@@ -5777,7 +5777,7 @@ static int bnx2x_set_power_state(struct bnx2x_softc *sc, uint8_t state)\n \n \t/* If there is no power capability, silently succeed */\n \tif (!(sc->devinfo.pcie_cap_flags & BNX2X_PM_CAPABLE_FLAG)) {\n-\t\tPMD_DRV_LOG(WARN, \"No power capability\");\n+\t\tPMD_DRV_LOG(WARNING, \"No power capability\");\n \t\treturn 0;\n \t}\n \n@@ -6444,12 +6444,12 @@ bnx2x_pf_rx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,\n \t/* validate rings have enough entries to cross high thresholds */\n \tif (sc->dropless_fc &&\n \t pause->bd_th_hi + FW_PREFETCH_CNT > sc->rx_ring_size) {\n-\t\tPMD_DRV_LOG(WARN, \"rx bd ring threshold limit\");\n+\t\tPMD_DRV_LOG(WARNING, \"rx bd ring threshold limit\");\n \t}\n \n \tif (sc->dropless_fc &&\n \t pause->rcq_th_hi + FW_PREFETCH_CNT > USABLE_RCQ_ENTRIES(rxq)) {\n-\t\tPMD_DRV_LOG(WARN, \"rcq ring threshold limit\");\n+\t\tPMD_DRV_LOG(WARNING, \"rcq ring threshold limit\");\n \t}\n \n \tpause->pri_map = 1;\n@@ -7116,7 +7116,7 @@ void bnx2x_periodic_callout(struct bnx2x_softc *sc)\n {\n \tif ((sc->state != BNX2X_STATE_OPEN) ||\n \t (atomic_load_acq_long(&sc->periodic_flags) == PERIODIC_STOP)) {\n-\t\tPMD_DRV_LOG(WARN, \"periodic callout exit (state=0x%x)\",\n+\t\tPMD_DRV_LOG(WARNING, \"periodic callout exit (state=0x%x)\",\n \t\t\t sc->state);\n \t\treturn;\n \t}\n@@ -7563,7 +7563,7 @@ static uint32_t bnx2x_pcie_capability_read(struct bnx2x_softc *sc, int reg)\n \t\treturn ret;\n \t}\n \n-\tPMD_DRV_LOG(WARN, \"PCIe capability NOT FOUND!!!\");\n+\tPMD_DRV_LOG(WARNING, \"PCIe capability NOT FOUND!!!\");\n \n \treturn 0;\n }\n@@ -9118,13 +9118,13 @@ static int bnx2x_do_flr(struct bnx2x_softc *sc)\n \n \t/* only E2 and onwards support FLR */\n \tif (CHIP_IS_E1x(sc)) {\n-\t\tPMD_DRV_LOG(WARN, \"FLR not supported in E1H\");\n+\t\tPMD_DRV_LOG(WARNING, \"FLR not supported in E1H\");\n \t\treturn -1;\n \t}\n \n \t/* only bootcode REQ_BC_VER_4_INITIATE_FLR and onwards support flr */\n \tif (sc->devinfo.bc_ver < REQ_BC_VER_4_INITIATE_FLR) {\n-\t\tPMD_DRV_LOG(WARN,\n+\t\tPMD_DRV_LOG(WARNING,\n \t\t\t \"FLR not supported by BC_VER: 0x%08x\",\n \t\t\t sc->devinfo.bc_ver);\n \t\treturn -1;\n@@ -9498,7 +9498,7 @@ static void bnx2x_init_multi_cos(struct bnx2x_softc *sc)\n \t\tif (cos < sc->max_cos) {\n \t\t\tsc->prio_to_cos[pri] = cos;\n \t\t} else {\n-\t\t\tPMD_DRV_LOG(WARN,\n+\t\t\tPMD_DRV_LOG(WARNING,\n \t\t\t\t \"Invalid COS %d for priority %d \"\n \t\t\t\t \"(max COS is %d), setting to 0\", cos, pri,\n \t\t\t\t (sc->max_cos - 1));\n@@ -11344,7 +11344,7 @@ static void bnx2x_link_reset(struct bnx2x_softc *sc)\n \t\telink_lfa_reset(&sc->link_params, &sc->link_vars);\n \t} else {\n \t\tif (!CHIP_REV_IS_SLOW(sc)) {\n-\t\t\tPMD_DRV_LOG(WARN,\n+\t\t\tPMD_DRV_LOG(WARNING,\n \t\t\t\t \"Bootcode is missing - cannot reset link\");\n \t\t}\n \t}\ndiff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h\nindex aa37234..bec799b 100644\n--- a/drivers/net/bnx2x/bnx2x_logs.h\n+++ b/drivers/net/bnx2x/bnx2x_logs.h\n@@ -38,7 +38,7 @@\n #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)\n #endif\n \n-#ifdef RTE_LIBRTE_BNX2X_DEBUG_DRIVER\n+#ifdef RTE_LIBRTE_BNX2X_DEBUG\n #define PMD_DRV_LOG_RAW(level, fmt, args...) \\\n \tRTE_LOG(level, PMD, \"%s(): \" fmt, __func__, ## args)\n #else\ndiff --git a/drivers/net/bnx2x/ecore_init.h b/drivers/net/bnx2x/ecore_init.h\nindex 49236b2..7fc5644 100644\n--- a/drivers/net/bnx2x/ecore_init.h\n+++ b/drivers/net/bnx2x/ecore_init.h\n@@ -799,8 +799,7 @@ static inline void ecore_clear_blocks_parity(struct bnx2x_softc *sc)\n \t\t\treg_val = REG_RD(sc, ecore_blocks_parity_data[i].\n \t\t\t\t\t sts_clr_addr);\n \t\t\tif (reg_val & reg_mask)\n-\t\t\t\tECORE_MSG(sc,\n-\t\t\t\t\t \"Parity errors in %s: 0x%x\",\n+\t\t\t\tECORE_MSG(\"Parity errors in %s: 0x%x\",\n \t\t\t\t\t ecore_blocks_parity_data[i].name,\n \t\t\t\t\t reg_val & reg_mask);\n \t\t}\ndiff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c\nindex 661cd1f..31ab8cf 100644\n--- a/drivers/net/bnx2x/ecore_sp.c\n+++ b/drivers/net/bnx2x/ecore_sp.c\n@@ -3008,8 +3008,7 @@ static int ecore_mcast_setup_e1h(struct bnx2x_softc *sc,\n \t\t\tbreak;\n \n \t\tcase ECORE_MCAST_CMD_DEL:\n-\t\t\tECORE_MSG(sc,\n-\t\t\t\t \"Invalidating multicast MACs configuration\");\n+\t\t\tECORE_MSG(\"Invalidating multicast MACs configuration\");\n \n \t\t\t/* clear the registry */\n \t\t\tECORE_MEMSET(o->registry.aprox_match.vec, 0,\n@@ -3741,8 +3740,7 @@ static int ecore_queue_comp_cmd(struct bnx2x_softc *sc __rte_unused,\n \t\t\t \"illegal value for next tx_only: %d. max cos was %d\",\n \t\t\t o->next_tx_only, o->max_cos);\n \n-\tECORE_MSG(sc,\n-\t\t \"Completing command %d for queue %d, setting state to %d\",\n+\tECORE_MSG(\"Completing command %d for queue %d, setting state to %d\",\n \t\t cmd, o->cids[ECORE_PRIMARY_CID_INDEX], o->next_state);\n \n \tif (o->next_tx_only)\t/* print num tx-only if any exist */\n@@ -4729,8 +4727,7 @@ ecore_func_state_change_comp(struct bnx2x_softc *sc __rte_unused,\n \t\treturn ECORE_INVAL;\n \t}\n \n-\tECORE_MSG(sc,\n-\t\t \"Completing command %d for func %d, setting state to %d\",\n+\tECORE_MSG(\"Completing command %d for func %d, setting state to %d\",\n \t\t cmd, ECORE_FUNC_ID(sc), o->next_state);\n \n \to->state = o->next_state;\n@@ -5172,8 +5169,7 @@ static int ecore_func_send_afex_update(struct bnx2x_softc *sc, struct ecore_func\n \t * read and we will have to put a full memory barrier there\n \t * (inside ecore_sp_post()).\n \t */\n-\tECORE_MSG(sc,\n-\t\t \"afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x\",\n+\tECORE_MSG(\"afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x\",\n \t\t rdata->vif_id,\n \t\t rdata->afex_default_vlan, rdata->allowed_priorities);\n \n", "prefixes": [ "dpdk-dev", "2/4" ] }