* [PATCH RFC 1/3] drivers: soc: sunxi: Introduce SoC driver to map SRAMs
2015-03-12 13:13 [PATCH RFC 0/3] ARM: sunxi: SRAM mapping support Maxime Ripard
@ 2015-03-12 13:13 ` Maxime Ripard
2015-03-12 13:13 ` [PATCH RFC 2/3] ARM: sun7i: Add A20 SRAM and SRAM controller Maxime Ripard
2015-03-12 13:13 ` [PATCH RFC 3/3] net: allwinner: emac: Claim our SRAM Maxime Ripard
2 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2015-03-12 13:13 UTC (permalink / raw)
To: linux-arm-kernel
The Allwinner SoCs have a handful of SRAM that can be either mapped to be
accessible by devices or the CPU.
That mapping is controlled by an SRAM controller, and that mapping might not be
set by the bootloader, for example if the device wasn't used at all, or if
we're using solutions like the U-Boot's Falcon Boot.
We could also imagine changing this at runtime for example to change the
mapping of these SRAMs to use them for suspend/resume or runtime memory rate
change, if that ever happens.
These use cases require some API in the kernel to control that mapping,
exported through a drivers/soc driver.
This driver also implement a debugfs file that shows the SRAM found in the
system, the current mapping and the SRAM that have been claimed by some drivers
in the kernel.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/sunxi/Kconfig | 12 ++
drivers/soc/sunxi/Makefile | 1 +
drivers/soc/sunxi/sunxi_sram.c | 234 +++++++++++++++++++++++++++++++++++
include/linux/soc/sunxi/sunxi_sram.h | 24 ++++
6 files changed, 273 insertions(+)
create mode 100644 drivers/soc/sunxi/Kconfig
create mode 100644 drivers/soc/sunxi/Makefile
create mode 100644 drivers/soc/sunxi/sunxi_sram.c
create mode 100644 include/linux/soc/sunxi/sunxi_sram.h
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index 76d6bd4da138..5d0f55dc88c1 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -1,6 +1,7 @@
menu "SOC (System On Chip) specific Drivers"
source "drivers/soc/qcom/Kconfig"
+source "drivers/soc/sunxi/Kconfig"
source "drivers/soc/ti/Kconfig"
source "drivers/soc/versatile/Kconfig"
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 063113d0bd38..170bba37f092 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -3,6 +3,7 @@
#
obj-$(CONFIG_ARCH_QCOM) += qcom/
+obj-$(CONFIG_ARCH_SUNXI) += sunxi/
obj-$(CONFIG_ARCH_TEGRA) += tegra/
obj-$(CONFIG_SOC_TI) += ti/
obj-$(CONFIG_PLAT_VERSATILE) += versatile/
diff --git a/drivers/soc/sunxi/Kconfig b/drivers/soc/sunxi/Kconfig
new file mode 100644
index 000000000000..212c6340097a
--- /dev/null
+++ b/drivers/soc/sunxi/Kconfig
@@ -0,0 +1,12 @@
+#
+# Allwinner sunXi SoC drivers
+#
+config SUNXI_SRAM
+ tristate "Allwinner sunXi SRAM Controller"
+ depends on ARCH_SUNXI
+ default y
+ help
+ Say y here to enable the SRAM controller support. This
+ device is responsible on mapping the SRAM in the sunXi SoCs
+ wether to the CPU/DMA, or to the devices.
+
diff --git a/drivers/soc/sunxi/Makefile b/drivers/soc/sunxi/Makefile
new file mode 100644
index 000000000000..4cf9dbdf346e
--- /dev/null
+++ b/drivers/soc/sunxi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SUNXI_SRAM) += sunxi_sram.o
diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
new file mode 100644
index 000000000000..a80c0668ba65
--- /dev/null
+++ b/drivers/soc/sunxi/sunxi_sram.c
@@ -0,0 +1,234 @@
+/*
+ * Allwinner SoCs SRAM Controller Driver
+ *
+ * Copyright (C) 2015 Maxime Ripard
+ *
+ * Author: Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/debugfs.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+
+#include <linux/soc/sunxi/sunxi_sram.h>
+
+struct sunxi_sram_func {
+ char *func;
+ u8 val;
+};
+
+struct sunxi_sram_desc {
+ enum sunxi_sram_type type;
+ char *name;
+ u8 reg;
+ u8 offset;
+ u8 width;
+ struct sunxi_sram_func *func;
+ bool claimed;
+ bool enabled;
+};
+
+#define SUNXI_SRAM_MAP(_val, _func) \
+ { \
+ .func = _func, \
+ .val = _val, \
+ }
+
+#define SUNXI_SRAM_DESC(_type, _name, _reg, _off, _width, ...) \
+ { \
+ .type = _type, \
+ .name = _name, \
+ .reg = _reg, \
+ .offset = _off, \
+ .width = _width, \
+ .func = (struct sunxi_sram_func[]){ \
+ __VA_ARGS__, { } }, \
+ }
+
+struct sunxi_sram_desc sun7i_sram_desc[] = {
+ SUNXI_SRAM_DESC(SUNXI_SRAM_EMAC, "A3-A4", 0x4, 0x4, 1,
+ SUNXI_SRAM_MAP(0, "cpu"),
+ SUNXI_SRAM_MAP(1, "emac")),
+ SUNXI_SRAM_DESC(SUNXI_SRAM_USB_OTG, "D", 0x4, 0x0, 1,
+ SUNXI_SRAM_MAP(0, "cpu"),
+ SUNXI_SRAM_MAP(1, "usb-otg")),
+ { /* Sentinel */ },
+};
+
+static struct sunxi_sram_desc *sram_list;
+static DEFINE_SPINLOCK(sram_lock);
+static void __iomem *base;
+
+static int sunxi_sram_show(struct seq_file *s, void *data)
+{
+ struct sunxi_sram_desc *sram;
+ struct sunxi_sram_func *func;
+ u32 val;
+
+ seq_printf(s, "Allwinner sunXi SRAM\n");
+ seq_printf(s, "--------------------\n");
+
+
+ for (sram = sram_list; sram->name; sram++) {
+ if (!sram->enabled)
+ continue;
+
+ seq_printf(s, "\n%s\n", sram->name);
+
+ val = readl(base + sram->reg);
+ val >>= sram->offset;
+ val &= sram->width;
+
+ for (func = sram->func; func->func; func++) {
+ seq_printf(s, "\t\t%s%c\n", func->func,
+ func->val == val ? '*' : ' ');
+ }
+ }
+
+ return 0;
+}
+
+static int sunxi_sram_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, sunxi_sram_show, inode->i_private);
+}
+
+static const struct file_operations sunxi_sram_fops = {
+ .open = sunxi_sram_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+int sunxi_sram_claim(enum sunxi_sram_type type, const char *function)
+{
+ struct sunxi_sram_desc *sram;
+ struct sunxi_sram_func *func;
+ u32 val;
+
+ if (IS_ERR(base))
+ return -EPROBE_DEFER;
+
+ for (sram = sram_list; sram->name; sram++) {
+ if (sram->type != type)
+ continue;
+
+ if (!sram->enabled)
+ return -ENODEV;
+
+ spin_lock(&sram_lock);
+
+ if (sram->claimed) {
+ spin_unlock(&sram_lock);
+ return -EBUSY;
+ }
+
+ sram->claimed = true;
+ spin_unlock(&sram_lock);
+
+ for (func = sram->func; func->func; func++) {
+ if (strcmp(function, func->func))
+ continue;
+
+ val = readl(base + sram->reg);
+ val &= ~GENMASK(sram->offset + sram->width, sram->offset);
+ writel(val | func->val, base + sram->reg);
+
+ return 0;
+ }
+ }
+
+ return -EINVAL;
+}
+EXPORT_SYMBOL(sunxi_sram_claim);
+
+int sunxi_sram_release(enum sunxi_sram_type type)
+{
+ struct sunxi_sram_desc *sram;
+
+ for (sram = sram_list; sram->type; sram++) {
+ if (sram->type != type)
+ continue;
+
+ if (!sram->enabled)
+ return -ENODEV;
+
+ spin_lock(&sram_lock);
+ sram->claimed = false;
+ spin_unlock(&sram_lock);
+
+ return 0;
+ }
+
+ return -EINVAL;
+}
+EXPORT_SYMBOL(sunxi_sram_release);
+
+static const struct of_device_id sunxi_sram_dt_match[] = {
+ { .compatible = "allwinner,sun7i-a20-sram-controller", .data = &sun7i_sram_desc},
+ { },
+};
+MODULE_DEVICE_TABLE(of, sunxi_sram_dt_match);
+
+static int sunxi_sram_probe(struct platform_device *pdev)
+{
+ const struct of_device_id *match;
+ struct sunxi_sram_desc *sram;
+ struct device_node *node;
+ struct resource *res;
+ struct dentry *d;
+ const char *name;
+ int ret;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ match = of_match_device(sunxi_sram_dt_match, &pdev->dev);
+ if (!match)
+ return -ENODEV;
+
+ sram_list = (struct sunxi_sram_desc *)match->data;
+
+ for_each_compatible_node(node, NULL, "allwinner,sun4i-a10-sram") {
+ if (of_property_read_string(node, "allwinner,sram-name", &name))
+ continue;
+
+ for (sram = sram_list; sram->name; sram++)
+ if (!strcmp(name, sram->name))
+ break;
+
+ if (!sram->name)
+ continue;
+
+ sram->enabled = true;
+ }
+
+ d = debugfs_create_file("sram", S_IRUGO, NULL, NULL,
+ &sunxi_sram_fops);
+ if (!d)
+ return -ENOMEM;
+
+ return 0;
+}
+
+static struct platform_driver sunxi_sram_driver = {
+ .driver = {
+ .name = "sunxi-sram",
+ .of_match_table = sunxi_sram_dt_match,
+ },
+ .probe = sunxi_sram_probe,
+};
+module_platform_driver(sunxi_sram_driver);
+
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
+MODULE_DESCRIPTION("Allwinner sunXi SRAM Controller Driver");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/soc/sunxi/sunxi_sram.h b/include/linux/soc/sunxi/sunxi_sram.h
new file mode 100644
index 000000000000..351c31a105c8
--- /dev/null
+++ b/include/linux/soc/sunxi/sunxi_sram.h
@@ -0,0 +1,24 @@
+/*
+ * Allwinner SoCs SRAM Controller Driver
+ *
+ * Copyright (C) 2015 Maxime Ripard
+ *
+ * Author: Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef _SUNXI_SRAM_H_
+#define _SUNXI_SRAM_H_
+
+enum sunxi_sram_type {
+ SUNXI_SRAM_USB_OTG,
+ SUNXI_SRAM_EMAC,
+};
+
+int sunxi_sram_claim(enum sunxi_sram_type type, const char *function);
+int sunxi_sram_release(enum sunxi_sram_type type);
+
+#endif /* _SUNXI_SRAM_H_ */
--
2.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH RFC 3/3] net: allwinner: emac: Claim our SRAM
2015-03-12 13:13 [PATCH RFC 0/3] ARM: sunxi: SRAM mapping support Maxime Ripard
2015-03-12 13:13 ` [PATCH RFC 1/3] drivers: soc: sunxi: Introduce SoC driver to map SRAMs Maxime Ripard
2015-03-12 13:13 ` [PATCH RFC 2/3] ARM: sun7i: Add A20 SRAM and SRAM controller Maxime Ripard
@ 2015-03-12 13:13 ` Maxime Ripard
2 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2015-03-12 13:13 UTC (permalink / raw)
To: linux-arm-kernel
The SRAM the EMAC is using might not have been mapped accordingly by the
bootloader, preventing the EMAC to work properly.
Ask for that SRAM to be mapped at probe time to make sure that this never
happens.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/net/ethernet/allwinner/sun4i-emac.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index f3470d96837a..9d0136b1fab8 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -29,6 +29,8 @@
#include <linux/platform_device.h>
#include <linux/phy.h>
+#include <linux/soc/sunxi/sunxi_sram.h>
+
#include "sun4i-emac.h"
#define DRV_NAME "sun4i-emac"
@@ -857,11 +859,15 @@ static int emac_probe(struct platform_device *pdev)
clk_prepare_enable(db->clk);
+ ret = sunxi_sram_claim(SUNXI_SRAM_EMAC, "emac");
+ if (ret)
+ dev_warn(&pdev->dev, "Couldn't map SRAM to device\n");
+
db->phy_node = of_parse_phandle(np, "phy", 0);
if (!db->phy_node) {
dev_err(&pdev->dev, "no associated PHY\n");
ret = -ENODEV;
- goto out;
+ goto out_release_sram;
}
/* Read MAC-address from DT */
@@ -893,7 +899,7 @@ static int emac_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "Registering netdev failed!\n");
ret = -ENODEV;
- goto out;
+ goto out_release_sram;
}
dev_info(&pdev->dev, "%s: at %p, IRQ %d MAC: %pM\n",
@@ -901,6 +907,8 @@ static int emac_probe(struct platform_device *pdev)
return 0;
+out_release_sram:
+ sunxi_sram_release(SUNXI_SRAM_EMAC);
out:
dev_err(db->dev, "not found (%d).\n", ret);
@@ -914,6 +922,7 @@ static int emac_remove(struct platform_device *pdev)
struct net_device *ndev = platform_get_drvdata(pdev);
unregister_netdev(ndev);
+ sunxi_sram_release(SUNXI_SRAM_EMAC);
free_netdev(ndev);
dev_dbg(&pdev->dev, "released and freed device\n");
--
2.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread