can: m_can: Call the RAM init directly from m_can_chip_config

[ Upstream commit eaacfeaca7ad0804b9a6eff7afeba93a87db7638 ]

When we try to access the mcan message ram addresses during the probe,
hclk is gated by any other drivers or disabled, because of that probe
gets failed.

Move the mram init functionality to mcan chip config called by
m_can_start from mcan open function, by that time clocks are
enabled.

Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Vivek Yadav <vivek.2311@samsung.com>
Link: https://lore.kernel.org/all/20221207100632.96200-2-vivek.2311@samsung.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Stable-dep-of: 67727a17a6b3 ("can: tcan4x5x: Fix use of register error status mask")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index e5575d2..2de998b 100644 (file)
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1233,10 +1233,17 @@ static int m_can_set_bittiming(struct net_device *dev)
  * - setup bittiming
  * - configure timestamp generation
  */
-static void m_can_chip_config(struct net_device *dev)
+static int m_can_chip_config(struct net_device *dev)
 {
        struct m_can_classdev *cdev = netdev_priv(dev);
        u32 cccr, test;
+       int err;
+
+       err = m_can_init_ram(cdev);
+       if (err) {
+               dev_err(cdev->dev, "Message RAM configuration failed\n");
+               return err;
+       }
 
        m_can_config_endisable(cdev, true);
 
@@ -1360,18 +1367,25 @@ static void m_can_chip_config(struct net_device *dev)
 
        if (cdev->ops->init)
                cdev->ops->init(cdev);
+
+       return 0;
 }
 
-static void m_can_start(struct net_device *dev)
+static int m_can_start(struct net_device *dev)
 {
        struct m_can_classdev *cdev = netdev_priv(dev);
+       int ret;
 
        /* basic m_can configuration */
-       m_can_chip_config(dev);
+       ret = m_can_chip_config(dev);
+       if (ret)
+               return ret;
 
        cdev->can.state = CAN_STATE_ERROR_ACTIVE;
 
        m_can_enable_all_interrupts(cdev);
+
+       return 0;
 }
 
 static int m_can_set_mode(struct net_device *dev, enum can_mode mode)
@@ -1799,7 +1813,9 @@ static int m_can_open(struct net_device *dev)
        }
 
        /* start the m_can controller */
-       m_can_start(dev);
+       err = m_can_start(dev);
+       if (err)
+               goto exit_irq_fail;
 
        if (!cdev->is_peripheral)
                napi_enable(&cdev->napi);
@@ -2058,9 +2074,13 @@ int m_can_class_resume(struct device *dev)
                ret = m_can_clk_start(cdev);
                if (ret)
                        return ret;
+               ret  = m_can_start(ndev);
+               if (ret) {
+                       m_can_clk_stop(cdev);
+
+                       return ret;
+               }
 
-               m_can_init_ram(cdev);
-               m_can_start(ndev);
                netif_device_attach(ndev);
                netif_start_queue(ndev);
        }

diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
index eee47ba..de6d8e0 100644 (file)
--- a/drivers/net/can/m_can/m_can_platform.c
+++ b/drivers/net/can/m_can/m_can_platform.c
@@ -140,10 +140,6 @@ static int m_can_plat_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, mcan_class);
 
-       ret = m_can_init_ram(mcan_class);
-       if (ret)
-               goto probe_fail;
-
        pm_runtime_enable(mcan_class->dev);
        ret = m_can_class_register(mcan_class);
        if (ret)

diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c
index 1fec394..a77f4d4 100644 (file)
--- a/drivers/net/can/m_can/tcan4x5x-core.c
+++ b/drivers/net/can/m_can/tcan4x5x-core.c
@@ -229,11 +229,6 @@ static int tcan4x5x_init(struct m_can_classdev *cdev)
        if (ret)
                return ret;
 
-       /* Zero out the MCAN buffers */
-       ret = m_can_init_ram(cdev);
-       if (ret)
-               return ret;
-
        ret = regmap_update_bits(tcan4x5x->regmap, TCAN4X5X_CONFIG,
                                 TCAN4X5X_MODE_SEL_MASK, TCAN4X5X_MODE_NORMAL);
        if (ret)