tjh.dev
-1
drivers/net/can/c_can/c_can_pci.c
-1
drivers/net/can/c_can/c_can_pci.c
-1
drivers/net/can/c_can/c_can_platform.c
-1
drivers/net/can/c_can/c_can_platform.c
···
320
320
break;
321
321
case BOSCH_D_CAN:
322
322
priv->regs = reg_map_d_can;
323
-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
324
323
priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
325
324
priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
326
325
priv->read_reg32 = d_can_plat_read_reg32;
+3
-3
drivers/net/can/ifi_canfd/ifi_canfd.c
+3
-3
drivers/net/can/ifi_canfd/ifi_canfd.c
···
670
670
priv->base + IFI_CANFD_FTIME);
671
671
672
672
/* Configure transmitter delay */
673
-
tdc = (dbt->brp * (dbt->phase_seg1 + 1)) & IFI_CANFD_TDELAY_MASK;
674
-
writel(IFI_CANFD_TDELAY_EN | IFI_CANFD_TDELAY_ABS | tdc,
675
-
priv->base + IFI_CANFD_TDELAY);
673
+
tdc = dbt->brp * (dbt->prop_seg + dbt->phase_seg1);
674
+
tdc &= IFI_CANFD_TDELAY_MASK;
675
+
writel(IFI_CANFD_TDELAY_EN | tdc, priv->base + IFI_CANFD_TDELAY);
676
676
}
677
677
678
678
static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id,
+12
-2
drivers/net/can/peak_canfd/peak_pciefd_main.c
+12
-2
drivers/net/can/peak_canfd/peak_pciefd_main.c
···
29
29
#include "peak_canfd_user.h"
30
30
31
31
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
32
-
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe FD family cards");
33
-
MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe FD CAN cards");
32
+
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");
33
+
MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe/M.2 FD CAN cards");
34
34
MODULE_LICENSE("GPL v2");
35
35
36
36
#define PCIEFD_DRV_NAME "peak_pciefd"
37
37
38
38
#define PEAK_PCI_VENDOR_ID 0x001c /* The PCI device and vendor IDs */
39
39
#define PEAK_PCIEFD_ID 0x0013 /* for PCIe slot cards */
40
+
#define PCAN_CPCIEFD_ID 0x0014 /* for Compact-PCI Serial slot cards */
41
+
#define PCAN_PCIE104FD_ID 0x0017 /* for PCIe-104 Express slot cards */
42
+
#define PCAN_MINIPCIEFD_ID 0x0018 /* for mini-PCIe slot cards */
43
+
#define PCAN_PCIEFD_OEM_ID 0x0019 /* for PCIe slot OEM cards */
44
+
#define PCAN_M2_ID 0x001a /* for M2 slot cards */
40
45
41
46
/* PEAK PCIe board access description */
42
47
#define PCIEFD_BAR0_SIZE (64 * 1024)
···
208
203
/* supported device ids. */
209
204
static const struct pci_device_id peak_pciefd_tbl[] = {
210
205
{PEAK_PCI_VENDOR_ID, PEAK_PCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
206
+
{PEAK_PCI_VENDOR_ID, PCAN_CPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
207
+
{PEAK_PCI_VENDOR_ID, PCAN_PCIE104FD_ID, PCI_ANY_ID, PCI_ANY_ID,},
208
+
{PEAK_PCI_VENDOR_ID, PCAN_MINIPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
209
+
{PEAK_PCI_VENDOR_ID, PCAN_PCIEFD_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
210
+
{PEAK_PCI_VENDOR_ID, PCAN_M2_ID, PCI_ANY_ID, PCI_ANY_ID,},
211
211
{0,}
212
212
};
213
213
+10
-2
drivers/net/can/sun4i_can.c
+10
-2
drivers/net/can/sun4i_can.c
···
539
539
}
540
540
stats->rx_over_errors++;
541
541
stats->rx_errors++;
542
+
543
+
/* reset the CAN IP by entering reset mode
544
+
* ignoring timeout error
545
+
*/
546
+
set_reset_mode(dev);
547
+
set_normal_mode(dev);
548
+
542
549
/* clear bit */
543
550
sun4i_can_write_cmdreg(priv, SUN4I_CMD_CLEAR_OR_FLAG);
544
551
}
···
660
653
netif_wake_queue(dev);
661
654
can_led_event(dev, CAN_LED_EVENT_TX);
662
655
}
663
-
if (isrc & SUN4I_INT_RBUF_VLD) {
664
-
/* receive interrupt */
656
+
if ((isrc & SUN4I_INT_RBUF_VLD) &&
657
+
!(isrc & SUN4I_INT_DATA_OR)) {
658
+
/* receive interrupt - don't read if overrun occurred */
665
659
while (status & SUN4I_STA_RBUF_RDY) {
666
660
/* RX buffer is not empty */
667
661
sun4i_can_rx(dev);