soc: sifive: shunt ccache driver to drivers/cache
authorConor Dooley <conor.dooley@microchip.com>
Thu, 12 Oct 2023 09:22:09 +0000 (10:22 +0100)
committerConor Dooley <conor.dooley@microchip.com>
Wed, 22 Nov 2023 11:49:25 +0000 (11:49 +0000)
Move the ccache driver over to drivers/cache, out of the drivers/soc
dumping ground, to this new collection point for cache controller
drivers.

Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
Tested-by: Samuel Holland <samuel.holland@sifive.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
MAINTAINERS
drivers/cache/Kconfig
drivers/cache/Makefile
drivers/cache/sifive_ccache.c [new file with mode: 0644]
drivers/soc/Kconfig
drivers/soc/Makefile
drivers/soc/sifive/Kconfig [deleted file]
drivers/soc/sifive/Makefile [deleted file]
drivers/soc/sifive/sifive_ccache.c [deleted file]

index 97f51d5ec1cfd715487a616c78afd40324082dfc..3135ec3de6edef20b108f3c7b775115f97b72788 100644 (file)
@@ -19785,6 +19785,13 @@ S:     Supported
 N:     sifive
 K:     [^@]sifive
 
+SIFIVE CACHE DRIVER
+M:     Conor Dooley <conor@kernel.org>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
+F:     drivers/cache/sifive_ccache.c
+
 SIFIVE FU540 SYSTEM-ON-CHIP
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 M:     Palmer Dabbelt <palmer@dabbelt.com>
@@ -19800,13 +19807,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
 F:     drivers/dma/sf-pdma/
 
-SIFIVE SOC DRIVERS
-M:     Conor Dooley <conor@kernel.org>
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
-F:     Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
-F:     drivers/soc/sifive/
 
 SILEAD TOUCHSCREEN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
index d6e5e3abaad8afde8f2f0a852f2408b4e1c5c4ac..9345ce4976d76d7d56b39c373e1d5bf8a374c1a5 100644 (file)
@@ -8,4 +8,10 @@ config AX45MP_L2_CACHE
        help
          Support for the L2 cache controller on Andes Technology AX45MP platforms.
 
+config SIFIVE_CCACHE
+       bool "Sifive Composable Cache controller"
+       depends on ARCH_SIFIVE || ARCH_STARFIVE
+       help
+         Support for the composable cache controller on SiFive platforms.
+
 endmenu
