@@ -11,6 +11,7 @@ config AX45MP_L2_CACHE
config SIFIVE_CCACHE
bool "Sifive Composable Cache controller"
depends on ARCH_SIFIVE || ARCH_STARFIVE
+ select AUXILIARY_BUS
help
Support for the composable cache controller on SiFive platforms.
@@ -9,6 +9,7 @@
#define pr_fmt(fmt) "CCACHE: " fmt
#include <linux/align.h>
+#include <linux/auxiliary_bus.h>
#include <linux/debugfs.h>
#include <linux/interrupt.h>
#include <linux/of_irq.h>
@@ -249,6 +250,39 @@ static irqreturn_t ccache_int_handler(int irq, void *device)
return IRQ_HANDLED;
}
+static void sifive_ccache_del_aux_dev(void *adev)
+{
+ auxiliary_device_delete(adev);
+ auxiliary_device_uninit(adev);
+}
+
+static int sifive_ccache_add_aux_dev(struct device *dev, struct auxiliary_device *adev,
+ const char *name)
+{
+ int rc;
+
+ adev->dev.parent = dev;
+ adev->name = name;
+
+ rc = auxiliary_device_init(adev);
+ if (rc)
+ return rc;
+
+ rc = auxiliary_device_add(adev);
+ if (rc)
+ goto err_uninit;
+
+ rc = devm_add_action_or_reset(dev, sifive_ccache_del_aux_dev, adev);
+ if (rc)
+ return rc;
+
+ return 0;
+
+err_uninit:
+ auxiliary_device_uninit(adev);
+ return rc;
+}
+
static int sifive_ccache_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -274,6 +308,14 @@ static int sifive_ccache_probe(struct platform_device *pdev)
return dev_err_probe(dev, rc, "Could not request IRQ %d\n", g_irq[i]);
}
+ rc = sifive_ccache_add_aux_dev(dev, &ccache.edac_dev, "edac");
+ if (rc)
+ return rc;
+
+ rc = sifive_ccache_add_aux_dev(dev, &ccache.pmu_dev, "pmu");
+ if (rc)
+ return rc;
+
return 0;
}
@@ -7,8 +7,12 @@
#ifndef __SOC_SIFIVE_CCACHE_H
#define __SOC_SIFIVE_CCACHE_H
+#include <linux/auxiliary_bus.h>
+
struct sifive_ccache {
void __iomem *base;
+ struct auxiliary_device edac_dev;
+ struct auxiliary_device pmu_dev;
};
extern int register_sifive_ccache_error_notifier(struct notifier_block *nb);
This allows the child drivers to access the Composable Cache device's MMIO space and ties them to the lifecycle of the main platform device. Currently, the EDAC driver is probed regardless of whether a Composable Cache device actually exists on the system. Once converted to use the auxiliary device bus, it will only be probed when needed. Signed-off-by: Samuel Holland <samuel.holland@sifive.com> --- drivers/cache/Kconfig | 1 + drivers/cache/sifive_ccache.c | 42 ++++++++++++++++++++++++++++++ include/soc/sifive/sifive_ccache.h | 4 +++ 3 files changed, 47 insertions(+)