| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20231030-bcm59054-v1-6-3517f980c1e3@gmail.com>
Date: Mon, 30 Oct 2023 20:36:43 +0100
From: Artur Weber <aweber.kernel@...il.com>
To: Lee Jones <lee@...nel.org>, Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>,
Florian Fainelli <florian.fainelli@...adcom.com>,
Ray Jui <rjui@...adcom.com>,
Scott Branden <sbranden@...adcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@...adcom.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>
Cc: Stanislav Jakubek <stano.jakubek@...il.com>,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-rpi-kernel@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
Artur Weber <aweber.kernel@...il.com>
Subject: [PATCH 6/6] regulator: bcm590xx: Add proper handling for PMMODE
registers
The state of BCM590XX regulators is controlled by writing to the
PMCTRL registers; there are 7 selectable mode entries in those
registers, each storing a specific mode value - OFF, LPM or ON.
Which entry is selected depends on the combination of enabled
PC pins (PC1, PC2 and the optional PC3).
Add a new function to write a specific mode value to all entries,
and make a custom enable/disable function to make use of it.
Keep the is_enabled function using the naive regmap method
(a potential improvement here would be to add support for getting
the state of the PC pins to figure out the selected mode).
It should also be possible to extend this to support regulator
modes, though some work may be needed to make sure it doesn't
interfere with the enabled/disabled state.
Signed-off-by: Artur Weber <aweber.kernel@...il.com>
---
drivers/regulator/bcm590xx-regulator.c | 100 ++++++++++++++++++++++++++++-----
1 file changed, 86 insertions(+), 14 deletions(-)
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c
index 8b90eae06ca6..af1ab8735ea7 100644
--- a/drivers/regulator/bcm590xx-regulator.c
+++ b/drivers/regulator/bcm590xx-regulator.c
@@ -38,6 +38,15 @@ struct bcm590xx_reg {
#define BCM590XX_LDO_VSEL_MASK GENMASK(5, 3)
#define BCM590XX_SR_VSEL_MASK GENMASK(5, 0)
+#define BCM590XX_PMMODE_ON 0x0
+#define BCM590XX_PMMODE_LPM 0x1
+#define BCM590XX_PMMODE_OFF 0x2
+
+#define PMMODE_3BIT_MASK(mode) \
+ ((mode << 3) | mode)
+#define PMMODE_2BIT_MASK(mode) \
+ ((mode << 6) | (mode << 4) | (mode << 2) | mode)
+
/* BCM59056 registers */
/* I2C slave 0 registers */
@@ -435,16 +444,16 @@ static int bcm590xx_get_vsel_register(struct bcm590xx_reg *pmu, int id)
return BCM59054_CSRVOUT1 + (id - BCM59054_REG_CSR) * 3;
case BCM59056_TYPE:
if (bcm590xx_reg_is_ldo(pmu, id))
- return BCM59056_RFLDOCTRL + (id - BCM59056_REG_RFLDO);
+ return BCM59056_RFLDOCTRL + (id - BCM59054_REG_RFLDO);
else if (bcm590xx_reg_is_gpldo(pmu, id))
- return BCM59056_GPLDO1CTRL + (id - BCM59056_REG_GPLDO1);
+ return BCM59056_GPLDO1CTRL + (id - BCM59054_REG_GPLDO1);
else
return BCM59056_CSRVOUT1 + (id - BCM59056_REG_CSR) * 3;
}
return -EINVAL;
}
-static int bcm59054_get_enable_register(struct bcm590xx_reg *pmu, int id)
+static int bcm59054_get_pmctrl_register(struct bcm590xx_reg *pmu, int id)
{
int reg = 0;
@@ -483,7 +492,7 @@ static int bcm59054_get_enable_register(struct bcm590xx_reg *pmu, int id)
return reg;
}
-static int bcm59056_get_enable_register(struct bcm590xx_reg *pmu, int id)
+static int bcm59056_get_pmctrl_register(struct bcm590xx_reg *pmu, int id)
{
int reg = 0;
@@ -522,13 +531,13 @@ static int bcm59056_get_enable_register(struct bcm590xx_reg *pmu, int id)
return reg;
}
-static int bcm590xx_get_enable_register(struct bcm590xx_reg *pmu, int id)
+static int bcm590xx_get_pmctrl_register(struct bcm590xx_reg *pmu, int id)
{
switch (pmu->mfd->device_type) {
case BCM59054_TYPE:
- return bcm59054_get_enable_register(pmu, id);
+ return bcm59054_get_pmctrl_register(pmu, id);
case BCM59056_TYPE:
- return bcm59056_get_enable_register(pmu, id);
+ return bcm59056_get_pmctrl_register(pmu, id);
}
return -EINVAL;
}
@@ -541,10 +550,73 @@ static int bcm590xx_get_enable_mask(struct bcm590xx_reg *pmu, int id)
return BCM590XX_REG_ENABLE;
}
+/*
+ * The state of BCM590XX regulators is controlled by the PM mode; most
+ * regulators have 3 such modes (off, low-power and on).
+ *
+ * These modes are then stored in the PMCTRL registers - there are 7
+ * PMMODE entries within these registers for any given regulator.
+ * Which one is selected is decided by the PC1 and PC2 pins (and the
+ * optional PC3 pin, if configured).
+ *
+ * For simplicity, to set a PM mode, we write it to all available
+ * PMMODE registers.
+ */
+static int
+_bcm590xx_set_pmmode(struct bcm590xx_reg *pmu, int reg_id, unsigned int mode)
+{
+ struct regmap *regmap;
+ u8 pmctrl_addr = bcm590xx_get_pmctrl_register(pmu, reg_id);
+ unsigned int i;
+ int pmctrl_count;
+ int mode_mask;
+ int ret;
+
+ /*
+ * Regulators using 2-bit mode controls have 2 PMCTRL registers;
+ * regulators using 3-bit mode controls have 4 PMCTRL registers.
+ * This is to accommodate all 7 selectable modes.
+ */
+ if (bcm590xx_reg_mode_is_3bit(pmu, reg_id)) {
+ pmctrl_count = 4;
+ mode_mask = PMMODE_3BIT_MASK(mode);
+ } else {
+ pmctrl_count = 2;
+ mode_mask = PMMODE_2BIT_MASK(mode);
+ }
+
+ if (bcm590xx_reg_is_secondary(pmu, reg_id))
+ regmap = pmu->mfd->regmap_sec;
+ else
+ regmap = pmu->mfd->regmap_pri;
+
+ for (i = 0; i < pmctrl_count; i++) {
+ ret = regmap_write(regmap, pmctrl_addr + i, mode_mask);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int bcm590xx_regulator_enable(struct regulator_dev *rdev)
+{
+ struct bcm590xx_reg *pmu = rdev->reg_data;
+
+ return _bcm590xx_set_pmmode(pmu, rdev->desc->id, BCM590XX_PMMODE_ON);
+}
+
+static int bcm590xx_regulator_disable(struct regulator_dev *rdev)
+{
+ struct bcm590xx_reg *pmu = rdev->reg_data;
+
+ return _bcm590xx_set_pmmode(pmu, rdev->desc->id, BCM590XX_PMMODE_OFF);
+}
+
static const struct regulator_ops bcm590xx_ops_ldo = {
.is_enabled = regulator_is_enabled_regmap,
- .enable = regulator_enable_regmap,
- .disable = regulator_disable_regmap,
+ .enable = bcm590xx_regulator_enable,
+ .disable = bcm590xx_regulator_disable,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
.list_voltage = regulator_list_voltage_table,
@@ -553,8 +625,8 @@ static const struct regulator_ops bcm590xx_ops_ldo = {
static const struct regulator_ops bcm590xx_ops_dcdc = {
.is_enabled = regulator_is_enabled_regmap,
- .enable = regulator_enable_regmap,
- .disable = regulator_disable_regmap,
+ .enable = bcm590xx_regulator_enable,
+ .disable = bcm590xx_regulator_disable,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
.list_voltage = regulator_list_voltage_linear_range,
@@ -563,8 +635,8 @@ static const struct regulator_ops bcm590xx_ops_dcdc = {
static const struct regulator_ops bcm590xx_ops_static = {
.is_enabled = regulator_is_enabled_regmap,
- .enable = regulator_enable_regmap,
- .disable = regulator_disable_regmap,
+ .enable = bcm590xx_regulator_enable,
+ .disable = bcm590xx_regulator_disable,
};
static int bcm590xx_probe(struct platform_device *pdev)
@@ -633,7 +705,7 @@ static int bcm590xx_probe(struct platform_device *pdev)
pmu->desc[i].enable_is_inverted = true;
}
pmu->desc[i].enable_reg = \
- bcm590xx_get_enable_register(pmu, i);
+ bcm590xx_get_pmctrl_register(pmu, i);
pmu->desc[i].type = REGULATOR_VOLTAGE;
pmu->desc[i].owner = THIS_MODULE;
--
2.42.0
Powered by blists - more mailing lists