Currently the driver doesn't support any clock-related resources request
and handling, fairly assuming that all of them are supposed to be enabled
anyway in order for the system to work correctly. It's true for the Core
and AXI Ports reference clocks, but the CSR (APB) and Scrubber clocks
might still be disabled in case if the system firmware doesn't imply any
other software touching the DDR controller internals. Since the DW uMCTL2
DDRC driver does access the controller registers at the very least the
driver needs to make sure the APB clock is enabled.
So add the reference clocks support then. First the driver will request
all the clocks possibly defined for the controller (Core, AXI, APB and
Scrubber). Second the APB clock will be enabled/disabled only since the
Scrubber is currently unsupported by the driver. Since the Core and AXI
clocks feed the critical system parts they left untouched to avoid a risk
to de-stabilize the system memory. Please note the clocks connection IDs
have been chosen in accordance with the DT-bindings.
Signed-off-by: Serge Semin <fancer.lancer@xxxxxxxxx>
---
drivers/edac/synopsys_edac.c | 101 +++++++++++++++++++++++++++++++++--
1 file changed, 98 insertions(+), 3 deletions(-)
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
index a91b048facb6..ab4c7cc2daf5 100644
--- a/drivers/edac/synopsys_edac.c
+++ b/drivers/edac/synopsys_edac.c
@@ -8,6 +8,7 @@
#include <linux/bitfield.h>
#include <linux/bits.h>
+#include <linux/clk.h>
#include <linux/edac.h>
#include <linux/fs.h>
#include <linux/log2.h>
@@ -303,6 +304,25 @@ enum snps_ecc_mode {
SNPS_ECC_ADVX4X8 = 5,
};
+/**
+ * enum snps_ref_clk - DW uMCTL2 DDR controller clocks.
+ * @SNPS_CSR_CLK: CSR/APB interface clock.
+ * @SNPS_AXI_CLK: AXI (AHB) Port reference clock.
+ * @SNPS_CORE_CLK: DDR controller (including DFI) clock. SDRAM clock
+ * matches runs with this freq in 1:1 ratio mode and
+ * with twice of this freq in case of 1:2 ratio mode.
+ * @SNPS_SBR_CLK: Scrubber port reference clock (synchronous to
+ * the core clock).
+ * @SNPS_MAX_NCLK: Total number of clocks.
+ */
+enum snps_ref_clk {
+ SNPS_CSR_CLK,
+ SNPS_AXI_CLK,
+ SNPS_CORE_CLK,
+ SNPS_SBR_CLK,
+ SNPS_MAX_NCLK
+};
+
/**
* struct snps_ddrc_info - DDR controller platform parameters.
* @caps: DDR controller capabilities.
@@ -410,6 +430,7 @@ struct snps_ecc_error_info {
* @pdev: Platform device.
* @baseaddr: Base address of the DDR controller.
* @reglock: Concurrent CSRs access lock.
+ * @clks: Controller reference clocks.
* @message: Buffer for framing the event specific info.
*/
struct snps_edac_priv {
@@ -419,6 +440,7 @@ struct snps_edac_priv {
struct platform_device *pdev;
void __iomem *baseaddr;
spinlock_t reglock;
+ struct clk_bulk_data clks[SNPS_MAX_NCLK];
char message[SNPS_EDAC_MSG_SIZE];
};
@@ -985,6 +1007,60 @@ static struct snps_edac_priv *snps_create_data(struct platform_device *pdev)
return priv;
}
+/**
+ * snps_get_res - Get platform device resources.
+ * @priv: DDR memory controller private instance data.
+ *
+ * It's supposed to request all the controller resources available for the
+ * particular platform and enable all the required for the driver normal
+ * work. Note only the CSR and Scrubber clocks are supposed to be switched
+ * on/off by the driver.
+ *
+ * Return: negative errno if failed to get the resources, otherwise - zero.
+ */
+static int snps_get_res(struct snps_edac_priv *priv)
+{
+ const char * const ids[] = {
+ [SNPS_CSR_CLK] = "pclk",
+ [SNPS_AXI_CLK] = "aclk",
+ [SNPS_CORE_CLK] = "core",
+ [SNPS_SBR_CLK] = "sbr",
+ };
+ int i, rc;
+
+ for (i = 0; i < SNPS_MAX_NCLK; i++)
+ priv->clks[i].id = ids[i];
+
+ rc = devm_clk_bulk_get_optional(&priv->pdev->dev, SNPS_MAX_NCLK,
+ priv->clks);
+ if (rc) {
+ edac_printk(KERN_INFO, EDAC_MC, "Failed to get ref clocks\n");
+ return rc;
+ }
+
+ /*
+ * Don't touch the Core and AXI clocks since they are critical for the
+ * stable system functioning and are supposed to have been enabled
+ * anyway.
+ */
+ rc = clk_prepare_enable(priv->clks[SNPS_CSR_CLK].clk);
+ if (rc) {
+ edac_printk(KERN_INFO, EDAC_MC, "Couldn't enable CSR clock\n");
+ return rc;
+ }
+
+ return 0;
+}
+
+/**
+ * snps_put_res - Put platform device resources.
+ * @priv: DDR memory controller private instance data.
+ */
+static void snps_put_res(struct snps_edac_priv *priv)
+{
+ clk_disable_unprepare(priv->clks[SNPS_CSR_CLK].clk);
+}
+
/*
* zynqmp_init_plat - ZynqMP-specific platform initialization.
* @priv: DDR memory controller private data.
@@ -1718,9 +1794,17 @@ static int snps_ddrc_info_show(struct seq_file *s, void *data)
{
struct mem_ctl_info *mci = s->private;
struct snps_edac_priv *priv = mci->pvt_info;
+ unsigned long rate;
seq_printf(s, "SDRAM: %s\n", edac_mem_types[priv->info.sdram_mode]);
+ rate = clk_get_rate(priv->clks[SNPS_CORE_CLK].clk);
+ if (rate) {
+ rate = rate / HZ_PER_MHZ;
+ seq_printf(s, "Clock: Core %luMHz SDRAM %luMHz\n",
+ rate, priv->info.freq_ratio * rate);
+ }
+
seq_printf(s, "DQ bus: %u/%s\n", (BITS_PER_BYTE << priv->info.dq_width),
priv->info.dq_mode == SNPS_DQ_FULL ? "Full" :
priv->info.dq_mode == SNPS_DQ_HALF ? "Half" :
@@ -2029,15 +2113,21 @@ static int snps_mc_probe(struct platform_device *pdev)
if (IS_ERR(priv))
return PTR_ERR(priv);
- rc = snps_get_ddrc_info(priv);
+ rc = snps_get_res(priv);
if (rc)
return rc;
+ rc = snps_get_ddrc_info(priv);
+ if (rc)
+ goto put_res;
+
snps_get_addr_map(priv);
mci = snps_mc_create(priv);
- if (IS_ERR(mci))
- return PTR_ERR(mci);
+ if (IS_ERR(mci)) {
+ rc = PTR_ERR(mci);
+ goto put_res;
+ }
rc = snps_setup_irq(mci);
if (rc)
@@ -2057,6 +2147,9 @@ static int snps_mc_probe(struct platform_device *pdev)
free_edac_mc:
snps_mc_free(mci);
+put_res:
+ snps_put_res(priv);
+
return rc;
}
@@ -2077,6 +2170,8 @@ static int snps_mc_remove(struct platform_device *pdev)
snps_mc_free(mci);
+ snps_put_res(priv);
+
return 0;
}
--
2.41.0
