Skip to content

Commit 92d2882

Browse files
davem330davem330
committed
Merge tag 'linux-can-fixes-for-4.14-20171110' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2017-11-10 this is a pull request for net/master. The first patch by Richard Schütz for the c_can driver removes the false indication to support triple sampling for d_can. Gerhard Bertelsmann's patch for the sun4i driver improves the RX overrun handling. The patch by Stephane Grosjean for the peak_canfd driver adds the PCI ids for various new PCIe/M2 interfaces. Marek Vasut's patch for the ifi driver fix transmitter delay calculation. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents be234ba + 4f71167 commit 92d2882

File tree

5 files changed

+25
-9
lines changed

5 files changed

+25
-9
lines changed

‎drivers/net/can/c_can/c_can_pci.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev,
178178
break;
179179
case BOSCH_D_CAN:
180180
priv->regs = reg_map_d_can;
181-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
182181
break;
183182
default:
184183
ret = -EINVAL;

‎drivers/net/can/c_can/c_can_platform.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
320320
break;
321321
case BOSCH_D_CAN:
322322
priv->regs = reg_map_d_can;
323-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
324323
priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
325324
priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
326325
priv->read_reg32 = d_can_plat_read_reg32;

‎drivers/net/can/ifi_canfd/ifi_canfd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,9 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev)
670670
priv->base + IFI_CANFD_FTIME);
671671

672672
/* 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);
676676
}
677677

678678
static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id,

‎drivers/net/can/peak_canfd/peak_pciefd_main.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@
2929
#include "peak_canfd_user.h"
3030

3131
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");
3434
MODULE_LICENSE("GPL v2");
3535

3636
#define PCIEFD_DRV_NAME "peak_pciefd"
3737

3838
#define PEAK_PCI_VENDOR_ID 0x001c /* The PCI device and vendor IDs */
3939
#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 */
4045

4146
/* PEAK PCIe board access description */
4247
#define PCIEFD_BAR0_SIZE (64 * 1024)
@@ -203,6 +208,11 @@ struct pciefd_board {
203208
/* supported device ids. */
204209
static const struct pci_device_id peak_pciefd_tbl[] = {
205210
{PEAK_PCI_VENDOR_ID, PEAK_PCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
211+
{PEAK_PCI_VENDOR_ID, PCAN_CPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
212+
{PEAK_PCI_VENDOR_ID, PCAN_PCIE104FD_ID, PCI_ANY_ID, PCI_ANY_ID,},
213+
{PEAK_PCI_VENDOR_ID, PCAN_MINIPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
214+
{PEAK_PCI_VENDOR_ID, PCAN_PCIEFD_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
215+
{PEAK_PCI_VENDOR_ID, PCAN_M2_ID, PCI_ANY_ID, PCI_ANY_ID,},
206216
{0,}
207217
};
208218

‎drivers/net/can/sun4i_can.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,13 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
539539
}
540540
stats->rx_over_errors++;
541541
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+
542549
/* clear bit */
543550
sun4i_can_write_cmdreg(priv, SUN4I_CMD_CLEAR_OR_FLAG);
544551
}
@@ -653,8 +660,9 @@ static irqreturn_t sun4i_can_interrupt(int irq, void *dev_id)
653660
netif_wake_queue(dev);
654661
can_led_event(dev, CAN_LED_EVENT_TX);
655662
}
656-
if (isrc & SUN4I_INT_RBUF_VLD) {
657-
/* receive interrupt */
663+
if ((isrc & SUN4I_INT_RBUF_VLD) &&
664+
!(isrc & SUN4I_INT_DATA_OR)) {
665+
/* receive interrupt - don't read if overrun occurred */
658666
while (status & SUN4I_STA_RBUF_RDY) {
659667
/* RX buffer is not empty */
660668
sun4i_can_rx(dev);

0 commit comments

Comments
 (0)