Commit ce225298 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-5.12-20210316' of... 

Merge tag 'linux-can-fixes-for-5.12-20210316' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2021-03-16

this is a pull request of 11 patches for net/master.

The first patch is by Martin Willi and fixes the deletion of network
name spaces with physical CAN interfaces in them.

The next two patches are by me an fix the ISOTP protocol, to ensure
that unused flags in classical CAN frames are properly initialized to
zero.

Stephane Grosjean contributes a patch for the pcan_usb_fd driver,
which add MODULE_SUPPORTED_DEVICE lines for two supported devices.

Angelo Dureghello's patch for the flexcan driver fixes a potential div
by zero, if the bitrate is not set during driver probe.

Jimmy Assarsson's patch for the kvaser_pciefd disables bus load
reporting in the device, if it was previously enabled by the vendor's
out of tree drier. A patch for the kvaser_usb adds support for a new
device, by adding the appropriate USB product ID.

Tong Zhang contributes two patches for the c_can driver. First a
use-after-free in the c_can_pci driver is fixed, in the second patch
the runtime PM for the c_can_pci is fixed by moving the runtime PM
enable/disable from the core driver to the platform driver.

The last two patches are by Torin Cooper-Bennun for the m_can driver.
First a extraneous msg loss warning is removed then he fixes the
RX-path, which might be blocked by errors.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8a4452ca e98d9ee6

drivers/net/can/c_can/c_can.c

+1 −23
Original line number Diff line number Diff line
@@ -212,18 +212,6 @@ static const struct can_bittiming_const c_can_bittiming_const = { 
	.brp_inc = 1,

};



static inline void c_can_pm_runtime_enable(const struct c_can_priv *priv)

{

	if (priv->device)

		pm_runtime_enable(priv->device);

}



static inline void c_can_pm_runtime_disable(const struct c_can_priv *priv)

{

	if (priv->device)

		pm_runtime_disable(priv->device);

}



static inline void c_can_pm_runtime_get_sync(const struct c_can_priv *priv)

{

	if (priv->device)
@@ -1335,7 +1323,6 @@ static const struct net_device_ops c_can_netdev_ops = { 


int register_c_can_dev(struct net_device *dev)

{

	struct c_can_priv *priv = netdev_priv(dev);

	int err;



	/* Deactivate pins to prevent DRA7 DCAN IP from being
@@ -1345,28 +1332,19 @@ int register_c_can_dev(struct net_device *dev) 
	 */

	pinctrl_pm_select_sleep_state(dev->dev.parent);



	c_can_pm_runtime_enable(priv);



	dev->flags |= IFF_ECHO;	/* we support local echo */

	dev->netdev_ops = &c_can_netdev_ops;



	err = register_candev(dev);

	if (err)

		c_can_pm_runtime_disable(priv);

	else

	if (!err)

		devm_can_led_init(dev);



	return err;

}

EXPORT_SYMBOL_GPL(register_c_can_dev);



void unregister_c_can_dev(struct net_device *dev)

{

	struct c_can_priv *priv = netdev_priv(dev);



	unregister_candev(dev);



	c_can_pm_runtime_disable(priv);

}

EXPORT_SYMBOL_GPL(unregister_c_can_dev);

drivers/net/can/c_can/c_can_pci.c

+2 −1
Original line number Diff line number Diff line
@@ -239,12 +239,13 @@ static void c_can_pci_remove(struct pci_dev *pdev) 
{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct c_can_priv *priv = netdev_priv(dev);

	void __iomem *addr = priv->base;



	unregister_c_can_dev(dev);



	free_c_can_dev(dev);



	pci_iounmap(pdev, priv->base);

	pci_iounmap(pdev, addr);

	pci_disable_msi(pdev);

	pci_clear_master(pdev);

	pci_release_regions(pdev);

drivers/net/can/c_can/c_can_platform.c

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/list.h>

#include <linux/io.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/clk.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -386,6 +387,7 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, dev);

	SET_NETDEV_DEV(dev, &pdev->dev);



	pm_runtime_enable(priv->device);

	ret = register_c_can_dev(dev);

	if (ret) {

		dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
@@ -398,6 +400,7 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	return 0;



exit_free_device:

	pm_runtime_disable(priv->device);

	free_c_can_dev(dev);

exit:

	dev_err(&pdev->dev, "probe failed\n");
@@ -408,9 +411,10 @@ static int c_can_plat_probe(struct platform_device *pdev) 
static int c_can_plat_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct c_can_priv *priv = netdev_priv(dev);



	unregister_c_can_dev(dev);



	pm_runtime_disable(priv->device);

	free_c_can_dev(dev);



	return 0;

drivers/net/can/dev/netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ static void can_dellink(struct net_device *dev, struct list_head *head) 


struct rtnl_link_ops can_link_ops __read_mostly = {

	.kind		= "can",

	.netns_refund	= true,

	.maxtype	= IFLA_CAN_MAX,

	.policy		= can_policy,

	.setup		= can_setup,

drivers/net/can/flexcan.c

+7 −1
Original line number Diff line number Diff line
@@ -697,9 +697,15 @@ static int flexcan_chip_disable(struct flexcan_priv *priv) 
static int flexcan_chip_freeze(struct flexcan_priv *priv)

{

	struct flexcan_regs __iomem *regs = priv->regs;

	unsigned int timeout = 1000 * 1000 * 10 / priv->can.bittiming.bitrate;

	unsigned int timeout;

	u32 bitrate = priv->can.bittiming.bitrate;

	u32 reg;



	if (bitrate)

		timeout = 1000 * 1000 * 10 / bitrate;

	else

		timeout = FLEXCAN_TIMEOUT_US / 10;



	reg = priv->read(&regs->mcr);

	reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT;

	priv->write(reg, &regs->mcr);