Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/6642/?format=api
{ "id": 6642, "url": "http://patchwork.dpdk.org/api/patches/6642/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1438098424-30515-5-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "http://patchwork.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-5-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1438098424-30515-5-git-send-email-thomas.monjalon@6wind.com", "date": "2015-07-28T15:47:04", "name": "[dpdk-dev,4/4] bnx2x: fix part of 32-bit build", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c6fd3cc39b84c3a17a4e1b2655fd485c17939042", "submitter": { "id": 1, "url": "http://patchwork.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1438098424-30515-5-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patchwork.dpdk.org/api/patches/6642/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/6642/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 69C0FC5CA;\n\tTue, 28 Jul 2015 17:48:37 +0200 (CEST)", "from mail-wi0-f181.google.com (mail-wi0-f181.google.com\n\t[209.85.212.181]) by dpdk.org (Postfix) with ESMTP id 70C58C3E4\n\tfor <dev@dpdk.org>; Tue, 28 Jul 2015 17:48:31 +0200 (CEST)", "by wibud3 with SMTP id ud3so165724885wib.0\n\tfor <dev@dpdk.org>; Tue, 28 Jul 2015 08:48:31 -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.30\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 28 Jul 2015 08:48:30 -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=Qhpz1bl21eNsLL9qL6SIiVKp1L5znKUeQ9mWfM4us0g=;\n\tb=A++9S2KSNudcSR/xRbvoTMadMOb1YUUcgu6aNWv9BV0jOPq/pw5Dy+BRPRwN/80T31\n\t4J5i2JMpHo3mv1cLzmxJO5p3sz2k6j9u/WdmyPi4puf6Me3wH3ad1Um8uRXpkjDjkyhX\n\tXuGiEpJa1lnIApWgpua7soBS0McrQ1HPZe/IUB6PhxTPY0bRDMSG978yW8u8TBMyU1rk\n\teb9HIkH3BU1iDUl4mdsR91+TiWCblI99ElAja6qfRJFfmnPQSZxjWaBiMjPcxfpI0ic7\n\tkzV5W7WvF7jWPa/2vx1EZdes478XrvuEejNmqndO0kUdId6XaBLU7qfXaNAk6/C8UZMW\n\t3g3g==", "X-Gm-Message-State": "ALoCoQlE0bC/yzLkOeM7Lc376kVHCr0FzCsn2tfyxxSSDApBRa8NjBWXSEdKpG6qAYYRYRQ6y/dQ", "X-Received": "by 10.180.72.145 with SMTP id d17mr36655334wiv.69.1438098511332; \n\tTue, 28 Jul 2015 08:48:31 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "Stephen Hemminger <stephen@networkplumber.org>", "Date": "Tue, 28 Jul 2015 17:47:04 +0200", "Message-Id": "<1438098424-30515-5-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 4/4] bnx2x: fix part of 32-bit build", "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": "Example of errors:\n\terror: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]\n\terror: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘uint64_t\n\terror: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘unsigned int’\n\nOnly 2 files are fixed. The others errors are left as exercise to the authors.\n\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n drivers/net/bnx2x/bnx2x.c | 57 +++++++++++++++++++++++++----------------------\n drivers/net/bnx2x/bnx2x.h | 2 +-\n 2 files changed, 31 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c\nindex 342bcb1..69600b2 100644\n--- a/drivers/net/bnx2x/bnx2x.c\n+++ b/drivers/net/bnx2x/bnx2x.c\n@@ -169,10 +169,10 @@ bnx2x_dma_alloc(struct bnx2x_softc *sc, size_t size, struct bnx2x_dma *dma,\n \n \tdma->sc = sc;\n \tif (IS_PF(sc))\n-\t\tsprintf(mz_name, \"bnx2x%d_%s_%lx\", SC_ABS_FUNC(sc), msg,\n+\t\tsprintf(mz_name, \"bnx2x%d_%s_%\" PRIx64, SC_ABS_FUNC(sc), msg,\n \t\t\trte_get_timer_cycles());\n \telse\n-\t\tsprintf(mz_name, \"bnx2x%d_%s_%lx\", sc->pcie_device, msg,\n+\t\tsprintf(mz_name, \"bnx2x%d_%s_%\" PRIx64, sc->pcie_device, msg,\n \t\t\trte_get_timer_cycles());\n \n \t/* Caller must take care that strlen(mz_name) < RTE_MEMZONE_NAMESIZE */\n@@ -186,7 +186,7 @@ bnx2x_dma_alloc(struct bnx2x_softc *sc, size_t size, struct bnx2x_dma *dma,\n \tdma->paddr = (uint64_t) z->phys_addr;\n \tdma->vaddr = z->addr;\n \n-\tPMD_DRV_LOG(DEBUG, \"%s: virt=%p phys=%lx\", msg, dma->vaddr, dma->paddr);\n+\tPMD_DRV_LOG(DEBUG, \"%s: virt=%p phys=%\" PRIx64, msg, dma->vaddr, dma->paddr);\n \n \treturn 0;\n }\n@@ -1296,7 +1296,7 @@ bnx2x_free_tx_pkt(__rte_unused struct bnx2x_fastpath *fp, struct bnx2x_tx_queue\n \t\trte_pktmbuf_free(tx_mbuf);\n \t} else {\n \t\tPMD_RX_LOG(ERR, \"fp[%02d] lost mbuf %lu\",\n-\t\t\t fp->index, TX_BD(pkt_idx, txq));\n+\t\t\t fp->index, (long unsigned) TX_BD(pkt_idx, txq));\n \t}\n \n \ttxq->sw_ring[TX_BD(pkt_idx, txq)] = NULL;\n@@ -1496,7 +1496,7 @@ bnx2x_set_q_rx_mode(struct bnx2x_softc *sc, uint8_t cl_id,\n \n \tramrod_param.rdata = BNX2X_SP(sc, rx_mode_rdata);\n \tramrod_param.rdata_mapping =\n-\t (phys_addr_t) ((void *)BNX2X_SP_MAPPING(sc, rx_mode_rdata)),\n+\t (phys_addr_t) BNX2X_SP_MAPPING(sc, rx_mode_rdata),\n \t bnx2x_set_bit(ECORE_FILTER_RX_MODE_PENDING, &sc->sp_state);\n \n \tramrod_param.ramrod_flags = ramrod_flags;\n@@ -4617,9 +4617,11 @@ static void bnx2x_init_func_obj(struct bnx2x_softc *sc)\n \n \tecore_init_func_obj(sc,\n \t\t\t &sc->func_obj,\n-\t\t\t BNX2X_SP(sc, func_rdata), (phys_addr_t) ((void *)\n-\t\t\t\t\t\t\t\t BNX2X_SP_MAPPING(sc, func_rdata)), BNX2X_SP(sc, func_afex_rdata), (phys_addr_t) ((void *)\n-\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tBNX2X_SP_MAPPING(sc, func_afex_rdata)), &bnx2x_func_sp_drv);\n+\t\t\t BNX2X_SP(sc, func_rdata),\n+\t\t\t (phys_addr_t) BNX2X_SP_MAPPING(sc, func_rdata),\n+\t\t\t BNX2X_SP(sc, func_afex_rdata),\n+\t\t\t (phys_addr_t) BNX2X_SP_MAPPING(sc, func_afex_rdata),\n+\t\t\t &bnx2x_func_sp_drv);\n }\n \n static int bnx2x_init_hw(struct bnx2x_softc *sc, uint32_t load_code)\n@@ -4934,9 +4936,8 @@ static void bnx2x_init_eth_fp(struct bnx2x_softc *sc, int idx)\n \t\t\t cids,\n \t\t\t sc->max_cos,\n \t\t\t SC_FUNC(sc),\n-\t\t\t BNX2X_SP(sc, q_rdata), (phys_addr_t) ((void *)\n-\t\t\t\t\t\t\t\t BNX2X_SP_MAPPING\n-\t\t\t\t\t\t\t\t (sc, q_rdata)),\n+\t\t\t BNX2X_SP(sc, q_rdata),\n+\t\t\t (phys_addr_t) BNX2X_SP_MAPPING(sc, q_rdata),\n \t\t\t q_type);\n \n \t/* configure classification DBs */\n@@ -4945,10 +4946,8 @@ static void bnx2x_init_eth_fp(struct bnx2x_softc *sc, int idx)\n \t\t\t fp->cl_id,\n \t\t\t idx,\n \t\t\t SC_FUNC(sc),\n-\t\t\t BNX2X_SP(sc, mac_rdata), (phys_addr_t) ((void *)\n-\t\t\t\t\t\t\t\t BNX2X_SP_MAPPING\n-\t\t\t\t\t\t\t\t (sc,\n-\t\t\t\t\t\t\t\t mac_rdata)),\n+\t\t\t BNX2X_SP(sc, mac_rdata),\n+\t\t\t (phys_addr_t) BNX2X_SP_MAPPING(sc, mac_rdata),\n \t\t\t ECORE_FILTER_MAC_PENDING, &sc->sp_state,\n \t\t\t ECORE_OBJ_TYPE_RX_TX, &sc->macs_pool);\n }\n@@ -5713,8 +5712,10 @@ static void bnx2x_init_objs(struct bnx2x_softc *sc)\n \t\t\t sc->fp[0].index,\n \t\t\t SC_FUNC(sc),\n \t\t\t SC_FUNC(sc),\n-\t\t\t BNX2X_SP(sc, mcast_rdata), (phys_addr_t) ((void *)\n-\t\t\t\t\t\t\t\t BNX2X_SP_MAPPING(sc, mcast_rdata)), ECORE_FILTER_MCAST_PENDING, &sc->sp_state, o_type);\n+\t\t\t BNX2X_SP(sc, mcast_rdata),\n+\t\t\t (phys_addr_t) BNX2X_SP_MAPPING(sc, mcast_rdata),\n+\t\t\t ECORE_FILTER_MCAST_PENDING,\n+\t\t\t &sc->sp_state, o_type);\n \n \t/* Setup CAM credit pools */\n \tecore_init_mac_credit_pool(sc,\n@@ -5735,8 +5736,10 @@ static void bnx2x_init_objs(struct bnx2x_softc *sc)\n \t\t\t\t sc->fp[0].index,\n \t\t\t\t SC_FUNC(sc),\n \t\t\t\t SC_FUNC(sc),\n-\t\t\t\t BNX2X_SP(sc, rss_rdata), (phys_addr_t) ((void *)\n-\t\t\t\t\t\t\t\t\tBNX2X_SP_MAPPING(sc, rss_rdata)), ECORE_FILTER_RSS_CONF_PENDING, &sc->sp_state, ECORE_OBJ_TYPE_RX);\n+\t\t\t\t BNX2X_SP(sc, rss_rdata),\n+\t\t\t\t (phys_addr_t) BNX2X_SP_MAPPING(sc, rss_rdata),\n+\t\t\t\t ECORE_FILTER_RSS_CONF_PENDING,\n+\t\t\t\t &sc->sp_state, ECORE_OBJ_TYPE_RX);\n }\n \n /*\n@@ -6455,10 +6458,10 @@ bnx2x_pf_rx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,\n \tpause->pri_map = 1;\n \n \t/* rxq setup */\n-\trxq_init->dscr_map = (phys_addr_t)((void *)rxq->rx_ring_phys_addr);\n-\trxq_init->rcq_map = (phys_addr_t)((void *)rxq->cq_ring_phys_addr);\n-\trxq_init->rcq_np_map = (phys_addr_t)((void *)(rxq->cq_ring_phys_addr +\n-\t\t\t\t\t\t BNX2X_PAGE_SIZE));\n+\trxq_init->dscr_map = (phys_addr_t)rxq->rx_ring_phys_addr;\n+\trxq_init->rcq_map = (phys_addr_t)rxq->cq_ring_phys_addr;\n+\trxq_init->rcq_np_map = (phys_addr_t)(rxq->cq_ring_phys_addr +\n+\t\t\t\t\t BNX2X_PAGE_SIZE);\n \n \t/*\n \t * This should be a maximum number of data bytes that may be\n@@ -6496,7 +6499,7 @@ bnx2x_pf_tx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,\n \t\tPMD_TX_LOG(ERR, \"ERROR: TX queue is NULL\");\n \t\treturn;\n \t}\n-\ttxq_init->dscr_map = (phys_addr_t)((void *)txq->tx_ring_phys_addr);\n+\ttxq_init->dscr_map = (phys_addr_t)txq->tx_ring_phys_addr;\n \ttxq_init->sb_cq_index = HC_INDEX_ETH_FIRST_TX_CQ_CONS + cos;\n \ttxq_init->traffic_type = LLFC_TRAFFIC_TYPE_NW;\n \ttxq_init->fw_sb_id = fp->fw_sb_id;\n@@ -9596,10 +9599,10 @@ void bnx2x_load_firmware(struct bnx2x_softc *sc)\n \n \tsc->fw_len = st.st_size;\n \tif (sc->fw_len < FW_HEADER_LEN) {\n-\t\tPMD_DRV_LOG(NOTICE, \"Invalid fw size: %lu\", sc->fw_len);\n+\t\tPMD_DRV_LOG(NOTICE, \"Invalid fw size: %\" PRIu64, sc->fw_len);\n \t\treturn;\n \t}\n-\tPMD_DRV_LOG(DEBUG, \"fw_len = %lu\", sc->fw_len);\n+\tPMD_DRV_LOG(DEBUG, \"fw_len = %\" PRIu64, sc->fw_len);\n }\n \n static void\n@@ -11081,7 +11084,7 @@ static int bnx2x_init_hw_func(struct bnx2x_softc *sc)\n \tfor (i = 0; i < L2_ILT_LINES(sc); i++) {\n \t\tilt->lines[cdu_ilt_start + i].page = sc->context[i].vcxt;\n \t\tilt->lines[cdu_ilt_start + i].page_mapping =\n-\t\t (phys_addr_t)((void *)sc->context[i].vcxt_dma.paddr);\n+\t\t (phys_addr_t)sc->context[i].vcxt_dma.paddr;\n \t\tilt->lines[cdu_ilt_start + i].size = sc->context[i].size;\n \t}\n \tecore_ilt_init_op(sc, INITOP_SET);\ndiff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h\nindex b1e36e5..867b92a 100644\n--- a/drivers/net/bnx2x/bnx2x.h\n+++ b/drivers/net/bnx2x/bnx2x.h\n@@ -1271,7 +1271,7 @@ struct bnx2x_softc {\n \tuint32_t gz_outlen;\n #define GUNZIP_BUF(sc) (sc->gz_buf)\n #define GUNZIP_OUTLEN(sc) (sc->gz_outlen)\n-#define GUNZIP_PHYS(sc) (phys_addr_t)((void *)(sc->gz_buf_dma.paddr))\n+#define GUNZIP_PHYS(sc) (phys_addr_t)(sc->gz_buf_dma.paddr)\n #define FW_BUF_SIZE 0x40000\n \n \tstruct raw_op *init_ops;\n", "prefixes": [ "dpdk-dev", "4/4" ] }