Re: [PATCH RFC 1/2] regulator: introduce regulator monitoring constraints
From: Matti Vaittinen
Date: Thu Apr 20 2023 - 07:34:45 EST
Hi Benjamin,
On 4/20/23 13:29, Benjamin Bara wrote:
From: Benjamin Bara <benjamin.bara@xxxxxxxxxxx>
Add constraints for regulator monitoring. These are useful when the
state of the regulator might change during runtime, but the monitor
state (in hardware) is not implicitly changed with the change of the
regulator state or mode (in hardware).
When used, the core takes care of handling the monitor state. This could
ensure that a monitor does not stay active when its regulator is
disabled.
I think this could be useful feature. AFAIR for example the bd718x7
regulator driver needs to disable the monitoring for the duration of a
voltage change.
+static int handle_monitors(struct regulator_dev *rdev, bool pre, bool enable, bool change,
+ unsigned int mode)
+{
+ const struct regulator_ops *ops = rdev->desc->ops;
+ const struct regulation_constraints *reg_c = rdev->constraints;
+
+ /*
+ * ensure that voltage monitoring is explicitly enabled in the device tree and that the
+ * driver has monitoring constraints and protection ops.
+ */
+ bool handle_ov = reg_c->over_voltage_detection && reg_c->ov_constraints &&
+ ops->set_over_voltage_protection;
+ bool handle_uv = reg_c->under_voltage_detection && reg_c->uv_constraints &&
+ ops->set_under_voltage_protection;
Hm. Is there a reason why we need to perform these checks for each of
the calls? Could we do checks when regulator is registered? Also, could
we just directly have function pointers to monitoring disabling which
would be populated by the driver. Core would then call these callbacks
if they were populated (instead of these flags and unconditional call to
handling). This might have other benefits as well (please see below).
+ int ret = 0;
+
+ if (!handle_ov && !handle_uv)
+ return 0;
+
+ dev_dbg(&rdev->dev, "%s: pre: %d, en: %d, ch: %d, mode: %u\n", __func__, pre, enable,
+ change, mode);
+ if ((enable + change + !!mode) > 1) {
+ dev_err(&rdev->dev, "%s: invalid combination!\n", __func__);
+ return -EINVAL;
+ }
+
+ if (handle_ov) {
+ if (should_disable_monitor(reg_c->ov_constraints, pre, enable, change, mode))
+ ret = handle_notify_limits(rdev, ops->set_over_voltage_protection,
+ &disable_limits);
+ else if (should_enable_monitor(reg_c->ov_constraints, pre, enable, change, mode))
+ ret = handle_notify_limits(rdev, ops->set_over_voltage_protection,
+ ®_c->over_voltage_limits);
+ }
+ if (ret)
+ return ret;
+
+ if (handle_uv) {
+ if (should_disable_monitor(reg_c->uv_constraints, pre, enable, change, mode))
+ ret = handle_notify_limits(rdev, ops->set_under_voltage_protection,
+ &disable_limits);
+ else if (should_enable_monitor(reg_c->uv_constraints, pre, enable, change, mode))
+ ret = handle_notify_limits(rdev, ops->set_under_voltage_protection,
+ ®_c->under_voltage_limits);
+ }
+
+ return ret;
+}
+
+static inline int handle_monitors_disable(struct regulator_dev *rdev)
+{
+ return handle_monitors(rdev, true, false, false, REGULATOR_MODE_INVALID);
+}
+
+static inline int handle_monitors_enable(struct regulator_dev *rdev)
+{
+ return handle_monitors(rdev, false, true, false, REGULATOR_MODE_INVALID);
+}
+
+static inline int handle_monitors_set(struct regulator_dev *rdev, bool pre)
+{
+ return handle_monitors(rdev, pre, false, true, REGULATOR_MODE_INVALID);
+}
+
+static inline int handle_monitors_mode(struct regulator_dev *rdev, bool pre, unsigned int mode)
+{
+ return handle_monitors(rdev, pre, false, false, mode);
+}
+
/**
* set_machine_constraints - sets regulator constraints
* @rdev: regulator source
@@ -1512,7 +1612,8 @@ static int set_machine_constraints(struct regulator_dev *rdev)
"IC does not support requested over-current limits\n");
}
- if (rdev->constraints->over_voltage_detection)
+ /* only if we have static monitoring. with dynamic, it will be set according to state. */
+ if (rdev->constraints->over_voltage_detection && !rdev->constraints->ov_constraints)
ret = handle_notify_limits(rdev,
ops->set_over_voltage_protection,
&rdev->constraints->over_voltage_limits);
@@ -1526,7 +1627,8 @@ static int set_machine_constraints(struct regulator_dev *rdev)
"IC does not support requested over voltage limits\n");
}
- if (rdev->constraints->under_voltage_detection)
+ /* only if we have static monitoring. with dynamic, it will be set according to state. */
+ if (rdev->constraints->under_voltage_detection && !rdev->constraints->uv_constraints)
ret = handle_notify_limits(rdev,
ops->set_under_voltage_protection,
&rdev->constraints->under_voltage_limits);
@@ -2734,7 +2836,7 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
trace_regulator_enable_complete(rdev_get_name(rdev));
- return 0;
+ return handle_monitors_enable(rdev);
Eg, instead of unconditional call to handle_monitors_enable() could we
here check if driver has given us a pointer to monitoring disabling
function? Or, do you think it would be worth making this a tiny bit more
generic by just doing some 'pre_enable' and 'post _disable' callbacks
which driver can populate? Maybe we could also add 'ready-to-use'
default helpers which drivers (who just want to propagate the call to
ops->set_over_voltage_protection et al) could use.
I think that some PMICs I've seen had separate 'disable/enable all
monitors' bit which needed to be used when monitoring was
disabled/enabled due to an operation [voltage change/disable/enable].
If we allowed driver to populate the disabling callbacks, then this
would support also those ICs which need to disable multiple monitors for
the duration of an operation (or do some other strange stuff). It would
also allow drivers to add delays to the function(s) re-enabling of
monitors when needed - at least the bd718x7 had to wait for new voltage
to stabilize prior re-enabling the monitors.
+/**
+ * struct monitoring_constraints - regulator monitoring constraints.
+ *
+ * This struct describes monitoring specific constraints.
+ *
+ * The constraints should be set by a driver if an enable/disable or regulator MODE switch does not
+ * change the state of the monitor implicitly. When used, the core handles the monitoring of a
+ * dynamic regulator implicitly on state/mode change, based on this configuration. This should
+ * avoid that the monitor reaches an invalid state.
+ *
+ * @mon_disable_during_reg_set: Monitor should be disabled before and enabled after the regulators'
+ * value is changed
+ * @mon_disable_during_reg_off: Monitor should be disabled before a regulator disable and enabled
+ * after a regulator enable
+ *
+ * @mon_disable_pre_reg_idle: Monitor should be disabled before a switch to MODE_IDLE
+ * @mon_disable_pre_reg_standby: Monitor should be disabled before a switch to MODE_STANDBY
+ * @mon_enable_post_reg_normal: Monitor should be enabled after a switch to MODE_NORMAL
+ * @mon_enable_post_reg_fast: Monitor should be enabled after a switch to MODE_FAST
+ */
+struct monitoring_constraints {
+ unsigned mon_disable_during_reg_set:1;
+ unsigned mon_disable_during_reg_off:1;
+
+ unsigned mon_disable_pre_reg_idle:1;
+ unsigned mon_disable_pre_reg_standby:1;
+ unsigned mon_enable_post_reg_normal:1;
+ unsigned mon_enable_post_reg_fast:1;
+};
So, could we perhaps have function pointers for these in the ops instead
of flags? Core could then call these if set? Do you think that would work?
+
#define REGULATOR_NOTIF_LIMIT_DISABLE -1
#define REGULATOR_NOTIF_LIMIT_ENABLE -2
struct notification_limit {
@@ -207,6 +237,10 @@ struct regulation_constraints {
unsigned int active_discharge;
+ /* monitoring constraints */
+ const struct monitoring_constraints *ov_constraints;
+ const struct monitoring_constraints *uv_constraints;
+
/* constraint flags */
unsigned always_on:1; /* regulator never off when system is on */
unsigned boot_on:1; /* bootloader/firmware enabled regulator */
Yours,
-- Matti
--
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland
~~ When things go utterly wrong vim users can always type :help! ~~