Skip to content

Commit

Permalink
ehea: converting msleeps to waitqueue on check_sqs() function
Browse files Browse the repository at this point in the history
Removing the msleep() call in check_sqs() function, and replacing by a wait queue.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Breno Leitao authored and David S. Miller committed Oct 6, 2010
1 parent 5b27d42 commit a8bb69f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions drivers/net/ehea/ehea.h
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ struct ehea_port {
u8 autoneg;
u8 num_def_qps;
wait_queue_head_t swqe_avail_wq;
wait_queue_head_t restart_wq;
};

struct port_res_cfg {
Expand Down
18 changes: 11 additions & 7 deletions drivers/net/ehea/ehea_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,7 @@ static void reset_sq_restart_flag(struct ehea_port *port)
struct ehea_port_res *pr = &port->port_res[i];
pr->sq_restart_flag = 0;
}
wake_up(&port->restart_wq);
}

static void check_sqs(struct ehea_port *port)
Expand All @@ -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++) {
struct ehea_port_res *pr = &port->port_res[i];
int ret;
k = 0;
swqe = ehea_get_swqe(pr->qp, &swqe_index);
memset(swqe, 0, SWQE_HEADER_SIZE);
Expand All @@ -809,13 +811,14 @@ static void check_sqs(struct ehea_port *port)

ehea_post_swqe(pr->qp, swqe);

while (pr->sq_restart_flag == 0) {
msleep(5);
if (++k == 100) {
ehea_error("HW/SW queues out of sync");
ehea_schedule_port_reset(pr->port);
return;
}
ret = wait_event_timeout(port->restart_wq,
pr->sq_restart_flag == 0,
msecs_to_jiffies(100));

if (!ret) {
ehea_error("HW/SW queues out of sync");
ehea_schedule_port_reset(pr->port);
return;
}
}
}
Expand Down Expand Up @@ -2654,6 +2657,7 @@ static int ehea_open(struct net_device *dev)
}

init_waitqueue_head(&port->swqe_avail_wq);
init_waitqueue_head(&port->restart_wq);

mutex_unlock(&port->port_lock);

Expand Down

0 comments on commit a8bb69f

Please sign in to comment.