index 2012e7fb978dc5cc645a67f14f5af5373f04819c..7657cff3bd6c74e964db7c833bee79dc6abe7fee 100644 (file)
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-$(CONFIG_AX45MP_L2_CACHE) += ax45mp_cache.o
+obj-$(CONFIG_AX45MP_L2_CACHE)  += ax45mp_cache.o
+obj-$(CONFIG_SIFIVE_CCACHE)    += sifive_ccache.o
diff --git a/drivers/cache/sifive_ccache.c b/drivers/cache/sifive_ccache.c
new file mode 100644 (file)
index 0000000..3684f5b
--- /dev/null
@@ -0,0 +1,272 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * SiFive composable cache controller Driver
+ *
+ * Copyright (C) 2018-2022 SiFive, Inc.
+ *
+ */
+
+#define pr_fmt(fmt) "CCACHE: " fmt
+
+#include <linux/debugfs.h>
+#include <linux/interrupt.h>
+#include <linux/of_irq.h>
+#include <linux/of_address.h>
+#include <linux/device.h>
+#include <linux/bitfield.h>
+#include <asm/cacheinfo.h>
+#include <soc/sifive/sifive_ccache.h>
+
+#define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100
+#define SIFIVE_CCACHE_DIRECCFIX_HIGH 0x104
+#define SIFIVE_CCACHE_DIRECCFIX_COUNT 0x108
+
+#define SIFIVE_CCACHE_DIRECCFAIL_LOW 0x120
+#define SIFIVE_CCACHE_DIRECCFAIL_HIGH 0x124
+#define SIFIVE_CCACHE_DIRECCFAIL_COUNT 0x128
+
+#define SIFIVE_CCACHE_DATECCFIX_LOW 0x140
+#define SIFIVE_CCACHE_DATECCFIX_HIGH 0x144
+#define SIFIVE_CCACHE_DATECCFIX_COUNT 0x148
+
+#define SIFIVE_CCACHE_DATECCFAIL_LOW 0x160
+#define SIFIVE_CCACHE_DATECCFAIL_HIGH 0x164
+#define SIFIVE_CCACHE_DATECCFAIL_COUNT 0x168
+
+#define SIFIVE_CCACHE_CONFIG 0x00
+#define SIFIVE_CCACHE_CONFIG_BANK_MASK GENMASK_ULL(7, 0)
+#define SIFIVE_CCACHE_CONFIG_WAYS_MASK GENMASK_ULL(15, 8)
+#define SIFIVE_CCACHE_CONFIG_SETS_MASK GENMASK_ULL(23, 16)
+#define SIFIVE_CCACHE_CONFIG_BLKS_MASK GENMASK_ULL(31, 24)
+
+#define SIFIVE_CCACHE_WAYENABLE 0x08
+#define SIFIVE_CCACHE_ECCINJECTERR 0x40
+
+#define SIFIVE_CCACHE_MAX_ECCINTR 4
+
+static void __iomem *ccache_base;
+static int g_irq[SIFIVE_CCACHE_MAX_ECCINTR];
+static struct riscv_cacheinfo_ops ccache_cache_ops;
+static int level;
+
+enum {
+       DIR_CORR = 0,
+       DATA_CORR,
+       DATA_UNCORR,
+       DIR_UNCORR,
+};
+
+#ifdef CONFIG_DEBUG_FS
+static struct dentry *sifive_test;
+
+static ssize_t ccache_write(struct file *file, const char __user *data,
+                           size_t count, loff_t *ppos)
+{
+       unsigned int val;
+
+       if (kstrtouint_from_user(data, count, 0, &val))
+               return -EINVAL;
+       if ((val < 0xFF) || (val >= 0x10000 && val < 0x100FF))
+               writel(val, ccache_base + SIFIVE_CCACHE_ECCINJECTERR);
+       else
+               return -EINVAL;
+       return count;
+}
+
+static const struct file_operations ccache_fops = {
+       .owner = THIS_MODULE,
+       .open = simple_open,
+       .write = ccache_write
+};
+
+static void setup_sifive_debug(void)
+{
+       sifive_test = debugfs_create_dir("sifive_ccache_cache", NULL);
+
+       debugfs_create_file("sifive_debug_inject_error", 0200,
+                           sifive_test, NULL, &ccache_fops);
+}
+#endif
+
+static void ccache_config_read(void)
+{
+       u32 cfg;
+
+       cfg = readl(ccache_base + SIFIVE_CCACHE_CONFIG);
+       pr_info("%llu banks, %llu ways, sets/bank=%llu, bytes/block=%llu\n",
+               FIELD_GET(SIFIVE_CCACHE_CONFIG_BANK_MASK, cfg),
+               FIELD_GET(SIFIVE_CCACHE_CONFIG_WAYS_MASK, cfg),
+               BIT_ULL(FIELD_GET(SIFIVE_CCACHE_CONFIG_SETS_MASK, cfg)),
+               BIT_ULL(FIELD_GET(SIFIVE_CCACHE_CONFIG_BLKS_MASK, cfg)));
+
+       cfg = readl(ccache_base + SIFIVE_CCACHE_WAYENABLE);
+       pr_info("Index of the largest way enabled: %u\n", cfg);
+}
+
+static const struct of_device_id sifive_ccache_ids[] = {
+       { .compatible = "sifive,fu540-c000-ccache" },
+       { .compatible = "sifive,fu740-c000-ccache" },
+       { .compatible = "sifive,ccache0" },
+       { /* end of table */ }
+};
+
+static ATOMIC_NOTIFIER_HEAD(ccache_err_chain);
+
+int register_sifive_ccache_error_notifier(struct notifier_block *nb)
+{
+       return atomic_notifier_chain_register(&ccache_err_chain, nb);
+}
+EXPORT_SYMBOL_GPL(register_sifive_ccache_error_notifier);
+
+int unregister_sifive_ccache_error_notifier(struct notifier_block *nb)
+{
+       return atomic_notifier_chain_unregister(&ccache_err_chain, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_sifive_ccache_error_notifier);
+
+static int ccache_largest_wayenabled(void)
+{
+       return readl(ccache_base + SIFIVE_CCACHE_WAYENABLE) & 0xFF;
+}
+
+static ssize_t number_of_ways_enabled_show(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+       return sprintf(buf, "%u\n", ccache_largest_wayenabled());
+}
+
+static DEVICE_ATTR_RO(number_of_ways_enabled);
+
+static struct attribute *priv_attrs[] = {
+       &dev_attr_number_of_ways_enabled.attr,
+       NULL,
+};
+
+static const struct attribute_group priv_attr_group = {
+       .attrs = priv_attrs,
+};
+
+static const struct attribute_group *ccache_get_priv_group(struct cacheinfo
+                                                          *this_leaf)
+{
+       /* We want to use private group for composable cache only */
+       if (this_leaf->level == level)
+               return &priv_attr_group;
+       else
+               return NULL;
+}
+
+static irqreturn_t ccache_int_handler(int irq, void *device)
+{
+       unsigned int add_h, add_l;
+
+       if (irq == g_irq[DIR_CORR]) {
+               add_h = readl(ccache_base + SIFIVE_CCACHE_DIRECCFIX_HIGH);
+               add_l = readl(ccache_base + SIFIVE_CCACHE_DIRECCFIX_LOW);
+               pr_err("DirError @ 0x%08X.%08X\n", add_h, add_l);
+               /* Reading this register clears the DirError interrupt sig */
+               readl(ccache_base + SIFIVE_CCACHE_DIRECCFIX_COUNT);
+               atomic_notifier_call_chain(&ccache_err_chain,
+                                          SIFIVE_CCACHE_ERR_TYPE_CE,
+                                          "DirECCFix");
+       }
+       if (irq == g_irq[DIR_UNCORR]) {
+               add_h = readl(ccache_base + SIFIVE_CCACHE_DIRECCFAIL_HIGH);
+               add_l = readl(ccache_base + SIFIVE_CCACHE_DIRECCFAIL_LOW);
+               /* Reading this register clears the DirFail interrupt sig */
+               readl(ccache_base + SIFIVE_CCACHE_DIRECCFAIL_COUNT);
+               atomic_notifier_call_chain(&ccache_err_chain,
+                                          SIFIVE_CCACHE_ERR_TYPE_UE,
+                                          "DirECCFail");
+               panic("CCACHE: DirFail @ 0x%08X.%08X\n", add_h, add_l);
+       }
+       if (irq == g_irq[DATA_CORR]) {
+               add_h = readl(ccache_base + SIFIVE_CCACHE_DATECCFIX_HIGH);
+               add_l = readl(ccache_base + SIFIVE_CCACHE_DATECCFIX_LOW);
+               pr_err("DataError @ 0x%08X.%08X\n", add_h, add_l);
+               /* Reading this register clears the DataError interrupt sig */
+               readl(ccache_base + SIFIVE_CCACHE_DATECCFIX_COUNT);
+               atomic_notifier_call_chain(&ccache_err_chain,
+                                          SIFIVE_CCACHE_ERR_TYPE_CE,
+                                          "DatECCFix");
+       }
+       if (irq == g_irq[DATA_UNCORR]) {
+               add_h = readl(ccache_base + SIFIVE_CCACHE_DATECCFAIL_HIGH);
+               add_l = readl(ccache_base + SIFIVE_CCACHE_DATECCFAIL_LOW);
+               pr_err("DataFail @ 0x%08X.%08X\n", add_h, add_l);
+               /* Reading this register clears the DataFail interrupt sig */
+               readl(ccache_base + SIFIVE_CCACHE_DATECCFAIL_COUNT);
+               atomic_notifier_call_chain(&ccache_err_chain,
+                                          SIFIVE_CCACHE_ERR_TYPE_UE,
+                                          "DatECCFail");
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int __init sifive_ccache_init(void)
+{
+       struct device_node *np;
+       struct resource res;
+       int i, rc, intr_num;
+
+       np = of_find_matching_node(NULL, sifive_ccache_ids);
+       if (!np)
+               return -ENODEV;
+
+       if (of_address_to_resource(np, 0, &res)) {
+               rc = -ENODEV;
+               goto err_node_put;
+       }
+
+       ccache_base = ioremap(res.start, resource_size(&res));
+       if (!ccache_base) {
+               rc = -ENOMEM;
+               goto err_node_put;
+       }
+
+       if (of_property_read_u32(np, "cache-level", &level)) {
+               rc = -ENOENT;
+               goto err_unmap;
+       }
+
+       intr_num = of_property_count_u32_elems(np, "interrupts");
+       if (!intr_num) {
+               pr_err("No interrupts property\n");
+               rc = -ENODEV;
+               goto err_unmap;
+       }
+
+       for (i = 0; i < intr_num; i++) {
+               g_irq[i] = irq_of_parse_and_map(np, i);
+               rc = request_irq(g_irq[i], ccache_int_handler, 0, "ccache_ecc",
+                                NULL);
+               if (rc) {
+                       pr_err("Could not request IRQ %d\n", g_irq[i]);
+                       goto err_free_irq;
+               }
+       }
+       of_node_put(np);
+
+       ccache_config_read();
+
+       ccache_cache_ops.get_priv_group = ccache_get_priv_group;
+       riscv_set_cacheinfo_ops(&ccache_cache_ops);
+
+#ifdef CONFIG_DEBUG_FS
+       setup_sifive_debug();
+#endif
+       return 0;
+
+err_free_irq:
+       while (--i >= 0)
+               free_irq(g_irq[i], NULL);
+err_unmap:
+       iounmap(ccache_base);
+err_node_put:
+       of_node_put(np);
+       return rc;
+}
+
+device_initcall(sifive_ccache_init);
index 10a9ff84ff41d038c28e4308ae712bf2df9c6008..5d924e946507b78ff90f13bf6d1b2466196ed024 100644 (file)
@@ -22,7 +22,6 @@ source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/renesas/Kconfig"
 source "drivers/soc/rockchip/Kconfig"
 source "drivers/soc/samsung/Kconfig"
-source "drivers/soc/sifive/Kconfig"
 source "drivers/soc/sunxi/Kconfig"
 source "drivers/soc/tegra/Kconfig"
 source "drivers/soc/ti/Kconfig"
index 0706a27d13bef3c39e81ee53b496dee587c75cf9..ba8f5b5460e1462640087c44a5331619cb14ad1f 100644 (file)
@@ -28,7 +28,6 @@ obj-y                         += qcom/
 obj-y                          += renesas/
 obj-y                          += rockchip/
 obj-$(CONFIG_SOC_SAMSUNG)      += samsung/
-obj-y                          += sifive/
 obj-y                          += sunxi/
 obj-$(CONFIG_ARCH_TEGRA)       += tegra/
 obj-y                          += ti/
diff --git a/drivers/soc/sifive/Kconfig b/drivers/soc/sifive/Kconfig
deleted file mode 100644 (file)
index 139884a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-if ARCH_SIFIVE || ARCH_STARFIVE
-
-config SIFIVE_CCACHE
-       bool "Sifive Composable Cache controller"
-       help
-         Support for the composable cache controller on SiFive platforms.
-
-endif
diff --git a/drivers/soc/sifive/Makefile b/drivers/soc/sifive/Makefile
deleted file mode 100644 (file)
index 1f5dc33..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-obj-$(CONFIG_SIFIVE_CCACHE)    += sifive_ccache.o
diff --git a/drivers/soc/sifive/sifive_ccache.c b/drivers/soc/sifive/sifive_ccache.c
deleted file mode 100644 (file)
index 3684f5b..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SiFive composable cache controller Driver
- *
- * Copyright (C) 2018-2022 SiFive, Inc.
- *
- */
-
-#define pr_fmt(fmt) "CCACHE: " fmt
-
-#include <linux/debugfs.h>
-#include <linux/interrupt.h>
-#include <linux/of_irq.h>
-#include <linux/of_address.h>
-#include <linux/device.h>
-#include <linux/bitfield.h>
-#include <asm/cacheinfo.h>
-#include <soc/sifive/sifive_ccache.h>
-
-#define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100
-#define SIFIVE_CCACHE_DIRECCFIX_HIGH 0x104
-#define SIFIVE_CCACHE_DIRECCFIX_COUNT 0x108
-
-#define SIFIVE_CCACHE_DIRECCFAIL_LOW 0x120
-#define SIFIVE_CCACHE_DIRECCFAIL_HIGH 0x124
-#define SIFIVE_CCACHE_DIRECCFAIL_COUNT 0x128
-
-#define SIFIVE_CCACHE_DATECCFIX_LOW 0x140
-#define SIFIVE_CCACHE_DATECCFIX_HIGH 0x144
-#define SIFIVE_CCACHE_DATECCFIX_COUNT 0x148
-
-#define SIFIVE_CCACHE_DATECCFAIL_LOW 0x160
-#define SIFIVE_CCACHE_DATECCFAIL_HIGH 0x164
-#define SIFIVE_CCACHE_DATECCFAIL_COUNT 0x168
-
-#define SIFIVE_CCACHE_CONFIG 0x00
-#define SIFIVE_CCACHE_CONFIG_BANK_MASK GENMASK_ULL(7, 0)
-#define SIFIVE_CCACHE_CONFIG_WAYS_MASK GENMASK_ULL(15, 8)
-#define SIFIVE_CCACHE_CONFIG_SETS_MASK GENMASK_ULL(23, 16)
-#define SIFIVE_CCACHE_CONFIG_BLKS_MASK GENMASK_ULL(31, 24)
-
-#define SIFIVE_CCACHE_WAYENABLE 0x08
-#define SIFIVE_CCACHE_ECCINJECTERR 0x40
-
-#define SIFIVE_CCACHE_MAX_ECCINTR 4
-
-static void __iomem *ccache_base;
-static int g_irq[SIFIVE_CCACHE_MAX_ECCINTR];
-static struct riscv_cacheinfo_ops ccache_cache_ops;
-static int level;
-
-enum {
-       DIR_CORR = 0,
-       DATA_CORR,
-       DATA_UNCORR,
-       DIR_UNCORR,
-};
-
-#ifdef CONFIG_DEBUG_FS
-static struct dentry *sifive_test;
-
-static ssize_t ccache_write(struct file *file, const char __user *data,
-                           size_t count, loff_t *ppos)
-{
-       unsigned int val;
-
-       if (kstrtouint_from_user(data, count, 0, &val))
-               return -EINVAL;
-       if ((val < 0xFF) || (val >= 0x10000 && val < 0x100FF))
-               writel(val, ccache_base + SIFIVE_CCACHE_ECCINJECTERR);
-       else
-               return -EINVAL;
-       return count;
-}
-
-static const struct file_operations ccache_fops = {
-       .owner = THIS_MODULE,
-       .open = simple_open,
-       .write = ccache_write
-};
-
-static void setup_sifive_debug(void)
-{
-       sifive_test = debugfs_create_dir("sifive_ccache_cache", NULL);
-
-       debugfs_create_file("sifive_debug_inject_error", 0200,
-                           sifive_test, NULL, &ccache_fops);
-}
-#endif
-
-static void ccache_config_read(void)
-{
-       u32 cfg;
-
-       cfg = readl(ccache_base + SIFIVE_CCACHE_CONFIG);
-       pr_info("%llu banks, %llu ways, sets/bank=%llu, bytes/block=%llu\n",
-               FIELD_GET(SIFIVE_CCACHE_CONFIG_BANK_MASK, cfg),
-               FIELD_GET(SIFIVE_CCACHE_CONFIG_WAYS_MASK, cfg),
-               BIT_ULL(FIELD_GET(SIFIVE_CCACHE_CONFIG_SETS_MASK, cfg)),
-               BIT_ULL(FIELD_GET(SIFIVE_CCACHE_CONFIG_BLKS_MASK, cfg)));
-
-       cfg = readl(ccache_base + SIFIVE_CCACHE_WAYENABLE);
-       pr_info("Index of the largest way enabled: %u\n", cfg);
-}
-
-static const struct of_device_id sifive_ccache_ids[] = {
-       { .compatible = "sifive,fu540-c000-ccache" },
-       { .compatible = "sifive,fu740-c000-ccache" },
-       { .compatible = "sifive,ccache0" },
-       { /* end of table */ }
-};
-
-static ATOMIC_NOTIFIER_HEAD(ccache_err_chain);
-
-int register_sifive_ccache_error_notifier(struct notifier_block *nb)
-{
-       return atomic_notifier_chain_register(&ccache_err_chain, nb);
-}
-EXPORT_SYMBOL_GPL(register_sifive_ccache_error_notifier);
-
-int unregister_sifive_ccache_error_notifier(struct notifier_block *nb)
-{
-       return atomic_notifier_chain_unregister(&ccache_err_chain, nb);
-}
-EXPORT_SYMBOL_GPL(unregister_sifive_ccache_error_notifier);
-
-static int ccache_largest_wayenabled(void)
-{
-       return readl(ccache_base + SIFIVE_CCACHE_WAYENABLE) & 0xFF;
-}
-
-static ssize_t number_of_ways_enabled_show(struct device *dev,
-                                          struct device_attribute *attr,
-                                          char *buf)
-{
-       return sprintf(buf, "%u\n", ccache_largest_wayenabled());
-}
-
-static DEVICE_ATTR_RO(number_of_ways_enabled);
-
-static struct attribute *priv_attrs[] = {
-       &dev_attr_number_of_ways_enabled.attr,
-       NULL,
-};
-
-static const struct attribute_group priv_attr_group = {
-       .attrs = priv_attrs,
-};
-
-static const struct attribute_group *ccache_get_priv_group(struct cacheinfo
-                                                          *this_leaf)
-{
-       /* We want to use private group for composable cache only */
-       if (this_leaf->level == level)
-               return &priv_attr_group;
-       else
-               return NULL;
-}
-
-static irqreturn_t ccache_int_handler(int irq, void *device)
-{
-       unsigned int add_h, add_l;
-
-       if (irq == g_irq[DIR_CORR]) {
-               add_h = readl(ccache_base + SIFIVE_CCACHE_DIRECCFIX_HIGH);
-               add_l = readl(ccache_base + SIFIVE_CCACHE_DIRECCFIX_LOW);
-               pr_err("DirError @ 0x%08X.%08X\n", add_h, add_l);
-               /* Reading this register clears the DirError interrupt sig */
-               readl(ccache_base + SIFIVE_CCACHE_DIRECCFIX_COUNT);
-               atomic_notifier_call_chain(&ccache_err_chain,
-                                          SIFIVE_CCACHE_ERR_TYPE_CE,
-                                          "DirECCFix");
-       }
-       if (irq == g_irq[DIR_UNCORR]) {
-               add_h = readl(ccache_base + SIFIVE_CCACHE_DIRECCFAIL_HIGH);
-               add_l = readl(ccache_base + SIFIVE_CCACHE_DIRECCFAIL_LOW);
-               /* Reading this register clears the DirFail interrupt sig */
-               readl(ccache_base + SIFIVE_CCACHE_DIRECCFAIL_COUNT);
-               atomic_notifier_call_chain(&ccache_err_chain,
-                                          SIFIVE_CCACHE_ERR_TYPE_UE,
-                                          "DirECCFail");
-               panic("CCACHE: DirFail @ 0x%08X.%08X\n", add_h, add_l);
-       }
-       if (irq == g_irq[DATA_CORR]) {
-               add_h = readl(ccache_base + SIFIVE_CCACHE_DATECCFIX_HIGH);
-               add_l = readl(ccache_base + SIFIVE_CCACHE_DATECCFIX_LOW);
-               pr_err("DataError @ 0x%08X.%08X\n", add_h, add_l);
-               /* Reading this register clears the DataError interrupt sig */
-               readl(ccache_base + SIFIVE_CCACHE_DATECCFIX_COUNT);
-               atomic_notifier_call_chain(&ccache_err_chain,
-                                          SIFIVE_CCACHE_ERR_TYPE_CE,
-                                          "DatECCFix");
-       }
-       if (irq == g_irq[DATA_UNCORR]) {
-               add_h = readl(ccache_base + SIFIVE_CCACHE_DATECCFAIL_HIGH);
-               add_l = readl(ccache_base + SIFIVE_CCACHE_DATECCFAIL_LOW);
-               pr_err("DataFail @ 0x%08X.%08X\n", add_h, add_l);
-               /* Reading this register clears the DataFail interrupt sig */
-               readl(ccache_base + SIFIVE_CCACHE_DATECCFAIL_COUNT);
-               atomic_notifier_call_chain(&ccache_err_chain,
-                                          SIFIVE_CCACHE_ERR_TYPE_UE,
-                                          "DatECCFail");
-       }
-
-       return IRQ_HANDLED;
-}
-
-static int __init sifive_ccache_init(void)
-{
-       struct device_node *np;
-       struct resource res;
-       int i, rc, intr_num;
-
-       np = of_find_matching_node(NULL, sifive_ccache_ids);
-       if (!np)
-               return -ENODEV;
-
-       if (of_address_to_resource(np, 0, &res)) {
-               rc = -ENODEV;
-               goto err_node_put;
-       }
-
-       ccache_base = ioremap(res.start, resource_size(&res));
-       if (!ccache_base) {
-               rc = -ENOMEM;
-               goto err_node_put;
-       }
-
-       if (of_property_read_u32(np, "cache-level", &level)) {
-               rc = -ENOENT;
-               goto err_unmap;
-       }
-
-       intr_num = of_property_count_u32_elems(np, "interrupts");
-       if (!intr_num) {
-               pr_err("No interrupts property\n");
-               rc = -ENODEV;
-               goto err_unmap;
-       }
-
-       for (i = 0; i < intr_num; i++) {
-               g_irq[i] = irq_of_parse_and_map(np, i);
-               rc = request_irq(g_irq[i], ccache_int_handler, 0, "ccache_ecc",
-                                NULL);
-               if (rc) {
-                       pr_err("Could not request IRQ %d\n", g_irq[i]);
-                       goto err_free_irq;
-               }
-       }
-       of_node_put(np);
-
-       ccache_config_read();
-
-       ccache_cache_ops.get_priv_group = ccache_get_priv_group;
-       riscv_set_cacheinfo_ops(&ccache_cache_ops);
-
-#ifdef CONFIG_DEBUG_FS
-       setup_sifive_debug();
-#endif
-       return 0;
-
-err_free_irq:
-       while (--i >= 0)
-               free_irq(g_irq[i], NULL);
-err_unmap:
-       iounmap(ccache_base);
-err_node_put:
-       of_node_put(np);
-       return rc;
-}
-
-device_initcall(sifive_ccache_init);