Deleted Added
full compact
35c35
< __FBSDID("$FreeBSD: stable/11/sys/dev/qlnx/qlnxe/qlnx_os.c 318657 2017-05-22 19:22:06Z davidcs $");
---
> __FBSDID("$FreeBSD: stable/11/sys/dev/qlnx/qlnxe/qlnx_os.c 318659 2017-05-22 19:28:38Z davidcs $");
306c306
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
314c314
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
356,357c356
< QL_DPRINT1(ha, (ha->pci_dev, "%s: %p\n", __func__,
< ha->sp_taskqueue[i]));
---
> QL_DPRINT1(ha, "%p\n", ha->sp_taskqueue[i]);
521c520
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit ret = %d\n", __func__, ret));
---
> QL_DPRINT2(ha, "exit ret = %d\n", ret);
551,552c550
< QL_DPRINT1(ha, (ha->pci_dev, "%s: %p\n", __func__,
< fp->fp_taskqueue));
---
> QL_DPRINT1(ha, "%p\n",fp->fp_taskqueue);
714c712
< QL_DPRINT1(ha, (dev, "%s:\n\t\t\tpci_reg [%p, 0x%08x 0x%08x]"
---
> QL_DPRINT1(ha, "\n\t\t\tpci_reg [%p, 0x%08x 0x%08x]"
718c716
< __func__, ha->pci_reg, rsrc_len_reg,
---
> ha->pci_reg, rsrc_len_reg,
721,722c719
< ha->msix_count, mp_ncpus, ha->num_rss, ha->num_tc));
<
---
> ha->msix_count, mp_ncpus, ha->num_rss, ha->num_tc);
758,760c755,757
< QL_DPRINT1(ha, (dev, "%s: p_hwfn [%p] sp_irq_rid %d"
< " sp_irq %p sp_handle %p\n", __func__, p_hwfn,
< ha->sp_irq_rid[i], ha->sp_irq[i], ha->sp_handle[i]));
---
> QL_DPRINT1(ha, "p_hwfn [%p] sp_irq_rid %d"
> " sp_irq %p sp_handle %p\n", p_hwfn,
> ha->sp_irq_rid[i], ha->sp_irq[i], ha->sp_handle[i]);
803,804c800,801
< QL_DPRINT1(ha, (dev, "grcdump_size[%d] = 0x%08x\n",
< i, ha->grcdump_size[i]));
---
> QL_DPRINT1(ha, "grcdump_size[%d] = 0x%08x\n",
> i, ha->grcdump_size[i]);
818,819c815,816
< QL_DPRINT1(ha, (dev, "idle_chk_size[%d] = 0x%08x\n",
< i, ha->idle_chk_size[i]));
---
> QL_DPRINT1(ha, "idle_chk_size[%d] = 0x%08x\n",
> i, ha->idle_chk_size[i]);
858,859c855,856
< QL_DPRINT1(ha, (dev, "%s: STORM_FW version %s MFW version %s\n",
< __func__, ha->stormfw_ver, ha->mfw_ver));
---
> QL_DPRINT1(ha, "STORM_FW version %s MFW version %s\n",
> ha->stormfw_ver, ha->mfw_ver);
877c874
< QL_DPRINT2(ha, (dev, "%s: success\n", __func__));
---
> QL_DPRINT2(ha, "success\n");
961c958
< QL_DPRINT2(ha, (dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
1044c1041
< QL_DPRINT2(ha, (dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
1056c1053
< QL_DPRINT2(ha, (ha->pci_dev, "%s: start\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
1063c1060
< QL_DPRINT2(ha, (ha->pci_dev, "%s: end\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
1782d1778
<
1787c1783
< ha->dp_level = 0;
---
> ha->dp_level = 0x01;
2002c1998
< QL_DPRINT2(ha, (dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
2011a2008,2009
> QL_DPRINT1(ha, "Driver Initialization start \n");
>
2029c2027
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
2035c2033
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
2224,2225c2222
< QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFADDR (0x%lx)\n",
< __func__, cmd));
---
> QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx)\n", cmd);
2234,2237c2231,2232
< QL_DPRINT4(ha, (ha->pci_dev,
< "%s: SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n",
< __func__, cmd,
< ntohl(IA_SIN(ifa)->sin_addr.s_addr)));
---
> QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n",
> cmd, ntohl(IA_SIN(ifa)->sin_addr.s_addr));
2246,2247c2241
< QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFMTU (0x%lx)\n",
< __func__, cmd));
---
> QL_DPRINT4(ha, "SIOCSIFMTU (0x%lx)\n", cmd);
2266,2267c2260
< QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFFLAGS (0x%lx)\n",
< __func__, cmd));
---
> QL_DPRINT4(ha, "SIOCSIFFLAGS (0x%lx)\n", cmd);
2295,2296c2288
< QL_DPRINT4(ha, (ha->pci_dev,
< "%s: %s (0x%lx)\n", __func__, "SIOCADDMULTI", cmd));
---
> QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCADDMULTI", cmd);
2305,2306c2297
< QL_DPRINT4(ha, (ha->pci_dev,
< "%s: %s (0x%lx)\n", __func__, "SIOCDELMULTI", cmd));
---
> QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCDELMULTI", cmd);
2316,2318c2307,2308
< QL_DPRINT4(ha, (ha->pci_dev,
< "%s: SIOCSIFMEDIA/SIOCGIFMEDIA (0x%lx)\n",
< __func__, cmd));
---
> QL_DPRINT4(ha, "SIOCSIFMEDIA/SIOCGIFMEDIA (0x%lx)\n", cmd);
>
2326,2327c2316
< QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFCAP (0x%lx)\n",
< __func__, cmd));
---
> QL_DPRINT4(ha, "SIOCSIFCAP (0x%lx)\n", cmd);
2370,2371c2359
< QL_DPRINT1(ha, (ha->pci_dev, "%s :"
< " ecore_ptt_acquire failed\n", __func__));
---
> QL_DPRINT1(ha, "ecore_ptt_acquire failed\n");
2389,2392c2377,2380
< QL_DPRINT8(ha, (ha->pci_dev, "SIOCGI2C copyout ret = %d"
< " len = %d addr = 0x%02x offset = 0x%04x"
< " data[0..7]=0x%02x 0x%02x 0x%02x 0x%02x 0x%02x"
< " 0x%02x 0x%02x 0x%02x\n",
---
> QL_DPRINT8(ha, "SIOCGI2C copyout ret = %d \
> len = %d addr = 0x%02x offset = 0x%04x \
> data[0..7]=0x%02x 0x%02x 0x%02x 0x%02x 0x%02x \
> 0x%02x 0x%02x 0x%02x\n",
2395c2383
< i2c.data[4], i2c.data[5], i2c.data[6], i2c.data[7]));
---
> i2c.data[4], i2c.data[5], i2c.data[6], i2c.data[7]);
2401,2402c2389
< QL_DPRINT4(ha, (ha->pci_dev, "%s: default (0x%lx)\n",
< __func__, cmd));
---
> QL_DPRINT4(ha, "default (0x%lx)\n", cmd);
2419c2406
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
2426c2413
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
2438c2425
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
2454,2455c2441
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit (%s)\n", __func__,
< (ha->link_up ? "link_up" : "link_down")));
---
> QL_DPRINT2(ha, "exit (%s)\n", (ha->link_up ? "link_up" : "link_down"));
2481c2467
< QL_DPRINT1(ha, (ha->pci_dev, "%s: (mp == NULL) "
---
> QL_DPRINT1(ha, "(mp == NULL) "
2488d2473
< __func__,
2494c2479
< ecore_chain_get_elem_left(&txq->tx_pbl)));
---
> ecore_chain_get_elem_left(&txq->tx_pbl));
2555c2540
< QL_DPRINT1(ha, (ha->pci_dev, "%s: (diff = 0x%x) "
---
> QL_DPRINT1(ha, "(diff = 0x%x) "
2562c2547
< __func__, diff,
---
> diff,
2568c2553
< ecore_chain_get_elem_left(&txq->tx_pbl)));
---
> ecore_chain_get_elem_left(&txq->tx_pbl));
2590c2575
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
2618c2603
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit ret = %d\n", __func__, ret));
---
> QL_DPRINT2(ha, "exit ret = %d\n", ret);
2632c2617
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
2651c2636
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
2795c2780
< QL_DPRINT8(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT8(ha, "enter\n");
2847,2848c2832
< QL_DPRINT8(ha, (ha->pci_dev, "%s: EFBIG [%d]\n", __func__,
< m_head->m_pkthdr.len));
---
> QL_DPRINT8(ha, "EFBIG [%d]\n", m_head->m_pkthdr.len);
2858,2860c2842
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: m_defrag() = NULL [%d]\n",
< __func__, ret));
---
> QL_DPRINT1(ha, "m_defrag() = NULL [%d]\n", ret);
2872,2874c2854,2856
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: bus_dmamap_load_mbuf_sg failed0[%d, %d]\n",
< __func__, ret, m_head->m_pkthdr.len));
---
> QL_DPRINT1(ha,
> "bus_dmamap_load_mbuf_sg failed0 [%d, %d]\n",
> ret, m_head->m_pkthdr.len);
2888,2890c2870,2872
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: (%d) nsegs too many for non-TSO[%d, %d]\n",
< __func__, ret, nsegs, m_head->m_pkthdr.len));
---
> QL_DPRINT1(ha,
> "(%d) nsegs too many for non-TSO [%d, %d]\n",
> ret, nsegs, m_head->m_pkthdr.len);
2905,2908c2887,2888
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: bus_dmamap_load_mbuf_sg failed1[%d, %d]\n",
< __func__, ret, m_head->m_pkthdr.len));
<
---
> QL_DPRINT1(ha, "bus_dmamap_load_mbuf_sg failed1 [%d, %d]\n",
> ret, m_head->m_pkthdr.len);
2927,2929c2907,2909
< QL_DPRINT1(ha, (ha->pci_dev, "%s: (%d, 0x%x) insuffient BDs"
< "in chain[%d] trying to free packets\n",
< __func__, nsegs, elem_left, fp->rss_id));
---
> QL_DPRINT1(ha, "(%d, 0x%x) insuffient BDs"
> " in chain[%d] trying to free packets\n",
> nsegs, elem_left, fp->rss_id);
2938,2940c2918,2920
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: (%d, 0x%x) insuffient BDs in chain[%d]\n",
< __func__, nsegs, elem_left, fp->rss_id));
---
> QL_DPRINT1(ha,
> "(%d, 0x%x) insuffient BDs in chain[%d]\n",
> nsegs, elem_left, fp->rss_id);
3168c3148
< QL_DPRINT8(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT8(ha, "exit\n");
3187a3168,3169
> QL_DPRINT1(ha, "QLNX STATE = %d\n",ha->state);
>
3280,3281c3262
< QL_DPRINT1(ha, (ha->pci_dev, "%s: mp = NULL\n",
< __func__));
---
> QL_DPRINT1(ha, "mp = NULL\n");
3296,3299c3277,3278
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: New buffer allocation failed, dropping"
< " incoming packet and reusing its buffer\n",
< __func__));
---
> QL_DPRINT1(ha, "New buffer allocation failed, dropping"
> " incoming packet and reusing its buffer\n");
3359,3375c3338,3354
< QL_DPRINT7(ha, (dev, "%s[%d]: enter\n "
< "\t type = 0x%x\n"
< "\t bitfields = 0x%x\n"
< "\t seg_len = 0x%x\n"
< "\t pars_flags = 0x%x\n"
< "\t vlan_tag = 0x%x\n"
< "\t rss_hash = 0x%x\n"
< "\t len_on_first_bd = 0x%x\n"
< "\t placement_offset = 0x%x\n"
< "\t tpa_agg_index = 0x%x\n"
< "\t header_len = 0x%x\n"
< "\t ext_bd_len_list[0] = 0x%x\n"
< "\t ext_bd_len_list[1] = 0x%x\n"
< "\t ext_bd_len_list[2] = 0x%x\n"
< "\t ext_bd_len_list[3] = 0x%x\n"
< "\t ext_bd_len_list[4] = 0x%x\n",
< __func__, fp->rss_id, cqe->type, cqe->bitfields, cqe->seg_len,
---
> QL_DPRINT7(ha, "[rss_id = %d]: enter\n \
> \t type = 0x%x\n \
> \t bitfields = 0x%x\n \
> \t seg_len = 0x%x\n \
> \t pars_flags = 0x%x\n \
> \t vlan_tag = 0x%x\n \
> \t rss_hash = 0x%x\n \
> \t len_on_first_bd = 0x%x\n \
> \t placement_offset = 0x%x\n \
> \t tpa_agg_index = 0x%x\n \
> \t header_len = 0x%x\n \
> \t ext_bd_len_list[0] = 0x%x\n \
> \t ext_bd_len_list[1] = 0x%x\n \
> \t ext_bd_len_list[2] = 0x%x\n \
> \t ext_bd_len_list[3] = 0x%x\n \
> \t ext_bd_len_list[4] = 0x%x\n",
> fp->rss_id, cqe->type, cqe->bitfields, cqe->seg_len,
3381c3360
< cqe->ext_bd_len_list[4]));
---
> cqe->ext_bd_len_list[4]);
3392c3371
< QL_DPRINT7(ha, (dev, "%s[%d]: mp = %p \n ", __func__, fp->rss_id, mp));
---
> QL_DPRINT7(ha, "[rss_id = %d]: mp = %p \n ", fp->rss_id, mp);
3395,3396c3374
< QL_DPRINT7(ha, (dev, "%s[%d]: mp = NULL\n", __func__,
< fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: mp = NULL\n", fp->rss_id);
3405,3408c3383,3385
< QL_DPRINT7(ha, (dev, "%s[%d]: CQE in CONS = %u has error,"
< " flags = %x, dropping incoming packet\n", __func__,
< fp->rss_id, rxq->sw_rx_cons,
< le16toh(cqe->pars_flags.flags)));
---
> QL_DPRINT7(ha, "[%d]: CQE in CONS = %u has error,"
> " flags = %x, dropping incoming packet\n", fp->rss_id,
> rxq->sw_rx_cons, le16toh(cqe->pars_flags.flags));
3421c3398
< QL_DPRINT7(ha, (dev, "%s[%d]: New buffer allocation failed,"
---
> QL_DPRINT7(ha, "[%d]: New buffer allocation failed,"
3423c3400
< __func__, fp->rss_id));
---
> fp->rss_id);
3475c3452
< QL_DPRINT7(ha, (dev, "%s[%d]: invalid aggregation state,"
---
> QL_DPRINT7(ha, "[%d]: invalid aggregation state,"
3477c3454
< __func__, fp->rss_id));
---
> fp->rss_id);
3514c3491
< QL_DPRINT7(ha, (dev, "%s[%d]: 4\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 4\n ", fp->rss_id);
3526,3527c3503
< QL_DPRINT7(ha, (ha->pci_dev, "%s[%d]: mpc = NULL\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: mpc = NULL\n", fp->rss_id);
3541,3544c3517,3519
< QL_DPRINT7(ha, (dev,
< "%s[%d]: New buffer allocation failed, dropping"
< " incoming packet and reusing its buffer\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: New buffer allocation failed,"
> " dropping incoming packet and reusing its"
> " buffer\n", fp->rss_id);
3582,3584c3557,3559
< QL_DPRINT7(ha, (dev, "%s[%d]: invalid aggregation state,"
< " dropping incoming packet and reusing its buffer\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: invalid aggregation state, dropping"
> " incoming packet and reusing its buffer\n",
> fp->rss_id);
3664,3667c3639,3641
< QL_DPRINT7(ha, (dev, "%s[%d]: 5\n" "\tagg_state = %d\n"
< "\t mpf = %p mpl = %p\n", __func__, fp->rss_id,
< rxq->tpa_info[agg_index].agg_state,
< rxq->tpa_info[agg_index].mpf, rxq->tpa_info[agg_index].mpl));
---
> QL_DPRINT7(ha, "[%d]: 5\n\tagg_state = %d\n\t mpf = %p mpl = %p\n",
> fp->rss_id, rxq->tpa_info[agg_index].agg_state,
> rxq->tpa_info[agg_index].mpf, rxq->tpa_info[agg_index].mpl);
3686,3695c3660,3669
< QL_DPRINT7(ha, (dev, "%s[%d]: enter\n "
< "\t type = 0x%x\n"
< "\t tpa_agg_index = 0x%x\n"
< "\t len_list[0] = 0x%x\n"
< "\t len_list[1] = 0x%x\n"
< "\t len_list[2] = 0x%x\n"
< "\t len_list[3] = 0x%x\n"
< "\t len_list[4] = 0x%x\n"
< "\t len_list[5] = 0x%x\n",
< __func__, fp->rss_id, cqe->type, cqe->tpa_agg_index,
---
> QL_DPRINT7(ha, "[%d]: enter\n \
> \t type = 0x%x\n \
> \t tpa_agg_index = 0x%x\n \
> \t len_list[0] = 0x%x\n \
> \t len_list[1] = 0x%x\n \
> \t len_list[2] = 0x%x\n \
> \t len_list[3] = 0x%x\n \
> \t len_list[4] = 0x%x\n \
> \t len_list[5] = 0x%x\n",
> fp->rss_id, cqe->type, cqe->tpa_agg_index,
3697c3671
< cqe->len_list[3], cqe->len_list[4], cqe->len_list[5]));
---
> cqe->len_list[3], cqe->len_list[4], cqe->len_list[5]);
3702c3676
< QL_DPRINT7(ha, (dev, "%s[%d]: 0\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 0\n ", fp->rss_id);
3710c3684
< QL_DPRINT7(ha, (dev, "%s[%d]: 1\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 1\n ", fp->rss_id);
3729,3730c3703
< QL_DPRINT7(ha, (dev, "%s[%d]: mpc = NULL\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: mpc = NULL\n", fp->rss_id);
3746,3749c3719,3721
< QL_DPRINT7(ha, (dev,
< "%s[%d]: New buffer allocation failed, dropping"
< " incoming packet and reusing its buffer\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: New buffer allocation failed,"
> " dropping incoming packet and reusing its"
> " buffer\n", fp->rss_id);
3785,3786c3757,3758
< QL_DPRINT7(ha, (dev, "%s[%d]: 2\n" "\tmpf = %p mpl = %p\n",
< __func__, fp->rss_id, mpf, mpl));
---
> QL_DPRINT7(ha, "[%d]: 2\n" "\tmpf = %p mpl = %p\n",
> fp->rss_id, mpf, mpl);
3814,3826c3786,3798
< QL_DPRINT7(ha, (dev, "%s[%d]: enter\n "
< "\t type = 0x%x\n"
< "\t tpa_agg_index = 0x%x\n"
< "\t total_packet_len = 0x%x\n"
< "\t num_of_bds = 0x%x\n"
< "\t end_reason = 0x%x\n"
< "\t num_of_coalesced_segs = 0x%x\n"
< "\t ts_delta = 0x%x\n"
< "\t len_list[0] = 0x%x\n"
< "\t len_list[1] = 0x%x\n"
< "\t len_list[2] = 0x%x\n"
< "\t len_list[3] = 0x%x\n",
< __func__, fp->rss_id, cqe->type, cqe->tpa_agg_index,
---
> QL_DPRINT7(ha, "[%d]: enter\n \
> \t type = 0x%x\n \
> \t tpa_agg_index = 0x%x\n \
> \t total_packet_len = 0x%x\n \
> \t num_of_bds = 0x%x\n \
> \t end_reason = 0x%x\n \
> \t num_of_coalesced_segs = 0x%x\n \
> \t ts_delta = 0x%x\n \
> \t len_list[0] = 0x%x\n \
> \t len_list[1] = 0x%x\n \
> \t len_list[2] = 0x%x\n \
> \t len_list[3] = 0x%x\n",
> fp->rss_id, cqe->type, cqe->tpa_agg_index,
3830c3802
< cqe->len_list[3]));
---
> cqe->len_list[3]);
3836c3808
< QL_DPRINT7(ha, (dev, "%s[%d]: 0\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 0\n ", fp->rss_id);
3845c3817
< QL_DPRINT7(ha, (dev, "%s[%d]: 1\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 1\n ", fp->rss_id);
3853,3854c3825
< QL_DPRINT7(ha, (dev, "%s[%d]: 2\n ", __func__,
< fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 2\n ", fp->rss_id);
3868,3869c3839
< QL_DPRINT7(ha, (dev, "%s[%d]: mpc = NULL\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: mpc = NULL\n", fp->rss_id);
3884,3887c3854,3856
< QL_DPRINT7(ha, (dev,
< "%s[%d]: New buffer allocation failed, dropping"
< " incoming packet and reusing its buffer\n",
< __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: New buffer allocation failed,"
> " dropping incoming packet and reusing its"
> " buffer\n", fp->rss_id);
3923c3892
< QL_DPRINT7(ha, (dev, "%s[%d]: 5\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 5\n ", fp->rss_id);
3927c3896
< QL_DPRINT7(ha, (dev, "%s[%d]: 6\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 6\n ", fp->rss_id);
3936c3905
< QL_DPRINT7(ha, (dev, "%s[%d]: 7\n ", __func__, fp->rss_id));
---
> QL_DPRINT7(ha, "[%d]: 7\n ", fp->rss_id);
3969,3972c3938,3941
< QL_DPRINT7(ha, (dev, "%s[%d]: 8 csum_data = 0x%x csum_flags = 0x%lx\n "
< "m_len = 0x%x m_pkthdr_len = 0x%x\n",
< __func__, fp->rss_id, mp->m_pkthdr.csum_data,
< mp->m_pkthdr.csum_flags, mp->m_len, mp->m_pkthdr.len));
---
> QL_DPRINT7(ha, "[%d]: 8 csum_data = 0x%x csum_flags = 0x%lx\n \
> m_len = 0x%x m_pkthdr_len = 0x%x\n",
> fp->rss_id, mp->m_pkthdr.csum_data,
> mp->m_pkthdr.csum_flags, mp->m_len, mp->m_pkthdr.len);
4030c3999
< QL_DPRINT3(ha, (ha->pci_dev, "Got a slowath CQE\n"));
---
> QL_DPRINT3(ha, "Got a slowath CQE\n");
4071,4072c4040
< QL_DPRINT1(ha, (ha->pci_dev, "%s: mp = NULL\n",
< __func__));
---
> QL_DPRINT1(ha, "mp = NULL\n");
4086,4087c4054
< QL_DPRINT3(ha,
< (ha->pci_dev, "CQE type = %x, flags = %x, vlan = %x,"
---
> QL_DPRINT3(ha, "CQE type = %x, flags = %x, vlan = %x,"
4091c4058
< len, le16toh(fp_cqe->pars_flags.flags), pad));
---
> len, le16toh(fp_cqe->pars_flags.flags), pad);
4109,4110c4076
< QL_DPRINT1(ha, (ha->pci_dev,
< "CQE in CONS = %u has error, flags = %x,"
---
> QL_DPRINT1(ha, "CQE in CONS = %u has error, flags = %x,"
4112,4113c4078
< le16toh(cqe->fast_path_regular.pars_flags.flags)));
<
---
> le16toh(cqe->fast_path_regular.pars_flags.flags));
4125,4128c4090,4091
< QL_DPRINT1(ha, (ha->pci_dev,
< "New buffer allocation failed, dropping"
< " incoming packet and reusing its buffer\n"));
<
---
> QL_DPRINT1(ha, "New buffer allocation failed, dropping"
> " incoming packet and reusing its buffer\n");
4144,4147c4107,4108
< QL_DPRINT1(ha,
< (ha->pci_dev, "%s: len = %d len_on_first_bd = %d\n",
< __func__, len, len_on_first_bd));
<
---
> QL_DPRINT1(ha, "len = %d len_on_first_bd = %d\n",
> len, len_on_first_bd);
4298,4299c4259
< QL_DPRINT1(ha, (ha->pci_dev, "%s: illegal interrupt[%d]\n",
< __func__, idx));
---
> QL_DPRINT1(ha, "illegal interrupt[%d]\n", idx);
4306,4307d4265
< QL_DPRINT1(ha, (ha->pci_dev, "%s: fp_array[%d] NULL\n",
< __func__, idx));
4335c4293
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
4339c4297
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
4387,4388c4345
< QL_DPRINT1(ha,
< (dev, "%s: could not create dma tag\n", __func__));
---
> QL_DPRINT1(ha, "could not create dma tag\n");
4397,4398c4354
< QL_DPRINT1(ha,
< (dev, "%s: bus_dmamem_alloc failed\n", __func__));
---
> QL_DPRINT1(ha, "bus_dmamem_alloc failed\n");
4460,4461c4416,4417
<
< QL_DPRINT5(ha, (dev, "%s: [%p %p %p %p 0x%08x ]\n", __func__,
---
> /*
> QL_DPRINT5(ha, "[%p %p %p %p 0x%08x ]\n",
4463,4464c4419,4420
< dma_buf.dma_b, (void *)dma_buf.dma_addr, size));
<
---
> dma_buf.dma_b, (void *)dma_buf.dma_addr, size);
> */
4485,4486c4441,4442
<
< QL_DPRINT5(ha, (dev, "%s: [%p %p %p %p 0x%08x ]\n", __func__,
---
> /*
> QL_DPRINT5(ha, "[%p %p %p %p 0x%08x ]\n",
4488,4489c4444,4445
< dma_p->dma_b, (void *)dma_p->dma_addr, size));
<
---
> dma_p->dma_b, (void *)dma_p->dma_addr, size);
> */
4521,4522c4477
< QL_DPRINT1(ha, (dev, "%s: could not create parent dma tag\n",
< __func__));
---
> QL_DPRINT1(ha, "could not create parent dma tag\n");
4557,4558c4512
< QL_DPRINT1(ha, (ha->pci_dev, "%s: tx_tag alloc failed\n",
< __func__));
---
> QL_DPRINT1(ha, "tx_tag alloc failed\n");
4591,4592c4545
< QL_DPRINT1(ha, (ha->pci_dev, "%s: rx_tag alloc failed\n",
< __func__));
---
> QL_DPRINT1(ha, " rx_tag alloc failed\n");
4682c4635,4636
< int reg;
---
> int reg;
> qlnx_host_t *ha;
4684,4685c4638,4640
< if (pci_find_cap(((qlnx_host_t *)ecore_dev)->pci_dev, PCIY_EXPRESS,
< &reg) == 0)
---
> ha = ecore_dev;
>
> if (pci_find_cap(ha->pci_dev, PCIY_EXPRESS, &reg) == 0)
4688,4690c4643
< QL_DPRINT1(((qlnx_host_t *)ecore_dev),
< (((qlnx_host_t *)ecore_dev)->pci_dev,
< "%s: failed\n", __func__));
---
> QL_DPRINT1(ha, "failed\n");
5077c5030
< device_t dev;
---
> qlnx_host_t *ha;
5079c5032
< dev = ((qlnx_host_t *)cdev)->pci_dev;
---
> ha = cdev;
5083a5037
>
5092c5046
< ((qlnx_host_t *)cdev)->err_get_proto_invalid_type++;
---
> ha->err_get_proto_invalid_type++;
5094,5096c5048
< QL_DPRINT1(((qlnx_host_t *)cdev),
< (dev, "%s: invalid protocol type 0x%x\n", __func__,
< type));
---
> QL_DPRINT1(ha, "invalid protocol type 0x%x\n", type);
5112,5113c5064
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s : ecore_ptt_acquire failed\n", __func__));
---
> QL_DPRINT1(ha, "ecore_ptt_acquire failed\n");
5133,5134c5084
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s : ecore_ptt_acquire failed\n", __func__));
---
> QL_DPRINT1(ha,"ecore_ptt_acquire failed\n");
5237,5241c5187,5191
< QL_DPRINT2(((qlnx_host_t *)cdev), (((qlnx_host_t *)cdev)->pci_dev,
< "%s: hwfn_index = %d p_hwfn = %p sb_id = 0x%x rel_sb_id = 0x%x "
< "sb_info = %p sb_virt_addr = %p sb_phy_addr = %p\n",
< __func__, hwfn_index, p_hwfn, sb_id, rel_sb_id, sb_info,
< sb_virt_addr, (void *)sb_phy_addr));
---
> QL_DPRINT2(((qlnx_host_t *)cdev),
> "hwfn_index = %d p_hwfn = %p sb_id = 0x%x rel_sb_id = 0x%x \
> sb_info = %p sb_virt_addr = %p sb_phy_addr = %p\n",
> hwfn_index, p_hwfn, sb_id, rel_sb_id, sb_info,
> sb_virt_addr, (void *)sb_phy_addr);
5265,5266c5215
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Status block allocation failed\n", __func__));
---
> QL_DPRINT1(ha, "Status block allocation failed\n");
5272d5220
< QL_DPRINT1(ha, (ha->pci_dev, "%s: failed\n", __func__));
5368,5369c5316
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s : Failed to allocate Rx data\n", __func__));
---
> QL_DPRINT1(ha, "Failed to allocate Rx data\n");
5383,5386c5330,5331
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: bus_dmamap_load failed[%d, 0x%016llx, %d]\n",
< __func__, ret, (long long unsigned int)dma_addr,
< nsegs));
---
> QL_DPRINT1(ha, "bus_dmamap_load failed[%d, 0x%016llx, %d]\n",
> ret, (long long unsigned int)dma_addr, nsegs);
5421,5422c5366
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s : Failed to allocate Rx data\n", __func__));
---
> QL_DPRINT1(ha, "Failed to allocate Rx data\n");
5436,5439c5380,5381
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: bus_dmamap_load failed[%d, 0x%016llx, %d]\n",
< __func__, ret, (long long unsigned int)dma_addr,
< nsegs));
---
> QL_DPRINT1(ha, "bus_dmamap_load failed[%d, 0x%016llx, %d]\n",
> ret, (long long unsigned int)dma_addr, nsegs);
5536,5537c5478
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Rx buffers allocation failed\n", __func__));
---
> QL_DPRINT1(ha, "Rx buffers allocation failed\n");
5540,5542c5481,5482
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Allocated less buffers than"
< " desired (%d allocated)\n", __func__, num_allocated));
---
> QL_DPRINT1(ha, "Allocated less buffers than"
> " desired (%d allocated)\n", num_allocated);
5554,5556c5494,5495
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: tcp_lro_init[%d] failed\n",
< __func__, rxq->rxq_id));
---
> QL_DPRINT1(ha, "tcp_lro_init[%d] failed\n",
> rxq->rxq_id);
5561,5563c5500,5501
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: tcp_lro_init[%d] failed\n",
< __func__, rxq->rxq_id));
---
> QL_DPRINT1(ha, "tcp_lro_init[%d] failed\n",
> rxq->rxq_id);
5687,5689c5625,5627
< QL_DPRINT1(ha, (ha->pci_dev, "buf_ring_alloc failed for "
< " fp[%d, %d]\n", ha->dev_unit, fp->rss_id));
< return -ENOMEM;
---
> QL_DPRINT1(ha, "buf_ring_alloc failed for fp[%d, %d]\n",
> ha->dev_unit, fp->rss_id);
> return -ENOMEM;
5796c5734
< QL_DPRINT2(ha, (ha->pci_dev, "%s: setting mtu to %d\n", __func__, mtu));
---
> QL_DPRINT2(ha, "Setting mtu to %d and VPORT ID = %d\n", mtu, vport_id);
5807,5809c5745,5746
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Failed to start VPORT V-PORT %d "
< "with MTU %d\n", __func__, vport_id, mtu));
---
> QL_DPRINT1(ha, "Failed to start VPORT V-PORT %d"
> " with MTU %d\n" , vport_id, mtu);
5815,5817c5752,5753
< QL_DPRINT2(ha, (ha->pci_dev,
< "%s: Started V-PORT %d with MTU %d\n",
< __func__, vport_id, mtu));
---
> QL_DPRINT2(ha, "Started V-PORT %d with MTU %d\n",
> vport_id, mtu);
5855c5791
<
---
> if (params->rss_params->update_rss_config)
5856a5793,5794
> else
> sp_params.rss_params = NULL;
5878,5879c5816
< QL_DPRINT3(ha, (ha->pci_dev,
< "%p %p %p %p %p %p %p %p \n",
---
> QL_DPRINT3(ha, "%p %p %p %p %p %p %p %p \n",
5887c5824
< rss->rss_ind_table[j+7]));
---
> rss->rss_ind_table[j+7]);
5892a5830,5832
>
> QL_DPRINT1(ha, "Update sp vport ID=%d\n", params->vport_id);
>
5896,5897c5836
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s:Failed to update VPORT\n", __func__));
---
> QL_DPRINT1(ha, "Failed to update VPORT\n");
5901,5904c5840,5841
< QL_DPRINT2(ha, (ha->pci_dev,
< "%s: Updated V-PORT %d: tx_active_flag %d,"
< "rx_active_flag %d [tx_update %d], [rx_update %d]\n",
< __func__,
---
> QL_DPRINT2(ha, "Updated V-PORT %d: tx_active_flag %d, \
> rx_active_flag %d [tx_update %d], [rx_update %d]\n",
5908c5845
< params->update_vport_active_rx_flg));
---
> params->update_vport_active_rx_flg);
6001a5939,5940
> QL_DPRINT1(ha, "Num RSS = %d\n", ha->num_rss);
>
6003,6005c5942,5943
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Cannot update V-VPORT as active as there"
< " are no Rx queues\n", __func__));
---
> QL_DPRINT1(ha, "Cannot update V-VPORT as active as there"
> " are no Rx queues\n");
6017,6018c5955
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Start V-PORT failed %d\n", __func__, rc));
---
> QL_DPRINT1(ha, "Start V-PORT failed %d\n", rc);
6022,6025c5959,5961
< QL_DPRINT2(ha, (ha->pci_dev,
< "%s: Start vport ramrod passed,"
< " vport_id = %d, MTU = %d, vlan_removal_en = %d\n", __func__,
< vport_id, (int)(ifp->if_mtu + 0xe), vlan_removal_en));
---
> QL_DPRINT2(ha, "Start vport ramrod passed, "
> "vport_id = %d, MTU = %d, vlan_removal_en = %d\n",
> vport_id, (int)(ifp->if_mtu + 0xe), vlan_removal_en);
6058,6060c5994
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Start RXQ #%d failed %d\n", __func__,
< i, rc));
---
> QL_DPRINT1(ha, "Start RXQ #%d failed %d\n", i, rc);
6094,6096c6028,6029
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Start TXQ #%d failed %d\n",
< __func__, txq->index, rc));
---
> QL_DPRINT1(ha, "Start TXQ #%d failed %d\n",
> txq->index, rc);
6176,6177c6109
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Update V-PORT failed %d\n", __func__, rc));
---
> QL_DPRINT1(ha, "Update V-PORT failed %d\n", rc);
6191c6123
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
6209,6210c6141
< QL_DPRINT2(ha, (ha->pci_dev, "%s[%d, %d]: done\n", __func__,
< fp->rss_id, txq->index));
---
> QL_DPRINT2(ha, "[%d, %d]: done\n", fp->rss_id, txq->index);
6239a6171,6172
> QL_DPRINT1(ha, "Update vport ID= %d\n", vport_update_params.vport_id);
>
6242,6243c6175
< QL_DPRINT1(ha, (ha->pci_dev, "%s:Failed to update vport\n",
< __func__));
---
> QL_DPRINT1(ha, "Failed to update vport\n");
6276,6278c6208,6209
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Failed to stop TXQ #%d\n",
< __func__, tx_queue_id));
---
> QL_DPRINT1(ha, "Failed to stop TXQ #%d\n",
> tx_queue_id);
6287,6288c6218
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Failed to stop RXQ #%d\n", __func__, i));
---
> QL_DPRINT1(ha, "Failed to stop RXQ #%d\n", i);
6301,6302c6231
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s: Failed to stop VPORT\n", __func__));
---
> QL_DPRINT1(ha, "Failed to stop VPORT\n");
6581c6510
< QL_DPRINT2(ha, (dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
6593,6594c6522,6523
< QL_DPRINT2(ha, (dev, "%s: Allocated %d RSS queues on %d TC/s\n",
< __func__, ha->num_rss, ha->num_tc));
---
> QL_DPRINT2(ha, "Allocated %d RSS queues on %d TC/s\n",
> ha->num_rss, ha->num_tc);
6603,6604c6532
< QL_DPRINT1(ha, (dev, "could not setup interrupt\n"));
<
---
> QL_DPRINT1(ha, "could not setup interrupt\n");
6608,6609c6536,6537
< QL_DPRINT2(ha, (dev, "%s: rss_id = %d irq_rid %d"
< " irq %p handle %p\n", __func__, i,
---
> QL_DPRINT2(ha, "rss_id = %d irq_rid %d \
> irq %p handle %p\n", i,
6611c6539
< ha->irq_vec[i].irq, ha->irq_vec[i].handle));
---
> ha->irq_vec[i].irq, ha->irq_vec[i].handle);
6620,6621c6548
< QL_DPRINT2(ha, (dev, "%s: Start VPORT, RXQ and TXQ succeeded\n",
< __func__));
---
> QL_DPRINT2(ha, "Start VPORT, RXQ and TXQ succeeded\n");
6647c6574
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit [%d]\n", __func__, rc));
---
> QL_DPRINT2(ha, "exit [%d]\n", rc);
6704c6631,6632
< QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__));
---
> QL_DPRINT2(ha, "enter\n");
> QL_DPRINT1(ha, " QLNX STATE = %d\n",ha->state);
6734c6662
< QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__));
---
> QL_DPRINT2(ha, "exit\n");
6751,6752c6679
< QL_DPRINT1(ha, (ha->pci_dev, "%s: ecore_ptt_acquire failed\n",
< __func__));
---
> QL_DPRINT1(ha, "ecore_ptt_acquire failed\n");
6761,6763c6688,6689
< QL_DPRINT1(ha, (ha->pci_dev,
< "%s : ecore_dbg_grc_get_dump_buf_size failed [0x%x]\n",
< __func__, rval));
---
> QL_DPRINT1(ha, "ecore_dbg_grc_get_dump_buf_size failed"
> "[0x%x]\n", rval);
6784,6785c6710
< QL_DPRINT1(ha, (ha->pci_dev, "%s: ecore_ptt_acquire failed\n",
< __func__));
---
> QL_DPRINT1(ha, "ecore_ptt_acquire failed\n");
6794,6796c6719,6720
< QL_DPRINT1(ha, (ha->pci_dev, "%s : "
< "ecore_dbg_idle_chk_get_dump_buf_size failed [0x%x]\n",
< __func__, rval));
---
> QL_DPRINT1(ha, "ecore_dbg_idle_chk_get_dump_buf_size failed"
> " [0x%x]\n", rval);