Skip to content

Commit

Permalink
fjes: epstop_task
Browse files Browse the repository at this point in the history
This patch adds epstop_task.
This task is used to process other receiver's
cancellation request.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Taku Izumi authored and David S. Miller committed Aug 24, 2015
1 parent 785f28e commit b5a9152
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
31 changes: 31 additions & 0 deletions drivers/net/fjes/fjes_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "fjes.h"

static void fjes_hw_update_zone_task(struct work_struct *);
static void fjes_hw_epstop_task(struct work_struct *);

/* supported MTU list */
const u32 fjes_support_mtu[] = {
Expand Down Expand Up @@ -325,6 +326,7 @@ int fjes_hw_init(struct fjes_hw *hw)
fjes_hw_set_irqmask(hw, REG_ICTL_MASK_ALL, true);

INIT_WORK(&hw->update_zone_task, fjes_hw_update_zone_task);
INIT_WORK(&hw->epstop_task, fjes_hw_epstop_task);

mutex_init(&hw->hw_info.lock);

Expand Down Expand Up @@ -355,6 +357,7 @@ void fjes_hw_exit(struct fjes_hw *hw)
fjes_hw_cleanup(hw);

cancel_work_sync(&hw->update_zone_task);
cancel_work_sync(&hw->epstop_task);
}

static enum fjes_dev_command_response_e
Expand Down Expand Up @@ -1092,3 +1095,31 @@ static void fjes_hw_update_zone_task(struct work_struct *work)
&adapter->unshare_watch_task);
}
}

static void fjes_hw_epstop_task(struct work_struct *work)
{
struct fjes_hw *hw = container_of(work, struct fjes_hw, epstop_task);
struct fjes_adapter *adapter = (struct fjes_adapter *)hw->back;

ulong remain_bit;
int epid_bit;

while ((remain_bit = hw->epstop_req_bit)) {
for (epid_bit = 0; remain_bit; remain_bit >>= 1, epid_bit++) {
if (remain_bit & 1) {
hw->ep_shm_info[epid_bit].
tx.info->v1i.rx_status |=
FJES_RX_STOP_REQ_DONE;

clear_bit(epid_bit, &hw->epstop_req_bit);
set_bit(epid_bit,
&adapter->unshare_watch_bitmask);

if (!work_pending(&adapter->unshare_watch_task))
queue_work(
adapter->control_wq,
&adapter->unshare_watch_task);
}
}
}
}
1 change: 1 addition & 0 deletions drivers/net/fjes/fjes_hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ struct fjes_hw {
unsigned long txrx_stop_req_bit;
unsigned long epstop_req_bit;
struct work_struct update_zone_task;
struct work_struct epstop_task;

int my_epid;
int max_epid;
Expand Down
1 change: 1 addition & 0 deletions drivers/net/fjes/fjes_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ static int fjes_close(struct net_device *netdev)
cancel_work_sync(&adapter->tx_stall_task);

cancel_work_sync(&hw->update_zone_task);
cancel_work_sync(&hw->epstop_task);

fjes_hw_wait_epstop(hw);

Expand Down

0 comments on commit b5a9152

Please sign in to comment.