can: rcar_canfd: Extract rcar_canfd_global_{,de}init()

Extract the code to (de)initialize global state into separate functions,
for future reuse.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://patch.msgid.link/20251124102837.106973-5-biju.das.jz@bp.renesas.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 3f71adce6f560ff65c2b393da788c6184dcfc63b..f18efaf8106162c382c1339f0a34a249c55c80bb 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1961,21 +1961,120 @@ static void rcar_canfd_channel_remove(struct rcar_canfd_global *gpriv, u32 ch)
        }
 }
 
+static int rcar_canfd_global_init(struct rcar_canfd_global *gpriv)
+{
+       struct device *dev = &gpriv->pdev->dev;
+       u32 rule_entry = 0;
+       u32 ch, sts;
+       int err;
+
+       err = reset_control_reset(gpriv->rstc1);
+       if (err)
+               return err;
+
+       err = reset_control_reset(gpriv->rstc2);
+       if (err)
+               goto fail_reset1;
+
+       /* Enable peripheral clock for register access */
+       err = clk_prepare_enable(gpriv->clkp);
+       if (err) {
+               dev_err(dev, "failed to enable peripheral clock: %pe\n",
+                       ERR_PTR(err));
+               goto fail_reset2;
+       }
+
+       /* Enable RAM clock */
+       err = clk_prepare_enable(gpriv->clk_ram);
+       if (err) {
+               dev_err(dev,
+                       "failed to enable RAM clock, error %d\n", err);
+               goto fail_clk;
+       }
+
+       err = rcar_canfd_reset_controller(gpriv);
+       if (err) {
+               dev_err(dev, "reset controller failed: %pe\n", ERR_PTR(err));
+               goto fail_ram_clk;
+       }
+
+       /* Controller in Global reset & Channel reset mode */
+       rcar_canfd_configure_controller(gpriv);
+
+       /* Configure per channel attributes */
+       for_each_set_bit(ch, &gpriv->channels_mask, gpriv->info->max_channels) {
+               /* Configure Channel's Rx fifo */
+               rcar_canfd_configure_rx(gpriv, ch);
+
+               /* Configure Channel's Tx (Common) fifo */
+               rcar_canfd_configure_tx(gpriv, ch);
+
+               /* Configure receive rules */
+               rcar_canfd_configure_afl_rules(gpriv, ch, rule_entry);
+               rule_entry += RCANFD_CHANNEL_NUMRULES;
+       }
+
+       /* Configure common interrupts */
+       rcar_canfd_enable_global_interrupts(gpriv);
+
+       /* Start Global operation mode */
+       rcar_canfd_update_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GMDC_MASK,
+                             RCANFD_GCTR_GMDC_GOPM);
+
+       /* Verify mode change */
+       err = readl_poll_timeout((gpriv->base + RCANFD_GSTS), sts,
+                                !(sts & RCANFD_GSTS_GNOPM), 2, 500000);
+       if (err) {
+               dev_err(dev, "global operational mode failed\n");
+               goto fail_mode;
+       }
+
+       return 0;
+
+fail_mode:
+       rcar_canfd_disable_global_interrupts(gpriv);
+fail_ram_clk:
+       clk_disable_unprepare(gpriv->clk_ram);
+fail_clk:
+       clk_disable_unprepare(gpriv->clkp);
+fail_reset2:
+       reset_control_assert(gpriv->rstc2);
+fail_reset1:
+       reset_control_assert(gpriv->rstc1);
+       return err;
+}
+
+static void rcar_canfd_global_deinit(struct rcar_canfd_global *gpriv, bool full)
+{
+       rcar_canfd_disable_global_interrupts(gpriv);
+
+       if (full) {
+               rcar_canfd_reset_controller(gpriv);
+
+               /* Enter global sleep mode */
+               rcar_canfd_set_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GSLPR);
+       }
+
+       clk_disable_unprepare(gpriv->clk_ram);
+       clk_disable_unprepare(gpriv->clkp);
+       reset_control_assert(gpriv->rstc2);
+       reset_control_assert(gpriv->rstc1);
+}
+
 static int rcar_canfd_probe(struct platform_device *pdev)
 {
        struct phy *transceivers[RCANFD_NUM_CHANNELS] = { NULL, };
        const struct rcar_canfd_hw_info *info;
        struct device *dev = &pdev->dev;
        void __iomem *addr;
-       u32 sts, ch, fcan_freq;
        struct rcar_canfd_global *gpriv;
        struct device_node *of_child;
        unsigned long channels_mask = 0;
        int err, ch_irq, g_irq;
        int g_err_irq, g_recc_irq;
-       u32 rule_entry = 0;
        bool fdmode = true;                     /* CAN FD only mode - default */
        char name[9] = "channelX";
+       u32 ch, fcan_freq;
        int i;
 
        info = of_device_get_match_data(dev);
@@ -2117,67 +2216,9 @@ static int rcar_canfd_probe(struct platform_device *pdev)
                }
        }
 
