* [PATCH net 0/3] qlge: Bug fixes
@ 2013-04-19 5:49 Jitendra Kalsaria
2013-04-19 5:49 ` [PATCH net 1/3] qlge: Fix receive path to drop error frames Jitendra Kalsaria
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jitendra Kalsaria @ 2013-04-19 5:49 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer, Dept_NX_Linux_NIC_Driver, Jitendra Kalsaria
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Please apply to net
Thanks,
Jiten
Jitendra Kalsaria (2):
qlge: Fix ethtool autoneg advertising.
qlge: Update version to 1.00.00.32.
Sritej Velaga (1):
qlge: Fix receive path to drop error frames
drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +-
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 2 +-
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 36 ++++++++++++++++++----
3 files changed, 31 insertions(+), 9 deletions(-)
--
1.7.6.rc1.1.g2c162b
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH net 1/3] qlge: Fix receive path to drop error frames 2013-04-19 5:49 [PATCH net 0/3] qlge: Bug fixes Jitendra Kalsaria @ 2013-04-19 5:49 ` Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 2/3] qlge: Fix ethtool autoneg advertising Jitendra Kalsaria ` (2 subsequent siblings) 3 siblings, 0 replies; 7+ messages in thread From: Jitendra Kalsaria @ 2013-04-19 5:49 UTC (permalink / raw) To: davem; +Cc: netdev, ron.mercer, Dept_NX_Linux_NIC_Driver, Sritej Velaga From: Sritej Velaga <sritej.velaga@qlogic.com> o Fix the driver to drop error frames in the receive path o Update error counter which was not getting incremented Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com> Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> --- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 36 +++++++++++++++++++++----- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index b13ab54..8033555 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -1434,11 +1434,13 @@ map_error: } /* Categorizing receive firmware frame errors */ -static void ql_categorize_rx_err(struct ql_adapter *qdev, u8 rx_err) +static void ql_categorize_rx_err(struct ql_adapter *qdev, u8 rx_err, + struct rx_ring *rx_ring) { struct nic_stats *stats = &qdev->nic_stats; stats->rx_err_count++; + rx_ring->rx_errors++; switch (rx_err & IB_MAC_IOCB_RSP_ERR_MASK) { case IB_MAC_IOCB_RSP_ERR_CODE_ERR: @@ -1474,6 +1476,12 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev, struct bq_desc *lbq_desc = ql_get_curr_lchunk(qdev, rx_ring); struct napi_struct *napi = &rx_ring->napi; + /* Frame error, so drop the packet. */ + if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) { + ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring); + put_page(lbq_desc->p.pg_chunk.page); + return; + } napi->dev = qdev->ndev; skb = napi_get_frags(napi); @@ -1529,6 +1537,12 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev, addr = lbq_desc->p.pg_chunk.va; prefetch(addr); + /* Frame error, so drop the packet. */ + if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) { + ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring); + goto err_out; + } + /* The max framesize filter on this chip is set higher than * MTU since FCoE uses 2k frames. */ @@ -1614,6 +1628,13 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev, memcpy(skb_put(new_skb, length), skb->data, length); skb = new_skb; + /* Frame error, so drop the packet. */ + if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) { + ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring); + dev_kfree_skb_any(skb); + return; + } + /* loopback self test for ethtool */ if (test_bit(QL_SELFTEST, &qdev->flags)) { ql_check_lb_frame(qdev, skb); @@ -1919,6 +1940,13 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev, return; } + /* Frame error, so drop the packet. */ + if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) { + ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring); + dev_kfree_skb_any(skb); + return; + } + /* The max framesize filter on this chip is set higher than * MTU since FCoE uses 2k frames. */ @@ -2000,12 +2028,6 @@ static unsigned long ql_process_mac_rx_intr(struct ql_adapter *qdev, QL_DUMP_IB_MAC_RSP(ib_mac_rsp); - /* Frame error, so drop the packet. */ - if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) { - ql_categorize_rx_err(qdev, ib_mac_rsp->flags2); - return (unsigned long)length; - } - if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) { /* The data and headers are split into * separate buffers. -- 1.7.6.rc1.1.g2c162b ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net 2/3] qlge: Fix ethtool autoneg advertising. 2013-04-19 5:49 [PATCH net 0/3] qlge: Bug fixes Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 1/3] qlge: Fix receive path to drop error frames Jitendra Kalsaria @ 2013-04-19 5:49 ` Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 3/3] qlge: Update version to 1.00.00.32 Jitendra Kalsaria 2013-04-19 21:54 ` [PATCH net 0/3] qlge: Bug fixes David Miller 3 siblings, 0 replies; 7+ messages in thread From: Jitendra Kalsaria @ 2013-04-19 5:49 UTC (permalink / raw) To: davem; +Cc: netdev, ron.mercer, Dept_NX_Linux_NIC_Driver, Jitendra Kalsaria From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Autoneg is supported on specific port types only. Fix the driver to advertise autoneg based on the port type. Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> --- drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index 6f316ab..0780e03 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c @@ -379,13 +379,13 @@ static int ql_get_settings(struct net_device *ndev, ecmd->supported = SUPPORTED_10000baseT_Full; ecmd->advertising = ADVERTISED_10000baseT_Full; - ecmd->autoneg = AUTONEG_ENABLE; ecmd->transceiver = XCVR_EXTERNAL; if ((qdev->link_status & STS_LINK_TYPE_MASK) == STS_LINK_TYPE_10GBASET) { ecmd->supported |= (SUPPORTED_TP | SUPPORTED_Autoneg); ecmd->advertising |= (ADVERTISED_TP | ADVERTISED_Autoneg); ecmd->port = PORT_TP; + ecmd->autoneg = AUTONEG_ENABLE; } else { ecmd->supported |= SUPPORTED_FIBRE; ecmd->advertising |= ADVERTISED_FIBRE; -- 1.7.6.rc1.1.g2c162b ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net 3/3] qlge: Update version to 1.00.00.32. 2013-04-19 5:49 [PATCH net 0/3] qlge: Bug fixes Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 1/3] qlge: Fix receive path to drop error frames Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 2/3] qlge: Fix ethtool autoneg advertising Jitendra Kalsaria @ 2013-04-19 5:49 ` Jitendra Kalsaria 2013-04-19 21:54 ` [PATCH net 0/3] qlge: Bug fixes David Miller 3 siblings, 0 replies; 7+ messages in thread From: Jitendra Kalsaria @ 2013-04-19 5:49 UTC (permalink / raw) To: davem; +Cc: netdev, ron.mercer, Dept_NX_Linux_NIC_Driver, Jitendra Kalsaria From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> --- drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h index a131d7b..7e8d682 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge.h +++ b/drivers/net/ethernet/qlogic/qlge/qlge.h @@ -18,7 +18,7 @@ */ #define DRV_NAME "qlge" #define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver " -#define DRV_VERSION "v1.00.00.31" +#define DRV_VERSION "v1.00.00.32" #define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */ -- 1.7.6.rc1.1.g2c162b ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net 0/3] qlge: Bug fixes 2013-04-19 5:49 [PATCH net 0/3] qlge: Bug fixes Jitendra Kalsaria ` (2 preceding siblings ...) 2013-04-19 5:49 ` [PATCH net 3/3] qlge: Update version to 1.00.00.32 Jitendra Kalsaria @ 2013-04-19 21:54 ` David Miller 3 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2013-04-19 21:54 UTC (permalink / raw) To: jitendra.kalsaria; +Cc: netdev, ron.mercer, Dept_NX_Linux_NIC_Driver From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Date: Fri, 19 Apr 2013 01:49:51 -0400 > Please apply to net Series applied, thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net 0/3] qlge: Bug fixes @ 2013-12-05 23:11 Jitendra Kalsaria 2013-12-06 1:34 ` David Miller 0 siblings, 1 reply; 7+ messages in thread From: Jitendra Kalsaria @ 2013-12-05 23:11 UTC (permalink / raw) To: davem; +Cc: netdev, ron.mercer, Dept-HSGLinuxNICDev, Jitendra Kalsaria From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> This patch series include bug fixes. o Receive frame error stats were getting overwritten by other driver statistics. o User is allowed to enable/disable rx/tx vlan acceleration independently. Jitendra Kalsaria (3): qlge: Fix ethtool statistics qlge: Allow enable/disable rx/tx vlan acceleration independently qlge: Update version to 1.00.00.34 drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 ++++ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 8 -------- 3 files changed, 5 insertions(+), 9 deletions(-) -- 1.7.6.rc1.1.g2c162b ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net 0/3] qlge: Bug fixes 2013-12-05 23:11 Jitendra Kalsaria @ 2013-12-06 1:34 ` David Miller 0 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2013-12-06 1:34 UTC (permalink / raw) To: jitendra.kalsaria; +Cc: netdev, ron.mercer, Dept-HSGLinuxNICDev From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Date: Thu, 5 Dec 2013 18:11:21 -0500 > This patch series include bug fixes. > o Receive frame error stats were getting overwritten by other driver statistics. > o User is allowed to enable/disable rx/tx vlan acceleration independently. Series applied, thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-12-06 1:34 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-19 5:49 [PATCH net 0/3] qlge: Bug fixes Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 1/3] qlge: Fix receive path to drop error frames Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 2/3] qlge: Fix ethtool autoneg advertising Jitendra Kalsaria 2013-04-19 5:49 ` [PATCH net 3/3] qlge: Update version to 1.00.00.32 Jitendra Kalsaria 2013-04-19 21:54 ` [PATCH net 0/3] qlge: Bug fixes David Miller -- strict thread matches above, loose matches on Subject: below -- 2013-12-05 23:11 Jitendra Kalsaria 2013-12-06 1:34 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).