AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

can: hi311x: Work around TX complete interrupt erratum

Browse Source 
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>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Lukas Wunner 2018-05-09 14:43:43 +02:00 committed by Marc Kleine-Budde
parent 5cec9425b4
commit 32bee8f48f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/can/spi/hi311x.c
View File

@ -91,6 +91,7 @@
#define HI3110_STAT_BUSOFF BIT(2) #define HI3110_STAT_BUSOFF BIT(2)
#define HI3110_STAT_ERRP BIT(3) #define HI3110_STAT_ERRP BIT(3)
#define HI3110_STAT_ERRW BIT(4) #define HI3110_STAT_ERRW BIT(4)
#define HI3110_STAT_TXMTY BIT(7)
#define HI3110_BTR0_SJW_SHIFT 6 #define HI3110_BTR0_SJW_SHIFT 6
#define HI3110_BTR0_BRP_SHIFT 0 #define HI3110_BTR0_BRP_SHIFT 0
@ -737,10 +738,7 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id)
} }
} }
if (intf == 0) if (priv->tx_len && statf & HI3110_STAT_TXMTY) {
break;
if (intf & HI3110_INT_TXCPLT) {
net->stats.tx_packets++; net->stats.tx_packets++;
net->stats.tx_bytes += priv->tx_len - 1; net->stats.tx_bytes += priv->tx_len - 1;
can_led_event(net, CAN_LED_EVENT_TX); 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); netif_wake_queue(net);
} }
if (intf == 0)
break;
} }
mutex_unlock(&priv->hi3110_lock); mutex_unlock(&priv->hi3110_lock);
return IRQ_HANDLED; return IRQ_HANDLED;