From: Greg Kroah-Hartman Date: Sun, 12 Nov 2017 09:08:36 +0000 (+0100) Subject: 4.13-stable patches X-Git-Tag: v3.18.81~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53391ff61f62429acdb54907602277f797fb27a2;p=thirdparty%2Fkernel%2Fstable-queue.git 4.13-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-peak-add-support-for-new-pcie-m2-can-fd-interfaces.patch can-sun4i-handle-overrun-in-rx-fifo.patch --- diff --git a/queue-4.13/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch b/queue-4.13/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.13/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.13/can-ifi-fix-transmitter-delay-calculation.patch b/queue-4.13/can-ifi-fix-transmitter-delay-calculation.patch new file mode 100644 index 00000000000..1312027fb50 --- /dev/null +++ b/queue-4.13/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.13/can-peak-add-support-for-new-pcie-m2-can-fd-interfaces.patch b/queue-4.13/can-peak-add-support-for-new-pcie-m2-can-fd-interfaces.patch new file mode 100644 index 00000000000..626ab73fac4 --- /dev/null +++ b/queue-4.13/can-peak-add-support-for-new-pcie-m2-can-fd-interfaces.patch @@ -0,0 +1,64 @@ +From 4cbdd0ee67191481ec57ceed94febdfef95c9f25 Mon Sep 17 00:00:00 2001 +From: Stephane Grosjean +Date: Thu, 9 Nov 2017 14:42:14 +0100 +Subject: can: peak: Add support for new PCIe/M2 CAN FD interfaces + +From: Stephane Grosjean + +commit 4cbdd0ee67191481ec57ceed94febdfef95c9f25 upstream. + +This adds support for the following PEAK-System CAN FD interfaces: + +PCAN-cPCIe FD CAN FD Interface for cPCI Serial (2 or 4 channels) +PCAN-PCIe/104-Express CAN FD Interface for PCIe/104-Express (1, 2 or 4 ch.) +PCAN-miniPCIe FD CAN FD Interface for PCIe Mini (1, 2 or 4 channels) +PCAN-PCIe FD OEM CAN FD Interface for PCIe OEM version (1, 2 or 4 ch.) +PCAN-M.2 CAN FD Interface for M.2 (1 or 2 channels) + +Like the PCAN-PCIe FD interface, all of these boards run the same IP Core +that is able to handle CAN FD (see also http://www.peak-system.com). + +Signed-off-by: Stephane Grosjean +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/drivers/net/can/peak_canfd/peak_pciefd_main.c ++++ b/drivers/net/can/peak_canfd/peak_pciefd_main.c +@@ -29,14 +29,19 @@ + #include "peak_canfd_user.h" + + MODULE_AUTHOR("Stephane Grosjean "); +-MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe FD family cards"); +-MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe FD CAN cards"); ++MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards"); ++MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe/M.2 FD CAN cards"); + MODULE_LICENSE("GPL v2"); + + #define PCIEFD_DRV_NAME "peak_pciefd" + + #define PEAK_PCI_VENDOR_ID 0x001c /* The PCI device and vendor IDs */ + #define PEAK_PCIEFD_ID 0x0013 /* for PCIe slot cards */ ++#define PCAN_CPCIEFD_ID 0x0014 /* for Compact-PCI Serial slot cards */ ++#define PCAN_PCIE104FD_ID 0x0017 /* for PCIe-104 Express slot cards */ ++#define PCAN_MINIPCIEFD_ID 0x0018 /* for mini-PCIe slot cards */ ++#define PCAN_PCIEFD_OEM_ID 0x0019 /* for PCIe slot OEM cards */ ++#define PCAN_M2_ID 0x001a /* for M2 slot cards */ + + /* PEAK PCIe board access description */ + #define PCIEFD_BAR0_SIZE (64 * 1024) +@@ -203,6 +208,11 @@ struct pciefd_board { + /* supported device ids. */ + static const struct pci_device_id peak_pciefd_tbl[] = { + {PEAK_PCI_VENDOR_ID, PEAK_PCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,}, ++ {PEAK_PCI_VENDOR_ID, PCAN_CPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,}, ++ {PEAK_PCI_VENDOR_ID, PCAN_PCIE104FD_ID, PCI_ANY_ID, PCI_ANY_ID,}, ++ {PEAK_PCI_VENDOR_ID, PCAN_MINIPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,}, ++ {PEAK_PCI_VENDOR_ID, PCAN_PCIEFD_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,}, ++ {PEAK_PCI_VENDOR_ID, PCAN_M2_ID, PCI_ANY_ID, PCI_ANY_ID,}, + {0,} + }; + diff --git a/queue-4.13/can-sun4i-handle-overrun-in-rx-fifo.patch b/queue-4.13/can-sun4i-handle-overrun-in-rx-fifo.patch new file mode 100644 index 00000000000..1078ce50922 --- /dev/null +++ b/queue-4.13/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.13/series b/queue-4.13/series index c2845563639..0b3212906fe 100644 --- a/queue-4.13/series +++ b/queue-4.13/series @@ -24,3 +24,7 @@ input-elan_i2c-add-elan060c-to-the-acpi-table.patch rbd-use-gfp_noio-for-parent-stat-and-data-requests.patch drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch revert-x86-cpu-fix-up-cpu-mhz-in-proc-cpuinfo.patch +can-sun4i-handle-overrun-in-rx-fifo.patch +can-peak-add-support-for-new-pcie-m2-can-fd-interfaces.patch +can-ifi-fix-transmitter-delay-calculation.patch +can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch