* [PATCH net 0/3] qlcnic: Bug fixes
@ 2013-04-18 18:10 Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 1/3] qlcnic: Stop traffic before performing loopback test Shahed Shaikh
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Shahed Shaikh @ 2013-04-18 18:10 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept_NX_Linux_NIC_Driver, Shahed Shaikh
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
This patch series contains bug fixes for -
* Loopback test failure while traffic is running.
* Tx timeout and subsequent firmware reset by removing check for
'(adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)' from tx fast
path, as per Eric's suggestion.
* Typo in logs.
Please apply to net.
Thanks,
Shahed
Jitendra Kalsaria (1):
qlcnic: Stop traffic before performing loopback test
Shahed Shaikh (1):
qlcnic: Fix typo in logs
Sritej Velaga (1):
qlcnic: fix TSO race condition
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 15 ++++++++++-----
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 +--
2 files changed, 11 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net 1/3] qlcnic: Stop traffic before performing loopback test
2013-04-18 18:10 [PATCH net 0/3] qlcnic: Bug fixes Shahed Shaikh
@ 2013-04-18 18:10 ` Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 2/3] qlcnic: fix TSO race condition Shahed Shaikh
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Shahed Shaikh @ 2013-04-18 18:10 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept_NX_Linux_NIC_Driver, Jitendra Kalsaria
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Before conducting loopback test by sending packets, driver should stop transmit
queue and turn off carrier.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index cd5ae88..284d628 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -1500,6 +1500,12 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode)
}
} while ((adapter->ahw->linkup && ahw->has_link_events) != 1);
+ /* Make sure carrier is off and queue is stopped during loopback */
+ if (netif_running(netdev)) {
+ netif_carrier_off(netdev);
+ netif_stop_queue(netdev);
+ }
+
ret = qlcnic_do_lb_test(adapter, mode);
qlcnic_83xx_clear_lb_mode(adapter, mode);
--
1.5.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net 2/3] qlcnic: fix TSO race condition
2013-04-18 18:10 [PATCH net 0/3] qlcnic: Bug fixes Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 1/3] qlcnic: Stop traffic before performing loopback test Shahed Shaikh
@ 2013-04-18 18:10 ` Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 3/3] qlcnic: Fix typo in logs Shahed Shaikh
2013-04-18 18:55 ` [PATCH net 0/3] qlcnic: Bug fixes David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Shahed Shaikh @ 2013-04-18 18:10 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept_NX_Linux_NIC_Driver, Sritej Velaga
From: Sritej Velaga <sritej.velaga@qlogic.com>
When driver receives a packet with gso size > 0 and when TSO is disabled,
it should be transmitted as a TSO packet to prevent Tx timeout and subsequent
firmware reset.
Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Acked-by: Eric Dumazet <edumazet@google.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 0e63006..5fa847f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -358,8 +358,7 @@ set_flags:
memcpy(&first_desc->eth_addr, skb->data, ETH_ALEN);
}
opcode = TX_ETHER_PKT;
- if ((adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
- skb_shinfo(skb)->gso_size > 0) {
+ if (skb_is_gso(skb)) {
hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
first_desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
first_desc->total_hdr_length = hdr_len;
--
1.5.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net 3/3] qlcnic: Fix typo in logs
2013-04-18 18:10 [PATCH net 0/3] qlcnic: Bug fixes Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 1/3] qlcnic: Stop traffic before performing loopback test Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 2/3] qlcnic: fix TSO race condition Shahed Shaikh
@ 2013-04-18 18:10 ` Shahed Shaikh
2013-04-18 18:55 ` [PATCH net 0/3] qlcnic: Bug fixes David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Shahed Shaikh @ 2013-04-18 18:10 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept_NX_Linux_NIC_Driver, Shahed Shaikh
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
o Debug logs were not matching with code functionality.
o Changed dev_info to netdev_err
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 284d628..edd63f1 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -2786,6 +2786,7 @@ static u64 *qlcnic_83xx_fill_stats(struct qlcnic_adapter *adapter,
void qlcnic_83xx_get_stats(struct qlcnic_adapter *adapter, u64 *data)
{
struct qlcnic_cmd_args cmd;
+ struct net_device *netdev = adapter->netdev;
int ret = 0;
qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_STATISTICS);
@@ -2795,7 +2796,7 @@ void qlcnic_83xx_get_stats(struct qlcnic_adapter *adapter, u64 *data)
data = qlcnic_83xx_fill_stats(adapter, &cmd, data,
QLC_83XX_STAT_TX, &ret);
if (ret) {
- dev_info(&adapter->pdev->dev, "Error getting MAC stats\n");
+ netdev_err(netdev, "Error getting Tx stats\n");
goto out;
}
/* Get MAC stats */
@@ -2805,8 +2806,7 @@ void qlcnic_83xx_get_stats(struct qlcnic_adapter *adapter, u64 *data)
data = qlcnic_83xx_fill_stats(adapter, &cmd, data,
QLC_83XX_STAT_MAC, &ret);
if (ret) {
- dev_info(&adapter->pdev->dev,
- "Error getting Rx stats\n");
+ netdev_err(netdev, "Error getting MAC stats\n");
goto out;
}
/* Get Rx stats */
@@ -2816,8 +2816,7 @@ void qlcnic_83xx_get_stats(struct qlcnic_adapter *adapter, u64 *data)
data = qlcnic_83xx_fill_stats(adapter, &cmd, data,
QLC_83XX_STAT_RX, &ret);
if (ret)
- dev_info(&adapter->pdev->dev,
- "Error getting Tx stats\n");
+ netdev_err(netdev, "Error getting Rx stats\n");
out:
qlcnic_free_mbx_args(&cmd);
}
--
1.5.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net 0/3] qlcnic: Bug fixes
2013-04-18 18:10 [PATCH net 0/3] qlcnic: Bug fixes Shahed Shaikh
` (2 preceding siblings ...)
2013-04-18 18:10 ` [PATCH net 3/3] qlcnic: Fix typo in logs Shahed Shaikh
@ 2013-04-18 18:55 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-04-18 18:55 UTC (permalink / raw)
To: shahed.shaikh; +Cc: netdev, Dept_NX_Linux_NIC_Driver
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
Date: Thu, 18 Apr 2013 14:10:03 -0400
> From: Shahed Shaikh <shahed.shaikh@qlogic.com>
>
> This patch series contains bug fixes for -
> * Loopback test failure while traffic is running.
> * Tx timeout and subsequent firmware reset by removing check for
> '(adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)' from tx fast
> path, as per Eric's suggestion.
> * Typo in logs.
>
> Please apply to net.
Series applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-18 18:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-18 18:10 [PATCH net 0/3] qlcnic: Bug fixes Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 1/3] qlcnic: Stop traffic before performing loopback test Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 2/3] qlcnic: fix TSO race condition Shahed Shaikh
2013-04-18 18:10 ` [PATCH net 3/3] qlcnic: Fix typo in logs Shahed Shaikh
2013-04-18 18:55 ` [PATCH net 0/3] qlcnic: Bug fixes 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).