The device argument passed to of_get_regulator_init_data is used to do some devres memory allocation. Currently the driver passes the MFD device pointer to this function, this could result in the init_data allocation being leaked if the regulator is unbound but the MFD isn't.

Correct this issue by correctly passing the local platform device.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com ---

New patch in the series since v1.

drivers/regulator/arizona-ldo1.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index e76d094..b726fa1 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -186,7 +186,8 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = { .num_consumer_supplies = 1, };

-static int arizona_ldo1_of_get_pdata(struct arizona *arizona, +static int arizona_ldo1_of_get_pdata(struct device *dev, + struct arizona *arizona, struct regulator_config *config, const struct regulator_desc *desc) { @@ -212,8 +213,7 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona, if (init_node) { config->of_node = init_node;

- init_data = of_get_regulator_init_data(arizona->dev, init_node, - desc); + init_data = of_get_regulator_init_data(dev, init_node, desc);

if (init_data) { init_data->consumer_supplies = &ldo1->supply; @@ -283,7 +283,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)

if (IS_ENABLED(CONFIG_OF)) { if (!dev_get_platdata(arizona->dev)) { - ret = arizona_ldo1_of_get_pdata(arizona, &config, desc); + ret = arizona_ldo1_of_get_pdata(&pdev->dev, arizona, + &config, desc); if (ret < 0) return ret; }

The maintainers entry for the Wolfson parts seems to be missing an entry that covers the Arizona regulator drivers, correct this by adding one.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com ---

New patch in the series since v1.

MAINTAINERS | 1 + 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS index c265a5f..c35e0ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13616,6 +13616,7 @@ F: drivers/mfd/cs47l24* F: drivers/power/supply/wm83*.c F: drivers/rtc/rtc-wm83*.c F: drivers/regulator/wm8*.c +F: drivers/regulator/arizona* F: drivers/video/backlight/wm83*_bl.c F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/arizona/

Add a helper function regulator_set_soft_start_regmap to allow regmap based regulators to easily enable soft start.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com ---

Changes since v1: - Added documentation for the new regulator_desc fields to the kernel doc.

drivers/regulator/helpers.c | 18 ++++++++++++++++++ include/linux/regulator/driver.h | 8 ++++++++ 2 files changed, 26 insertions(+)

diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index 379cdac..a75e7da 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -446,6 +446,24 @@ int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable) EXPORT_SYMBOL_GPL(regulator_set_bypass_regmap);

/** + * regulator_set_soft_start_regmap - Default set_soft_start() using regmap + * + * @rdev: device to operate on. + */ +int regulator_set_soft_start_regmap(struct regulator_dev *rdev) +{ + unsigned int val; + + val = rdev->desc->soft_start_val_on; + if (!val) + val = rdev->desc->soft_start_mask; + + return regmap_update_bits(rdev->regmap, rdev->desc->soft_start_reg, + rdev->desc->soft_start_mask, val); +} +EXPORT_SYMBOL_GPL(regulator_set_soft_start_regmap); + +/** * regulator_get_bypass_regmap - Default get_bypass() using regmap * * @rdev: device to operate on. diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index dac8e7b1..1054c03 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -292,6 +292,10 @@ enum regulator_type { * set_active_discharge * @active_discharge_reg: Register for control when using regmap * set_active_discharge + * @soft_start_reg: Register for control when using regmap set_soft_start + * @soft_start_mask: Mask for control when using regmap set_soft_start + * @soft_start_val_on: Enabling value for control when using regmap + * set_soft_start * * @enable_time: Time taken for initial enable of regulator (in uS). * @off_on_delay: guard time (in uS), before re-enabling a regulator @@ -345,6 +349,9 @@ struct regulator_desc { unsigned int active_discharge_off; unsigned int active_discharge_mask; unsigned int active_discharge_reg; + unsigned int soft_start_reg; + unsigned int soft_start_mask; + unsigned int soft_start_val_on;

unsigned int enable_time;

@@ -476,6 +483,7 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev, unsigned int new_selector); int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable); int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable); +int regulator_set_soft_start_regmap(struct regulator_dev *rdev);

int regulator_set_active_discharge_regmap(struct regulator_dev *rdev, bool enable);

Add a helper function regulator_set_pull_down_regmap to allow regmap based regulators to easily enable pull down.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com ---

Turns out I don't actually need this patch for the series, but since I had gone to the effort of writing the code anyway, thought I might as well keep it in. Will be useful if someone does want to use a pull down on a regmap regulators and it is has been pretty well tested here.

Changes since v1: - Added documentation for the new regulator_desc fields to the kernel doc.

drivers/regulator/helpers.c | 18 ++++++++++++++++++ include/linux/regulator/driver.h | 8 ++++++++ 2 files changed, 26 insertions(+)

diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index a75e7da..2ae7c3a 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -464,6 +464,24 @@ int regulator_set_soft_start_regmap(struct regulator_dev *rdev) EXPORT_SYMBOL_GPL(regulator_set_soft_start_regmap);

/** + * regulator_set_pull_down_regmap - Default set_pull_down() using regmap + * + * @rdev: device to operate on. + */ +int regulator_set_pull_down_regmap(struct regulator_dev *rdev) +{ + unsigned int val; + + val = rdev->desc->pull_down_val_on; + if (!val) + val = rdev->desc->pull_down_mask; + + return regmap_update_bits(rdev->regmap, rdev->desc->pull_down_reg, + rdev->desc->pull_down_mask, val); +} +EXPORT_SYMBOL_GPL(regulator_set_pull_down_regmap); + +/** * regulator_get_bypass_regmap - Default get_bypass() using regmap * * @rdev: device to operate on. diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 1054c03..8a9078d 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -296,6 +296,10 @@ enum regulator_type { * @soft_start_mask: Mask for control when using regmap set_soft_start * @soft_start_val_on: Enabling value for control when using regmap * set_soft_start + * @pull_down_reg: Register for control when using regmap set_pull_down + * @pull_down_mask: Mask for control when using regmap set_pull_down + * @pull_down_val_on: Enabling value for control when using regmap + * set_pull_down * * @enable_time: Time taken for initial enable of regulator (in uS). * @off_on_delay: guard time (in uS), before re-enabling a regulator @@ -352,6 +356,9 @@ struct regulator_desc { unsigned int soft_start_reg; unsigned int soft_start_mask; unsigned int soft_start_val_on; + unsigned int pull_down_reg; + unsigned int pull_down_mask; + unsigned int pull_down_val_on;

unsigned int enable_time;

@@ -484,6 +491,7 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev, int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable); int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable); int regulator_set_soft_start_regmap(struct regulator_dev *rdev); +int regulator_set_pull_down_regmap(struct regulator_dev *rdev);

int regulator_set_active_discharge_regmap(struct regulator_dev *rdev, bool enable);

Add a driver for controlling the micbias regulators on the Arizona class audio CODECs. This will replace earlier fixed support that initialised the micbias's with fixed settings from platform data, although that platform data can still be used to configure the constraints on this new regulator.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com ---

Changes since v1: - Use active_discharge rather than pull_down as that is what the regulator actually does. - Pass the micbias device rather than the arizona device to of_get_regulator_init_data to avoid leaking init_data - Update the pdata to use an actual regulator_init_data - Tidy up the code to make it a little easier to follow

drivers/regulator/Makefile | 2 +- drivers/regulator/arizona-micbias.c | 228 ++++++++++++++++++++++++++++++++++++ include/linux/mfd/arizona/pdata.h | 6 +- 3 files changed, 231 insertions(+), 5 deletions(-) create mode 100644 drivers/regulator/arizona-micbias.c

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index ef7725e..b670e87 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -19,7 +19,7 @@ obj-$(CONFIG_REGULATOR_ACT8865) += act8865-regulator.o obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o -obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o +obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o arizona-micbias.o obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o diff --git a/drivers/regulator/arizona-micbias.c b/drivers/regulator/arizona-micbias.c new file mode 100644 index 0000000..622e659 --- /dev/null +++ b/drivers/regulator/arizona-micbias.c @@ -0,0 +1,228 @@ +/* + * arizona-micbias.c -- Microphone bias supplies for Arizona devices + * + * Copyright 2017 Cirrus Logic Inc. + * + * Author: Charles Keepax ckeepax@opensource.wolfsonmicro.com + * + * 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/err.h> +#include <linux/init.h> +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/of_regulator.h> +#include <linux/slab.h> + +#include <linux/mfd/arizona/core.h> +#include <linux/mfd/arizona/pdata.h> +#include <linux/mfd/arizona/registers.h> + +#define ARIZONA_MICBIAS_MAX_SELECTOR 0xD + +struct arizona_micbias_priv { + int id; + struct arizona *arizona; + + struct device_node *np; + struct regulator_desc desc; + struct regulator_consumer_supply supply; + struct regulator_init_data *init_data; + + struct regulator_dev *regulator; +}; + +static const struct regulator_ops arizona_micbias_ops = { + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .list_voltage = regulator_list_voltage_linear, + .map_voltage = regulator_map_voltage_linear, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .get_bypass = regulator_get_bypass_regmap, + .set_bypass = regulator_set_bypass_regmap, + .set_soft_start = regulator_set_soft_start_regmap, + .set_active_discharge = regulator_set_active_discharge_regmap, +}; + +static const struct regulator_desc arizona_micbias_desc_tmpl = { + .supply_name = "MICVDD", + .type = REGULATOR_VOLTAGE, + .ops = &arizona_micbias_ops, + + .min_uV = 1500000, + .uV_step = 100000, + .n_voltages = ARIZONA_MICBIAS_MAX_SELECTOR + 1, + + .vsel_reg = ARIZONA_MIC_BIAS_CTRL_1, + .vsel_mask = ARIZONA_MICB1_LVL_MASK, + .enable_reg = ARIZONA_MIC_BIAS_CTRL_1, + .enable_mask = ARIZONA_MICB1_ENA, + .bypass_reg = ARIZONA_MIC_BIAS_CTRL_1, + .bypass_mask = ARIZONA_MICB1_BYPASS, + .soft_start_reg = ARIZONA_MIC_BIAS_CTRL_1, + .soft_start_mask = ARIZONA_MICB1_RATE, + .active_discharge_reg = ARIZONA_MIC_BIAS_CTRL_1, + .active_discharge_mask = ARIZONA_MICB1_DISCH, + .active_discharge_on = ARIZONA_MICB1_DISCH, + + .owner = THIS_MODULE, +}; + +static const struct regulator_init_data arizona_micbias_tmpl = { + .constraints = { + .valid_ops_mask = REGULATOR_CHANGE_STATUS | + REGULATOR_CHANGE_VOLTAGE | + REGULATOR_CHANGE_BYPASS, + .min_uV = 1500000, + .max_uV = 2800000, + }, +}; + +static int arizona_micbias_of_get_pdata(struct device *dev, + struct device_node *np, + struct arizona_micbias_priv *micbias) +{ + struct arizona *arizona = micbias->arizona; + struct arizona_micbias *pdata = &arizona->pdata.micbias[micbias->id]; + + micbias->np = of_get_child_by_name(np, micbias->desc.name); + if (micbias->np) { + micbias->init_data = of_get_regulator_init_data(dev, + micbias->np, + &micbias->desc); + + pdata->ext_cap = of_property_read_bool(micbias->np, + "wlf,ext-cap"); + } + + return 0; +} + +static int arizona_micbias_init_pdata(struct device *dev, + struct arizona_micbias_priv *micbias) +{ + struct arizona *arizona = micbias->arizona; + struct arizona_micbias *pdata = &arizona->pdata.micbias[micbias->id]; + int ret; + + if (pdata->init_data) + return 0; + + if (IS_ENABLED(CONFIG_OF)) { + struct device_node *np = arizona->dev->of_node; + + ret = arizona_micbias_of_get_pdata(dev, np, micbias); + if (ret < 0) { + dev_err(dev, "Failed to parse DT: %d\n", ret); + return ret; + } + } + + if (!micbias->init_data) { + micbias->init_data = devm_kmemdup(dev, + &arizona_micbias_tmpl, + sizeof(arizona_micbias_tmpl), + GFP_KERNEL); + if (!micbias->init_data) + return -ENOMEM; + } + + micbias->supply.supply = micbias->desc.name; + micbias->supply.dev_name = dev_name(arizona->dev); + + micbias->init_data->consumer_supplies = &micbias->supply; + micbias->init_data->num_consumer_supplies = 1; + + pdata->init_data = micbias->init_data; + + return 0; +} + +static int arizona_micbias_probe(struct platform_device *pdev) +{ + struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); + int id = pdev->id; + struct arizona_micbias *pdata = &arizona->pdata.micbias[id]; + struct arizona_micbias_priv *micbias; + struct regulator_config config = { }; + unsigned int val; + int ret; + + micbias = devm_kzalloc(&pdev->dev, sizeof(*micbias), GFP_KERNEL); + if (micbias == NULL) + return -ENOMEM; + + micbias->id = id; + micbias->arizona = arizona; + + micbias->desc = arizona_micbias_desc_tmpl; + micbias->desc.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "MICBIAS%d", id + 1); + micbias->desc.vsel_reg += id; + micbias->desc.enable_reg += id; + micbias->desc.bypass_reg += id; + micbias->desc.soft_start_reg += id; + micbias->desc.pull_down_reg += id; + + ret = arizona_micbias_init_pdata(&pdev->dev, micbias); + if (ret) + return ret; + + if (pdata->ext_cap) + val = ARIZONA_MICB1_EXT_CAP; + else + val = 0; + + /* + * The core expects the regulator to have bypass disabled by default + * so clear it, whilst we set the external cap. + */ + regmap_update_bits(arizona->regmap, ARIZONA_MIC_BIAS_CTRL_1 + id, + ARIZONA_MICB1_EXT_CAP | ARIZONA_MICB1_BYPASS, val); + + config.dev = arizona->dev; + config.regmap = arizona->regmap; + config.of_node = micbias->np; + config.init_data = pdata->init_data; + config.driver_data = micbias; + + micbias->regulator = devm_regulator_register(&pdev->dev, + &micbias->desc, + &config); + + of_node_put(config.of_node); + + if (IS_ERR(micbias->regulator)) { + ret = PTR_ERR(micbias->regulator); + dev_err(arizona->dev, "Failed to register %s supply: %d\n", + micbias->desc.name, ret); + return ret; + } + + return 0; +} + +static struct platform_driver arizona_micbias_driver = { + .probe = arizona_micbias_probe, + .driver = { + .name = "arizona-micbias", + }, +}; + +module_platform_driver(arizona_micbias_driver); + +/* Module information */ +MODULE_AUTHOR("Charles Keepax ckeepax@opensource.wolfsonmicro.com"); +MODULE_DESCRIPTION("Arizona microphone bias supply driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:arizona-micbias"); diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 64faeef..89a3512 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h @@ -56,11 +56,9 @@ struct regulator_init_data;

struct arizona_micbias { - int mV; /** Regulated voltage */ + /* Regulator configuration */ + const struct regulator_init_data *init_data; unsigned int ext_cap:1; /** External capacitor fitted */ - unsigned int discharge:1; /** Actively discharge */ - unsigned int soft_start:1; /** Disable aggressive startup ramp rate */ - unsigned int bypass:1; /** Use bypass mode */ };

struct arizona_micd_config {

Add the new micbias regulators into the Arizona regulator binding document.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com Acked-by: Rob Herring robh@kernel.org ---

No changes since v1.

Documentation/devicetree/bindings/regulator/arizona-regulator.txt | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/regulator/arizona-regulator.txt b/Documentation/devicetree/bindings/regulator/arizona-regulator.txt index 443564d..68a13d5 100644 --- a/Documentation/devicetree/bindings/regulator/arizona-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/arizona-regulator.txt @@ -15,3 +15,9 @@ Optional subnodes: Documentation/devicetree/bindings/regulator/regulator.txt - micvdd : Initial data for the MICVDD regulator, as covered in Documentation/devicetree/bindings/regulator/regulator.txt + + - MICBIASx : Initial data for the MICBIAS regulators, as covered in + Documentation/devicetree/bindings/regulator/regulator.txt but the + following additional properties are also supported: + - wlf,ext-cap : Specifies if the MICBIAS has external decoupling + capacitors attached.

The patch

regulator: arizona-micsupp: Avoid potential memory leak reading init_data

has been applied to the regulator tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git

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

From 2543ef3173889373fc07df61520e1bb42a99c85e Mon Sep 17 00:00:00 2001

From: Charles Keepax ckeepax@opensource.wolfsonmicro.com Date: Tue, 28 Mar 2017 15:14:37 +0100 Subject: [PATCH] regulator: arizona-micsupp: Avoid potential memory leak reading init_data

The device argument passed to of_get_regulator_init_data is used to do some devres memory allocation. Currently the driver passes the MFD device pointer to this function, this could result in the init_data allocation being leaked if the regulator is unbound but the MFD isn't.

Correct this issue by correctly passing the local platform device.

Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com Signed-off-by: Mark Brown broonie@kernel.org --- drivers/regulator/arizona-micsupp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index fcb98dbda837..0ed14e41de11 100644 --- a/drivers/regulator/arizona-micsupp.c +++ b/drivers/regulator/arizona-micsupp.c @@ -197,7 +197,8 @@ static const struct regulator_init_data arizona_micsupp_ext_default = { .num_consumer_supplies = 1, };

-static int arizona_micsupp_of_get_pdata(struct arizona *arizona, +static int arizona_micsupp_of_get_pdata(struct device *dev, + struct arizona *arizona, struct regulator_config *config, const struct regulator_desc *desc) { @@ -211,7 +212,7 @@ static int arizona_micsupp_of_get_pdata(struct arizona *arizona, if (np) { config->of_node = np;

- init_data = of_get_regulator_init_data(arizona->dev, np, desc); + init_data = of_get_regulator_init_data(dev, np, desc);

if (init_data) { init_data->consumer_supplies = &micsupp->supply; @@ -266,8 +267,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev)

if (IS_ENABLED(CONFIG_OF)) { if (!dev_get_platdata(arizona->dev)) { - ret = arizona_micsupp_of_get_pdata(arizona, &config, - desc); + ret = arizona_micsupp_of_get_pdata(&pdev->dev, arizona, + &config, desc); if (ret < 0) return ret; }