diff options
author | Andri Yngvason <andri.yngvason@marel.com> | 2018-03-14 07:52:56 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2018-03-14 08:00:15 -0400 |
commit | f4353daf4905c0099fd25fa742e2ffd4a4bab26a (patch) | |
tree | 38d46fcd59c45458d17cb899349dcd983239aa47 | |
parent | f89782c2d131e6eae0d1ea2569ba76bc4c5875fe (diff) |
can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack
This has been reported to cause stalls on rt-linux.
Suggested-by: Richard Weinberger <richard@nod.at>
Tested-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andri Yngvason <andri.yngvason@marel.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/cc770/cc770.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c index 1e37313054f3..9fed163262e0 100644 --- a/drivers/net/can/cc770/cc770.c +++ b/drivers/net/can/cc770/cc770.c | |||
@@ -447,15 +447,6 @@ static netdev_tx_t cc770_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
447 | 447 | ||
448 | stats->tx_bytes += dlc; | 448 | stats->tx_bytes += dlc; |
449 | 449 | ||
450 | |||
451 | /* | ||
452 | * HM: We had some cases of repeated IRQs so make sure the | ||
453 | * INT is acknowledged I know it's already further up, but | ||
454 | * doing again fixed the issue | ||
455 | */ | ||
456 | cc770_write_reg(priv, msgobj[mo].ctrl0, | ||
457 | MSGVAL_UNC | TXIE_UNC | RXIE_UNC | INTPND_RES); | ||
458 | |||
459 | return NETDEV_TX_OK; | 450 | return NETDEV_TX_OK; |
460 | } | 451 | } |
461 | 452 | ||
@@ -684,12 +675,6 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o) | |||
684 | /* Nothing more to send, switch off interrupts */ | 675 | /* Nothing more to send, switch off interrupts */ |
685 | cc770_write_reg(priv, msgobj[mo].ctrl0, | 676 | cc770_write_reg(priv, msgobj[mo].ctrl0, |
686 | MSGVAL_RES | TXIE_RES | RXIE_RES | INTPND_RES); | 677 | MSGVAL_RES | TXIE_RES | RXIE_RES | INTPND_RES); |
687 | /* | ||
688 | * We had some cases of repeated IRQ so make sure the | ||
689 | * INT is acknowledged | ||
690 | */ | ||
691 | cc770_write_reg(priv, msgobj[mo].ctrl0, | ||
692 | MSGVAL_UNC | TXIE_UNC | RXIE_UNC | INTPND_RES); | ||
693 | 678 | ||
694 | stats->tx_packets++; | 679 | stats->tx_packets++; |
695 | can_get_echo_skb(dev, 0); | 680 | can_get_echo_skb(dev, 0); |