Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7481a857 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by David S. Miller
Browse files

liquidio: make timeout HZ independent and readable 



schedule_timeout_* takes a timeout in jiffies but the code currently is
passing in a constant which makes this timeout HZ dependent. So define
a constant with (hopefully) meaningful name and pass it through
msecs_to_jiffies() to fix the HZ dependency.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
commit f21fb3ed ("Add support of Cavium Liquidio ethernet adapters")
Acked-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38cd58ed

drivers/net/ethernet/cavium/liquidio/lio_main.c

+4 −1
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ static int octeon_console_debug_enabled(u32 console) 
 */

#define LIO_SYNC_OCTEON_TIME_INTERVAL_MS 60000



/* time to wait for possible in-flight requests in milliseconds */

#define WAIT_INFLIGHT_REQUEST	msecs_to_jiffies(1000)



struct lio_trusted_vf_ctx {

	struct completion complete;

	int status;
@@ -259,7 +262,7 @@ static inline void pcierror_quiesce_device(struct octeon_device *oct) 
	force_io_queues_off(oct);



	/* To allow for in-flight requests */

	schedule_timeout_uninterruptible(100);

	schedule_timeout_uninterruptible(WAIT_INFLIGHT_REQUEST);



	if (wait_for_pending_requests(oct))

		dev_err(&oct->pci_dev->dev, "There were pending requests\n");