|
 |
1632d2 |
Date: Thu, 18 Jun 2020 19:42:50 -0400
|
|
|
1632d2 |
From: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
1632d2 |
To: rhkernel-list@redhat.com
|
|
|
1632d2 |
Cc: darcari@redhat.com, nhorman@redhat.com, linville@redhat.com
|
|
|
1632d2 |
Subject: [PATCH RHEL-8.3 15/16] ionic: no link check while resetting queues
|
|
|
1632d2 |
|
|
|
1632d2 |
If the driver is busy resetting queues after a change in
|
|
|
1632d2 |
MTU or queue parameters, don't bother checking the link,
|
|
|
1632d2 |
wait until the next watchdog cycle.
|
|
|
1632d2 |
|
|
|
1632d2 |
Fixes: 987c0871e8ae ("ionic: check for linkup in watchdog")
|
|
|
1632d2 |
Signed-off-by: Shannon Nelson <snelson@pensando.io>
|
|
|
1632d2 |
Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
1632d2 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
1632d2 |
(cherry picked from commit 3103b6feb4454646558eedc50ece728bc469f341)
|
|
|
1632d2 |
Bugzilla: 1846953
|
|
|
1632d2 |
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=29498383
|
|
|
1632d2 |
Tested: QE tested devel kernel as well as the partner
|
|
|
1632d2 |
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
1632d2 |
---
|
|
|
1632d2 |
drivers/net/ethernet/pensando/ionic/ionic_lif.c | 3 ++-
|
|
|
1632d2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
1632d2 |
|
|
|
1632d2 |
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
|
1632d2 |
index 7cc1ef657b10..8f29ef133743 100644
|
|
|
1632d2 |
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
|
1632d2 |
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
|
1632d2 |
@@ -96,7 +96,8 @@ static void ionic_link_status_check(struct ionic_lif *lif)
|
|
|
1632d2 |
u16 link_status;
|
|
|
1632d2 |
bool link_up;
|
|
|
1632d2 |
|
|
|
1632d2 |
- if (!test_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state))
|
|
|
1632d2 |
+ if (!test_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state) ||
|
|
|
1632d2 |
+ test_bit(IONIC_LIF_F_QUEUE_RESET, lif->state))
|
|
|
1632d2 |
return;
|
|
|
1632d2 |
|
|
|
1632d2 |
link_status = le16_to_cpu(lif->info->status.link_status);
|
|
|
1632d2 |
--
|
|
|
1632d2 |
2.16.4
|
|
|
1632d2 |
|
|
|
1632d2 |
|