| Message ID | dc7901c96bed90724bb372f4d3eead82bd22ac37.1525869303.git.lukas@wunner.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | can: hi311x: Work around TX complete interrupt erratum | expand |
On Wed, May 09, 2018 at 02:43:43PM +0200, Lukas Wunner wrote: > When sending packets as fast as possible using "cangen -g 0 -i -x", the > HI-3110 occasionally latches the interrupt pin high on completion of a > packet, but doesn't set the TXCPLT bit in the INTF register. The INTF > register contains 0x00 as if no interrupt has occurred. Even waiting > for a few milliseconds after the interrupt doesn't help. > > Work around this apparent erratum by instead checking the TXMTY bit in > the STATF register ("TX FIFO empty"). We know that we've queued up a > packet for transmission if priv->tx_len is nonzero. If the TX FIFO is > empty, transmission of that packet must have completed. > > Note that this is congruent with our handling of received packets, which > likewise gleans from the STATF register whether a packet is waiting in > the RX FIFO, instead of looking at the INTF register. I should have mentioned, to verify the existence of the erratum and the validity of the patch, you can apply the little debug patch below, then run "cangen -g 0 -i -x". You should see error messages in dmesg within a few minutes. -- >8 -- diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index 53e320c..48b5c63 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -739,6 +739,9 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) } if (priv->tx_len && statf & HI3110_STAT_TXMTY) { + if (!(intf & HI3110_INT_TXCPLT)) + dev_err(&spi->dev, "TX FIFO empty and TX was queued but TXCPLT not set\n"); + net->stats.tx_packets++; net->stats.tx_bytes += priv->tx_len - 1; can_led_event(net, CAN_LED_EVENT_TX);
On Wed, May 9, 2018 at 8:43 AM, Lukas Wunner <lukas@wunner.de> wrote: > When sending packets as fast as possible using "cangen -g 0 -i -x", the > HI-3110 occasionally latches the interrupt pin high on completion of a > packet, but doesn't set the TXCPLT bit in the INTF register. The INTF > register contains 0x00 as if no interrupt has occurred. Even waiting > for a few milliseconds after the interrupt doesn't help. > > Work around this apparent erratum by instead checking the TXMTY bit in > the STATF register ("TX FIFO empty"). We know that we've queued up a > packet for transmission if priv->tx_len is nonzero. If the TX FIFO is > empty, transmission of that packet must have completed. > > Note that this is congruent with our handling of received packets, which > likewise gleans from the STATF register whether a packet is waiting in > the RX FIFO, instead of looking at the INTF register. > > Cc: Mathias Duckeck <m.duckeck@kunbus.de> > Cc: Akshay Bhat <akshay.bhat@timesys.com> > Cc: Casey Fitzpatrick <casey.fitzpatrick@timesys.com> > Cc: stable@vger.kernel.org # v4.12+ > Signed-off-by: Lukas Wunner <lukas@wunner.de> > --- Acked-by: Akshay Bhat <akshay.bhat@timesys.com>
On 05/09/2018 02:43 PM, Lukas Wunner wrote: > When sending packets as fast as possible using "cangen -g 0 -i -x", the > HI-3110 occasionally latches the interrupt pin high on completion of a > packet, but doesn't set the TXCPLT bit in the INTF register. The INTF > register contains 0x00 as if no interrupt has occurred. Even waiting > for a few milliseconds after the interrupt doesn't help. > > Work around this apparent erratum by instead checking the TXMTY bit in > the STATF register ("TX FIFO empty"). We know that we've queued up a > packet for transmission if priv->tx_len is nonzero. If the TX FIFO is > empty, transmission of that packet must have completed. > > Note that this is congruent with our handling of received packets, which > likewise gleans from the STATF register whether a packet is waiting in > the RX FIFO, instead of looking at the INTF register. > > Cc: Mathias Duckeck <m.duckeck@kunbus.de> > Cc: Akshay Bhat <akshay.bhat@timesys.com> > Cc: Casey Fitzpatrick <casey.fitzpatrick@timesys.com> > Cc: stable@vger.kernel.org # v4.12+ > Signed-off-by: Lukas Wunner <lukas@wunner.de> Applied to can. Tnx, Marc
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index c2cf254e4e95..53e320c92a8b 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -91,6 +91,7 @@ #define HI3110_STAT_BUSOFF BIT(2) #define HI3110_STAT_ERRP BIT(3) #define HI3110_STAT_ERRW BIT(4) +#define HI3110_STAT_TXMTY BIT(7) #define HI3110_BTR0_SJW_SHIFT 6 #define HI3110_BTR0_BRP_SHIFT 0 @@ -737,10 +738,7 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) } } - if (intf == 0) - break; - - if (intf & HI3110_INT_TXCPLT) { + if (priv->tx_len && statf & HI3110_STAT_TXMTY) { net->stats.tx_packets++; net->stats.tx_bytes += priv->tx_len - 1; can_led_event(net, CAN_LED_EVENT_TX); @@ -750,6 +748,9 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) } netif_wake_queue(net); } + + if (intf == 0) + break; } mutex_unlock(&priv->hi3110_lock); return IRQ_HANDLED;
When sending packets as fast as possible using "cangen -g 0 -i -x", the HI-3110 occasionally latches the interrupt pin high on completion of a packet, but doesn't set the TXCPLT bit in the INTF register. The INTF register contains 0x00 as if no interrupt has occurred. Even waiting for a few milliseconds after the interrupt doesn't help. Work around this apparent erratum by instead checking the TXMTY bit in the STATF register ("TX FIFO empty"). We know that we've queued up a packet for transmission if priv->tx_len is nonzero. If the TX FIFO is empty, transmission of that packet must have completed. Note that this is congruent with our handling of received packets, which likewise gleans from the STATF register whether a packet is waiting in the RX FIFO, instead of looking at the INTF register. Cc: Mathias Duckeck <m.duckeck@kunbus.de> Cc: Akshay Bhat <akshay.bhat@timesys.com> Cc: Casey Fitzpatrick <casey.fitzpatrick@timesys.com> Cc: stable@vger.kernel.org # v4.12+ Signed-off-by: Lukas Wunner <lukas@wunner.de> --- drivers/net/can/spi/hi311x.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)