Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1456051 > unrolled thread
| Started by | John Stultz <john.stultz@linaro.org> |
|---|---|
| First post | 2016-08-04 01:10 +0200 |
| Last post | 2016-08-07 01:50 +0200 |
| Articles | 5 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[RFC][PATCH 3/4] power: reset: Add sram-reboot-mode driver John Stultz <john.stultz@linaro.org> - 2016-08-04 01:10 +0200
Re: [RFC][PATCH 3/4] power: reset: Add sram-reboot-mode driver Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-08-04 03:10 +0200
Re: [RFC][PATCH 3/4] power: reset: Add sram-reboot-mode driver John Stultz <john.stultz@linaro.org> - 2016-08-04 05:10 +0200
Re: [RFC][PATCH 3/4] power: reset: Add sram-reboot-mode driver Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-08-04 07:40 +0200
Re: [RFC][PATCH 3/4] power: reset: Add sram-reboot-mode driver Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-08-07 01:50 +0200
| From | John Stultz <john.stultz@linaro.org> |
|---|---|
| Date | 2016-08-04 01:10 +0200 |
| Subject | [RFC][PATCH 3/4] power: reset: Add sram-reboot-mode driver |
| Message-ID | <s2dst-EM-5@gated-at.bofh.it> |
Add sram-reboot-mode driver, which enables
reboot modes to be specified from sram subnodes.
Cc: Andy Yan <andy.yan@rock-chips.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Heiko Stübner <heiko@sntech.de>
Cc: Caesar Wang <wxt@rock-chips.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Vishal Bhoj <vishal.bhoj@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: devicetree@vger.kernel.org
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/power/reset/Kconfig | 10 ++++
drivers/power/reset/Makefile | 1 +
drivers/power/reset/sram-reboot-mode.c | 95 ++++++++++++++++++++++++++++++++++
3 files changed, 106 insertions(+)
create mode 100644 drivers/power/reset/sram-reboot-mode.c
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 3bfac53..af553ed 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -208,5 +208,15 @@ config SYSCON_REBOOT_MODE
register, then the bootloader can read it to take different
action according to the mode.
+config SRAM_REBOOT_MODE
+ bool "Generic SRAM reboot mode driver"
+ select REBOOT_MODE
+ select SRAM
+ help
+ Say y here will enable reboot mode driver. This will
+ get reboot mode arguments and store it in an SRAM
+ address, then the bootloader can read it to take different
+ action according to the mode.
+
endif
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index 1be307c..14f23ad 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -24,3 +24,4 @@ obj-$(CONFIG_POWER_RESET_RMOBILE) += rmobile-reset.o
obj-$(CONFIG_POWER_RESET_ZX) += zx-reboot.o
obj-$(CONFIG_REBOOT_MODE) += reboot-mode.o
obj-$(CONFIG_SYSCON_REBOOT_MODE) += syscon-reboot-mode.o
+obj-$(CONFIG_SRAM_REBOOT_MODE) += sram-reboot-mode.o
diff --git a/drivers/power/reset/sram-reboot-mode.c b/drivers/power/reset/sram-reboot-mode.c
new file mode 100644
index 0000000..8945dac
--- /dev/null
+++ b/drivers/power/reset/sram-reboot-mode.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2016, Linaro Limited
+ * Based on syscon-reboot-mode.c
+ * Copyright (c) 2016, Fuzhou Rockchip Electronics Co., Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/reboot.h>
+#include <linux/regmap.h>
+#include "reboot-mode.h"
+
+
+
+struct sram_reboot_mode {
+ struct reboot_mode_driver reboot;
+ void __iomem *reboot_reason_val_addr;
+};
+
+static int sram_reboot_mode_write(struct reboot_mode_driver *reboot,
+ unsigned int magic)
+{
+ struct sram_reboot_mode *sram_rbm;
+
+ sram_rbm = container_of(reboot, struct sram_reboot_mode, reboot);
+
+ writel(magic, sram_rbm->reboot_reason_val_addr);
+ return 0;
+}
+
+static int sram_reboot_mode_probe(struct platform_device *pdev)
+{
+ struct sram_reboot_mode *sram_rbm;
+ struct resource *res;
+ int ret;
+
+ sram_rbm = devm_kzalloc(&pdev->dev, sizeof(*sram_rbm), GFP_KERNEL);
+ if (!sram_rbm)
+ return -ENOMEM;
+
+ sram_rbm->reboot.dev = &pdev->dev;
+ sram_rbm->reboot.write = sram_reboot_mode_write;
+
+ dev_set_drvdata(&pdev->dev, sram_rbm);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return PTR_ERR(res);
+
+ sram_rbm->reboot_reason_val_addr = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
+ if (IS_ERR(sram_rbm->reboot_reason_val_addr))
+ return PTR_ERR(sram_rbm->reboot_reason_val_addr);
+
+ ret = reboot_mode_register(&sram_rbm->reboot);
+ if (ret)
+ dev_err(&pdev->dev, "can't register reboot mode\n");
+
+ return ret;
+}
+
+static int sram_reboot_mode_remove(struct platform_device *pdev)
+{
+ struct sram_reboot_mode *sram_rbm = dev_get_drvdata(&pdev->dev);
+
+ return reboot_mode_unregister(&sram_rbm->reboot);
+}
+
+static const struct of_device_id sram_reboot_mode_of_match[] = {
+ { .compatible = "sram-reboot-mode" },
+ {}
+};
+
+static struct platform_driver sram_reboot_mode_driver = {
+ .probe = sram_reboot_mode_probe,
+ .remove = sram_reboot_mode_remove,
+ .driver = {
+ .name = "sram-reboot-mode",
+ .of_match_table = sram_reboot_mode_of_match,
+ },
+};
+module_platform_driver(sram_reboot_mode_driver);
+
+MODULE_AUTHOR("John Stultz <john.stultz@linaro.org>");
+MODULE_DESCRIPTION("SRAM reboot mode driver");
+MODULE_LICENSE("GPL v2");
--
1.9.1
[toc] | [next] | [standalone]
| From | Bjorn Andersson <bjorn.andersson@linaro.org> |
|---|---|
| Date | 2016-08-04 03:10 +0200 |
| Message-ID | <s2fkB-1Rq-7@gated-at.bofh.it> |
| In reply to | #1456051 |
On Wed 03 Aug 16:05 PDT 2016, John Stultz wrote:
[..]
> diff --git a/drivers/power/reset/sram-reboot-mode.c b/drivers/power/reset/sram-reboot-mode.c
[..]
> +
> +struct sram_reboot_mode {
> + struct reboot_mode_driver reboot;
> + void __iomem *reboot_reason_val_addr;
23 characters is...a lot of characters...
> +};
> +
> +static int sram_reboot_mode_write(struct reboot_mode_driver *reboot,
> + unsigned int magic)
> +{
> + struct sram_reboot_mode *sram_rbm;
> +
> + sram_rbm = container_of(reboot, struct sram_reboot_mode, reboot);
> +
> + writel(magic, sram_rbm->reboot_reason_val_addr);
> + return 0;
> +}
> +
> +static int sram_reboot_mode_probe(struct platform_device *pdev)
> +{
> + struct sram_reboot_mode *sram_rbm;
> + struct resource *res;
> + int ret;
> +
> + sram_rbm = devm_kzalloc(&pdev->dev, sizeof(*sram_rbm), GFP_KERNEL);
> + if (!sram_rbm)
> + return -ENOMEM;
> +
> + sram_rbm->reboot.dev = &pdev->dev;
> + sram_rbm->reboot.write = sram_reboot_mode_write;
> +
> + dev_set_drvdata(&pdev->dev, sram_rbm);
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!res)
> + return PTR_ERR(res);
> +
> + sram_rbm->reboot_reason_val_addr = devm_ioremap(&pdev->dev, res->start,
> + resource_size(res));
Use devm_ioremap_resource() instead, it saves you the return value check
on platform_get_resource() and is cleaner.
> + if (IS_ERR(sram_rbm->reboot_reason_val_addr))
> + return PTR_ERR(sram_rbm->reboot_reason_val_addr);
> +
> + ret = reboot_mode_register(&sram_rbm->reboot);
I think you should take the time to throw in a
devm_reboot_mode_register(), it would save you from the
dev_set_drvdata() and you can drop the remove function.
> + if (ret)
> + dev_err(&pdev->dev, "can't register reboot mode\n");
> +
> + return ret;
> +}
> +
Regards,
Bjorn
[toc] | [prev] | [next] | [standalone]
| From | John Stultz <john.stultz@linaro.org> |
|---|---|
| Date | 2016-08-04 05:10 +0200 |
| Message-ID | <s2hcK-3aD-13@gated-at.bofh.it> |
| In reply to | #1456110 |
On Wed, Aug 3, 2016 at 6:03 PM, Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
> On Wed 03 Aug 16:05 PDT 2016, John Stultz wrote:
>
> [..]
>> diff --git a/drivers/power/reset/sram-reboot-mode.c b/drivers/power/reset/sram-reboot-mode.c
> [..]
>> +
>> +struct sram_reboot_mode {
>> + struct reboot_mode_driver reboot;
>> + void __iomem *reboot_reason_val_addr;
>
> 23 characters is...a lot of characters...
Fair enough. Renamed to reason_addr.
>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> + if (!res)
>> + return PTR_ERR(res);
>> +
>> + sram_rbm->reboot_reason_val_addr = devm_ioremap(&pdev->dev, res->start,
>> + resource_size(res));
>
> Use devm_ioremap_resource() instead, it saves you the return value check
> on platform_get_resource() and is cleaner.
Ok. Done.
>> + if (IS_ERR(sram_rbm->reboot_reason_val_addr))
>> + return PTR_ERR(sram_rbm->reboot_reason_val_addr);
>> +
>> + ret = reboot_mode_register(&sram_rbm->reboot);
>
> I think you should take the time to throw in a
> devm_reboot_mode_register(), it would save you from the
> dev_set_drvdata() and you can drop the remove function.
So I've only got a vague sense of what your suggesting here. Do you
have a pointer to a good example?
thanks
-john
[toc] | [prev] | [next] | [standalone]
| From | Bjorn Andersson <bjorn.andersson@linaro.org> |
|---|---|
| Date | 2016-08-04 07:40 +0200 |
| Message-ID | <s2jxT-4Ea-5@gated-at.bofh.it> |
| In reply to | #1456132 |
On Wed 03 Aug 20:08 PDT 2016, John Stultz wrote: > On Wed, Aug 3, 2016 at 6:03 PM, Bjorn Andersson > <bjorn.andersson@linaro.org> wrote: > > On Wed 03 Aug 16:05 PDT 2016, John Stultz wrote: > > > > [..] > >> diff --git a/drivers/power/reset/sram-reboot-mode.c b/drivers/power/reset/sram-reboot-mode.c [..] > >> + ret = reboot_mode_register(&sram_rbm->reboot); > > > > I think you should take the time to throw in a > > devm_reboot_mode_register(), it would save you from the > > dev_set_drvdata() and you can drop the remove function. > > So I've only got a vague sense of what your suggesting here. Do you > have a pointer to a good example? > https://patchwork.kernel.org/patch/9262691/ https://patchwork.kernel.org/patch/9262693/ Regards, Bjorn
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2016-08-07 01:50 +0200 |
| Message-ID | <s3jvP-48q-5@gated-at.bofh.it> |
| In reply to | #1456051 |
On Wed, Aug 3, 2016 at 7:05 PM, John Stultz <john.stultz@linaro.org> wrote: > Add sram-reboot-mode driver, which enables > reboot modes to be specified from sram subnodes. > > Cc: Andy Yan <andy.yan@rock-chips.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Thierry Reding <treding@nvidia.com> > Cc: Heiko Stübner <heiko@sntech.de> > Cc: Caesar Wang <wxt@rock-chips.com> > Cc: Kees Cook <keescook@chromium.org> > Cc: Guodong Xu <guodong.xu@linaro.org> > Cc: Haojian Zhuang <haojian.zhuang@linaro.org> > Cc: Vishal Bhoj <vishal.bhoj@linaro.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: devicetree@vger.kernel.org > Cc: Android Kernel Team <kernel-team@android.com> > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- > drivers/power/reset/Kconfig | 10 ++++ > drivers/power/reset/Makefile | 1 + > drivers/power/reset/sram-reboot-mode.c | 95 ++++++++++++++++++++++++++++++++++ > 3 files changed, 106 insertions(+) > create mode 100644 drivers/power/reset/sram-reboot-mode.c > > diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig > index 3bfac53..af553ed 100644 > --- a/drivers/power/reset/Kconfig > +++ b/drivers/power/reset/Kconfig > @@ -208,5 +208,15 @@ config SYSCON_REBOOT_MODE > register, then the bootloader can read it to take different > action according to the mode. > > +config SRAM_REBOOT_MODE > + bool "Generic SRAM reboot mode driver" Since this is bool, can we dump the module.h and any MODULE_* tags from the driver, and register using a builtin variant? Thanks, Paul. -- > + select REBOOT_MODE > + select SRAM > + help > + Say y here will enable reboot mode driver. This will > + get reboot mode arguments and store it in an SRAM > + address, then the bootloader can read it to take different > + action according to the mode. > + > endif > > diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile > index 1be307c..14f23ad 100644 > --- a/drivers/power/reset/Makefile > +++ b/drivers/power/reset/Makefile > @@ -24,3 +24,4 @@ obj-$(CONFIG_POWER_RESET_RMOBILE) += rmobile-reset.o > obj-$(CONFIG_POWER_RESET_ZX) += zx-reboot.o > obj-$(CONFIG_REBOOT_MODE) += reboot-mode.o > obj-$(CONFIG_SYSCON_REBOOT_MODE) += syscon-reboot-mode.o > +obj-$(CONFIG_SRAM_REBOOT_MODE) += sram-reboot-mode.o > diff --git a/drivers/power/reset/sram-reboot-mode.c b/drivers/power/reset/sram-reboot-mode.c > new file mode 100644 > index 0000000..8945dac > --- /dev/null > +++ b/drivers/power/reset/sram-reboot-mode.c > @@ -0,0 +1,95 @@ > +/* > + * Copyright (c) 2016, Linaro Limited > + * Based on syscon-reboot-mode.c > + * Copyright (c) 2016, Fuzhou Rockchip Electronics Co., Ltd > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > +#include <linux/init.h> > +#include <linux/module.h> > +#include <linux/kernel.h> > +#include <linux/io.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/platform_device.h> > +#include <linux/reboot.h> > +#include <linux/regmap.h> > +#include "reboot-mode.h" > +
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web