From: Greg Kroah-Hartman Date: Sun, 12 Nov 2017 09:09:13 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v3.18.81~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2aea4c24b70bde809523e15b7830a3a01737cd1;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch can-ifi-fix-transmitter-delay-calculation.patch can-sun4i-handle-overrun-in-rx-fifo.patch --- diff --git a/queue-4.9/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch b/queue-4.9/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch new file mode 100644 index 00000000000..dd1e9caf419 --- /dev/null +++ b/queue-4.9/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch @@ -0,0 +1,45 @@ +From fb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Richard=20Sch=C3=BCtz?= +Date: Sun, 29 Oct 2017 13:03:22 +0100 +Subject: can: c_can: don't indicate triple sampling support for D_CAN +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Richard Schütz + +commit fb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 upstream. + +The D_CAN controller doesn't provide a triple sampling mode, so don't set +the CAN_CTRLMODE_3_SAMPLES flag in ctrlmode_supported. Currently enabling +triple sampling is a no-op. + +Signed-off-by: Richard Schütz +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/c_can/c_can_pci.c | 1 - + drivers/net/can/c_can/c_can_platform.c | 1 - + 2 files changed, 2 deletions(-) + +--- a/drivers/net/can/c_can/c_can_pci.c ++++ b/drivers/net/can/c_can/c_can_pci.c +@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_de + break; + case BOSCH_D_CAN: + priv->regs = reg_map_d_can; +- priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; + break; + default: + ret = -EINVAL; +--- a/drivers/net/can/c_can/c_can_platform.c ++++ b/drivers/net/can/c_can/c_can_platform.c +@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platf + break; + case BOSCH_D_CAN: + priv->regs = reg_map_d_can; +- priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; + priv->read_reg = c_can_plat_read_reg_aligned_to_16bit; + priv->write_reg = c_can_plat_write_reg_aligned_to_16bit; + priv->read_reg32 = d_can_plat_read_reg32; diff --git a/queue-4.9/can-ifi-fix-transmitter-delay-calculation.patch b/queue-4.9/can-ifi-fix-transmitter-delay-calculation.patch new file mode 100644 index 00000000000..1312027fb50 --- /dev/null +++ b/queue-4.9/can-ifi-fix-transmitter-delay-calculation.patch @@ -0,0 +1,38 @@ +From 4f7116757b4bd99e4ef2636c7d957a6d63035d11 Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Fri, 10 Nov 2017 11:22:39 +0100 +Subject: can: ifi: Fix transmitter delay calculation + +From: Marek Vasut + +commit 4f7116757b4bd99e4ef2636c7d957a6d63035d11 upstream. + +The CANFD transmitter delay calculation formula was updated in the +latest software drop from IFI and improves the behavior of the IFI +CANFD core during bitrate switching. Use the new formula to improve +stability of the CANFD operation. + +Signed-off-by: Marek Vasut +Cc: Markus Marb +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/ifi_canfd/ifi_canfd.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/net/can/ifi_canfd/ifi_canfd.c ++++ b/drivers/net/can/ifi_canfd/ifi_canfd.c +@@ -670,9 +670,9 @@ static void ifi_canfd_set_bittiming(stru + priv->base + IFI_CANFD_FTIME); + + /* Configure transmitter delay */ +- tdc = (dbt->brp * (dbt->phase_seg1 + 1)) & IFI_CANFD_TDELAY_MASK; +- writel(IFI_CANFD_TDELAY_EN | IFI_CANFD_TDELAY_ABS | tdc, +- priv->base + IFI_CANFD_TDELAY); ++ tdc = dbt->brp * (dbt->prop_seg + dbt->phase_seg1); ++ tdc &= IFI_CANFD_TDELAY_MASK; ++ writel(IFI_CANFD_TDELAY_EN | tdc, priv->base + IFI_CANFD_TDELAY); + } + + static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id, diff --git a/queue-4.9/can-sun4i-handle-overrun-in-rx-fifo.patch b/queue-4.9/can-sun4i-handle-overrun-in-rx-fifo.patch new file mode 100644 index 00000000000..1078ce50922 --- /dev/null +++ b/queue-4.9/can-sun4i-handle-overrun-in-rx-fifo.patch @@ -0,0 +1,49 @@ +From 4dcf924c2eda0c47a5c53b7703e3dc65ddaa8920 Mon Sep 17 00:00:00 2001 +From: Gerhard Bertelsmann +Date: Mon, 6 Nov 2017 18:16:56 +0100 +Subject: can: sun4i: handle overrun in RX FIFO + +From: Gerhard Bertelsmann + +commit 4dcf924c2eda0c47a5c53b7703e3dc65ddaa8920 upstream. + +SUN4Is CAN IP has a 64 byte deep FIFO buffer. If the buffer is not +drained fast enough (overrun) it's getting mangled. Already received +frames are dropped - the data can't be restored. + +Signed-off-by: Gerhard Bertelsmann +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/sun4i_can.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/drivers/net/can/sun4i_can.c ++++ b/drivers/net/can/sun4i_can.c +@@ -539,6 +539,13 @@ static int sun4i_can_err(struct net_devi + } + stats->rx_over_errors++; + stats->rx_errors++; ++ ++ /* reset the CAN IP by entering reset mode ++ * ignoring timeout error ++ */ ++ set_reset_mode(dev); ++ set_normal_mode(dev); ++ + /* clear bit */ + sun4i_can_write_cmdreg(priv, SUN4I_CMD_CLEAR_OR_FLAG); + } +@@ -653,8 +660,9 @@ static irqreturn_t sun4i_can_interrupt(i + netif_wake_queue(dev); + can_led_event(dev, CAN_LED_EVENT_TX); + } +- if (isrc & SUN4I_INT_RBUF_VLD) { +- /* receive interrupt */ ++ if ((isrc & SUN4I_INT_RBUF_VLD) && ++ !(isrc & SUN4I_INT_DATA_OR)) { ++ /* receive interrupt - don't read if overrun occurred */ + while (status & SUN4I_STA_RBUF_RDY) { + /* RX buffer is not empty */ + sun4i_can_rx(dev); diff --git a/queue-4.9/series b/queue-4.9/series index 64b72d32ea1..55ec3ba9521 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -80,3 +80,6 @@ drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch drm-bridge-adv7511-rework-adv7511_power_on-off-so-they-can-be-reused-internally.patch drm-bridge-adv7511-reuse-__adv7511_power_on-off-when-probing-edid.patch drm-bridge-adv7511-re-write-the-i2c-address-before-edid-probing.patch +can-sun4i-handle-overrun-in-rx-fifo.patch +can-ifi-fix-transmitter-delay-calculation.patch +can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch