2018-08-22 05:02:14 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2015-10-16 16:41:19 +07:00
|
|
|
/*
|
|
|
|
* Renesas Clock Pulse Generator / Module Standby and Software Reset
|
|
|
|
*
|
|
|
|
* Copyright (C) 2015 Glider bvba
|
|
|
|
*
|
|
|
|
* Based on clk-mstp.c, clk-rcar-gen2.c, and clk-rcar-gen3.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 2013 Ideas On Board SPRL
|
|
|
|
* Copyright (C) 2015 Renesas Electronics Corp.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/clk.h>
|
|
|
|
#include <linux/clk-provider.h>
|
2016-03-04 23:03:46 +07:00
|
|
|
#include <linux/clk/renesas.h>
|
2017-01-20 17:03:03 +07:00
|
|
|
#include <linux/delay.h>
|
2015-10-16 16:41:19 +07:00
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/init.h>
|
2019-04-19 05:20:22 +07:00
|
|
|
#include <linux/io.h>
|
2015-10-16 16:41:19 +07:00
|
|
|
#include <linux/mod_devicetable.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/of_address.h>
|
|
|
|
#include <linux/of_device.h>
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <linux/pm_clock.h>
|
|
|
|
#include <linux/pm_domain.h>
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
#include <linux/psci.h>
|
2017-01-20 17:03:03 +07:00
|
|
|
#include <linux/reset-controller.h>
|
2015-10-16 16:41:19 +07:00
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
|
|
#include <dt-bindings/clock/renesas-cpg-mssr.h>
|
|
|
|
|
|
|
|
#include "renesas-cpg-mssr.h"
|
|
|
|
#include "clk-div6.h"
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
#define WARN_DEBUG(x) WARN_ON(x)
|
2016-10-03 18:03:38 +07:00
|
|
|
#else
|
|
|
|
#define WARN_DEBUG(x) do { } while (0)
|
2015-10-16 16:41:19 +07:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Module Standby and Software Reset register offets.
|
|
|
|
*
|
|
|
|
* If the registers exist, these are valid for SH-Mobile, R-Mobile,
|
2017-01-20 16:53:11 +07:00
|
|
|
* R-Car Gen2, R-Car Gen3, and RZ/G1.
|
2015-10-16 16:41:19 +07:00
|
|
|
* These are NOT valid for R-Car Gen1 and RZ/A1!
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Module Stop Status Register offsets
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const u16 mstpsr[] = {
|
|
|
|
0x030, 0x038, 0x040, 0x048, 0x04C, 0x03C, 0x1C0, 0x1C4,
|
|
|
|
0x9A0, 0x9A4, 0x9A8, 0x9AC,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MSTPSR(i) mstpsr[i]
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* System Module Stop Control Register offsets
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const u16 smstpcr[] = {
|
|
|
|
0x130, 0x134, 0x138, 0x13C, 0x140, 0x144, 0x148, 0x14C,
|
|
|
|
0x990, 0x994, 0x998, 0x99C,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define SMSTPCR(i) smstpcr[i]
|
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
/*
|
|
|
|
* Standby Control Register offsets (RZ/A)
|
|
|
|
* Base address is FRQCR register
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const u16 stbcr[] = {
|
|
|
|
0xFFFF/*dummy*/, 0x010, 0x014, 0x410, 0x414, 0x418, 0x41C, 0x420,
|
|
|
|
0x424, 0x428, 0x42C,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define STBCR(i) stbcr[i]
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Software Reset Register offsets
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const u16 srcr[] = {
|
|
|
|
0x0A0, 0x0A8, 0x0B0, 0x0B8, 0x0BC, 0x0C4, 0x1C8, 0x1CC,
|
|
|
|
0x920, 0x924, 0x928, 0x92C,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define SRCR(i) srcr[i]
|
|
|
|
|
|
|
|
|
|
|
|
/* Realtime Module Stop Control Register offsets */
|
|
|
|
#define RMSTPCR(i) (smstpcr[i] - 0x20)
|
|
|
|
|
|
|
|
/* Modem Module Stop Control Register offsets (r8a73a4) */
|
|
|
|
#define MMSTPCR(i) (smstpcr[i] + 0x20)
|
|
|
|
|
|
|
|
/* Software Reset Clearing Register offsets */
|
|
|
|
#define SRSTCLR(i) (0x940 + (i) * 4)
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Clock Pulse Generator / Module Standby and Software Reset Private Data
|
|
|
|
*
|
2017-01-20 17:03:03 +07:00
|
|
|
* @rcdev: Optional reset controller entity
|
2015-10-16 16:41:19 +07:00
|
|
|
* @dev: CPG/MSSR device
|
|
|
|
* @base: CPG/MSSR register block base address
|
2017-01-20 16:58:11 +07:00
|
|
|
* @rmw_lock: protects RMW register accesses
|
2019-06-12 22:19:12 +07:00
|
|
|
* @np: Device node in DT for this CPG/MSSR module
|
2015-10-16 16:41:19 +07:00
|
|
|
* @num_core_clks: Number of Core Clocks in clks[]
|
|
|
|
* @num_mod_clks: Number of Module Clocks in clks[]
|
|
|
|
* @last_dt_core_clk: ID of the last Core Clock exported to DT
|
2019-06-12 22:19:12 +07:00
|
|
|
* @stbyctrl: This device has Standby Control Registers
|
2017-06-22 03:24:15 +07:00
|
|
|
* @notifiers: Notifier chain to save/restore clock state for system resume
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
* @smstpcr_saved[].mask: Mask of SMSTPCR[] bits under our control
|
|
|
|
* @smstpcr_saved[].val: Saved values of SMSTPCR[]
|
2019-06-12 22:27:56 +07:00
|
|
|
* @clks: Array containing all Core and Module Clocks
|
2015-10-16 16:41:19 +07:00
|
|
|
*/
|
|
|
|
struct cpg_mssr_priv {
|
2017-01-20 17:03:03 +07:00
|
|
|
#ifdef CONFIG_RESET_CONTROLLER
|
|
|
|
struct reset_controller_dev rcdev;
|
|
|
|
#endif
|
2015-10-16 16:41:19 +07:00
|
|
|
struct device *dev;
|
|
|
|
void __iomem *base;
|
2017-01-20 16:58:11 +07:00
|
|
|
spinlock_t rmw_lock;
|
2018-09-24 23:49:35 +07:00
|
|
|
struct device_node *np;
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
unsigned int num_core_clks;
|
|
|
|
unsigned int num_mod_clks;
|
|
|
|
unsigned int last_dt_core_clk;
|
2018-09-07 23:58:49 +07:00
|
|
|
bool stbyctrl;
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
|
2017-06-22 03:24:15 +07:00
|
|
|
struct raw_notifier_head notifiers;
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
struct {
|
|
|
|
u32 mask;
|
|
|
|
u32 val;
|
|
|
|
} smstpcr_saved[ARRAY_SIZE(smstpcr)];
|
2019-06-12 22:27:56 +07:00
|
|
|
|
|
|
|
struct clk *clks[];
|
2015-10-16 16:41:19 +07:00
|
|
|
};
|
|
|
|
|
2018-09-24 23:49:35 +07:00
|
|
|
static struct cpg_mssr_priv *cpg_mssr_priv;
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
/**
|
|
|
|
* struct mstp_clock - MSTP gating clock
|
|
|
|
* @hw: handle between common and hardware-specific interfaces
|
|
|
|
* @index: MSTP clock number
|
|
|
|
* @priv: CPG/MSSR private data
|
|
|
|
*/
|
|
|
|
struct mstp_clock {
|
|
|
|
struct clk_hw hw;
|
|
|
|
u32 index;
|
|
|
|
struct cpg_mssr_priv *priv;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define to_mstp_clock(_hw) container_of(_hw, struct mstp_clock, hw)
|
|
|
|
|
|
|
|
static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
|
|
|
|
{
|
|
|
|
struct mstp_clock *clock = to_mstp_clock(hw);
|
|
|
|
struct cpg_mssr_priv *priv = clock->priv;
|
|
|
|
unsigned int reg = clock->index / 32;
|
|
|
|
unsigned int bit = clock->index % 32;
|
|
|
|
struct device *dev = priv->dev;
|
|
|
|
u32 bitmask = BIT(bit);
|
|
|
|
unsigned long flags;
|
|
|
|
unsigned int i;
|
|
|
|
u32 value;
|
|
|
|
|
|
|
|
dev_dbg(dev, "MSTP %u%02u/%pC %s\n", reg, bit, hw->clk,
|
|
|
|
enable ? "ON" : "OFF");
|
2017-01-20 16:58:11 +07:00
|
|
|
spin_lock_irqsave(&priv->rmw_lock, flags);
|
2015-10-16 16:41:19 +07:00
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
if (priv->stbyctrl) {
|
|
|
|
value = readb(priv->base + STBCR(reg));
|
|
|
|
if (enable)
|
|
|
|
value &= ~bitmask;
|
|
|
|
else
|
|
|
|
value |= bitmask;
|
|
|
|
writeb(value, priv->base + STBCR(reg));
|
|
|
|
|
|
|
|
/* dummy read to ensure write has completed */
|
|
|
|
readb(priv->base + STBCR(reg));
|
|
|
|
barrier_data(priv->base + STBCR(reg));
|
|
|
|
} else {
|
|
|
|
value = readl(priv->base + SMSTPCR(reg));
|
|
|
|
if (enable)
|
|
|
|
value &= ~bitmask;
|
|
|
|
else
|
|
|
|
value |= bitmask;
|
|
|
|
writel(value, priv->base + SMSTPCR(reg));
|
|
|
|
}
|
2015-10-16 16:41:19 +07:00
|
|
|
|
2017-01-20 16:58:11 +07:00
|
|
|
spin_unlock_irqrestore(&priv->rmw_lock, flags);
|
2015-10-16 16:41:19 +07:00
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
if (!enable || priv->stbyctrl)
|
2015-10-16 16:41:19 +07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (i = 1000; i > 0; --i) {
|
2016-09-21 21:31:41 +07:00
|
|
|
if (!(readl(priv->base + MSTPSR(reg)) & bitmask))
|
2015-10-16 16:41:19 +07:00
|
|
|
break;
|
|
|
|
cpu_relax();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!i) {
|
|
|
|
dev_err(dev, "Failed to enable SMSTP %p[%d]\n",
|
|
|
|
priv->base + SMSTPCR(reg), bit);
|
|
|
|
return -ETIMEDOUT;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mstp_clock_enable(struct clk_hw *hw)
|
|
|
|
{
|
|
|
|
return cpg_mstp_clock_endisable(hw, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cpg_mstp_clock_disable(struct clk_hw *hw)
|
|
|
|
{
|
|
|
|
cpg_mstp_clock_endisable(hw, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)
|
|
|
|
{
|
|
|
|
struct mstp_clock *clock = to_mstp_clock(hw);
|
|
|
|
struct cpg_mssr_priv *priv = clock->priv;
|
|
|
|
u32 value;
|
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
if (priv->stbyctrl)
|
|
|
|
value = readb(priv->base + STBCR(clock->index / 32));
|
|
|
|
else
|
|
|
|
value = readl(priv->base + MSTPSR(clock->index / 32));
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
return !(value & BIT(clock->index % 32));
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct clk_ops cpg_mstp_clock_ops = {
|
|
|
|
.enable = cpg_mstp_clock_enable,
|
|
|
|
.disable = cpg_mstp_clock_disable,
|
|
|
|
.is_enabled = cpg_mstp_clock_is_enabled,
|
|
|
|
};
|
|
|
|
|
|
|
|
static
|
|
|
|
struct clk *cpg_mssr_clk_src_twocell_get(struct of_phandle_args *clkspec,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
unsigned int clkidx = clkspec->args[1];
|
|
|
|
struct cpg_mssr_priv *priv = data;
|
|
|
|
struct device *dev = priv->dev;
|
|
|
|
unsigned int idx;
|
|
|
|
const char *type;
|
|
|
|
struct clk *clk;
|
2018-09-07 23:58:49 +07:00
|
|
|
int range_check;
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
switch (clkspec->args[0]) {
|
|
|
|
case CPG_CORE:
|
|
|
|
type = "core";
|
|
|
|
if (clkidx > priv->last_dt_core_clk) {
|
|
|
|
dev_err(dev, "Invalid %s clock index %u\n", type,
|
|
|
|
clkidx);
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
}
|
|
|
|
clk = priv->clks[clkidx];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CPG_MOD:
|
|
|
|
type = "module";
|
2018-09-07 23:58:49 +07:00
|
|
|
if (priv->stbyctrl) {
|
|
|
|
idx = MOD_CLK_PACK_10(clkidx);
|
|
|
|
range_check = 7 - (clkidx % 10);
|
|
|
|
} else {
|
|
|
|
idx = MOD_CLK_PACK(clkidx);
|
|
|
|
range_check = 31 - (clkidx % 100);
|
|
|
|
}
|
|
|
|
if (range_check < 0 || idx >= priv->num_mod_clks) {
|
2015-10-16 16:41:19 +07:00
|
|
|
dev_err(dev, "Invalid %s clock index %u\n", type,
|
|
|
|
clkidx);
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
}
|
|
|
|
clk = priv->clks[priv->num_core_clks + idx];
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
dev_err(dev, "Invalid CPG clock type %u\n", clkspec->args[0]);
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IS_ERR(clk))
|
|
|
|
dev_err(dev, "Cannot get %s clock %u: %ld", type, clkidx,
|
|
|
|
PTR_ERR(clk));
|
|
|
|
else
|
2018-06-01 16:28:19 +07:00
|
|
|
dev_dbg(dev, "clock (%u, %u) is %pC at %lu Hz\n",
|
|
|
|
clkspec->args[0], clkspec->args[1], clk,
|
|
|
|
clk_get_rate(clk));
|
2015-10-16 16:41:19 +07:00
|
|
|
return clk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
|
|
|
|
const struct cpg_mssr_info *info,
|
|
|
|
struct cpg_mssr_priv *priv)
|
|
|
|
{
|
2017-05-17 20:43:56 +07:00
|
|
|
struct clk *clk = ERR_PTR(-ENOTSUPP), *parent;
|
2015-10-16 16:41:19 +07:00
|
|
|
struct device *dev = priv->dev;
|
2016-03-30 21:58:18 +07:00
|
|
|
unsigned int id = core->id, div = core->div;
|
2015-10-16 16:41:19 +07:00
|
|
|
const char *parent_name;
|
|
|
|
|
|
|
|
WARN_DEBUG(id >= priv->num_core_clks);
|
|
|
|
WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT);
|
|
|
|
|
2016-09-29 19:47:58 +07:00
|
|
|
if (!core->name) {
|
|
|
|
/* Skip NULLified clock */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
switch (core->type) {
|
|
|
|
case CLK_TYPE_IN:
|
2018-09-24 23:49:35 +07:00
|
|
|
clk = of_clk_get_by_name(priv->np, core->name);
|
2015-10-16 16:41:19 +07:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CLK_TYPE_FF:
|
|
|
|
case CLK_TYPE_DIV6P1:
|
2016-03-30 21:58:18 +07:00
|
|
|
case CLK_TYPE_DIV6_RO:
|
2015-10-16 16:41:19 +07:00
|
|
|
WARN_DEBUG(core->parent >= priv->num_core_clks);
|
|
|
|
parent = priv->clks[core->parent];
|
|
|
|
if (IS_ERR(parent)) {
|
|
|
|
clk = parent;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
parent_name = __clk_get_name(parent);
|
2016-03-30 21:58:18 +07:00
|
|
|
|
|
|
|
if (core->type == CLK_TYPE_DIV6_RO)
|
|
|
|
/* Multiply with the DIV6 register value */
|
|
|
|
div *= (readl(priv->base + core->offset) & 0x3f) + 1;
|
|
|
|
|
|
|
|
if (core->type == CLK_TYPE_DIV6P1) {
|
2015-10-16 16:41:19 +07:00
|
|
|
clk = cpg_div6_register(core->name, 1, &parent_name,
|
2017-06-22 03:34:33 +07:00
|
|
|
priv->base + core->offset,
|
|
|
|
&priv->notifiers);
|
2016-03-30 21:58:18 +07:00
|
|
|
} else {
|
|
|
|
clk = clk_register_fixed_factor(NULL, core->name,
|
|
|
|
parent_name, 0,
|
|
|
|
core->mult, div);
|
2015-10-16 16:41:19 +07:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2018-07-11 18:47:28 +07:00
|
|
|
case CLK_TYPE_FR:
|
|
|
|
clk = clk_register_fixed_rate(NULL, core->name, NULL, 0,
|
|
|
|
core->mult);
|
|
|
|
break;
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
default:
|
|
|
|
if (info->cpg_clk_register)
|
|
|
|
clk = info->cpg_clk_register(dev, core, info,
|
2017-06-22 03:24:15 +07:00
|
|
|
priv->clks, priv->base,
|
|
|
|
&priv->notifiers);
|
2015-10-16 16:41:19 +07:00
|
|
|
else
|
|
|
|
dev_err(dev, "%s has unsupported core clock type %u\n",
|
|
|
|
core->name, core->type);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IS_ERR_OR_NULL(clk))
|
|
|
|
goto fail;
|
|
|
|
|
2018-06-01 16:28:19 +07:00
|
|
|
dev_dbg(dev, "Core clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
|
2015-10-16 16:41:19 +07:00
|
|
|
priv->clks[id] = clk;
|
|
|
|
return;
|
|
|
|
|
|
|
|
fail:
|
2016-10-18 20:59:13 +07:00
|
|
|
dev_err(dev, "Failed to register %s clock %s: %ld\n", "core",
|
2015-10-16 16:41:19 +07:00
|
|
|
core->name, PTR_ERR(clk));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
|
|
|
|
const struct cpg_mssr_info *info,
|
|
|
|
struct cpg_mssr_priv *priv)
|
|
|
|
{
|
|
|
|
struct mstp_clock *clock = NULL;
|
|
|
|
struct device *dev = priv->dev;
|
|
|
|
unsigned int id = mod->id;
|
|
|
|
struct clk_init_data init;
|
|
|
|
struct clk *parent, *clk;
|
|
|
|
const char *parent_name;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
WARN_DEBUG(id < priv->num_core_clks);
|
|
|
|
WARN_DEBUG(id >= priv->num_core_clks + priv->num_mod_clks);
|
|
|
|
WARN_DEBUG(mod->parent >= priv->num_core_clks + priv->num_mod_clks);
|
|
|
|
WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT);
|
|
|
|
|
2016-09-29 19:47:58 +07:00
|
|
|
if (!mod->name) {
|
|
|
|
/* Skip NULLified clock */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
parent = priv->clks[mod->parent];
|
|
|
|
if (IS_ERR(parent)) {
|
|
|
|
clk = parent;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
clock = kzalloc(sizeof(*clock), GFP_KERNEL);
|
|
|
|
if (!clock) {
|
|
|
|
clk = ERR_PTR(-ENOMEM);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
init.name = mod->name;
|
|
|
|
init.ops = &cpg_mstp_clock_ops;
|
2018-12-01 02:05:35 +07:00
|
|
|
init.flags = CLK_SET_RATE_PARENT;
|
2015-10-16 16:41:19 +07:00
|
|
|
for (i = 0; i < info->num_crit_mod_clks; i++)
|
|
|
|
if (id == info->crit_mod_clks[i]) {
|
2017-01-16 22:15:50 +07:00
|
|
|
dev_dbg(dev, "MSTP %s setting CLK_IS_CRITICAL\n",
|
2015-10-16 16:41:19 +07:00
|
|
|
mod->name);
|
2017-01-16 22:15:50 +07:00
|
|
|
init.flags |= CLK_IS_CRITICAL;
|
2015-10-16 16:41:19 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
parent_name = __clk_get_name(parent);
|
|
|
|
init.parent_names = &parent_name;
|
|
|
|
init.num_parents = 1;
|
|
|
|
|
|
|
|
clock->index = id - priv->num_core_clks;
|
|
|
|
clock->priv = priv;
|
|
|
|
clock->hw.init = &init;
|
|
|
|
|
|
|
|
clk = clk_register(NULL, &clock->hw);
|
|
|
|
if (IS_ERR(clk))
|
|
|
|
goto fail;
|
|
|
|
|
2018-06-01 16:28:19 +07:00
|
|
|
dev_dbg(dev, "Module clock %pC at %lu Hz\n", clk, clk_get_rate(clk));
|
2015-10-16 16:41:19 +07:00
|
|
|
priv->clks[id] = clk;
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
priv->smstpcr_saved[clock->index / 32].mask |= BIT(clock->index % 32);
|
2015-10-16 16:41:19 +07:00
|
|
|
return;
|
|
|
|
|
|
|
|
fail:
|
2016-10-18 20:59:13 +07:00
|
|
|
dev_err(dev, "Failed to register %s clock %s: %ld\n", "module",
|
2015-10-16 16:41:19 +07:00
|
|
|
mod->name, PTR_ERR(clk));
|
|
|
|
kfree(clock);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cpg_mssr_clk_domain {
|
|
|
|
struct generic_pm_domain genpd;
|
|
|
|
unsigned int num_core_pm_clks;
|
2019-06-17 18:58:58 +07:00
|
|
|
unsigned int core_pm_clks[];
|
2015-10-16 16:41:19 +07:00
|
|
|
};
|
|
|
|
|
2016-03-04 23:03:46 +07:00
|
|
|
static struct cpg_mssr_clk_domain *cpg_mssr_clk_domain;
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
static bool cpg_mssr_is_pm_clk(const struct of_phandle_args *clkspec,
|
|
|
|
struct cpg_mssr_clk_domain *pd)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
2019-05-27 15:55:26 +07:00
|
|
|
if (clkspec->np != pd->genpd.dev.of_node || clkspec->args_count != 2)
|
2015-10-16 16:41:19 +07:00
|
|
|
return false;
|
|
|
|
|
|
|
|
switch (clkspec->args[0]) {
|
|
|
|
case CPG_CORE:
|
|
|
|
for (i = 0; i < pd->num_core_pm_clks; i++)
|
|
|
|
if (clkspec->args[1] == pd->core_pm_clks[i])
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
case CPG_MOD:
|
|
|
|
return true;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-04 23:03:46 +07:00
|
|
|
int cpg_mssr_attach_dev(struct generic_pm_domain *unused, struct device *dev)
|
2015-10-16 16:41:19 +07:00
|
|
|
{
|
2016-03-04 23:03:46 +07:00
|
|
|
struct cpg_mssr_clk_domain *pd = cpg_mssr_clk_domain;
|
2015-10-16 16:41:19 +07:00
|
|
|
struct device_node *np = dev->of_node;
|
|
|
|
struct of_phandle_args clkspec;
|
|
|
|
struct clk *clk;
|
|
|
|
int i = 0;
|
|
|
|
int error;
|
|
|
|
|
2016-03-04 23:03:46 +07:00
|
|
|
if (!pd) {
|
|
|
|
dev_dbg(dev, "CPG/MSSR clock domain not yet available\n");
|
|
|
|
return -EPROBE_DEFER;
|
|
|
|
}
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
while (!of_parse_phandle_with_args(np, "clocks", "#clock-cells", i,
|
|
|
|
&clkspec)) {
|
|
|
|
if (cpg_mssr_is_pm_clk(&clkspec, pd))
|
|
|
|
goto found;
|
|
|
|
|
|
|
|
of_node_put(clkspec.np);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
found:
|
|
|
|
clk = of_clk_get_from_provider(&clkspec);
|
|
|
|
of_node_put(clkspec.np);
|
|
|
|
|
|
|
|
if (IS_ERR(clk))
|
|
|
|
return PTR_ERR(clk);
|
|
|
|
|
|
|
|
error = pm_clk_create(dev);
|
2019-05-27 16:26:42 +07:00
|
|
|
if (error)
|
2015-10-16 16:41:19 +07:00
|
|
|
goto fail_put;
|
|
|
|
|
|
|
|
error = pm_clk_add_clk(dev, clk);
|
2019-05-27 16:26:42 +07:00
|
|
|
if (error)
|
2015-10-16 16:41:19 +07:00
|
|
|
goto fail_destroy;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail_destroy:
|
|
|
|
pm_clk_destroy(dev);
|
|
|
|
fail_put:
|
|
|
|
clk_put(clk);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2016-03-04 23:03:46 +07:00
|
|
|
void cpg_mssr_detach_dev(struct generic_pm_domain *unused, struct device *dev)
|
2015-10-16 16:41:19 +07:00
|
|
|
{
|
2017-02-09 01:08:44 +07:00
|
|
|
if (!pm_clk_no_clocks(dev))
|
2015-10-16 16:41:19 +07:00
|
|
|
pm_clk_destroy(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init cpg_mssr_add_clk_domain(struct device *dev,
|
|
|
|
const unsigned int *core_pm_clks,
|
|
|
|
unsigned int num_core_pm_clks)
|
|
|
|
{
|
|
|
|
struct device_node *np = dev->of_node;
|
|
|
|
struct generic_pm_domain *genpd;
|
|
|
|
struct cpg_mssr_clk_domain *pd;
|
|
|
|
size_t pm_size = num_core_pm_clks * sizeof(core_pm_clks[0]);
|
|
|
|
|
|
|
|
pd = devm_kzalloc(dev, sizeof(*pd) + pm_size, GFP_KERNEL);
|
|
|
|
if (!pd)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
pd->num_core_pm_clks = num_core_pm_clks;
|
|
|
|
memcpy(pd->core_pm_clks, core_pm_clks, pm_size);
|
|
|
|
|
|
|
|
genpd = &pd->genpd;
|
|
|
|
genpd->name = np->name;
|
2019-08-09 20:44:51 +07:00
|
|
|
genpd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ALWAYS_ON |
|
|
|
|
GENPD_FLAG_ACTIVE_WAKEUP;
|
2015-10-16 16:41:19 +07:00
|
|
|
genpd->attach_dev = cpg_mssr_attach_dev;
|
|
|
|
genpd->detach_dev = cpg_mssr_detach_dev;
|
2016-04-22 19:59:10 +07:00
|
|
|
pm_genpd_init(genpd, &pm_domain_always_on_gov, false);
|
2016-03-04 23:03:46 +07:00
|
|
|
cpg_mssr_clk_domain = pd;
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
of_genpd_add_provider_simple(np, genpd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-20 17:03:03 +07:00
|
|
|
#ifdef CONFIG_RESET_CONTROLLER
|
|
|
|
|
|
|
|
#define rcdev_to_priv(x) container_of(x, struct cpg_mssr_priv, rcdev)
|
|
|
|
|
|
|
|
static int cpg_mssr_reset(struct reset_controller_dev *rcdev,
|
|
|
|
unsigned long id)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);
|
|
|
|
unsigned int reg = id / 32;
|
|
|
|
unsigned int bit = id % 32;
|
|
|
|
u32 bitmask = BIT(bit);
|
|
|
|
|
|
|
|
dev_dbg(priv->dev, "reset %u%02u\n", reg, bit);
|
|
|
|
|
|
|
|
/* Reset module */
|
clk: renesas: cpg-mssr: Fix reset control race condition
The module reset code in the Renesas CPG/MSSR driver uses
read-modify-write (RMW) operations to write to a Software Reset Register
(SRCRn), and simple writes to write to a Software Reset Clearing
Register (SRSTCLRn), as was mandated by the R-Car Gen2 and Gen3 Hardware
User's Manuals.
However, this may cause a race condition when two devices are reset in
parallel: if the reset for device A completes in the middle of the RMW
operation for device B, device A may be reset again, causing subtle
failures (e.g. i2c timeouts):
thread A thread B
-------- --------
val = SRCRn
val |= bit A
SRCRn = val
delay
val = SRCRn (bit A is set)
SRSTCLRn = bit A
(bit A in SRCRn is cleared)
val |= bit B
SRCRn = val (bit A and B are set)
This can be reproduced on e.g. Salvator-XS using:
$ while true; do i2cdump -f -y 4 0x6A b > /dev/null; done &
$ while true; do i2cdump -f -y 2 0x10 b > /dev/null; done &
i2c-rcar e6510000.i2c: error -110 : 40000002
i2c-rcar e66d8000.i2c: error -110 : 40000002
According to the R-Car Gen3 Hardware Manual Errata for Rev.
0.80 of Feb 28, 2018, reflected in Rev. 1.00 of the R-Car Gen3 Hardware
User's Manual, writes to SRCRn do not require read-modify-write cycles.
Note that the R-Car Gen2 Hardware User's Manual has not been updated
yet, and still says a read-modify-write sequence is required. According
to the hardware team, the reset hardware block is the same on both R-Car
Gen2 and Gen3, though.
Hence fix the issue by replacing the read-modify-write operations on
SRCRn by simple writes.
Reported-by: Yao Lihua <Lihua.Yao@desay-svautomotive.com>
Fixes: 6197aa65c4905532 ("clk: renesas: cpg-mssr: Add support for reset control")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Linh Phung <linh.phung.jy@renesas.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
2019-07-11 20:03:59 +07:00
|
|
|
writel(bitmask, priv->base + SRCR(reg));
|
2017-01-20 17:03:03 +07:00
|
|
|
|
|
|
|
/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */
|
|
|
|
udelay(35);
|
|
|
|
|
|
|
|
/* Release module from reset state */
|
|
|
|
writel(bitmask, priv->base + SRSTCLR(reg));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mssr_assert(struct reset_controller_dev *rcdev, unsigned long id)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);
|
|
|
|
unsigned int reg = id / 32;
|
|
|
|
unsigned int bit = id % 32;
|
|
|
|
u32 bitmask = BIT(bit);
|
|
|
|
|
|
|
|
dev_dbg(priv->dev, "assert %u%02u\n", reg, bit);
|
|
|
|
|
clk: renesas: cpg-mssr: Fix reset control race condition
The module reset code in the Renesas CPG/MSSR driver uses
read-modify-write (RMW) operations to write to a Software Reset Register
(SRCRn), and simple writes to write to a Software Reset Clearing
Register (SRSTCLRn), as was mandated by the R-Car Gen2 and Gen3 Hardware
User's Manuals.
However, this may cause a race condition when two devices are reset in
parallel: if the reset for device A completes in the middle of the RMW
operation for device B, device A may be reset again, causing subtle
failures (e.g. i2c timeouts):
thread A thread B
-------- --------
val = SRCRn
val |= bit A
SRCRn = val
delay
val = SRCRn (bit A is set)
SRSTCLRn = bit A
(bit A in SRCRn is cleared)
val |= bit B
SRCRn = val (bit A and B are set)
This can be reproduced on e.g. Salvator-XS using:
$ while true; do i2cdump -f -y 4 0x6A b > /dev/null; done &
$ while true; do i2cdump -f -y 2 0x10 b > /dev/null; done &
i2c-rcar e6510000.i2c: error -110 : 40000002
i2c-rcar e66d8000.i2c: error -110 : 40000002
According to the R-Car Gen3 Hardware Manual Errata for Rev.
0.80 of Feb 28, 2018, reflected in Rev. 1.00 of the R-Car Gen3 Hardware
User's Manual, writes to SRCRn do not require read-modify-write cycles.
Note that the R-Car Gen2 Hardware User's Manual has not been updated
yet, and still says a read-modify-write sequence is required. According
to the hardware team, the reset hardware block is the same on both R-Car
Gen2 and Gen3, though.
Hence fix the issue by replacing the read-modify-write operations on
SRCRn by simple writes.
Reported-by: Yao Lihua <Lihua.Yao@desay-svautomotive.com>
Fixes: 6197aa65c4905532 ("clk: renesas: cpg-mssr: Add support for reset control")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Linh Phung <linh.phung.jy@renesas.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
2019-07-11 20:03:59 +07:00
|
|
|
writel(bitmask, priv->base + SRCR(reg));
|
2017-01-20 17:03:03 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mssr_deassert(struct reset_controller_dev *rcdev,
|
|
|
|
unsigned long id)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);
|
|
|
|
unsigned int reg = id / 32;
|
|
|
|
unsigned int bit = id % 32;
|
|
|
|
u32 bitmask = BIT(bit);
|
|
|
|
|
|
|
|
dev_dbg(priv->dev, "deassert %u%02u\n", reg, bit);
|
|
|
|
|
|
|
|
writel(bitmask, priv->base + SRSTCLR(reg));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mssr_status(struct reset_controller_dev *rcdev,
|
|
|
|
unsigned long id)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);
|
|
|
|
unsigned int reg = id / 32;
|
|
|
|
unsigned int bit = id % 32;
|
|
|
|
u32 bitmask = BIT(bit);
|
|
|
|
|
|
|
|
return !!(readl(priv->base + SRCR(reg)) & bitmask);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct reset_control_ops cpg_mssr_reset_ops = {
|
|
|
|
.reset = cpg_mssr_reset,
|
|
|
|
.assert = cpg_mssr_assert,
|
|
|
|
.deassert = cpg_mssr_deassert,
|
|
|
|
.status = cpg_mssr_status,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int cpg_mssr_reset_xlate(struct reset_controller_dev *rcdev,
|
|
|
|
const struct of_phandle_args *reset_spec)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);
|
|
|
|
unsigned int unpacked = reset_spec->args[0];
|
|
|
|
unsigned int idx = MOD_CLK_PACK(unpacked);
|
|
|
|
|
|
|
|
if (unpacked % 100 > 31 || idx >= rcdev->nr_resets) {
|
|
|
|
dev_err(priv->dev, "Invalid reset index %u\n", unpacked);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return idx;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mssr_reset_controller_register(struct cpg_mssr_priv *priv)
|
|
|
|
{
|
|
|
|
priv->rcdev.ops = &cpg_mssr_reset_ops;
|
|
|
|
priv->rcdev.of_node = priv->dev->of_node;
|
|
|
|
priv->rcdev.of_reset_n_cells = 1;
|
|
|
|
priv->rcdev.of_xlate = cpg_mssr_reset_xlate;
|
|
|
|
priv->rcdev.nr_resets = priv->num_mod_clks;
|
|
|
|
return devm_reset_controller_register(priv->dev, &priv->rcdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* !CONFIG_RESET_CONTROLLER */
|
|
|
|
static inline int cpg_mssr_reset_controller_register(struct cpg_mssr_priv *priv)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* !CONFIG_RESET_CONTROLLER */
|
|
|
|
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
static const struct of_device_id cpg_mssr_match[] = {
|
2018-09-07 23:58:49 +07:00
|
|
|
#ifdef CONFIG_CLK_R7S9210
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r7s9210-cpg-mssr",
|
|
|
|
.data = &r7s9210_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2020-04-27 21:41:00 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7742
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7742-cpg-mssr",
|
|
|
|
.data = &r8a7742_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
clk: renesas: Rework Kconfig and Makefile logic
The goals are to:
- Allow precise control over and automatic selection of which
(sub)drivers are used for which SoC (which may change in the
future),
- Allow adding support for new SoCs easily,
- Allow compile-testing of all (sub)drivers,
- Keep driver selection logic in the subsystem-specific Kconfig,
independent from the architecture-specific Kconfig (i.e. no "select"
from arch/arm64/Kconfig.platforms), to avoid dependencies.
This is implemented by:
- Introducing Kconfig symbols for all drivers and sub-drivers,
- Introducing the Kconfig symbol CLK_RENESAS, which is enabled
automatically when building for a Renesas ARM platform, and which
enables all required drivers without interaction of the user, based
on SoC-specific ARCH_* symbols,
- Allowing the user to enable any Kconfig symbol manually if
COMPILE_TEST is enabled,
- Using the new Kconfig symbols instead of the ARCH_* symbols to
control compilation in the Makefile,
- Always entering drivers/clk/renesas/ during the build.
Note that currently not all (sub)drivers are enabled for
compile-testing, as they depend on independent fixes in other
subsystems.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
2017-04-24 21:54:14 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7743
|
2016-11-09 04:21:50 +07:00
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7743-cpg-mssr",
|
|
|
|
.data = &r8a7743_cpg_mssr_info,
|
|
|
|
},
|
2018-09-11 17:12:49 +07:00
|
|
|
/* RZ/G1N is (almost) identical to RZ/G1M w.r.t. clocks. */
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7744-cpg-mssr",
|
|
|
|
.data = &r8a7743_cpg_mssr_info,
|
|
|
|
},
|
2016-11-09 04:21:50 +07:00
|
|
|
#endif
|
clk: renesas: Rework Kconfig and Makefile logic
The goals are to:
- Allow precise control over and automatic selection of which
(sub)drivers are used for which SoC (which may change in the
future),
- Allow adding support for new SoCs easily,
- Allow compile-testing of all (sub)drivers,
- Keep driver selection logic in the subsystem-specific Kconfig,
independent from the architecture-specific Kconfig (i.e. no "select"
from arch/arm64/Kconfig.platforms), to avoid dependencies.
This is implemented by:
- Introducing Kconfig symbols for all drivers and sub-drivers,
- Introducing the Kconfig symbol CLK_RENESAS, which is enabled
automatically when building for a Renesas ARM platform, and which
enables all required drivers without interaction of the user, based
on SoC-specific ARCH_* symbols,
- Allowing the user to enable any Kconfig symbol manually if
COMPILE_TEST is enabled,
- Using the new Kconfig symbols instead of the ARCH_* symbols to
control compilation in the Makefile,
- Always entering drivers/clk/renesas/ during the build.
Note that currently not all (sub)drivers are enabled for
compile-testing, as they depend on independent fixes in other
subsystems.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
2017-04-24 21:54:14 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7745
|
2016-11-09 04:25:08 +07:00
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7745-cpg-mssr",
|
|
|
|
.data = &r8a7745_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2018-03-29 02:26:12 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77470
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77470-cpg-mssr",
|
|
|
|
.data = &r8a77470_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2018-08-02 21:57:51 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A774A1
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a774a1-cpg-mssr",
|
|
|
|
.data = &r8a774a1_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2019-09-19 15:17:14 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A774B1
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a774b1-cpg-mssr",
|
|
|
|
.data = &r8a774b1_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2018-09-12 17:41:53 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A774C0
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a774c0-cpg-mssr",
|
|
|
|
.data = &r8a774c0_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2017-03-20 00:05:42 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7790
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7790-cpg-mssr",
|
|
|
|
.data = &r8a7790_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2015-10-16 16:41:19 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7791
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7791-cpg-mssr",
|
|
|
|
.data = &r8a7791_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
/* R-Car M2-N is (almost) identical to R-Car M2-W w.r.t. clocks. */
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7793-cpg-mssr",
|
|
|
|
.data = &r8a7791_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2017-03-20 00:08:59 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7792
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7792-cpg-mssr",
|
|
|
|
.data = &r8a7792_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2017-03-20 00:12:51 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7794
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7794-cpg-mssr",
|
|
|
|
.data = &r8a7794_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
clk: renesas: Rework Kconfig and Makefile logic
The goals are to:
- Allow precise control over and automatic selection of which
(sub)drivers are used for which SoC (which may change in the
future),
- Allow adding support for new SoCs easily,
- Allow compile-testing of all (sub)drivers,
- Keep driver selection logic in the subsystem-specific Kconfig,
independent from the architecture-specific Kconfig (i.e. no "select"
from arch/arm64/Kconfig.platforms), to avoid dependencies.
This is implemented by:
- Introducing Kconfig symbols for all drivers and sub-drivers,
- Introducing the Kconfig symbol CLK_RENESAS, which is enabled
automatically when building for a Renesas ARM platform, and which
enables all required drivers without interaction of the user, based
on SoC-specific ARCH_* symbols,
- Allowing the user to enable any Kconfig symbol manually if
COMPILE_TEST is enabled,
- Using the new Kconfig symbols instead of the ARCH_* symbols to
control compilation in the Makefile,
- Always entering drivers/clk/renesas/ during the build.
Note that currently not all (sub)drivers are enabled for
compile-testing, as they depend on independent fixes in other
subsystems.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
2017-04-24 21:54:14 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A7795
|
2015-10-16 16:41:19 +07:00
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7795-cpg-mssr",
|
|
|
|
.data = &r8a7795_cpg_mssr_info,
|
|
|
|
},
|
2016-05-03 16:06:15 +07:00
|
|
|
#endif
|
2019-10-23 19:29:40 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77960
|
2016-05-03 16:06:15 +07:00
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a7796-cpg-mssr",
|
|
|
|
.data = &r8a7796_cpg_mssr_info,
|
|
|
|
},
|
2017-07-12 15:47:36 +07:00
|
|
|
#endif
|
2019-10-23 19:29:41 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77961
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77961-cpg-mssr",
|
|
|
|
.data = &r8a7796_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2018-02-20 22:12:03 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77965
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77965-cpg-mssr",
|
|
|
|
.data = &r8a77965_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2017-09-09 04:34:20 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77970
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77970-cpg-mssr",
|
|
|
|
.data = &r8a77970_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2018-03-20 14:40:16 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77980
|
2018-02-15 18:58:45 +07:00
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77980-cpg-mssr",
|
|
|
|
.data = &r8a77980_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2018-04-20 19:27:44 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77990
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77990-cpg-mssr",
|
|
|
|
.data = &r8a77990_cpg_mssr_info,
|
|
|
|
},
|
|
|
|
#endif
|
2017-07-12 15:47:36 +07:00
|
|
|
#ifdef CONFIG_CLK_R8A77995
|
|
|
|
{
|
|
|
|
.compatible = "renesas,r8a77995-cpg-mssr",
|
|
|
|
.data = &r8a77995_cpg_mssr_info,
|
|
|
|
},
|
2015-10-16 16:41:19 +07:00
|
|
|
#endif
|
2015-10-16 16:41:19 +07:00
|
|
|
{ /* sentinel */ }
|
|
|
|
};
|
|
|
|
|
|
|
|
static void cpg_mssr_del_clk_provider(void *data)
|
|
|
|
{
|
|
|
|
of_clk_del_provider(data);
|
|
|
|
}
|
|
|
|
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_ARM_PSCI_FW)
|
|
|
|
static int cpg_mssr_suspend_noirq(struct device *dev)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = dev_get_drvdata(dev);
|
|
|
|
unsigned int reg;
|
|
|
|
|
|
|
|
/* This is the best we can do to check for the presence of PSCI */
|
|
|
|
if (!psci_ops.cpu_suspend)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Save module registers with bits under our control */
|
|
|
|
for (reg = 0; reg < ARRAY_SIZE(priv->smstpcr_saved); reg++) {
|
|
|
|
if (priv->smstpcr_saved[reg].mask)
|
2020-05-07 14:47:13 +07:00
|
|
|
priv->smstpcr_saved[reg].val = priv->stbyctrl ?
|
|
|
|
readb(priv->base + STBCR(reg)) :
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
readl(priv->base + SMSTPCR(reg));
|
|
|
|
}
|
|
|
|
|
2017-06-22 03:24:15 +07:00
|
|
|
/* Save core clocks */
|
|
|
|
raw_notifier_call_chain(&priv->notifiers, PM_EVENT_SUSPEND, NULL);
|
|
|
|
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cpg_mssr_resume_noirq(struct device *dev)
|
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv = dev_get_drvdata(dev);
|
|
|
|
unsigned int reg, i;
|
|
|
|
u32 mask, oldval, newval;
|
|
|
|
|
|
|
|
/* This is the best we can do to check for the presence of PSCI */
|
|
|
|
if (!psci_ops.cpu_suspend)
|
|
|
|
return 0;
|
|
|
|
|
2017-06-22 03:24:15 +07:00
|
|
|
/* Restore core clocks */
|
|
|
|
raw_notifier_call_chain(&priv->notifiers, PM_EVENT_RESUME, NULL);
|
|
|
|
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
/* Restore module clocks */
|
|
|
|
for (reg = 0; reg < ARRAY_SIZE(priv->smstpcr_saved); reg++) {
|
|
|
|
mask = priv->smstpcr_saved[reg].mask;
|
|
|
|
if (!mask)
|
|
|
|
continue;
|
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
if (priv->stbyctrl)
|
|
|
|
oldval = readb(priv->base + STBCR(reg));
|
|
|
|
else
|
|
|
|
oldval = readl(priv->base + SMSTPCR(reg));
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
newval = oldval & ~mask;
|
|
|
|
newval |= priv->smstpcr_saved[reg].val & mask;
|
|
|
|
if (newval == oldval)
|
|
|
|
continue;
|
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
if (priv->stbyctrl) {
|
|
|
|
writeb(newval, priv->base + STBCR(reg));
|
|
|
|
/* dummy read to ensure write has completed */
|
|
|
|
readb(priv->base + STBCR(reg));
|
|
|
|
barrier_data(priv->base + STBCR(reg));
|
|
|
|
continue;
|
|
|
|
} else
|
|
|
|
writel(newval, priv->base + SMSTPCR(reg));
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
|
|
|
|
/* Wait until enabled clocks are really enabled */
|
|
|
|
mask &= ~priv->smstpcr_saved[reg].val;
|
|
|
|
if (!mask)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (i = 1000; i > 0; --i) {
|
|
|
|
oldval = readl(priv->base + MSTPSR(reg));
|
|
|
|
if (!(oldval & mask))
|
|
|
|
break;
|
|
|
|
cpu_relax();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!i)
|
2020-05-07 14:47:13 +07:00
|
|
|
dev_warn(dev, "Failed to enable %s%u[0x%x]\n",
|
|
|
|
priv->stbyctrl ? "STB" : "SMSTP", reg,
|
|
|
|
oldval & mask);
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct dev_pm_ops cpg_mssr_pm = {
|
|
|
|
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(cpg_mssr_suspend_noirq,
|
|
|
|
cpg_mssr_resume_noirq)
|
|
|
|
};
|
|
|
|
#define DEV_PM_OPS &cpg_mssr_pm
|
|
|
|
#else
|
|
|
|
#define DEV_PM_OPS NULL
|
|
|
|
#endif /* CONFIG_PM_SLEEP && CONFIG_ARM_PSCI_FW */
|
|
|
|
|
2018-09-24 23:49:35 +07:00
|
|
|
static int __init cpg_mssr_common_init(struct device *dev,
|
|
|
|
struct device_node *np,
|
|
|
|
const struct cpg_mssr_info *info)
|
2015-10-16 16:41:19 +07:00
|
|
|
{
|
|
|
|
struct cpg_mssr_priv *priv;
|
|
|
|
unsigned int nclks, i;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (info->init) {
|
|
|
|
error = info->init(dev);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2019-06-12 22:27:56 +07:00
|
|
|
nclks = info->num_total_core_clks + info->num_hw_mod_clks;
|
|
|
|
priv = kzalloc(struct_size(priv, clks, nclks), GFP_KERNEL);
|
2015-10-16 16:41:19 +07:00
|
|
|
if (!priv)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2018-09-24 23:49:35 +07:00
|
|
|
priv->np = np;
|
2015-10-16 16:41:19 +07:00
|
|
|
priv->dev = dev;
|
2017-01-20 16:58:11 +07:00
|
|
|
spin_lock_init(&priv->rmw_lock);
|
2015-10-16 16:41:19 +07:00
|
|
|
|
2018-09-24 23:49:35 +07:00
|
|
|
priv->base = of_iomap(np, 0);
|
|
|
|
if (!priv->base) {
|
|
|
|
error = -ENOMEM;
|
|
|
|
goto out_err;
|
|
|
|
}
|
2015-10-16 16:41:19 +07:00
|
|
|
|
2018-09-24 23:49:35 +07:00
|
|
|
cpg_mssr_priv = priv;
|
2015-10-16 16:41:19 +07:00
|
|
|
priv->num_core_clks = info->num_total_core_clks;
|
|
|
|
priv->num_mod_clks = info->num_hw_mod_clks;
|
|
|
|
priv->last_dt_core_clk = info->last_dt_core_clk;
|
2017-06-22 03:24:15 +07:00
|
|
|
RAW_INIT_NOTIFIER_HEAD(&priv->notifiers);
|
2018-09-07 23:58:49 +07:00
|
|
|
priv->stbyctrl = info->stbyctrl;
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
for (i = 0; i < nclks; i++)
|
2019-06-12 22:27:56 +07:00
|
|
|
priv->clks[i] = ERR_PTR(-ENOENT);
|
2015-10-16 16:41:19 +07:00
|
|
|
|
2018-09-24 23:49:35 +07:00
|
|
|
error = of_clk_add_provider(np, cpg_mssr_clk_src_twocell_get, priv);
|
|
|
|
if (error)
|
|
|
|
goto out_err;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_err:
|
|
|
|
if (priv->base)
|
|
|
|
iounmap(priv->base);
|
|
|
|
kfree(priv);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init cpg_mssr_early_init(struct device_node *np,
|
|
|
|
const struct cpg_mssr_info *info)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
error = cpg_mssr_common_init(NULL, np, info);
|
|
|
|
if (error)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < info->num_early_core_clks; i++)
|
|
|
|
cpg_mssr_register_core_clk(&info->early_core_clks[i], info,
|
|
|
|
cpg_mssr_priv);
|
|
|
|
|
|
|
|
for (i = 0; i < info->num_early_mod_clks; i++)
|
|
|
|
cpg_mssr_register_mod_clk(&info->early_mod_clks[i], info,
|
|
|
|
cpg_mssr_priv);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init cpg_mssr_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct device *dev = &pdev->dev;
|
|
|
|
struct device_node *np = dev->of_node;
|
|
|
|
const struct cpg_mssr_info *info;
|
|
|
|
struct cpg_mssr_priv *priv;
|
|
|
|
unsigned int i;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
info = of_device_get_match_data(dev);
|
|
|
|
|
|
|
|
if (!cpg_mssr_priv) {
|
|
|
|
error = cpg_mssr_common_init(dev, dev->of_node, info);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
priv = cpg_mssr_priv;
|
|
|
|
priv->dev = dev;
|
|
|
|
dev_set_drvdata(dev, priv);
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
for (i = 0; i < info->num_core_clks; i++)
|
|
|
|
cpg_mssr_register_core_clk(&info->core_clks[i], info, priv);
|
|
|
|
|
|
|
|
for (i = 0; i < info->num_mod_clks; i++)
|
|
|
|
cpg_mssr_register_mod_clk(&info->mod_clks[i], info, priv);
|
|
|
|
|
2016-02-23 16:30:03 +07:00
|
|
|
error = devm_add_action_or_reset(dev,
|
|
|
|
cpg_mssr_del_clk_provider,
|
|
|
|
np);
|
|
|
|
if (error)
|
|
|
|
return error;
|
2015-10-16 16:41:19 +07:00
|
|
|
|
|
|
|
error = cpg_mssr_add_clk_domain(dev, info->core_pm_clks,
|
|
|
|
info->num_core_pm_clks);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
|
2018-09-07 23:58:49 +07:00
|
|
|
/* Reset Controller not supported for Standby Control SoCs */
|
|
|
|
if (info->stbyctrl)
|
|
|
|
return 0;
|
|
|
|
|
2017-01-20 17:03:03 +07:00
|
|
|
error = cpg_mssr_reset_controller_register(priv);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct platform_driver cpg_mssr_driver = {
|
|
|
|
.driver = {
|
|
|
|
.name = "renesas-cpg-mssr",
|
|
|
|
.of_match_table = cpg_mssr_match,
|
clk: renesas: cpg-mssr: Restore module clocks during resume
During PSCI system suspend, R-Car Gen3 SoCs are powered down, and their
clock register state is lost. Note that as the boot loader skips most
initialization after system resume, clock register state differs from
the state encountered during normal system boot, too.
Hence after s2ram, some operations may fail because module clocks are
disabled, while drivers expect them to be still enabled. E.g. EtherAVB
fails when Wake-on-LAN has been enabled using "ethtool -s eth0 wol g":
ravb e6800000.ethernet eth0: failed to switch device to config mode
ravb e6800000.ethernet eth0: device will be stopped after h/w processes are done.
ravb e6800000.ethernet eth0: failed to switch device to config
PM: Device e6800000.ethernet failed to resume: error -110
In addition, some module clocks that were disabled by
clk_disable_unused() may have been re-enabled, wasting power.
To fix this, restore all bits of the SMSTPCR registers that represent
clocks under control of Linux.
Notes:
- While this fixes EtherAVB operation after resume from s2ram,
EtherAVB cannot be used as an actual wake-up source from s2ram, only
from s2idle, due to PSCI limitations,
- To avoid overhead on platforms not needing it, the suspend/resume
code has a build time dependency on sleep and PSCI support, and a
runtime dependency on PSCI.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
2017-06-07 18:20:06 +07:00
|
|
|
.pm = DEV_PM_OPS,
|
2015-10-16 16:41:19 +07:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init cpg_mssr_init(void)
|
|
|
|
{
|
|
|
|
return platform_driver_probe(&cpg_mssr_driver, cpg_mssr_probe);
|
|
|
|
}
|
|
|
|
|
|
|
|
subsys_initcall(cpg_mssr_init);
|
|
|
|
|
2016-09-29 19:47:58 +07:00
|
|
|
void __init cpg_core_nullify_range(struct cpg_core_clk *core_clks,
|
|
|
|
unsigned int num_core_clks,
|
|
|
|
unsigned int first_clk,
|
|
|
|
unsigned int last_clk)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < num_core_clks; i++)
|
|
|
|
if (core_clks[i].id >= first_clk &&
|
|
|
|
core_clks[i].id <= last_clk)
|
|
|
|
core_clks[i].name = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init mssr_mod_nullify(struct mssr_mod_clk *mod_clks,
|
|
|
|
unsigned int num_mod_clks,
|
|
|
|
const unsigned int *clks, unsigned int n)
|
|
|
|
{
|
|
|
|
unsigned int i, j;
|
|
|
|
|
|
|
|
for (i = 0, j = 0; i < num_mod_clks && j < n; i++)
|
|
|
|
if (mod_clks[i].id == clks[j]) {
|
|
|
|
mod_clks[i].name = NULL;
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init mssr_mod_reparent(struct mssr_mod_clk *mod_clks,
|
|
|
|
unsigned int num_mod_clks,
|
|
|
|
const struct mssr_mod_reparent *clks,
|
|
|
|
unsigned int n)
|
|
|
|
{
|
|
|
|
unsigned int i, j;
|
|
|
|
|
|
|
|
for (i = 0, j = 0; i < num_mod_clks && j < n; i++)
|
|
|
|
if (mod_clks[i].id == clks[j].clk) {
|
|
|
|
mod_clks[i].parent = clks[j].parent;
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-16 16:41:19 +07:00
|
|
|
MODULE_DESCRIPTION("Renesas CPG/MSSR Driver");
|
|
|
|
MODULE_LICENSE("GPL v2");
|