-       err = reset_control_reset(gpriv->rstc1);
+       err = rcar_canfd_global_init(gpriv);
        if (err)
-               goto fail_dev;
-       err = reset_control_reset(gpriv->rstc2);
-       if (err) {
-               reset_control_assert(gpriv->rstc1);
-               goto fail_dev;
-       }
-
-       /* Enable peripheral clock for register access */
-       err = clk_prepare_enable(gpriv->clkp);
-       if (err) {
-               dev_err(dev, "failed to enable peripheral clock: %pe\n",
-                       ERR_PTR(err));
-               goto fail_reset;
-       }
-
-       /* Enable RAM clock  */
-       err = clk_prepare_enable(gpriv->clk_ram);
-       if (err) {
-               dev_err(dev, "failed to enable RAM clock: %pe\n",
-                       ERR_PTR(err));
-               goto fail_clk;
-       }
-
-       err = rcar_canfd_reset_controller(gpriv);
-       if (err) {
-               dev_err(dev, "reset controller failed: %pe\n", ERR_PTR(err));
-               goto fail_ram_clk;
-       }
-
-       /* Controller in Global reset & Channel reset mode */
-       rcar_canfd_configure_controller(gpriv);
-
-       /* Configure per channel attributes */
-       for_each_set_bit(ch, &gpriv->channels_mask, info->max_channels) {
-               /* Configure Channel's Rx fifo */
-               rcar_canfd_configure_rx(gpriv, ch);
-
-               /* Configure Channel's Tx (Common) fifo */
-               rcar_canfd_configure_tx(gpriv, ch);
-
-               /* Configure receive rules */
-               rcar_canfd_configure_afl_rules(gpriv, ch, rule_entry);
-               rule_entry += RCANFD_CHANNEL_NUMRULES;
-       }
-
-       /* Configure common interrupts */
-       rcar_canfd_enable_global_interrupts(gpriv);
-
-       /* Start Global operation mode */
-       rcar_canfd_update_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GMDC_MASK,
-                             RCANFD_GCTR_GMDC_GOPM);
-
-       /* Verify mode change */
-       err = readl_poll_timeout((gpriv->base + RCANFD_GSTS), sts,
-                                !(sts & RCANFD_GSTS_GNOPM), 2, 500000);
-       if (err) {
-               dev_err(dev, "global operational mode failed\n");
                goto fail_mode;
-       }
 
        for_each_set_bit(ch, &gpriv->channels_mask, info->max_channels) {
                err = rcar_canfd_channel_probe(gpriv, ch, fcan_freq,
@@ -2196,14 +2237,7 @@ fail_channel:
        for_each_set_bit(ch, &gpriv->channels_mask, info->max_channels)
                rcar_canfd_channel_remove(gpriv, ch);
 fail_mode:
-       rcar_canfd_disable_global_interrupts(gpriv);
-fail_ram_clk:
-       clk_disable_unprepare(gpriv->clk_ram);
-fail_clk:
-       clk_disable_unprepare(gpriv->clkp);
-fail_reset:
-       reset_control_assert(gpriv->rstc2);
-       reset_control_assert(gpriv->rstc1);
+       rcar_canfd_global_deinit(gpriv, false);
 fail_dev:
        return err;
 }
@@ -2218,15 +2252,7 @@ static void rcar_canfd_remove(struct platform_device *pdev)
                rcar_canfd_channel_remove(gpriv, ch);
        }
 
-       rcar_canfd_disable_global_interrupts(gpriv);
-       rcar_canfd_reset_controller(gpriv);
-
-       /* Enter global sleep mode */
-       rcar_canfd_set_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GSLPR);
-       clk_disable_unprepare(gpriv->clk_ram);
-       clk_disable_unprepare(gpriv->clkp);
-       reset_control_assert(gpriv->rstc2);
-       reset_control_assert(gpriv->rstc1);
+       rcar_canfd_global_deinit(gpriv, true);
 }
 
 static int __maybe_unused rcar_canfd_suspend(struct device *dev)