Commit a8bb69f7 authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller

ehea: converting msleeps to waitqueue on check_sqs() function

Removing the msleep() call in check_sqs() function, and replacing by a wait queue.
Signed-off-by: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b27d427
...@@ -492,6 +492,7 @@ struct ehea_port { ...@@ -492,6 +492,7 @@ struct ehea_port {
u8 autoneg; u8 autoneg;
u8 num_def_qps; u8 num_def_qps;
wait_queue_head_t swqe_avail_wq; wait_queue_head_t swqe_avail_wq;
wait_queue_head_t restart_wq;
}; };
struct port_res_cfg { struct port_res_cfg {
......
...@@ -786,6 +786,7 @@ static void reset_sq_restart_flag(struct ehea_port *port) ...@@ -786,6 +786,7 @@ static void reset_sq_restart_flag(struct ehea_port *port)
struct ehea_port_res *pr = &port->port_res[i]; struct ehea_port_res *pr = &port->port_res[i];
pr->sq_restart_flag = 0; pr->sq_restart_flag = 0;
} }
wake_up(&port->restart_wq);
} }
static void check_sqs(struct ehea_port *port) static void check_sqs(struct ehea_port *port)
...@@ -796,6 +797,7 @@ static void check_sqs(struct ehea_port *port) ...@@ -796,6 +797,7 @@ static void check_sqs(struct ehea_port *port)
for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) { for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) {
struct ehea_port_res *pr = &port->port_res[i]; struct ehea_port_res *pr = &port->port_res[i];
int ret;
k = 0; k = 0;
swqe = ehea_get_swqe(pr->qp, &swqe_index); swqe = ehea_get_swqe(pr->qp, &swqe_index);
memset(swqe, 0, SWQE_HEADER_SIZE); memset(swqe, 0, SWQE_HEADER_SIZE);
...@@ -809,13 +811,14 @@ static void check_sqs(struct ehea_port *port) ...@@ -809,13 +811,14 @@ static void check_sqs(struct ehea_port *port)
ehea_post_swqe(pr->qp, swqe); ehea_post_swqe(pr->qp, swqe);
while (pr->sq_restart_flag == 0) { ret = wait_event_timeout(port->restart_wq,
msleep(5); pr->sq_restart_flag == 0,
if (++k == 100) { msecs_to_jiffies(100));
ehea_error("HW/SW queues out of sync");
ehea_schedule_port_reset(pr->port); if (!ret) {
return; ehea_error("HW/SW queues out of sync");
} ehea_schedule_port_reset(pr->port);
return;
} }
} }
} }
...@@ -2654,6 +2657,7 @@ static int ehea_open(struct net_device *dev) ...@@ -2654,6 +2657,7 @@ static int ehea_open(struct net_device *dev)
} }
init_waitqueue_head(&port->swqe_avail_wq); init_waitqueue_head(&port->swqe_avail_wq);
init_waitqueue_head(&port->restart_wq);
mutex_unlock(&port->port_lock); mutex_unlock(&port->port_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment