| Message ID | cover.1600329307.git.matti.vaittinen@fi.rohmeurope.com |
|---|---|
| Headers | show |
| Series | Support ROHM BD9576MUF and BD9573MUF PMICs | expand |
On Thu, 17 Sep 2020 11:01:27 +0300, Matti Vaittinen wrote: > Initial support for ROHM BD9576MUF and BD9573MUF PMICs. > > These PMICs are primarily intended to be used to power the R-Car family > processors. BD9576MUF includes some additional safety features the > BD9573MUF does not have. This initial version of drivers does not > utilize these features and for now the SW behaviour is identical. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next Thanks! [1/2] dt_bindings: regulator: Add ROHM BD9576MUF and BD9573MUF PMICs commit: fdb2f9ffc9f533ceef16666818557ea7b6edfe2a [2/2] regulator: Support ROHM BD9576MUF and BD9573MUF commit: b014e9fae7e7de4329a7092ade4256982c5ce974 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
On 9/17/20 1:03 AM, Matti Vaittinen wrote: > Add Watchdog support for ROHM BD9576MUF and BD9573MUF PMICs which are > mainly used to power the R-Car series processors. The watchdog is > pinged using a GPIO and enabled using another GPIO. Additionally > watchdog time-out can be configured to HW prior starting the watchdog. > Watchdog timeout can be configured to detect only delayed ping or in > a window mode where also too fast pings are detected. > > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > --- > drivers/watchdog/Kconfig | 13 ++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/bd9576_wdt.c | 295 ++++++++++++++++++++++++++++++++++ > 3 files changed, 309 insertions(+) > create mode 100644 drivers/watchdog/bd9576_wdt.c > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index ab7aad5a1e69..d042a517a946 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -172,6 +172,19 @@ config BD70528_WATCHDOG > Alternatively say M to compile the driver as a module, > which will be called bd70528_wdt. > > +config BD957XMUF_WATCHDOG > + tristate "ROHM BD9576MUF and BD9573MUF PMIC Watchdog" > + depends on MFD_ROHM_BD957XMUF > + select WATCHDOG_CORE > + help > + Support for the watchdog in the ROHM BD9576 and BD9573 PMICs. > + These PMIC ICs contain watchdog block which can be configured > + to toggle reset line if SoC fails to ping watchdog via GPIO. > + > + Say Y here to include support for the ROHM BD9576 or BD9573 > + watchdog. Alternatively say M to compile the driver as a module, > + which will be called bd9576_wdt. > + > config DA9052_WATCHDOG > tristate "Dialog DA9052 Watchdog" > depends on PMIC_DA9052 || COMPILE_TEST > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 97bed1d3d97c..14d75f98e3df 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -208,6 +208,7 @@ obj-$(CONFIG_XEN_WDT) += xen_wdt.o > > # Architecture Independent > obj-$(CONFIG_BD70528_WATCHDOG) += bd70528_wdt.o > +obj-$(CONFIG_BD957XMUF_WATCHDOG) += bd9576_wdt.o > obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o > obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o > obj-$(CONFIG_DA9062_WATCHDOG) += da9062_wdt.o > diff --git a/drivers/watchdog/bd9576_wdt.c b/drivers/watchdog/bd9576_wdt.c > new file mode 100644 > index 000000000000..917c8c7ddeb1 > --- /dev/null > +++ b/drivers/watchdog/bd9576_wdt.c > @@ -0,0 +1,295 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (C) 2020 ROHM Semiconductors > + * > + * ROHM BD9576MUF and BD9573MUF Watchdog driver > + */ > + > +#include <linux/err.h> > +#include <linux/delay.h> Alphabetic include file order please. > +#include <linux/mfd/rohm-bd957x.h> > +#include <linux/module.h> > +#include <linux/gpio/consumer.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <linux/watchdog.h> > + > +static bool nowayout; > +module_param(nowayout, bool, 0); > +MODULE_PARM_DESC(nowayout, > + "Watchdog cannot be stopped once started (default=\"false\")"); > + > +#define HW_MARGIN_MIN 2 > +#define HW_MARGIN_MAX 4416 > +#define BD957X_WDT_DEFAULT_MARGIN 4416 > + > +struct bd9576_wdt_priv { > + struct gpio_desc *gpiod_ping; > + struct gpio_desc *gpiod_en; > + struct device *dev; > + struct regmap *regmap; > + bool always_running; > + struct watchdog_device wdd; > +}; > + > +static void bd9576_wdt_disable(struct bd9576_wdt_priv *priv) > +{ > + gpiod_set_value_cansleep(priv->gpiod_en, 0); > +} > + > +static int bd9576_wdt_ping(struct watchdog_device *wdd) > +{ > + struct bd9576_wdt_priv *priv = watchdog_get_drvdata(wdd); > + > + /* Pulse */ > + gpiod_set_value_cansleep(priv->gpiod_ping, 1); > + gpiod_set_value_cansleep(priv->gpiod_ping, 0); > + > + return 0; > +} > + > +static int bd9576_wdt_start(struct watchdog_device *wdd) > +{ > + struct bd9576_wdt_priv *priv = watchdog_get_drvdata(wdd); > + > + gpiod_set_value_cansleep(priv->gpiod_en, 1); > + > + return bd9576_wdt_ping(wdd); > +} > + > +static int bd9576_wdt_stop(struct watchdog_device *wdd) > +{ > + struct bd9576_wdt_priv *priv = watchdog_get_drvdata(wdd); > + > + if (!priv->always_running) > + bd9576_wdt_disable(priv); > + else > + set_bit(WDOG_HW_RUNNING, &wdd->status); > + > + return 0; > +} > + > +static const struct watchdog_info bd957x_wdt_ident = { > + .options = WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | > + WDIOF_SETTIMEOUT, > + .identity = "BD957x Watchdog", > +}; > + > +static const struct watchdog_ops bd957x_wdt_ops = { > + .owner = THIS_MODULE, > + .start = bd9576_wdt_start, > + .stop = bd9576_wdt_stop, > + .ping = bd9576_wdt_ping, > +}; > + > +/* Unit is hundreds of uS */ > +#define FASTNG_MIN 23 > + > +static int find_closest_fast(int target, int *sel, int *val) > +{ > + int i; > + int window = FASTNG_MIN; > + > + for (i = 0; i < 8 && window < target; i++) > + window <<= 1; > + > + *val = window; > + *sel = i; > + > + if (i == 8) > + return -EINVAL; > + > + return 0; > + > +} > + > +static int find_closest_slow_by_fast(int fast_val, int target, int *slowsel) > +{ > + int sel; > + static const int multipliers[] = {2, 3, 7, 15}; > + > + for (sel = 0; sel < ARRAY_SIZE(multipliers) && > + multipliers[sel] * fast_val < target; sel++) > + ; > + > + if (sel == ARRAY_SIZE(multipliers)) > + return -EINVAL; > + > + *slowsel = sel; > + > + return 0; > +} > + > +static int find_closest_slow(int target, int *slow_sel, int *fast_sel) > +{ > + static const int multipliers[] = {2, 3, 7, 15}; > + int i, j; > + int val = 0; > + int window = FASTNG_MIN; > + > + for (i = 0; i < 8; i++) { > + for (j = 0; j < ARRAY_SIZE(multipliers); j++) { > + int slow; > + > + slow = window * multipliers[j]; > + if (slow >= target && (!val || slow < val)) { > + val = slow; > + *fast_sel = i; > + *slow_sel = j; > + } > + } > + window <<= 1; > + } > + if (!val) > + return -EINVAL; > + > + return 0; > +} > + > +#define BD957X_WDG_TYPE_WINDOW BIT(5) > +#define BD957X_WDG_TYPE_SLOW 0 > +#define BD957X_WDG_TYPE_MASK BIT(5) > +#define BD957X_WDG_NG_RATIO_MASK 0x18 > +#define BD957X_WDG_FASTNG_MASK 0x7 > + > +static int bd957x_set_wdt_mode(struct bd9576_wdt_priv *priv, int hw_margin, > + int hw_margin_min) > +{ > + int ret, fastng, slowng, type, reg, mask; > + struct device *dev = priv->dev; > + > + /* convert to 100uS */ > + hw_margin *= 10; > + hw_margin_min *= 10; > + if (hw_margin_min) { > + int min; > + > + type = BD957X_WDG_TYPE_WINDOW; > + dev_dbg(dev, "Setting type WINDOW 0x%x\n", type); > + ret = find_closest_fast(hw_margin_min, &fastng, &min); > + if (ret) { > + dev_err(dev, "bad WDT window for fast timeout\n"); > + return ret; > + } > + > + ret = find_closest_slow_by_fast(min, hw_margin, &slowng); > + if (ret) { > + dev_err(dev, "bad WDT window\n"); > + return ret; > + } > + > + } else { > + type = BD957X_WDG_TYPE_SLOW; > + dev_dbg(dev, "Setting type SLOW 0x%x\n", type); > + ret = find_closest_slow(hw_margin, &slowng, &fastng); > + if (ret) { > + dev_err(dev, "bad WDT window\n"); > + return ret; > + } > + } > + > + slowng <<= ffs(BD957X_WDG_NG_RATIO_MASK) - 1; > + reg = type | slowng | fastng; > + mask = BD957X_WDG_TYPE_MASK | BD957X_WDG_NG_RATIO_MASK | > + BD957X_WDG_FASTNG_MASK; > + ret = regmap_update_bits(priv->regmap, BD957X_REG_WDT_CONF, > + mask, reg); > + > + return ret; > +} > + > +static int bd9576_wdt_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->parent->of_node; > + struct bd9576_wdt_priv *priv; > + u32 hw_margin, hw_margin_min; > + int ret; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, priv); > + > + priv->dev = dev; > + priv->regmap = dev_get_regmap(dev->parent, NULL); > + if (!priv->regmap) { > + dev_err(dev, "No regmap found\n"); > + return -ENODEV; > + } > + > + priv->gpiod_en = devm_gpiod_get_from_of_node(dev, dev->parent->of_node, > + "rohm,watchdog-enable-gpios", > + 0, GPIOD_OUT_LOW, > + "watchdog-enable"); > + if (IS_ERR(priv->gpiod_en)) { devm_gpiod_get_from_of_node() can return -EPROBE_DEFER in which case we don't want to see an error message. I would suggest to use dev_err_probe(). > + dev_err(dev, "getting watchdog-enable GPIO failed\n"); > + return PTR_ERR(priv->gpiod_en); > + } > + > + priv->gpiod_ping = devm_gpiod_get_from_of_node(dev, dev->parent->of_node, > + "rohm,watchdog-ping-gpios", > + 0, GPIOD_OUT_LOW, > + "watchdog-ping"); > + if (IS_ERR(priv->gpiod_ping)) { > + dev_err(dev, "getting watchdog-ping GPIO failed\n"); > + return PTR_ERR(priv->gpiod_ping); > + } Same as above. > + > + ret = of_property_read_u32(np, > + "hw_margin_ms", &hw_margin); Line splits are arbitrary. Why is this "hw_margin_ms" and not "rohm,hw_margin_ms" ? > + if (ret) { > + if (ret != -EINVAL) > + return ret; > + > + hw_margin = BD957X_WDT_DEFAULT_MARGIN; > + } > + > + ret = of_property_read_u32(np, "rohm,hw-margin-min-ms", &hw_margin_min); > + if (ret == -EINVAL) > + hw_margin_min = 0; > + else if (ret) > + return ret; Please use a single mechanism to handle -EINVAL after of_property_read_u32(). > + > + ret = bd957x_set_wdt_mode(priv, hw_margin, hw_margin_min); > + if (ret) > + return ret; > + > + priv->always_running = of_property_read_bool(np, > + "always-running"); Another arbitrary line split. > + > + watchdog_set_drvdata(&priv->wdd, priv); > + > + priv->wdd.info = &bd957x_wdt_ident; > + priv->wdd.ops = &bd957x_wdt_ops; > + priv->wdd.min_hw_heartbeat_ms = hw_margin_min; > + priv->wdd.max_hw_heartbeat_ms = hw_margin; > + priv->wdd.parent = dev; > + priv->wdd.timeout = (hw_margin / 2) * 1000; > + > + watchdog_init_timeout(&priv->wdd, 0, dev); > + watchdog_set_nowayout(&priv->wdd, nowayout); > + > + watchdog_stop_on_reboot(&priv->wdd); > + > + if (priv->always_running) > + bd9576_wdt_start(&priv->wdd); > + > + return devm_watchdog_register_device(dev, &priv->wdd); > +} > + > +static struct platform_driver bd9576_wdt_driver = { > + .driver = { > + .name = "bd9576-wdt", > + }, > + .probe = bd9576_wdt_probe, > +}; > + > +module_platform_driver(bd9576_wdt_driver); > + > +MODULE_AUTHOR("Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>"); > +MODULE_DESCRIPTION("ROHM BD9576/BD9573 Watchdog driver"); > +MODULE_LICENSE("GPL"); > +MODULE_ALIAS("platform:bd9576-wdt"); >
Thanks (again) for review Guenter! On Thu, 2020-09-17 at 22:45 -0700, Guenter Roeck wrote: > On 9/17/20 1:03 AM, Matti Vaittinen wrote: > > Add Watchdog support for ROHM BD9576MUF and BD9573MUF PMICs which > > are > > mainly used to power the R-Car series processors. The watchdog is > > pinged using a GPIO and enabled using another GPIO. Additionally > > watchdog time-out can be configured to HW prior starting the > > watchdog. > > Watchdog timeout can be configured to detect only delayed ping or > > in > > a window mode where also too fast pings are detected. > > > > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > > --- > > drivers/watchdog/Kconfig | 13 ++ > > drivers/watchdog/Makefile | 1 + > > drivers/watchdog/bd9576_wdt.c | 295 > > ++++++++++++++++++++++++++++++++++ > > 3 files changed, 309 insertions(+) > > create mode 100644 drivers/watchdog/bd9576_wdt.c > > > + > > + ret = of_property_read_u32(np, > > + "hw_margin_ms", &hw_margin); > > Line splits are arbitrary. Why is this "hw_margin_ms" and not > "rohm,hw_margin_ms" ? "hw_margin_ms" is an existing binding for specifying the maximum TMO in HW (if I understood it correctly). (It is used at least by the generig GPIO watchdog) I thought it's better to not invent a new vendor specific binding when we have a generic one. https://elixir.bootlin.com/linux/v5.9-rc2/source/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt > > > + if (ret) { > > + if (ret != -EINVAL) > > + return ret; > > + > > + hw_margin = BD957X_WDT_DEFAULT_MARGIN; > > + } > > + > > + ret = of_property_read_u32(np, "rohm,hw-margin-min-ms", > > &hw_margin_min); > > + if (ret == -EINVAL) > > + hw_margin_min = 0; > > + else if (ret) > > + return ret; > > Please use a single mechanism to handle -EINVAL after > of_property_read_u32(). Sorry Guenter - I am probably a bit slow today but I am unsure if I understand the suggestion. Do you mean something like: hw_margin_min = 0; ret = of_property_read_u32(np, "rohm,hw-margin-min-ms", &hw_margin_min); if (ret && ret != -EINVAL) return ret; Other than that - all findings are clear to me. I'll craft a new version but I'll wait for a while to see if Lee has time to send some feedback on MFD so I could get both WDG and MFD fixes to same version :) Best Regards --Matti -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. "non cogito me" dixit Rene Descarte, deinde evanescavit (Thanks for the translation Simon)
On Thu, Sep 17, 2020 at 11:01:52AM +0300, Matti Vaittinen wrote: > Add bindings for ROHM BD9576MUF and BD9573MUF PMICs. These > PMICs are primarily intended to be used to power the R-Car series > processors. They provide 6 power outputs, safety features and a > watchdog with two functional modes. > > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > --- > .../bindings/mfd/rohm,bd9576-pmic.yaml | 129 ++++++++++++++++++ > 1 file changed, 129 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml > > diff --git a/Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml b/Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml > new file mode 100644 > index 000000000000..f17d4d621585 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml > @@ -0,0 +1,129 @@ > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mfd/rohm,bd9576-pmic.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: ROHM BD9576MUF and BD9573MUF Power Management Integrated Circuit bindings > + > +maintainers: > + - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > + > +description: | > + BD9576MUF and BD9573MUF are power management ICs primarily intended for > + powering the R-Car series processors. > + The IC provides 6 power outputs with configurable sequencing and safety > + monitoring. A watchdog logic with slow ping/windowed modes is also included. > + > +properties: > + compatible: > + enum: > + - rohm,bd9576 > + - rohm,bd9573 > + > + reg: > + description: > + I2C slave address. > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + rohm,vout1-en-low: > + description: > + BD9576 and BD9573 VOUT1 regulator enable state can be individually > + controlled by a GPIO. This is dictated by state of vout1-en pin during > + the PMIC startup. If vout1-en is LOW during PMIC startup then the VOUT1 > + enable sate is controlled via this pin. Set this property if vout1-en > + is wired to be down at PMIC start-up. > + type: boolean > + > + rohm,vout1-en-gpios: > + description: > + GPIO specifier to specify the GPIO connected to vout1-en for vout1 ON/OFF > + state control. > + maxItems: 1 > + > + rohm,ddr-sel-low: > + description: > + The BD9576 and BD9573 output voltage for DDR can be selected by setting > + the ddr-sel pin low or high. Set this property if ddr-sel is grounded. > + type: boolean > + > + rohm,watchdog-enable-gpios: > + description: The GPIO line used to enable the watchdog. > + maxItems: 1 > + > + rohm,watchdog-ping-gpios: > + description: The GPIO line used to ping the watchdog. > + maxItems: 1 > + > + hw_margin_ms: Needs a vendor prefix. s/_/-/ > + minimum: 4 > + maximum: 4416 > + description: Watchog timeout in milliseconds Maybe the words in the description should be in the property name as I don't see how 'h/w margin' relates to 'watchdog timeout'. Is this a max and below is the min?: > + > + rohm,hw-margin-min-ms: > + minimum: 2 > + maximum: 220 > + description: > + Watchdog on these ICs can be configured in a window mode where the ping > + must come within certain time-window. Eg. too quick pinging will also > + trigger timeout. Specify the minimum delay between pings if you wish to > + use the window mode. Note, the maximum delay is internally configured as > + a certain multiple of this value so maximum delay can be only up to 15 > + times this value. For example for 73 ms short ping value the maximum > + timeout will be close to 1 sec. > + > + regulators: > + $ref: ../regulator/rohm,bd9576-regulator.yaml > + description: > + List of child nodes that specify the regulators. > + > +required: > + - compatible > + - reg > + - regulators > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/gpio/gpio.h> > + #include <dt-bindings/leds/common.h> > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + pmic: pmic@30 { > + compatible = "rohm,bd9576"; > + reg = <0x30>; > + rohm,vout1-en-low; > + rohm,vout1-en-gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; > + rohm,ddr-sel-low; > + rohm,watchdog-enable-gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; > + rohm,watchdog-ping-gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>; > + hw_margin_ms = <30>; > + rohm,hw-margin-min-ms = <4>; > + > + regulators { > + boost1: regulator-vd50 { > + regulator-name = "VD50"; > + }; > + buck1: regulator-vd18 { > + regulator-name = "VD18"; > + }; > + buck2: regulator-vdddr { > + regulator-name = "vdddr"; > + }; > + buck3: regulator-vd10 { > + regulator-name = "vd10"; > + }; > + ldo: regulator-voutl1 { > + regulator-name = "VOUTL1"; > + }; > + sw: regulator-vouts1 { > + regulator-name = "VOUTS1"; > + }; > + }; > + }; > + }; > -- > 2.21.0 > > > -- > Matti Vaittinen, Linux device drivers > ROHM Semiconductors, Finland SWDC > Kiviharjunlenkki 1E > 90220 OULU > FINLAND > > ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ > Simon says - in Latin please. > ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ > Thanks to Simon Glass for the translation =]
On 9/17/20 11:06 PM, Vaittinen, Matti wrote: > Thanks (again) for review Guenter! > > On Thu, 2020-09-17 at 22:45 -0700, Guenter Roeck wrote: >> On 9/17/20 1:03 AM, Matti Vaittinen wrote: >>> Add Watchdog support for ROHM BD9576MUF and BD9573MUF PMICs which >>> are >>> mainly used to power the R-Car series processors. The watchdog is >>> pinged using a GPIO and enabled using another GPIO. Additionally >>> watchdog time-out can be configured to HW prior starting the >>> watchdog. >>> Watchdog timeout can be configured to detect only delayed ping or >>> in >>> a window mode where also too fast pings are detected. >>> >>> Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> >>> --- >>> drivers/watchdog/Kconfig | 13 ++ >>> drivers/watchdog/Makefile | 1 + >>> drivers/watchdog/bd9576_wdt.c | 295 >>> ++++++++++++++++++++++++++++++++++ >>> 3 files changed, 309 insertions(+) >>> create mode 100644 drivers/watchdog/bd9576_wdt.c > >> >>> + >>> + ret = of_property_read_u32(np, >>> + "hw_margin_ms", &hw_margin); >> >> Line splits are arbitrary. Why is this "hw_margin_ms" and not >> "rohm,hw_margin_ms" ? > > "hw_margin_ms" is an existing binding for specifying the maximum TMO in > HW (if I understood it correctly). (It is used at least by the generig > GPIO watchdog) I thought it's better to not invent a new vendor > specific binding when we have a generic one. > > https://elixir.bootlin.com/linux/v5.9-rc2/source/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt > >> >>> + if (ret) { >>> + if (ret != -EINVAL) >>> + return ret; >>> + >>> + hw_margin = BD957X_WDT_DEFAULT_MARGIN; >>> + } >>> + >>> + ret = of_property_read_u32(np, "rohm,hw-margin-min-ms", >>> &hw_margin_min); >>> + if (ret == -EINVAL) >>> + hw_margin_min = 0; >>> + else if (ret) >>> + return ret; >> >> Please use a single mechanism to handle -EINVAL after >> of_property_read_u32(). > > Sorry Guenter - I am probably a bit slow today but I am unsure if I > understand the suggestion. Do you mean something like: > if (ret) { >>> + if (ret != -EINVAL) >>> + return ret; >>> + >>> + hw_margin = BD957X_WDT_DEFAULT_MARGIN; >>> + } vs. >>> + if (ret == -EINVAL) >>> + hw_margin_min = 0; >>> + else if (ret) >>> + return ret; is not very consistent to me. Guenter > hw_margin_min = 0; > > ret = of_property_read_u32(np, "rohm,hw-margin-min-ms", > &hw_margin_min); > if (ret && ret != -EINVAL) > return ret; > > Other than that - all findings are clear to me. I'll craft a new > version but I'll wait for a while to see if Lee has time to send some > feedback on MFD so I could get both WDG and MFD fixes to same version > :) > > Best Regards > --Matti > > > -- > Matti Vaittinen, Linux device drivers > ROHM Semiconductors, Finland > SWDC > Kiviharjunlenkki 1E > 90220 OULU > FINLAND > > ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ > > Simon says - in Latin please. > "non cogito me" dixit Rene Descarte, deinde evanescavit > > (Thanks for the translation Simon) >
On Sat, Sep 19, 2020 at 5:46 AM Vaittinen, Matti <Matti.Vaittinen@fi.rohmeurope.com> wrote: > > Thanks Rob for taking a look at this! > > On Fri, 2020-09-18 at 11:28 -0600, Rob Herring wrote: > > On Thu, Sep 17, 2020 at 11:01:52AM +0300, Matti Vaittinen wrote: > > > Add bindings for ROHM BD9576MUF and BD9573MUF PMICs. These > > > PMICs are primarily intended to be used to power the R-Car series > > > processors. They provide 6 power outputs, safety features and a > > > watchdog with two functional modes. > > > > > > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > > > --- > > > .../bindings/mfd/rohm,bd9576-pmic.yaml | 129 > > > ++++++++++++++++++ > > > 1 file changed, 129 insertions(+) > > > create mode 100644 > > > Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml > > > > > > diff --git a/Documentation/devicetree/bindings/mfd/rohm,bd9576- > > > pmic.yaml b/Documentation/devicetree/bindings/mfd/rohm,bd9576- > > > pmic.yaml > > > new file mode 100644 > > > index 000000000000..f17d4d621585 > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml > > > @@ -0,0 +1,129 @@ > > > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > > > +%YAML 1.2 > > > +--- > > > +$id: http://devicetree.org/schemas/mfd/rohm,bd9576-pmic.yaml# > > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > > + > > > +title: ROHM BD9576MUF and BD9573MUF Power Management Integrated > > > Circuit bindings > > > + > > > +maintainers: > > > + - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > > > + > > > +description: | > > > + BD9576MUF and BD9573MUF are power management ICs primarily > > > intended for > > > + powering the R-Car series processors. > > > + The IC provides 6 power outputs with configurable sequencing and > > > safety > > > + monitoring. A watchdog logic with slow ping/windowed modes is > > > also included. > > > + > > > +properties: > > > + compatible: > > > + enum: > > > + - rohm,bd9576 > > > + - rohm,bd9573 > > > + > > > + reg: > > > + description: > > > + I2C slave address. > > > + maxItems: 1 > > > + > > > + interrupts: > > > + maxItems: 1 > > > + > > > + rohm,vout1-en-low: > > > + description: > > > + BD9576 and BD9573 VOUT1 regulator enable state can be > > > individually > > > + controlled by a GPIO. This is dictated by state of vout1-en > > > pin during > > > + the PMIC startup. If vout1-en is LOW during PMIC startup > > > then the VOUT1 > > > + enable sate is controlled via this pin. Set this property if > > > vout1-en > > > + is wired to be down at PMIC start-up. > > > + type: boolean > > > + > > > + rohm,vout1-en-gpios: > > > + description: > > > + GPIO specifier to specify the GPIO connected to vout1-en for > > > vout1 ON/OFF > > > + state control. > > > + maxItems: 1 > > > + > > > + rohm,ddr-sel-low: > > > + description: > > > + The BD9576 and BD9573 output voltage for DDR can be selected > > > by setting > > > + the ddr-sel pin low or high. Set this property if ddr-sel is > > > grounded. > > > + type: boolean > > > + > > > + rohm,watchdog-enable-gpios: > > > + description: The GPIO line used to enable the watchdog. > > > + maxItems: 1 > > > + > > > + rohm,watchdog-ping-gpios: > > > + description: The GPIO line used to ping the watchdog. > > > + maxItems: 1 > > > + > > > + hw_margin_ms: > > > > Needs a vendor prefix. > > > > s/_/-/ > > > > > + minimum: 4 > > > + maximum: 4416 > > > + description: Watchog timeout in milliseconds > > > > Maybe the words in the description should be in the property name as > > I don't see how 'h/w margin' relates to 'watchdog timeout'. > > The hw_margin_ms is an existing property. As I wrote to Guenter: > "hw_margin_ms" is an existing binding for specifying the maximum TMO in > HW (if I understood it correctly). (It is used at least by the generig > GPIO watchdog) I thought it's better to not invent a new vendor > specific binding when we have a generic one. > > https://elixir.bootlin.com/linux/v5.9-rc2/source/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt That one is odd and I haven't found an actual user of it. It would make more sense as a collection of properties devices could use rather than a virtual device. I think I'd do something like 'watchdog-ping-time-msec' that can be either '<min> <max>' or '<max>'. Rob
On Wed, 2020-09-23 at 08:27 -0600, Rob Herring wrote: > On Sat, Sep 19, 2020 at 5:46 AM Vaittinen, Matti > <Matti.Vaittinen@fi.rohmeurope.com> wrote: > > Thanks Rob for taking a look at this! > > > > On Fri, 2020-09-18 at 11:28 -0600, Rob Herring wrote: > > > On Thu, Sep 17, 2020 at 11:01:52AM +0300, Matti Vaittinen wrote: > > > > Add bindings for ROHM BD9576MUF and BD9573MUF PMICs. These > > > > PMICs are primarily intended to be used to power the R-Car > > > > series > > > > processors. They provide 6 power outputs, safety features and a > > > > watchdog with two functional modes. > > > > > > > > Signed-off-by: Matti Vaittinen < > > > > matti.vaittinen@fi.rohmeurope.com> > > > > --- > > > > .../bindings/mfd/rohm,bd9576-pmic.yaml | 129 > > > > ++++++++++++++++++ > > > > 1 file changed, 129 insertions(+) > > > > create mode 100644 > > > > Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml > > > > > > > > diff --git a/Documentation/devicetree/bindings/mfd/rohm,bd9576- > > > > pmic.yaml b/Documentation/devicetree/bindings/mfd/rohm,bd9576- > > > > pmic.yaml > > > > new file mode 100644 > > > > index 000000000000..f17d4d621585 > > > > --- /dev/null > > > > +++ b/Documentation/devicetree/bindings/mfd/rohm,bd9576- > > > > pmic.yaml > > > > @@ -0,0 +1,129 @@ > > > > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > > > > +%YAML 1.2 > > > > +--- > > > > +$id: http://devicetree.org/schemas/mfd/rohm,bd9576-pmic.yaml# > > > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > > > + > > > > +title: ROHM BD9576MUF and BD9573MUF Power Management > > > > Integrated > > > > Circuit bindings > > > > + > > > > +maintainers: > > > > + - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> > > > > + > > > > +description: | > > > > + BD9576MUF and BD9573MUF are power management ICs primarily > > > > intended for > > > > + powering the R-Car series processors. > > > > + The IC provides 6 power outputs with configurable sequencing > > > > and > > > > safety > > > > + monitoring. A watchdog logic with slow ping/windowed modes > > > > is > > > > also included. > > > > + > > > > +properties: > > > > + compatible: > > > > + enum: > > > > + - rohm,bd9576 > > > > + - rohm,bd9573 > > > > + > > > > + reg: > > > > + description: > > > > + I2C slave address. > > > > + maxItems: 1 > > > > + > > > > + interrupts: > > > > + maxItems: 1 > > > > + > > > > + rohm,vout1-en-low: > > > > + description: > > > > + BD9576 and BD9573 VOUT1 regulator enable state can be > > > > individually > > > > + controlled by a GPIO. This is dictated by state of > > > > vout1-en > > > > pin during > > > > + the PMIC startup. If vout1-en is LOW during PMIC startup > > > > then the VOUT1 > > > > + enable sate is controlled via this pin. Set this > > > > property if > > > > vout1-en > > > > + is wired to be down at PMIC start-up. > > > > + type: boolean > > > > + > > > > + rohm,vout1-en-gpios: > > > > + description: > > > > + GPIO specifier to specify the GPIO connected to vout1-en > > > > for > > > > vout1 ON/OFF > > > > + state control. > > > > + maxItems: 1 > > > > + > > > > + rohm,ddr-sel-low: > > > > + description: > > > > + The BD9576 and BD9573 output voltage for DDR can be > > > > selected > > > > by setting > > > > + the ddr-sel pin low or high. Set this property if ddr- > > > > sel is > > > > grounded. > > > > + type: boolean > > > > + > > > > + rohm,watchdog-enable-gpios: > > > > + description: The GPIO line used to enable the watchdog. > > > > + maxItems: 1 > > > > + > > > > + rohm,watchdog-ping-gpios: > > > > + description: The GPIO line used to ping the watchdog. > > > > + maxItems: 1 > > > > + > > > > + hw_margin_ms: > > > > > > Needs a vendor prefix. > > > > > > s/_/-/ > > > > > > > + minimum: 4 > > > > + maximum: 4416 > > > > + description: Watchog timeout in milliseconds > > > > > > Maybe the words in the description should be in the property name > > > as > > > I don't see how 'h/w margin' relates to 'watchdog timeout'. > > > > The hw_margin_ms is an existing property. As I wrote to Guenter: > > "hw_margin_ms" is an existing binding for specifying the maximum > > TMO in > > HW (if I understood it correctly). (It is used at least by the > > generig > > GPIO watchdog) I thought it's better to not invent a new vendor > > specific binding when we have a generic one. > > > > https://elixir.bootlin.com/linux/v5.9-rc2/source/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt > > That one is odd and I haven't found an actual user of it. It would > make more sense as a collection of properties devices could use > rather > than a virtual device. > > I think I'd do something like 'watchdog-ping-time-msec' that can be > either '<min> <max>' or '<max>'. Your suggestion looks good to me. If we introduce such then it would make sense to add handling for this in GPIO watchdog too. What I do wonder is how "hw_margin_ms" is unused? I see it is a required property for GPIO watchdog. The GPIO WDG probe seems to actually error out if reading this property fails with any error. I would assume the GPIO WDG is used somewhere? Hence I am a bit afraid of touching it. Breaking existing setups would not be nice. Guenter - how do you see this? Should we leave GPIO WDG as it is, convert it to use this new binding Rob suggested - or support both the old and new (at least for some time) in the driver - and possibly print a warning when old is used? Best Regards Matti Vaittinen
Hi dee Ho peeps! On Thu, 2020-09-24 at 09:12 +0300, Matti Vaittinen wrote: > On Wed, 2020-09-23 at 08:27 -0600, Rob Herring wrote: > > On Sat, Sep 19, 2020 at 5:46 AM Vaittinen, Matti > > <Matti.Vaittinen@fi.rohmeurope.com> wrote: > > > Thanks Rob for taking a look at this! > > > > > > On Fri, 2020-09-18 at 11:28 -0600, Rob Herring wrote: > > > > On Thu, Sep 17, 2020 at 11:01:52AM +0300, Matti Vaittinen > > > > wrote: > > > > > Add bindings for ROHM BD9576MUF and BD9573MUF PMICs. These > > > > > PMICs are primarily intended to be used to power the R-Car > > > > > series > > > > > processors. They provide 6 power outputs, safety features and > > > > > a > > > > > watchdog with two functional modes. > > > > > > > > > > Signed-off-by: Matti Vaittinen < > > > > > matti.vaittinen@fi.rohmeurope.com> > > > > > --- > > > > > .../bindings/mfd/rohm,bd9576-pmic.yaml | 129 > > > > > ++++++++++++++++++ > > > > > 1 file changed, 129 insertions(+) > > > > > create mode 100644 > > > > > Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml // Snip > > > > > + > > > > > + hw_margin_ms: > > > > > > > > Needs a vendor prefix. > > > > > > > > s/_/-/ > > > > > > > > > + minimum: 4 > > > > > + maximum: 4416 > > > > > + description: Watchog timeout in milliseconds > > > > > > > > Maybe the words in the description should be in the property > > > > name > > > > as > > > > I don't see how 'h/w margin' relates to 'watchdog timeout'. > > > > > > The hw_margin_ms is an existing property. As I wrote to Guenter: > > > "hw_margin_ms" is an existing binding for specifying the maximum > > > TMO in > > > HW (if I understood it correctly). (It is used at least by the > > > generig > > > GPIO watchdog) I thought it's better to not invent a new vendor > > > specific binding when we have a generic one. > > > > > > https://elixir.bootlin.com/linux/v5.9-rc2/source/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt > > > > That one is odd and I haven't found an actual user of it. It would > > make more sense as a collection of properties devices could use > > rather > > than a virtual device. > > > > I think I'd do something like 'watchdog-ping-time-msec' that can be > > either '<min> <max>' or '<max>'. > > Your suggestion looks good to me. If we introduce such then it would > make sense to add handling for this in GPIO watchdog too. > > What I do wonder is how "hw_margin_ms" is unused? I see it is a > required property for GPIO watchdog. The GPIO WDG probe seems to > actually error out if reading this property fails with any error. I > would assume the GPIO WDG is used somewhere? Hence I am a bit afraid > of > touching it. Breaking existing setups would not be nice. > > Guenter - how do you see this? Should we leave GPIO WDG as it is, > convert it to use this new binding Rob suggested - or support both > the > old and new (at least for some time) in the driver - and possibly > print > a warning when old is used? And one thing more - I don't think the 'watchdog-ping-time-msec' is best candidate as it sounds like the time when one should ping the WDG (SW feature). We already have the timeout-sec defined for that. This new property is to configure/advertice the HW time limit - Eg, time when WDG takes action if it has not been pinged (for max) or takes action if WDG is pinged too quickly (min). Thus I liked hw-margin better than ping-time. (For example with hw-margin <500ms> ... <4000ms> the ping-time 1000 ms would be just fine. Couple of things I would like to get opinions for ... 1. Corect location for this binding - and should it be vendor specific or generic? - I wonder if I should put this new property in rohm-bd9576.yaml? - Should it be vendor specific? - Or should I put it in watchdog.yaml and make it generic? I think it should be generic as many wdg chips implement the timeout configuration. 2. Should we extend WDG core to parse this property if it is placed in watchdog.yaml? 2a) And should we extend watchdog core to call the driver callback for setting timeout if it finds the <max> tmo? 2b) Should we extend driver IF to allow callback for setting min tmo? 2c) Current tmo setting callback uses units of seconds. Should we support setting TMO in ms? I think it might make sense for few specific Linux setups. (I know people use Linux for things that are almost RT - no matter how clever that is. So some might benefit from sub-second scale wdg window). Thoughts? Best Regards Matti Vaittinen -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. "non cogito me" dixit Rene Descarte, deinde evanescavit (Thanks for the translation Simon)