Change flexcan features at runtime
Subsystems (3)
cover Change flexcan features at runtime
This series was born from the review https://lkml.org/lkml/2022/1/2/127
by Marc Kleine-Budde. The ethtool module is minimal and lacks the callback to change the setting at runtime (this has yet to be defined). I'm certainly not an expert but might it make sense to use the set_features() callback? Although I understand that it belongs to `struct net_device_ops' and not to 'struct ethtool_ops'.
Dario Binacchi (2):
can: flexcan: allow to change quirks at runtime
can: flexcan: add ethtool support
drivers/net/can/Makefile | 3 +
drivers/net/can/flexcan.h | 107 +++++++++++++
drivers/net/can/flexcan_ethtool.c | 29 ++++
drivers/net/can/{flexcan.c => flexcan_main.c} | 144 ++++--------------
4 files changed, 166 insertions(+), 117 deletions(-)
create mode 100644 drivers/net/can/flexcan.h
create mode 100644 drivers/net/can/flexcan_ethtool.c
rename drivers/net/can/{flexcan.c => flexcan_main.c} (92%)Signature · 1 line
2.32.0
RFC PATCH 1/2 can: flexcan: allow to change quirks at runtime
This is a preliminary patch for the upcoming support to ethtool api.
---
drivers/net/can/flexcan.c | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/net/can/flexcan.c +25 -25
@@ -369,7 +369,7 @@ struct flexcan_priv {struct clk *clk_ipg;struct clk *clk_per; -const struct flexcan_devtype_data *devtype_data; +struct flexcan_devtype_data devtype_data;struct regulator *reg_xceiver;struct flexcan_stop_mode stm;
@@ -600,7 +600,7 @@ static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv) priv->write (reg_mcr, ®s->mcr);/* enable stop request */ -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW ) { ret =flexcan_stop_mode_enable_scfw (priv, true);if (ret <0 )return ret;
@@ -619,7 +619,7 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv)int ret;/* remove stop request */ -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW ) { ret =flexcan_stop_mode_enable_scfw (priv, false);if (ret <0 )return ret;
@@ -1022,7 +1022,7 @@ static struct sk_buff *flexcan_mailbox_read(struct can_rx_offload *offload, mb =flexcan_get_mb (priv, n); -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) {u32 code; do {
@@ -1087,7 +1087,7 @@ static struct sk_buff *flexcan_mailbox_read(struct can_rx_offload *offload, } mark_as_read: -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP )flexcan_write64 (priv,FLEXCAN_IFLAG_MB (n), ®s->iflag1);else priv->write (FLEXCAN_IFLAG_RX_FIFO_AVAILABLE , ®s->iflag1);
@@ -1113,7 +1113,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)enum can_state last_state = priv->can.state;/* reception interrupt */ -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) {u64 reg_iflag_rx;int ret;
@@ -1173,7 +1173,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)/* state change interrupt or broken error state quirk fix is enabled */ if ((reg_esr &FLEXCAN_ESR_ERR_STATE ) || - (priv->devtype_data->quirks & (FLEXCAN_QUIRK_BROKEN_WERR_STATE | + (priv->devtype_data.quirks & (FLEXCAN_QUIRK_BROKEN_WERR_STATE |FLEXCAN_QUIRK_BROKEN_PERR_STATE )))flexcan_irq_state (dev, reg_esr);
@@ -1195,11 +1195,11 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)* (1): enabled if FLEXCAN_QUIRK_BROKEN_WERR_STATE is enabled */ if ((last_state != priv->can.state) && - (priv->devtype_data->quirks &FLEXCAN_QUIRK_BROKEN_PERR_STATE ) && + (priv->devtype_data.quirks &FLEXCAN_QUIRK_BROKEN_PERR_STATE ) && !(priv->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING )) {switch (priv->can.state) {case CAN_STATE_ERROR_ACTIVE : -if (priv->devtype_data->quirks & +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_BROKEN_WERR_STATE )flexcan_error_irq_enable (priv);else
@@ -1423,13 +1423,13 @@ static int flexcan_rx_offload_setup(struct net_device *dev)else priv->mb_size =sizeof (struct flexcan_mb ) +CAN_MAX_DLEN ; -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_NR_MB_16 ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_NR_MB_16 ) priv->mb_count =16 ;else priv->mb_count = (sizeof (priv->regs->mb[0 ]) / priv->mb_size) + (sizeof (priv->regs->mb[1 ]) / priv->mb_size); -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) priv->tx_mb_reserved =flexcan_get_mb (priv,FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP );else
@@ -1441,7 +1441,7 @@ static int flexcan_rx_offload_setup(struct net_device *dev) priv->offload.mailbox_read = flexcan_mailbox_read; -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) { priv->offload.mb_first =FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST ; priv->offload.mb_last = priv->mb_count -2 ;
@@ -1506,7 +1506,7 @@ static int flexcan_chip_start(struct net_device *dev)if (err) goto out_chip_disable; -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_SUPPORT_ECC ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SUPPORT_ECC )flexcan_ram_init (dev);flexcan_set_bittiming (dev);
@@ -1535,7 +1535,7 @@ static int flexcan_chip_start(struct net_device *dev)* - disable for timestamp mode * - enable for FIFO mode */ -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) reg_mcr &= ~FLEXCAN_MCR_FEN ;else reg_mcr |=FLEXCAN_MCR_FEN ;
@@ -1586,7 +1586,7 @@ static int flexcan_chip_start(struct net_device *dev)* on most Flexcan cores, too. Otherwise we don't get * any error warning or passive interrupts. */ -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_BROKEN_WERR_STATE || +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_BROKEN_WERR_STATE || priv->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) reg_ctrl |=FLEXCAN_CTRL_ERR_MSK ;else
@@ -1599,7 +1599,7 @@ static int flexcan_chip_start(struct net_device *dev)netdev_dbg (dev,"%s: writing ctrl=0x%08x" , __func__, reg_ctrl); priv->write (reg_ctrl, ®s->ctrl); -if ((priv->devtype_data->quirks &FLEXCAN_QUIRK_ENABLE_EACEN_RRS )) { +if ((priv->devtype_data.quirks &FLEXCAN_QUIRK_ENABLE_EACEN_RRS )) { reg_ctrl2 = priv->read (®s->ctrl2); reg_ctrl2 |=FLEXCAN_CTRL2_EACEN |FLEXCAN_CTRL2_RRS ; priv->write (reg_ctrl2, ®s->ctrl2);
@@ -1631,7 +1631,7 @@ static int flexcan_chip_start(struct net_device *dev) priv->write (reg_fdctrl, ®s->fdctrl); } -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_OFF_TIMESTAMP ) {for (i = priv->offload.mb_first; i <= priv->offload.mb_last; i++) { mb =flexcan_get_mb (priv, i); priv->write(FLEXCAN_MB_CODE_RX_EMPTY,
@@ -1659,7 +1659,7 @@ static int flexcan_chip_start(struct net_device *dev) priv->write (0x0 , ®s->rx14mask); priv->write (0x0 , ®s->rx15mask); -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_DISABLE_RXFG ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_DISABLE_RXFG ) priv->write (0x0 , ®s->rxfgmask);/* clear acceptance filters */
@@ -1673,7 +1673,7 @@ static int flexcan_chip_start(struct net_device *dev)* This also works around errata e5295 which generates false * positive memory errors and put the device in freeze mode. */ -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_DISABLE_MECR ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_DISABLE_MECR ) {/* Follow the protocol as described in "Detection * and Correction of Memory Errors" to write to * MECR register (step 1 - 5)
@@ -1799,7 +1799,7 @@ static int flexcan_open(struct net_device *dev)if (err) goto out_can_rx_offload_disable; -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_NR_IRQ_3 ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_NR_IRQ_3 ) { err =request_irq (priv->irq_boff, flexcan_irq,IRQF_SHARED , dev->name, dev);if (err)
@@ -1845,7 +1845,7 @@ static int flexcan_close(struct net_device *dev)netif_stop_queue (dev);flexcan_chip_interrupts_disable (dev); -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_NR_IRQ_3 ) { +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_NR_IRQ_3 ) {free_irq (priv->irq_err, dev);free_irq (priv->irq_boff, dev); }
@@ -2051,9 +2051,9 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) priv =netdev_priv (dev); -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW ) +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW ) ret =flexcan_setup_stop_mode_scfw (pdev); -else if (priv->devtype_data->quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) +else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) ret =flexcan_setup_stop_mode_gpr (pdev);else /* return 0 directly if doesn't support stop mode feature */
@@ -2202,7 +2202,7 @@ static int flexcan_probe(struct platform_device *pdev) priv->clk_ipg = clk_ipg; priv->clk_per = clk_per; priv->clk_src = clk_src; - priv->devtype_data = devtype_data; +memcpy (&priv->devtype_data, devtype_data,sizeof (priv->devtype_data)); priv->reg_xceiver = reg_xceiver;if (devtype_data->quirks &FLEXCAN_QUIRK_NR_IRQ_3 ) {
@@ -2218,7 +2218,7 @@ static int flexcan_probe(struct platform_device *pdev) } } -if (priv->devtype_data->quirks &FLEXCAN_QUIRK_SUPPORT_FD ) { +if (devtype_data->quirks &FLEXCAN_QUIRK_SUPPORT_FD ) { priv->can.ctrlmode_supported |=CAN_CTRLMODE_FD |CAN_CTRLMODE_FD_NON_ISO ; priv->can.bittiming_const = &flexcan_fd_bittiming_const;
Signature · 1 line
2.32.0
RFC PATCH 2/2 can: flexcan: add ethtool support
In reply to Dario BinacchiFor now, the driver information is added but the target is to change the type of reception at runtime (RxFIFO enabled / disabled).
---
drivers/net/can/Makefile | 3 +
drivers/net/can/flexcan.h | 107 ++++++++++++++++++
drivers/net/can/flexcan_ethtool.c | 29 +++++
drivers/net/can/{flexcan.c => flexcan_main.c} | 96 +---------------
4 files changed, 142 insertions(+), 93 deletions(-)
create mode 100644 drivers/net/can/flexcan.h
create mode 100644 drivers/net/can/flexcan_ethtool.c
rename drivers/net/can/{flexcan.c => flexcan_main.c} (94%)drivers/net/can/Makefile +3 -0
@@ -16,7 +16,10 @@ obj-y += softing/ obj-$(CONFIG_CAN_AT91) += at91_can.o obj-$(CONFIG_CAN_CC770) += cc770/ obj-$(CONFIG_CAN_C_CAN) += c_can/ + obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o +flexcan-objs += flexcan_main.o flexcan_ethtool.o + obj-$(CONFIG_CAN_GRCAN) += grcan.o obj-$(CONFIG_CAN_IFI_CANFD) += ifi_canfd/ obj-$(CONFIG_CAN_JANZ_ICAN3) += janz-ican3.o
drivers/net/can/flexcan.h new file +107 -0
107 lines not on this page · raw message
drivers/net/can/flexcan_ethtool.c new file +29 -0
@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2022 Amarula Solutions +* +* Author: Dario Binacchi <[email protected]> +*/ + +#include <linux/ethtool.h> +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/netdevice.h> +#include <linux/can/dev.h> + +#include "flexcan.h" + +static void flexcan_get_drvinfo (struct net_device *netdev, +struct ethtool_drvinfo *info) +{ +strscpy (info->driver,"flexcan" ,sizeof (info->driver)); +} + +static const struct ethtool_ops flexcan_ethtool_ops = { + .get_drvinfo = flexcan_get_drvinfo, +}; + +void flexcan_set_ethtool_ops (struct net_device *netdev) +{ + netdev->ethtool_ops = &flexcan_ethtool_ops; +}
drivers/net/can/flexcan_main.c renamed from drivers/net/can/flexcan.c +3 -93
126 lines not on this page · raw message
Signature · 1 line
2.32.0