* [PATCH 0/4] some fixes for bnx2x
@ 2015-07-28 15:47 Thomas Monjalon
2015-07-28 15:47 ` [PATCH 1/4] bnx2x: fix build as shared library Thomas Monjalon
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-07-28 15:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
The basic build tests fail in many ways.
The driver was disabled by error in first test before applying it.
That's why it has been accepted.
This is a first try to fix most of the errors.
It has not been tested with old compilers, nor icc.
The 32-bit build fix is not complete.
Please review it and send other patches to completely fix it ASAP.
Thomas Monjalon (4):
bnx2x: fix build as shared library
bnx2x: fix build with debug enabled
bnx2x: fix build with clang
bnx2x: fix part of 32-bit build
drivers/net/bnx2x/Makefile | 4 +++
drivers/net/bnx2x/bnx2x.c | 79 +++++++++++++++++++++--------------------
drivers/net/bnx2x/bnx2x.h | 2 +-
drivers/net/bnx2x/bnx2x_logs.h | 2 +-
drivers/net/bnx2x/bnx2x_stats.c | 12 -------
drivers/net/bnx2x/ecore_init.h | 3 +-
drivers/net/bnx2x/ecore_sp.c | 12 +++----
7 files changed, 52 insertions(+), 62 deletions(-)
--
2.4.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] bnx2x: fix build as shared library
2015-07-28 15:47 [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
@ 2015-07-28 15:47 ` Thomas Monjalon
2015-07-28 15:47 ` [PATCH 2/4] bnx2x: fix build with debug enabled Thomas Monjalon
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-07-28 15:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
Build log:
Must Specify a librte_pmd_bnx2x.so..1 ABI version
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
drivers/net/bnx2x/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
index 0de5db9..87f31b6 100644
--- a/drivers/net/bnx2x/Makefile
+++ b/drivers/net/bnx2x/Makefile
@@ -9,6 +9,10 @@ CFLAGS += -O3 -g
CFLAGS += $(WERROR_FLAGS)
CFLAGS += -DZLIB_CONST
+EXPORT_MAP := rte_pmd_bnx2x_version.map
+
+LIBABIVER := 1
+
#
# all source are stored in SRCS-y
#
--
2.4.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] bnx2x: fix build with debug enabled
2015-07-28 15:47 [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
2015-07-28 15:47 ` [PATCH 1/4] bnx2x: fix build as shared library Thomas Monjalon
@ 2015-07-28 15:47 ` Thomas Monjalon
2015-07-28 15:47 ` [PATCH 3/4] bnx2x: fix build with clang Thomas Monjalon
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-07-28 15:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
Build log:
error: unused variable ‘cid’
error: ‘RTE_LOG_WARN’ undeclared
error: expected ‘)’ before ‘sc’
There were unused variables defined for debug but not used in debug log because
it was ifdef'ed a the wrong condition (RTE_LIBRTE_BNX2X_DEBUG_DRIVER).
The warning were using WARN instead of WARNING.
Some debug messages had some extra parameters.
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
drivers/net/bnx2x/bnx2x.c | 22 +++++++++++-----------
drivers/net/bnx2x/bnx2x_logs.h | 2 +-
drivers/net/bnx2x/ecore_init.h | 3 +--
drivers/net/bnx2x/ecore_sp.c | 12 ++++--------
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 8aa9dd5..342bcb1 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -4042,7 +4042,7 @@ static void bnx2x_attn_int_deasserted0(struct bnx2x_softc *sc, uint32_t attn)
val &= ~AEU_INPUTS_ATTN_BITS_SPIO5;
REG_WR(sc, reg_offset, val);
- PMD_DRV_LOG(WARN, "SPIO5 hw attention");
+ PMD_DRV_LOG(WARNING, "SPIO5 hw attention");
/* Fan failure attention */
elink_hw_reset_phy(&sc->link_params);
@@ -4577,7 +4577,7 @@ int bnx2x_intr_legacy(struct bnx2x_softc *sc, int scan_fp)
}
if (unlikely(status)) {
- PMD_DRV_LOG(WARN,
+ PMD_DRV_LOG(WARNING,
"Unexpected fastpath status (0x%08x)!", status);
}
@@ -5777,7 +5777,7 @@ static int bnx2x_set_power_state(struct bnx2x_softc *sc, uint8_t state)
/* If there is no power capability, silently succeed */
if (!(sc->devinfo.pcie_cap_flags & BNX2X_PM_CAPABLE_FLAG)) {
- PMD_DRV_LOG(WARN, "No power capability");
+ PMD_DRV_LOG(WARNING, "No power capability");
return 0;
}
@@ -6444,12 +6444,12 @@ bnx2x_pf_rx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,
/* validate rings have enough entries to cross high thresholds */
if (sc->dropless_fc &&
pause->bd_th_hi + FW_PREFETCH_CNT > sc->rx_ring_size) {
- PMD_DRV_LOG(WARN, "rx bd ring threshold limit");
+ PMD_DRV_LOG(WARNING, "rx bd ring threshold limit");
}
if (sc->dropless_fc &&
pause->rcq_th_hi + FW_PREFETCH_CNT > USABLE_RCQ_ENTRIES(rxq)) {
- PMD_DRV_LOG(WARN, "rcq ring threshold limit");
+ PMD_DRV_LOG(WARNING, "rcq ring threshold limit");
}
pause->pri_map = 1;
@@ -7116,7 +7116,7 @@ void bnx2x_periodic_callout(struct bnx2x_softc *sc)
{
if ((sc->state != BNX2X_STATE_OPEN) ||
(atomic_load_acq_long(&sc->periodic_flags) == PERIODIC_STOP)) {
- PMD_DRV_LOG(WARN, "periodic callout exit (state=0x%x)",
+ PMD_DRV_LOG(WARNING, "periodic callout exit (state=0x%x)",
sc->state);
return;
}
@@ -7563,7 +7563,7 @@ static uint32_t bnx2x_pcie_capability_read(struct bnx2x_softc *sc, int reg)
return ret;
}
- PMD_DRV_LOG(WARN, "PCIe capability NOT FOUND!!!");
+ PMD_DRV_LOG(WARNING, "PCIe capability NOT FOUND!!!");
return 0;
}
@@ -9118,13 +9118,13 @@ static int bnx2x_do_flr(struct bnx2x_softc *sc)
/* only E2 and onwards support FLR */
if (CHIP_IS_E1x(sc)) {
- PMD_DRV_LOG(WARN, "FLR not supported in E1H");
+ PMD_DRV_LOG(WARNING, "FLR not supported in E1H");
return -1;
}
/* only bootcode REQ_BC_VER_4_INITIATE_FLR and onwards support flr */
if (sc->devinfo.bc_ver < REQ_BC_VER_4_INITIATE_FLR) {
- PMD_DRV_LOG(WARN,
+ PMD_DRV_LOG(WARNING,
"FLR not supported by BC_VER: 0x%08x",
sc->devinfo.bc_ver);
return -1;
@@ -9498,7 +9498,7 @@ static void bnx2x_init_multi_cos(struct bnx2x_softc *sc)
if (cos < sc->max_cos) {
sc->prio_to_cos[pri] = cos;
} else {
- PMD_DRV_LOG(WARN,
+ PMD_DRV_LOG(WARNING,
"Invalid COS %d for priority %d "
"(max COS is %d), setting to 0", cos, pri,
(sc->max_cos - 1));
@@ -11344,7 +11344,7 @@ static void bnx2x_link_reset(struct bnx2x_softc *sc)
elink_lfa_reset(&sc->link_params, &sc->link_vars);
} else {
if (!CHIP_REV_IS_SLOW(sc)) {
- PMD_DRV_LOG(WARN,
+ PMD_DRV_LOG(WARNING,
"Bootcode is missing - cannot reset link");
}
}
diff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h
index aa37234..bec799b 100644
--- a/drivers/net/bnx2x/bnx2x_logs.h
+++ b/drivers/net/bnx2x/bnx2x_logs.h
@@ -38,7 +38,7 @@
#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)
#endif
-#ifdef RTE_LIBRTE_BNX2X_DEBUG_DRIVER
+#ifdef RTE_LIBRTE_BNX2X_DEBUG
#define PMD_DRV_LOG_RAW(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
#else
diff --git a/drivers/net/bnx2x/ecore_init.h b/drivers/net/bnx2x/ecore_init.h
index 49236b2..7fc5644 100644
--- a/drivers/net/bnx2x/ecore_init.h
+++ b/drivers/net/bnx2x/ecore_init.h
@@ -799,8 +799,7 @@ static inline void ecore_clear_blocks_parity(struct bnx2x_softc *sc)
reg_val = REG_RD(sc, ecore_blocks_parity_data[i].
sts_clr_addr);
if (reg_val & reg_mask)
- ECORE_MSG(sc,
- "Parity errors in %s: 0x%x",
+ ECORE_MSG("Parity errors in %s: 0x%x",
ecore_blocks_parity_data[i].name,
reg_val & reg_mask);
}
diff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c
index 661cd1f..31ab8cf 100644
--- a/drivers/net/bnx2x/ecore_sp.c
+++ b/drivers/net/bnx2x/ecore_sp.c
@@ -3008,8 +3008,7 @@ static int ecore_mcast_setup_e1h(struct bnx2x_softc *sc,
break;
case ECORE_MCAST_CMD_DEL:
- ECORE_MSG(sc,
- "Invalidating multicast MACs configuration");
+ ECORE_MSG("Invalidating multicast MACs configuration");
/* clear the registry */
ECORE_MEMSET(o->registry.aprox_match.vec, 0,
@@ -3741,8 +3740,7 @@ static int ecore_queue_comp_cmd(struct bnx2x_softc *sc __rte_unused,
"illegal value for next tx_only: %d. max cos was %d",
o->next_tx_only, o->max_cos);
- ECORE_MSG(sc,
- "Completing command %d for queue %d, setting state to %d",
+ ECORE_MSG("Completing command %d for queue %d, setting state to %d",
cmd, o->cids[ECORE_PRIMARY_CID_INDEX], o->next_state);
if (o->next_tx_only) /* print num tx-only if any exist */
@@ -4729,8 +4727,7 @@ ecore_func_state_change_comp(struct bnx2x_softc *sc __rte_unused,
return ECORE_INVAL;
}
- ECORE_MSG(sc,
- "Completing command %d for func %d, setting state to %d",
+ ECORE_MSG("Completing command %d for func %d, setting state to %d",
cmd, ECORE_FUNC_ID(sc), o->next_state);
o->state = o->next_state;
@@ -5172,8 +5169,7 @@ static int ecore_func_send_afex_update(struct bnx2x_softc *sc, struct ecore_func
* read and we will have to put a full memory barrier there
* (inside ecore_sp_post()).
*/
- ECORE_MSG(sc,
- "afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x",
+ ECORE_MSG("afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x",
rdata->vif_id,
rdata->afex_default_vlan, rdata->allowed_priorities);
--
2.4.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] bnx2x: fix build with clang
2015-07-28 15:47 [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
2015-07-28 15:47 ` [PATCH 1/4] bnx2x: fix build as shared library Thomas Monjalon
2015-07-28 15:47 ` [PATCH 2/4] bnx2x: fix build with debug enabled Thomas Monjalon
@ 2015-07-28 15:47 ` Thomas Monjalon
2015-07-28 15:47 ` [PATCH 4/4] bnx2x: fix part of 32-bit build Thomas Monjalon
2015-08-03 15:42 ` [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
4 siblings, 0 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-07-28 15:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
Build log:
error: unused function 'bnx2x_hilo'
No need to keep an unused function.
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
drivers/net/bnx2x/bnx2x_stats.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c
index f9819ef..80260f0 100644
--- a/drivers/net/bnx2x/bnx2x_stats.c
+++ b/drivers/net/bnx2x/bnx2x_stats.c
@@ -43,18 +43,6 @@
#define BITS_PER_LONG 64
#endif
-static inline long
-bnx2x_hilo(uint32_t *hiref)
-{
- uint32_t lo = *(hiref + 1);
-#if (BITS_PER_LONG == 64)
- uint32_t hi = *hiref;
- return HILO_U64(hi, lo);
-#else
- return lo;
-#endif
-}
-
static inline uint16_t
bnx2x_get_port_stats_dma_len(struct bnx2x_softc *sc)
{
--
2.4.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] bnx2x: fix part of 32-bit build
2015-07-28 15:47 [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
` (2 preceding siblings ...)
2015-07-28 15:47 ` [PATCH 3/4] bnx2x: fix build with clang Thomas Monjalon
@ 2015-07-28 15:47 ` Thomas Monjalon
2015-08-03 15:42 ` Thomas Monjalon
2015-08-03 15:42 ` [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
4 siblings, 1 reply; 7+ messages in thread
From: Thomas Monjalon @ 2015-07-28 15:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
Example of errors:
error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘uint64_t
error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘unsigned int’
Only 2 files are fixed. The others errors are left as exercise to the authors.
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
drivers/net/bnx2x/bnx2x.c | 57 +++++++++++++++++++++++++----------------------
drivers/net/bnx2x/bnx2x.h | 2 +-
2 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 342bcb1..69600b2 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -169,10 +169,10 @@ bnx2x_dma_alloc(struct bnx2x_softc *sc, size_t size, struct bnx2x_dma *dma,
dma->sc = sc;
if (IS_PF(sc))
- sprintf(mz_name, "bnx2x%d_%s_%lx", SC_ABS_FUNC(sc), msg,
+ sprintf(mz_name, "bnx2x%d_%s_%" PRIx64, SC_ABS_FUNC(sc), msg,
rte_get_timer_cycles());
else
- sprintf(mz_name, "bnx2x%d_%s_%lx", sc->pcie_device, msg,
+ sprintf(mz_name, "bnx2x%d_%s_%" PRIx64, sc->pcie_device, msg,
rte_get_timer_cycles());
/* Caller must take care that strlen(mz_name) < RTE_MEMZONE_NAMESIZE */
@@ -186,7 +186,7 @@ bnx2x_dma_alloc(struct bnx2x_softc *sc, size_t size, struct bnx2x_dma *dma,
dma->paddr = (uint64_t) z->phys_addr;
dma->vaddr = z->addr;
- PMD_DRV_LOG(DEBUG, "%s: virt=%p phys=%lx", msg, dma->vaddr, dma->paddr);
+ PMD_DRV_LOG(DEBUG, "%s: virt=%p phys=%" PRIx64, msg, dma->vaddr, dma->paddr);
return 0;
}
@@ -1296,7 +1296,7 @@ bnx2x_free_tx_pkt(__rte_unused struct bnx2x_fastpath *fp, struct bnx2x_tx_queue
rte_pktmbuf_free(tx_mbuf);
} else {
PMD_RX_LOG(ERR, "fp[%02d] lost mbuf %lu",
- fp->index, TX_BD(pkt_idx, txq));
+ fp->index, (long unsigned) TX_BD(pkt_idx, txq));
}
txq->sw_ring[TX_BD(pkt_idx, txq)] = NULL;
@@ -1496,7 +1496,7 @@ bnx2x_set_q_rx_mode(struct bnx2x_softc *sc, uint8_t cl_id,
ramrod_param.rdata = BNX2X_SP(sc, rx_mode_rdata);
ramrod_param.rdata_mapping =
- (phys_addr_t) ((void *)BNX2X_SP_MAPPING(sc, rx_mode_rdata)),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, rx_mode_rdata),
bnx2x_set_bit(ECORE_FILTER_RX_MODE_PENDING, &sc->sp_state);
ramrod_param.ramrod_flags = ramrod_flags;
@@ -4617,9 +4617,11 @@ static void bnx2x_init_func_obj(struct bnx2x_softc *sc)
ecore_init_func_obj(sc,
&sc->func_obj,
- BNX2X_SP(sc, func_rdata), (phys_addr_t) ((void *)
- BNX2X_SP_MAPPING(sc, func_rdata)), BNX2X_SP(sc, func_afex_rdata), (phys_addr_t) ((void *)
- BNX2X_SP_MAPPING(sc, func_afex_rdata)), &bnx2x_func_sp_drv);
+ BNX2X_SP(sc, func_rdata),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, func_rdata),
+ BNX2X_SP(sc, func_afex_rdata),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, func_afex_rdata),
+ &bnx2x_func_sp_drv);
}
static int bnx2x_init_hw(struct bnx2x_softc *sc, uint32_t load_code)
@@ -4934,9 +4936,8 @@ static void bnx2x_init_eth_fp(struct bnx2x_softc *sc, int idx)
cids,
sc->max_cos,
SC_FUNC(sc),
- BNX2X_SP(sc, q_rdata), (phys_addr_t) ((void *)
- BNX2X_SP_MAPPING
- (sc, q_rdata)),
+ BNX2X_SP(sc, q_rdata),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, q_rdata),
q_type);
/* configure classification DBs */
@@ -4945,10 +4946,8 @@ static void bnx2x_init_eth_fp(struct bnx2x_softc *sc, int idx)
fp->cl_id,
idx,
SC_FUNC(sc),
- BNX2X_SP(sc, mac_rdata), (phys_addr_t) ((void *)
- BNX2X_SP_MAPPING
- (sc,
- mac_rdata)),
+ BNX2X_SP(sc, mac_rdata),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, mac_rdata),
ECORE_FILTER_MAC_PENDING, &sc->sp_state,
ECORE_OBJ_TYPE_RX_TX, &sc->macs_pool);
}
@@ -5713,8 +5712,10 @@ static void bnx2x_init_objs(struct bnx2x_softc *sc)
sc->fp[0].index,
SC_FUNC(sc),
SC_FUNC(sc),
- BNX2X_SP(sc, mcast_rdata), (phys_addr_t) ((void *)
- BNX2X_SP_MAPPING(sc, mcast_rdata)), ECORE_FILTER_MCAST_PENDING, &sc->sp_state, o_type);
+ BNX2X_SP(sc, mcast_rdata),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, mcast_rdata),
+ ECORE_FILTER_MCAST_PENDING,
+ &sc->sp_state, o_type);
/* Setup CAM credit pools */
ecore_init_mac_credit_pool(sc,
@@ -5735,8 +5736,10 @@ static void bnx2x_init_objs(struct bnx2x_softc *sc)
sc->fp[0].index,
SC_FUNC(sc),
SC_FUNC(sc),
- BNX2X_SP(sc, rss_rdata), (phys_addr_t) ((void *)
- BNX2X_SP_MAPPING(sc, rss_rdata)), ECORE_FILTER_RSS_CONF_PENDING, &sc->sp_state, ECORE_OBJ_TYPE_RX);
+ BNX2X_SP(sc, rss_rdata),
+ (phys_addr_t) BNX2X_SP_MAPPING(sc, rss_rdata),
+ ECORE_FILTER_RSS_CONF_PENDING,
+ &sc->sp_state, ECORE_OBJ_TYPE_RX);
}
/*
@@ -6455,10 +6458,10 @@ bnx2x_pf_rx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,
pause->pri_map = 1;
/* rxq setup */
- rxq_init->dscr_map = (phys_addr_t)((void *)rxq->rx_ring_phys_addr);
- rxq_init->rcq_map = (phys_addr_t)((void *)rxq->cq_ring_phys_addr);
- rxq_init->rcq_np_map = (phys_addr_t)((void *)(rxq->cq_ring_phys_addr +
- BNX2X_PAGE_SIZE));
+ rxq_init->dscr_map = (phys_addr_t)rxq->rx_ring_phys_addr;
+ rxq_init->rcq_map = (phys_addr_t)rxq->cq_ring_phys_addr;
+ rxq_init->rcq_np_map = (phys_addr_t)(rxq->cq_ring_phys_addr +
+ BNX2X_PAGE_SIZE);
/*
* This should be a maximum number of data bytes that may be
@@ -6496,7 +6499,7 @@ bnx2x_pf_tx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,
PMD_TX_LOG(ERR, "ERROR: TX queue is NULL");
return;
}
- txq_init->dscr_map = (phys_addr_t)((void *)txq->tx_ring_phys_addr);
+ txq_init->dscr_map = (phys_addr_t)txq->tx_ring_phys_addr;
txq_init->sb_cq_index = HC_INDEX_ETH_FIRST_TX_CQ_CONS + cos;
txq_init->traffic_type = LLFC_TRAFFIC_TYPE_NW;
txq_init->fw_sb_id = fp->fw_sb_id;
@@ -9596,10 +9599,10 @@ void bnx2x_load_firmware(struct bnx2x_softc *sc)
sc->fw_len = st.st_size;
if (sc->fw_len < FW_HEADER_LEN) {
- PMD_DRV_LOG(NOTICE, "Invalid fw size: %lu", sc->fw_len);
+ PMD_DRV_LOG(NOTICE, "Invalid fw size: %" PRIu64, sc->fw_len);
return;
}
- PMD_DRV_LOG(DEBUG, "fw_len = %lu", sc->fw_len);
+ PMD_DRV_LOG(DEBUG, "fw_len = %" PRIu64, sc->fw_len);
}
static void
@@ -11081,7 +11084,7 @@ static int bnx2x_init_hw_func(struct bnx2x_softc *sc)
for (i = 0; i < L2_ILT_LINES(sc); i++) {
ilt->lines[cdu_ilt_start + i].page = sc->context[i].vcxt;
ilt->lines[cdu_ilt_start + i].page_mapping =
- (phys_addr_t)((void *)sc->context[i].vcxt_dma.paddr);
+ (phys_addr_t)sc->context[i].vcxt_dma.paddr;
ilt->lines[cdu_ilt_start + i].size = sc->context[i].size;
}
ecore_ilt_init_op(sc, INITOP_SET);
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index b1e36e5..867b92a 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1271,7 +1271,7 @@ struct bnx2x_softc {
uint32_t gz_outlen;
#define GUNZIP_BUF(sc) (sc->gz_buf)
#define GUNZIP_OUTLEN(sc) (sc->gz_outlen)
-#define GUNZIP_PHYS(sc) (phys_addr_t)((void *)(sc->gz_buf_dma.paddr))
+#define GUNZIP_PHYS(sc) (phys_addr_t)(sc->gz_buf_dma.paddr)
#define FW_BUF_SIZE 0x40000
struct raw_op *init_ops;
--
2.4.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] bnx2x: fix part of 32-bit build
2015-07-28 15:47 ` [PATCH 4/4] bnx2x: fix part of 32-bit build Thomas Monjalon
@ 2015-08-03 15:42 ` Thomas Monjalon
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-08-03 15:42 UTC (permalink / raw)
To: Stephen Hemminger, Harish Patil; +Cc: dev
2015-07-28 17:47, Thomas Monjalon:
> Example of errors:
> error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘uint64_t
> error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘unsigned int’
>
> Only 2 files are fixed. The others errors are left as exercise to the authors.
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
There was no ack nor completion of this patch, so it will be applied
as-is (with some checkpatch fixes).
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] some fixes for bnx2x
2015-07-28 15:47 [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
` (3 preceding siblings ...)
2015-07-28 15:47 ` [PATCH 4/4] bnx2x: fix part of 32-bit build Thomas Monjalon
@ 2015-08-03 15:42 ` Thomas Monjalon
4 siblings, 0 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-08-03 15:42 UTC (permalink / raw)
To: Stephen Hemminger, Harish Patil; +Cc: dev
2015-07-28 17:47, Thomas Monjalon:
> The basic build tests fail in many ways.
> The driver was disabled by error in first test before applying it.
> That's why it has been accepted.
>
> This is a first try to fix most of the errors.
> It has not been tested with old compilers, nor icc.
> The 32-bit build fix is not complete.
> Please review it and send other patches to completely fix it ASAP.
>
> Thomas Monjalon (4):
> bnx2x: fix build as shared library
> bnx2x: fix build with debug enabled
> bnx2x: fix build with clang
> bnx2x: fix part of 32-bit build
Applied
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-08-03 15:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-28 15:47 [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
2015-07-28 15:47 ` [PATCH 1/4] bnx2x: fix build as shared library Thomas Monjalon
2015-07-28 15:47 ` [PATCH 2/4] bnx2x: fix build with debug enabled Thomas Monjalon
2015-07-28 15:47 ` [PATCH 3/4] bnx2x: fix build with clang Thomas Monjalon
2015-07-28 15:47 ` [PATCH 4/4] bnx2x: fix part of 32-bit build Thomas Monjalon
2015-08-03 15:42 ` Thomas Monjalon
2015-08-03 15:42 ` [PATCH 0/4] some fixes for bnx2x Thomas Monjalon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.