mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Merge tag 'linux-can-next-for-6.18-20250924' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2025-09-25
this is a pull request of 48 patches for net-next/main, which
supersedes tags/linux-can-next-for-6.18-20250923.
The 1st patch is by Xichao Zhao and converts ns_to_ktime() to
us_to_ktime() in the m_can driver.
Vincent Mailhol contributes 2 patches: Updating the MAINTAINERS and
mailmap files to Vincent's new email address and sorting the includes
in the CAN helper library alphabeticaly.
Stéphane Grosjean's patch modifies all peak CAN drivers and the
mailmap to reflect Stéphane's new email address.
4 patches by Biju Das update the CAN-FD handling in the rcar_canfd
driver.
Followed by 11 patches by Geert Uytterhoeven updating and improving
the rcar_can driver.
Stefan Mätje contributes 2 patches for the esd_usb driver updating the
error messages.
The next 3 patch series are all by Vincent Mailhol: 3 patches to
optimize the size of struct raw_sock and struct uniqframe. 4 patches
which rework the CAN MTU logic as preparation for CAN-XL interfaces.
And finally 20 patches that prepare and refactor the CAN netlink code
for the upcoming CAN-XL support.
* tag 'linux-can-next-for-6.18-20250924' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (48 commits)
can: netlink: add userland error messages
can: dev: add can_get_ctrlmode_str()
can: calc_bittiming: make can_calc_tdco() FD agnostic
can: netlink: make can_tdc_fill_info() FD agnostic
can: netlink: add can_bitrate_const_fill_info()
can: netlink: add can_bittiming_const_fill_info()
can: netlink: add can_bittiming_fill_info()
can: netlink: add can_data_bittiming_get_size()
can: netlink: make can_tdc_get_size() FD agnostic
can: netlink: add can_ctrlmode_changelink()
can: netlink: add can_dtb_changelink()
can: netlink: make can_tdc_changelink() FD agnostic
can: netlink: remove useless check in can_tdc_changelink()
can: netlink: refactor CAN_CTRLMODE_TDC_{AUTO,MANUAL} flag reset logic
can: netlink: add can_validate_databittiming()
can: netlink: add can_validate_tdc()
can: netlink: refactor can_validate_bittiming()
can: netlink: document which symbols are FD specific
can: dev: make can_get_relative_tdco() FD agnostic and move it to bittiming.h
can: dev: move struct data_bittiming_params to linux/can/bittiming.h
...
====================
Link: https://patch.msgid.link/20250925121332.848157-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
@@ -741,6 +741,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
|
||||
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
|
||||
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
|
||||
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
|
||||
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
|
||||
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
|
||||
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
|
||||
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
|
||||
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
|
||||
@@ -817,6 +819,7 @@ Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
|
||||
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
|
||||
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
|
||||
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
|
||||
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
|
||||
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
|
||||
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
|
||||
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
|
||||
|
||||
+2
-2
@@ -5415,7 +5415,7 @@ F: net/sched/sch_cake.c
|
||||
|
||||
CAN NETWORK DRIVERS
|
||||
M: Marc Kleine-Budde <mkl@pengutronix.de>
|
||||
M: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
|
||||
M: Vincent Mailhol <mailhol@kernel.org>
|
||||
L: linux-can@vger.kernel.org
|
||||
S: Maintained
|
||||
W: https://github.com/linux-can
|
||||
@@ -9094,7 +9094,7 @@ S: Odd Fixes
|
||||
F: drivers/net/ethernet/agere/
|
||||
|
||||
ETAS ES58X CAN/USB DRIVER
|
||||
M: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
|
||||
M: Vincent Mailhol <mailhol@kernel.org>
|
||||
L: linux-can@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/networking/devlink/etas_es58x.rst
|
||||
|
||||
@@ -173,13 +173,15 @@ int can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,
|
||||
|
||||
void can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,
|
||||
const struct can_bittiming *dbt,
|
||||
u32 *ctrlmode, u32 ctrlmode_supported)
|
||||
u32 tdc_mask, u32 *ctrlmode, u32 ctrlmode_supported)
|
||||
|
||||
{
|
||||
if (!tdc_const || !(ctrlmode_supported & CAN_CTRLMODE_TDC_AUTO))
|
||||
u32 tdc_auto = tdc_mask & CAN_CTRLMODE_TDC_AUTO_MASK;
|
||||
|
||||
if (!tdc_const || !(ctrlmode_supported & tdc_auto))
|
||||
return;
|
||||
|
||||
*ctrlmode &= ~CAN_CTRLMODE_FD_TDC_MASK;
|
||||
*ctrlmode &= ~tdc_mask;
|
||||
|
||||
/* As specified in ISO 11898-1 section 11.3.3 "Transmitter
|
||||
* delay compensation" (TDC) is only applicable if data BRP is
|
||||
@@ -193,6 +195,6 @@ void can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,
|
||||
if (sample_point_in_tc < tdc_const->tdco_min)
|
||||
return;
|
||||
tdc->tdco = min(sample_point_in_tc, tdc_const->tdco_max);
|
||||
*ctrlmode |= CAN_CTRLMODE_TDC_AUTO;
|
||||
*ctrlmode |= tdc_auto;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
* Copyright (C) 2008-2009 Wolfgang Grandegger <wg@grandegger.com>
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/can.h>
|
||||
#include <linux/can/can-ml.h>
|
||||
#include <linux/can/dev.h>
|
||||
#include <linux/can/skb.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/workqueue.h>
|
||||
|
||||
static void can_update_state_error_stats(struct net_device *dev,
|
||||
enum can_state new_state)
|
||||
@@ -88,6 +88,39 @@ const char *can_get_state_str(const enum can_state state)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(can_get_state_str);
|
||||
|
||||
const char *can_get_ctrlmode_str(u32 ctrlmode)
|
||||
{
|
||||
switch (ctrlmode & ~(ctrlmode - 1)) {
|
||||
case 0:
|
||||
return "none";
|
||||
case CAN_CTRLMODE_LOOPBACK:
|
||||
return "loopback";
|
||||
case CAN_CTRLMODE_LISTENONLY:
|
||||
return "listen-only";
|
||||
case CAN_CTRLMODE_3_SAMPLES:
|
||||
return "triple-sampling";
|
||||
case CAN_CTRLMODE_ONE_SHOT:
|
||||
return "one-shot";
|
||||
case CAN_CTRLMODE_BERR_REPORTING:
|
||||
return "berr-reporting";
|
||||
case CAN_CTRLMODE_FD:
|
||||
return "fd";
|
||||
case CAN_CTRLMODE_PRESUME_ACK:
|
||||
return "presume-ack";
|
||||
case CAN_CTRLMODE_FD_NON_ISO:
|
||||
return "fd-non-iso";
|
||||
case CAN_CTRLMODE_CC_LEN8_DLC:
|
||||
return "cc-len8-dlc";
|
||||
case CAN_CTRLMODE_TDC_AUTO:
|
||||
return "fd-tdc-auto";
|
||||
case CAN_CTRLMODE_TDC_MANUAL:
|
||||
return "fd-tdc-manual";
|
||||
default:
|
||||
return "<unknown>";
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(can_get_ctrlmode_str);
|
||||
|
||||
static enum can_state can_state_err_to_state(u16 err)
|
||||
{
|
||||
if (err < CAN_ERROR_WARNING_THRESHOLD)
|
||||
@@ -240,6 +273,8 @@ void can_setup(struct net_device *dev)
|
||||
{
|
||||
dev->type = ARPHRD_CAN;
|
||||
dev->mtu = CAN_MTU;
|
||||
dev->min_mtu = CAN_MTU;
|
||||
dev->max_mtu = CAN_MTU;
|
||||
dev->hard_header_len = 0;
|
||||
dev->addr_len = 0;
|
||||
dev->tx_queue_len = 10;
|
||||
@@ -309,6 +344,21 @@ void free_candev(struct net_device *dev)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(free_candev);
|
||||
|
||||
void can_set_default_mtu(struct net_device *dev)
|
||||
{
|
||||
struct can_priv *priv = netdev_priv(dev);
|
||||
|
||||
if (priv->ctrlmode & CAN_CTRLMODE_FD) {
|
||||
dev->mtu = CANFD_MTU;
|
||||
dev->min_mtu = CANFD_MTU;
|
||||
dev->max_mtu = CANFD_MTU;
|
||||
} else {
|
||||
dev->mtu = CAN_MTU;
|
||||
dev->min_mtu = CAN_MTU;
|
||||
dev->max_mtu = CAN_MTU;
|
||||
}
|
||||
}
|
||||
|
||||
/* changing MTU and control mode for CAN/CANFD devices */
|
||||
int can_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
@@ -347,6 +397,26 @@ int can_change_mtu(struct net_device *dev, int new_mtu)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(can_change_mtu);
|
||||
|
||||
/* helper to define static CAN controller features at device creation time */
|
||||
int can_set_static_ctrlmode(struct net_device *dev, u32 static_mode)
|
||||
{
|
||||
struct can_priv *priv = netdev_priv(dev);
|
||||
|
||||
/* alloc_candev() succeeded => netdev_priv() is valid at this point */
|
||||
if (priv->ctrlmode_supported & static_mode) {
|
||||
netdev_warn(dev,
|
||||
"Controller features can not be supported and static at the same time\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
priv->ctrlmode = static_mode;
|
||||
|
||||
/* override MTU which was set by default in can_setup()? */
|
||||
can_set_default_mtu(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(can_set_static_ctrlmode);
|
||||
|
||||
/* generic implementation of netdev_ops::ndo_eth_ioctl for CAN devices
|
||||
* supporting hardware timestamps
|
||||
*/
|
||||
|
||||
+391
-237
File diff suppressed because it is too large
Load Diff
@@ -2213,11 +2213,9 @@ static int m_can_set_coalesce(struct net_device *dev,
|
||||
cdev->tx_coalesce_usecs_irq = ec->tx_coalesce_usecs_irq;
|
||||
|
||||
if (cdev->rx_coalesce_usecs_irq)
|
||||
cdev->irq_timer_wait =
|
||||
ns_to_ktime(cdev->rx_coalesce_usecs_irq * NSEC_PER_USEC);
|
||||
cdev->irq_timer_wait = us_to_ktime(cdev->rx_coalesce_usecs_irq);
|
||||
else
|
||||
cdev->irq_timer_wait =
|
||||
ns_to_ktime(cdev->tx_coalesce_usecs_irq * NSEC_PER_USEC);
|
||||
cdev->irq_timer_wait = us_to_ktime(cdev->tx_coalesce_usecs_irq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
|
||||
* Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
*
|
||||
* Copyright (C) 2016 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2016-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
|
||||
#include <linux/can.h>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/* CAN driver for PEAK System micro-CAN based adapters
|
||||
*
|
||||
* Copyright (C) 2003-2011 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2011-2013 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
#ifndef PEAK_CANFD_USER_H
|
||||
#define PEAK_CANFD_USER_H
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
|
||||
* Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
*
|
||||
* Derived from the PCAN project file driver/src/pcan_pci.c:
|
||||
*
|
||||
* Copyright (C) 2001-2006 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2001-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "peak_canfd_user.h"
|
||||
|
||||
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
|
||||
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
|
||||
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
|
||||
+148
-142
File diff suppressed because it is too large
Load Diff
@@ -103,22 +103,13 @@
|
||||
/* Channel register bits */
|
||||
|
||||
/* RSCFDnCmCFG - Classical CAN only */
|
||||
#define RCANFD_CFG_SJW(x) (((x) & 0x3) << 24)
|
||||
#define RCANFD_CFG_TSEG2(x) (((x) & 0x7) << 20)
|
||||
#define RCANFD_CFG_TSEG1(x) (((x) & 0xf) << 16)
|
||||
#define RCANFD_CFG_BRP(x) (((x) & 0x3ff) << 0)
|
||||
#define RCANFD_CFG_SJW GENMASK(25, 24)
|
||||
#define RCANFD_CFG_TSEG2 GENMASK(22, 20)
|
||||
#define RCANFD_CFG_TSEG1 GENMASK(19, 16)
|
||||
#define RCANFD_CFG_BRP GENMASK(9, 0)
|
||||
|
||||
/* RSCFDnCFDCmNCFG - CAN FD only */
|
||||
#define RCANFD_NCFG_NTSEG2(gpriv, x) \
|
||||
(((x) & ((gpriv)->info->nom_bittiming->tseg2_max - 1)) << (gpriv)->info->sh->ntseg2)
|
||||
|
||||
#define RCANFD_NCFG_NTSEG1(gpriv, x) \
|
||||
(((x) & ((gpriv)->info->nom_bittiming->tseg1_max - 1)) << (gpriv)->info->sh->ntseg1)
|
||||
|
||||
#define RCANFD_NCFG_NSJW(gpriv, x) \
|
||||
(((x) & ((gpriv)->info->nom_bittiming->sjw_max - 1)) << (gpriv)->info->sh->nsjw)
|
||||
|
||||
#define RCANFD_NCFG_NBRP(x) (((x) & 0x3ff) << 0)
|
||||
#define RCANFD_NCFG_NBRP GENMASK(9, 0)
|
||||
|
||||
/* RSCFDnCFDCmCTR / RSCFDnCmCTR */
|
||||
#define RCANFD_CCTR_CTME BIT(24)
|
||||
@@ -178,15 +169,7 @@
|
||||
#define RCANFD_CERFL_ERR(x) ((x) & (0x7fff)) /* above bits 14:0 */
|
||||
|
||||
/* RSCFDnCFDCmDCFG */
|
||||
#define RCANFD_DCFG_DSJW(gpriv, x) (((x) & ((gpriv)->info->data_bittiming->sjw_max - 1)) << 24)
|
||||
|
||||
#define RCANFD_DCFG_DTSEG2(gpriv, x) \
|
||||
(((x) & ((gpriv)->info->data_bittiming->tseg2_max - 1)) << (gpriv)->info->sh->dtseg2)
|
||||
|
||||
#define RCANFD_DCFG_DTSEG1(gpriv, x) \
|
||||
(((x) & ((gpriv)->info->data_bittiming->tseg1_max - 1)) << (gpriv)->info->sh->dtseg1)
|
||||
|
||||
#define RCANFD_DCFG_DBRP(x) (((x) & 0xff) << 0)
|
||||
#define RCANFD_DCFG_DBRP GENMASK(7, 0)
|
||||
|
||||
/* RSCFDnCFDCmFDCFG */
|
||||
#define RCANFD_GEN4_FDCFG_CLOE BIT(30)
|
||||
@@ -1389,6 +1372,41 @@ static irqreturn_t rcar_canfd_channel_interrupt(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static inline u32 rcar_canfd_compute_nominal_bit_rate_cfg(struct rcar_canfd_channel *priv,
|
||||
u16 tseg1, u16 tseg2, u16 sjw, u16 brp)
|
||||
{
|
||||
struct rcar_canfd_global *gpriv = priv->gpriv;
|
||||
const struct rcar_canfd_hw_info *info = gpriv->info;
|
||||
u32 ntseg1, ntseg2, nsjw, nbrp;
|
||||
|
||||
if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) || gpriv->info->shared_can_regs) {
|
||||
ntseg1 = (tseg1 & (info->nom_bittiming->tseg1_max - 1)) << info->sh->ntseg1;
|
||||
ntseg2 = (tseg2 & (info->nom_bittiming->tseg2_max - 1)) << info->sh->ntseg2;
|
||||
nsjw = (sjw & (info->nom_bittiming->sjw_max - 1)) << info->sh->nsjw;
|
||||
nbrp = FIELD_PREP(RCANFD_NCFG_NBRP, brp);
|
||||
} else {
|
||||
ntseg1 = FIELD_PREP(RCANFD_CFG_TSEG1, tseg1);
|
||||
ntseg2 = FIELD_PREP(RCANFD_CFG_TSEG2, tseg2);
|
||||
nsjw = FIELD_PREP(RCANFD_CFG_SJW, sjw);
|
||||
nbrp = FIELD_PREP(RCANFD_CFG_BRP, brp);
|
||||
}
|
||||
|
||||
return (ntseg1 | ntseg2 | nsjw | nbrp);
|
||||
}
|
||||
|
||||
static inline u32 rcar_canfd_compute_data_bit_rate_cfg(const struct rcar_canfd_hw_info *info,
|
||||
u16 tseg1, u16 tseg2, u16 sjw, u16 brp)
|
||||
{
|
||||
u32 dtseg1, dtseg2, dsjw, dbrp;
|
||||
|
||||
dtseg1 = (tseg1 & (info->data_bittiming->tseg1_max - 1)) << info->sh->dtseg1;
|
||||
dtseg2 = (tseg2 & (info->data_bittiming->tseg2_max - 1)) << info->sh->dtseg2;
|
||||
dsjw = (sjw & (info->data_bittiming->sjw_max - 1)) << 24;
|
||||
dbrp = FIELD_PREP(RCANFD_DCFG_DBRP, brp);
|
||||
|
||||
return (dtseg1 | dtseg2 | dsjw | dbrp);
|
||||
}
|
||||
|
||||
static void rcar_canfd_set_bittiming(struct net_device *ndev)
|
||||
{
|
||||
u32 mask = RCANFD_FDCFG_TDCO | RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC;
|
||||
@@ -1407,15 +1425,7 @@ static void rcar_canfd_set_bittiming(struct net_device *ndev)
|
||||
sjw = bt->sjw - 1;
|
||||
tseg1 = bt->prop_seg + bt->phase_seg1 - 1;
|
||||
tseg2 = bt->phase_seg2 - 1;
|
||||
|
||||
if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) || gpriv->info->shared_can_regs) {
|
||||
cfg = (RCANFD_NCFG_NTSEG1(gpriv, tseg1) | RCANFD_NCFG_NBRP(brp) |
|
||||
RCANFD_NCFG_NSJW(gpriv, sjw) | RCANFD_NCFG_NTSEG2(gpriv, tseg2));
|
||||
} else {
|
||||
cfg = (RCANFD_CFG_TSEG1(tseg1) | RCANFD_CFG_BRP(brp) |
|
||||
RCANFD_CFG_SJW(sjw) | RCANFD_CFG_TSEG2(tseg2));
|
||||
}
|
||||
|
||||
cfg = rcar_canfd_compute_nominal_bit_rate_cfg(priv, tseg1, tseg2, sjw, brp);
|
||||
rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg);
|
||||
|
||||
if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD))
|
||||
@@ -1426,10 +1436,7 @@ static void rcar_canfd_set_bittiming(struct net_device *ndev)
|
||||
sjw = dbt->sjw - 1;
|
||||
tseg1 = dbt->prop_seg + dbt->phase_seg1 - 1;
|
||||
tseg2 = dbt->phase_seg2 - 1;
|
||||
|
||||
cfg = (RCANFD_DCFG_DTSEG1(gpriv, tseg1) | RCANFD_DCFG_DBRP(brp) |
|
||||
RCANFD_DCFG_DSJW(gpriv, sjw) | RCANFD_DCFG_DTSEG2(gpriv, tseg2));
|
||||
|
||||
cfg = rcar_canfd_compute_data_bit_rate_cfg(gpriv->info, tseg1, tseg2, sjw, brp);
|
||||
writel(cfg, &gpriv->fcbase[ch].dcfg);
|
||||
|
||||
/* Transceiver Delay Compensation */
|
||||
@@ -1913,7 +1920,10 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,
|
||||
priv->can.fd.do_get_auto_tdcv = rcar_canfd_get_auto_tdcv;
|
||||
} else {
|
||||
/* Controller starts in Classical CAN only mode */
|
||||
priv->can.bittiming_const = &rcar_canfd_bittiming_const;
|
||||
if (gpriv->info->shared_can_regs)
|
||||
priv->can.bittiming_const = gpriv->info->nom_bittiming;
|
||||
else
|
||||
priv->can.bittiming_const = &rcar_canfd_bittiming_const;
|
||||
priv->can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
|
||||
* Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
*
|
||||
* Derived from the PCAN project file driver/src/pcan_pci.c:
|
||||
*
|
||||
* Copyright (C) 2001-2006 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2001-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include "sja1000.h"
|
||||
|
||||
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
|
||||
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
|
||||
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (C) 2010-2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
*
|
||||
* CAN driver for PEAK-System PCAN-PC Card
|
||||
* Derived from the PCAN project file driver/src/pcan_pccard.c
|
||||
* Copyright (C) 2006-2010 PEAK System-Technik GmbH
|
||||
*
|
||||
* Copyright (C) 2006-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <linux/can/dev.h>
|
||||
#include "sja1000.h"
|
||||
|
||||
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
|
||||
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
|
||||
MODULE_DESCRIPTION("CAN driver for PEAK-System PCAN-PC Cards");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <linux/can.h>
|
||||
#include <linux/can/dev.h>
|
||||
#include <linux/can/error.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/netdevice.h>
|
||||
@@ -274,6 +275,7 @@ struct esd_usb {
|
||||
int net_count;
|
||||
u32 version;
|
||||
int rxinitdone;
|
||||
int in_usb_disconnect;
|
||||
void *rxbuf[ESD_USB_MAX_RX_URBS];
|
||||
dma_addr_t rxbuf_dma[ESD_USB_MAX_RX_URBS];
|
||||
};
|
||||
@@ -480,7 +482,7 @@ static void esd_usb_tx_done_msg(struct esd_usb_net_priv *priv,
|
||||
static void esd_usb_read_bulk_callback(struct urb *urb)
|
||||
{
|
||||
struct esd_usb *dev = urb->context;
|
||||
int retval;
|
||||
int err;
|
||||
int pos = 0;
|
||||
int i;
|
||||
|
||||
@@ -496,7 +498,7 @@ static void esd_usb_read_bulk_callback(struct urb *urb)
|
||||
|
||||
default:
|
||||
dev_info(dev->udev->dev.parent,
|
||||
"Rx URB aborted (%d)\n", urb->status);
|
||||
"Rx URB aborted (%pe)\n", ERR_PTR(urb->status));
|
||||
goto resubmit_urb;
|
||||
}
|
||||
|
||||
@@ -539,15 +541,15 @@ resubmit_urb:
|
||||
urb->transfer_buffer, ESD_USB_RX_BUFFER_SIZE,
|
||||
esd_usb_read_bulk_callback, dev);
|
||||
|
||||
retval = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (retval == -ENODEV) {
|
||||
err = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (err == -ENODEV) {
|
||||
for (i = 0; i < dev->net_count; i++) {
|
||||
if (dev->nets[i])
|
||||
netif_device_detach(dev->nets[i]->netdev);
|
||||
}
|
||||
} else if (retval) {
|
||||
} else if (err) {
|
||||
dev_err(dev->udev->dev.parent,
|
||||
"failed resubmitting read bulk urb: %d\n", retval);
|
||||
"failed resubmitting read bulk urb: %pe\n", ERR_PTR(err));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -572,7 +574,7 @@ static void esd_usb_write_bulk_callback(struct urb *urb)
|
||||
return;
|
||||
|
||||
if (urb->status)
|
||||
netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status);
|
||||
netdev_info(netdev, "Tx URB aborted (%pe)\n", ERR_PTR(urb->status));
|
||||
|
||||
netif_trans_update(netdev);
|
||||
}
|
||||
@@ -758,7 +760,7 @@ out:
|
||||
if (err == -ENODEV)
|
||||
netif_device_detach(netdev);
|
||||
if (err)
|
||||
netdev_err(netdev, "couldn't start device: %d\n", err);
|
||||
netdev_err(netdev, "couldn't start device: %pe\n", ERR_PTR(err));
|
||||
|
||||
kfree(msg);
|
||||
return err;
|
||||
@@ -800,7 +802,6 @@ static int esd_usb_open(struct net_device *netdev)
|
||||
/* finally start device */
|
||||
err = esd_usb_start(priv);
|
||||
if (err) {
|
||||
netdev_warn(netdev, "couldn't start device: %d\n", err);
|
||||
close_candev(netdev);
|
||||
return err;
|
||||
}
|
||||
@@ -923,7 +924,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb,
|
||||
if (err == -ENODEV)
|
||||
netif_device_detach(netdev);
|
||||
else
|
||||
netdev_warn(netdev, "failed tx_urb %d\n", err);
|
||||
netdev_warn(netdev, "failed tx_urb %pe\n", ERR_PTR(err));
|
||||
|
||||
goto releasebuf;
|
||||
}
|
||||
@@ -947,10 +948,11 @@ nourbmem:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int esd_usb_close(struct net_device *netdev)
|
||||
/* Stop interface */
|
||||
static int esd_usb_stop(struct esd_usb_net_priv *priv)
|
||||
{
|
||||
struct esd_usb_net_priv *priv = netdev_priv(netdev);
|
||||
union esd_usb_msg *msg;
|
||||
int err;
|
||||
int i;
|
||||
|
||||
msg = kmalloc(sizeof(*msg), GFP_KERNEL);
|
||||
@@ -964,8 +966,11 @@ static int esd_usb_close(struct net_device *netdev)
|
||||
msg->filter.option = ESD_USB_ID_ENABLE; /* start with segment 0 */
|
||||
for (i = 0; i <= ESD_USB_MAX_ID_SEGMENT; i++)
|
||||
msg->filter.mask[i] = 0;
|
||||
if (esd_usb_send_msg(priv->usb, msg) < 0)
|
||||
netdev_err(netdev, "sending idadd message failed\n");
|
||||
err = esd_usb_send_msg(priv->usb, msg);
|
||||
if (err < 0) {
|
||||
netdev_err(priv->netdev, "sending idadd message failed: %pe\n", ERR_PTR(err));
|
||||
goto bail;
|
||||
}
|
||||
|
||||
/* set CAN controller to reset mode */
|
||||
msg->hdr.len = sizeof(struct esd_usb_set_baudrate_msg) / sizeof(u32); /* # of 32bit words */
|
||||
@@ -973,8 +978,25 @@ static int esd_usb_close(struct net_device *netdev)
|
||||
msg->setbaud.net = priv->index;
|
||||
msg->setbaud.rsvd = 0;
|
||||
msg->setbaud.baud = cpu_to_le32(ESD_USB_NO_BAUDRATE);
|
||||
if (esd_usb_send_msg(priv->usb, msg) < 0)
|
||||
netdev_err(netdev, "sending setbaud message failed\n");
|
||||
err = esd_usb_send_msg(priv->usb, msg);
|
||||
if (err < 0)
|
||||
netdev_err(priv->netdev, "sending setbaud message failed: %pe\n", ERR_PTR(err));
|
||||
|
||||
bail:
|
||||
kfree(msg);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int esd_usb_close(struct net_device *netdev)
|
||||
{
|
||||
struct esd_usb_net_priv *priv = netdev_priv(netdev);
|
||||
int err = 0;
|
||||
|
||||
if (!priv->usb->in_usb_disconnect) {
|
||||
/* It's moot to try this in usb_disconnect()! */
|
||||
err = esd_usb_stop(priv);
|
||||
}
|
||||
|
||||
priv->can.state = CAN_STATE_STOPPED;
|
||||
|
||||
@@ -982,9 +1004,7 @@ static int esd_usb_close(struct net_device *netdev)
|
||||
|
||||
close_candev(netdev);
|
||||
|
||||
kfree(msg);
|
||||
|
||||
return 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
static const struct net_device_ops esd_usb_netdev_ops = {
|
||||
@@ -1251,14 +1271,14 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index)
|
||||
|
||||
err = register_candev(netdev);
|
||||
if (err) {
|
||||
dev_err(&intf->dev, "couldn't register CAN device: %d\n", err);
|
||||
dev_err(&intf->dev, "couldn't register CAN device: %pe\n", ERR_PTR(err));
|
||||
free_candev(netdev);
|
||||
err = -ENOMEM;
|
||||
goto done;
|
||||
}
|
||||
|
||||
dev->nets[index] = priv;
|
||||
netdev_info(netdev, "device %s registered\n", netdev->name);
|
||||
netdev_info(netdev, "registered\n");
|
||||
|
||||
done:
|
||||
return err;
|
||||
@@ -1354,9 +1374,11 @@ static void esd_usb_disconnect(struct usb_interface *intf)
|
||||
usb_set_intfdata(intf, NULL);
|
||||
|
||||
if (dev) {
|
||||
dev->in_usb_disconnect = 1;
|
||||
for (i = 0; i < dev->net_count; i++) {
|
||||
if (dev->nets[i]) {
|
||||
netdev = dev->nets[i]->netdev;
|
||||
netdev_info(netdev, "unregister\n");
|
||||
unregister_netdev(netdev);
|
||||
free_candev(netdev);
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
* CAN driver for PEAK System PCAN-USB adapter
|
||||
* Derived from the PCAN project file driver/src/pcan_usb.c
|
||||
*
|
||||
* Copyright (C) 2003-2010 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2011-2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*
|
||||
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
|
||||
*/
|
||||
@@ -919,7 +919,7 @@ static int pcan_usb_init(struct peak_usb_device *dev)
|
||||
CAN_CTRLMODE_LOOPBACK;
|
||||
} else {
|
||||
dev_info(dev->netdev->dev.parent,
|
||||
"Firmware update available. Please contact support@peak-system.com\n");
|
||||
"Firmware update available. Please contact support.peak@hms-networks.com\n");
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
* CAN driver for PEAK System USB adapters
|
||||
* Derived from the PCAN project file driver/src/pcan_usb_core.c
|
||||
*
|
||||
* Copyright (C) 2003-2010 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2010-2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*
|
||||
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
|
||||
*/
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#include "pcan_usb_core.h"
|
||||
|
||||
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
|
||||
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
|
||||
MODULE_DESCRIPTION("CAN driver for PEAK-System USB adapters");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
* CAN driver for PEAK System USB adapters
|
||||
* Derived from the PCAN project file driver/src/pcan_usb_core.c
|
||||
*
|
||||
* Copyright (C) 2003-2010 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2010-2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*
|
||||
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
|
||||
*/
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
/*
|
||||
* CAN driver for PEAK System PCAN-USB FD / PCAN-USB Pro FD adapter
|
||||
*
|
||||
* Copyright (C) 2013-2014 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2013-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
* CAN driver for PEAK System PCAN-USB Pro adapter
|
||||
* Derived from the PCAN project file driver/src/pcan_usbpro.c
|
||||
*
|
||||
* Copyright (C) 2003-2011 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2011-2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
* CAN driver for PEAK System PCAN-USB Pro adapter
|
||||
* Derived from the PCAN project file driver/src/pcan_usbpro_fw.h
|
||||
*
|
||||
* Copyright (C) 2003-2011 PEAK System-Technik GmbH
|
||||
* Copyright (C) 2011-2012 Stephane Grosjean <s.grosjean@peak-system.com>
|
||||
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
|
||||
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
|
||||
*/
|
||||
#ifndef PCAN_USB_PRO_H
|
||||
#define PCAN_USB_PRO_H
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user