diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /drivers/misc/habanalabs/command_submission.c | |
| parent | Merge branch 'tipc-improve-TIPC-unicast-link-throughput' (diff) | |
| parent | Merge tag 'mm-compaction-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux (diff) | |
| download | linux-dev-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.xz linux-dev-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/misc/habanalabs/command_submission.c')
| -rw-r--r-- | drivers/misc/habanalabs/command_submission.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/misc/habanalabs/command_submission.c b/drivers/misc/habanalabs/command_submission.c index 3525236ed8d9..19c84214a7ea 100644 --- a/drivers/misc/habanalabs/command_submission.c +++ b/drivers/misc/habanalabs/command_submission.c @@ -179,6 +179,12 @@ static void cs_do_release(struct kref *ref) /* We also need to update CI for internal queues */ if (cs->submitted) { + int cs_cnt = atomic_dec_return(&hdev->cs_active_cnt); + + WARN_ONCE((cs_cnt < 0), + "hl%d: error in CS active cnt %d\n", + hdev->id, cs_cnt); + hl_int_hw_queue_update_ci(cs); spin_lock(&hdev->hw_queues_mirror_lock); |