Commit e794b089 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.7-20231005' of... 

Merge tag 'linux-can-next-for-6.7-20231005' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2023-10-05

The first patch is by Miquel Raynal and fixes a comment in the sja1000
driver.

Vincent Mailhol contributes 2 patches that fix W=1 compiler warnings
in the etas_es58x driver.

Jiapeng Chong's patch removes an unneeded NULL pointer check before
dev_put() in the CAN raw protocol.

A patch by Justin Stittreplaces a strncpy() by strscpy() in the
peak_pci sja1000 driver.

The next 5 patches are by me and fix the can_restart() handler and
replace BUG_ON()s in the CAN dev helpers with proper error handling.

The last 27 patches are also by me and target the at91_can driver.
First a new helper function is introduced, the at91_can driver is
cleaned up and updated to use the rx-offload helper.

* tag 'linux-can-next-for-6.7-20231005' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (37 commits)
  can: at91_can: switch to rx-offload implementation
  can: at91_can: at91_alloc_can_err_skb() introduce new function
  can: at91_can: at91_irq_err_line(): send error counters with state change
  can: at91_can: at91_irq_err_line(): make use of can_change_state() and can_bus_off()
  can: at91_can: at91_irq_err_line(): take reg_sr into account for bus off
  can: at91_can: at91_irq_err_line(): make use of can_state_get_by_berr_counter()
  can: at91_can: at91_irq_err(): rename to at91_irq_err_line()
  can: at91_can: at91_irq_err_frame(): move next to at91_irq_err()
  can: at91_can: at91_irq_err_frame(): call directly from IRQ handler
  can: at91_can: at91_poll_err(): increase stats even if no quota left or OOM
  can: at91_can: at91_poll_err(): fold in at91_poll_err_frame()
  can: at91_can: add CAN transceiver support
  can: at91_can: at91_open(): forward request_irq()'s return value in case or an error
  can: at91_can: at91_chip_start(): don't disable IRQs twice
  can: at91_can: at91_set_bittiming(): demote register output to debug level
  can: at91_can: rename struct at91_priv::{tx_next,tx_echo} to {tx_head,tx_tail}
  can: at91_can: at91_setup_mailboxes(): update comments
  can: at91_can: add more register definitions
  can: at91_can: MCR Register: convert to FIELD_PREP()
  can: at91_can: MSR Register: convert to FIELD_PREP()
  ...
====================

Link: https://lore.kernel.org/r/20231005195812.549776-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1a489087 bf176313

drivers/net/can/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ config CAN_RX_OFFLOAD 
config CAN_AT91

	tristate "Atmel AT91 onchip CAN controller"

	depends on (ARCH_AT91 || COMPILE_TEST) && HAS_IOMEM

	select CAN_RX_OFFLOAD

	help

	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263

	  and AT91SAM9X5 processors.

drivers/net/can/at91_can.c

+398 −586

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/can/dev/dev.c

+36 −15
Original line number Diff line number Diff line
@@ -90,6 +90,28 @@ const char *can_get_state_str(const enum can_state state) 
}

EXPORT_SYMBOL_GPL(can_get_state_str);



static enum can_state can_state_err_to_state(u16 err)

{

	if (err < CAN_ERROR_WARNING_THRESHOLD)

		return CAN_STATE_ERROR_ACTIVE;

	if (err < CAN_ERROR_PASSIVE_THRESHOLD)

		return CAN_STATE_ERROR_WARNING;

	if (err < CAN_BUS_OFF_THRESHOLD)

		return CAN_STATE_ERROR_PASSIVE;



	return CAN_STATE_BUS_OFF;

}



void can_state_get_by_berr_counter(const struct net_device *dev,

				   const struct can_berr_counter *bec,

				   enum can_state *tx_state,

				   enum can_state *rx_state)

{

	*tx_state = can_state_err_to_state(bec->txerr);

	*rx_state = can_state_err_to_state(bec->rxerr);

}

EXPORT_SYMBOL_GPL(can_state_get_by_berr_counter);



void can_change_state(struct net_device *dev, struct can_frame *cf,

		      enum can_state tx_state, enum can_state rx_state)

{
@@ -132,7 +154,8 @@ static void can_restart(struct net_device *dev) 
	struct can_frame *cf;

	int err;



	BUG_ON(netif_carrier_ok(dev));

	if (netif_carrier_ok(dev))

		netdev_err(dev, "Attempt to restart for bus-off recovery, but carrier is OK?\n");



	/* No synchronization needed because the device is bus-off and

	 * no messages can come in or go out.
@@ -141,23 +164,21 @@ static void can_restart(struct net_device *dev) 


	/* send restart message upstream */

	skb = alloc_can_err_skb(dev, &cf);

	if (!skb)

		goto restart;



	if (skb) {

		cf->can_id |= CAN_ERR_RESTARTED;



		netif_rx(skb);



restart:

	netdev_dbg(dev, "restarted\n");

	priv->can_stats.restarts++;

	}



	/* Now restart the device */

	err = priv->do_set_mode(dev, CAN_MODE_START);



	netif_carrier_on(dev);

	if (err)

		netdev_err(dev, "Error %d during restart", err);

	err = priv->do_set_mode(dev, CAN_MODE_START);

	if (err) {

		netdev_err(dev, "Restart failed, error %pe\n", ERR_PTR(err));

		netif_carrier_off(dev);

	} else {

		netdev_dbg(dev, "Restarted\n");

		priv->can_stats.restarts++;

	}

}



static void can_restart_work(struct work_struct *work)

drivers/net/can/dev/skb.c

+5 −1
Original line number Diff line number Diff line
@@ -49,7 +49,11 @@ int can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, 
{

	struct can_priv *priv = netdev_priv(dev);



	BUG_ON(idx >= priv->echo_skb_max);

	if (idx >= priv->echo_skb_max) {

		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",

			   __func__, idx, priv->echo_skb_max);

		return -EINVAL;

	}



	/* check flag whether this packet has to be looped back */

	if (!(dev->flags & IFF_ECHO) ||

drivers/net/can/sja1000/peak_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev) 
		card->led_chip.owner = THIS_MODULE;

		card->led_chip.dev.parent = &pdev->dev;

		card->led_chip.algo_data = &card->i2c_bit;

		strncpy(card->led_chip.name, "peak_i2c",

		strscpy(card->led_chip.name, "peak_i2c",

			sizeof(card->led_chip.name));



		card->i2c_bit = peak_pciec_i2c_bit_ops;