On 02/12/2015 04:56 PM, Alexandre Courbot wrote:
On Wed, Jan 14, 2015 at 3:19 PM, Vince Hsu<vinceh@xxxxxxxxxx> wrote:The flush operation of memory clients is needed for various IP blocks in the Tegra SoCs to perform a clean reset. Signed-off-by: Vince Hsu<vinceh@xxxxxxxxxx> --- drivers/memory/tegra/mc.c | 132 ++++++++++++++++++++++++++++++++++++++++ drivers/memory/tegra/tegra114.c | 2 +- drivers/memory/tegra/tegra30.c | 2 +- include/soc/tegra/mc.h | 41 ++++++++++++- 4 files changed, 173 insertions(+), 4 deletions(-) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index fe3c44e7e1d1..35f769f9f1cd 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -62,6 +63,130 @@ static const struct of_device_id tegra_mc_of_match[] = { }; MODULE_DEVICE_TABLE(of, tegra_mc_of_match); +static struct tegra_mc_swgroup *find_swgroup(struct tegra_mc *mc, + unsigned int swgroup)Indentation looks a little bit weird here.+{ + struct tegra_mc_swgroup *sg; + + list_for_each_entry(sg, &mc->swgroups, head) { + if (sg->id == swgroup) + return sg; + } + + return NULL; +} + +static struct tegra_mc_swgroup *add_swgroup(struct tegra_mc *mc, + unsigned int swgroup)Here too. Also even though they are static, these functions should probably be prefixed with tegra_mc or something.
Will fix the indentation and function naming.
+int tegra_mc_flush(struct tegra_mc_swgroup *sg) +{ + struct tegra_mc *mc; + const struct tegra_mc_hotreset *client; + int i; + + if (!sg || !sg->mc) + return -EINVAL;; + + mc = sg->mc; + if (!mc->soc->ops || !mc->soc->ops->flush) + return -EINVAL;; + + client = mc->soc->hotresets; + + for (i = 0; i < mc->soc->num_hotresets; i++, client++) { + if (sg->id == client->swgroup) + return mc->soc->ops->flush(mc, client); + } + + return -EINVAL; +} +EXPORT_SYMBOL(tegra_mc_flush); + +int tegra_mc_flush_done(struct tegra_mc_swgroup *sg) +{ + struct tegra_mc *mc; + const struct tegra_mc_hotreset *client; + int i; + + if (!sg || !sg->mc) + return -EINVAL;; + + mc = sg->mc; + if (!mc->soc->ops || !mc->soc->ops->flush) + return -EINVAL;; + + client = mc->soc->hotresets; + + for (i = 0; i < mc->soc->num_hotresets; i++, client++) { + if (sg->id == client->swgroup) + return mc->soc->ops->flush_done(mc, client); + } + + return -EINVAL; +} +EXPORT_SYMBOL(tegra_mc_flush_done);These functions are identical, excepted for the callback they are invoking. Could you merge the common part into a function that returns the right client to call the callback on, or ERR_PTR(-EINVAL) in case of failure?
I couldn't think of a clever way to do this. Any ideas? :)
This patch uses a list in the struct tegra_mc_client to gather swgroup information from+ +static int tegra_mc_build_swgroup(struct tegra_mc *mc) +{ + int i; + + for (i = 0; i < mc->soc->num_clients; i++) { + struct tegra_mc_swgroup *sg; + + sg = find_swgroup(mc, mc->soc->clients[i].swgroup); + + if (!sg) { + sg = add_swgroup(mc, mc->soc->clients[i].swgroup); + if (IS_ERR(sg)) + return PTR_ERR(sg); + } + + list_add_tail(&mc->soc->clients[i].head, &sg->clients); + } + + return 0; +} + static int tegra_mc_setup_latency_allowance(struct tegra_mc *mc) { unsigned long long tick; @@ -229,6 +354,13 @@ static int tegra_mc_probe(struct platform_device *pdev) /* length of MC tick in nanoseconds */ mc->tick = 30; + INIT_LIST_HEAD(&mc->swgroups); + err = tegra_mc_build_swgroup(mc); + if (err) { + dev_err(&pdev->dev, "failed to build swgroup: %d\n", err); + return err; + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mc->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(mc->regs)) diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c index 511e9a25c151..92ab5552fcee 100644 --- a/drivers/memory/tegra/tegra114.c +++ b/drivers/memory/tegra/tegra114.c @@ -15,7 +15,7 @@ #include "mc.h" -static const struct tegra_mc_client tegra114_mc_clients[] = { +static struct tegra_mc_client tegra114_mc_clients[] = {Why is this needed? I cannot see anything in this patch that would require dropping the const here.
DT when driver is probed. So the mc client array instance can't be constant. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
