Hello Dimitri,
On Fri, Mar 01, 2024 at 12:11:23PM +0100, Dimitri Fedrau wrote:
> diff --git a/drivers/pwm/pwm-mc33xs2410.c b/drivers/pwm/pwm-mc33xs2410.c
> new file mode 100644
> index 000000000000..35753039da6b
> --- /dev/null
> +++ b/drivers/pwm/pwm-mc33xs2410.c
> @@ -0,0 +1,324 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2024 Liebherr-Electronics and Drives GmbH
> + */
Please document the general behaviour of the device here. For that
please stick to the format used in other drivers such that
sed -rn '/Limitations:/,/\*\/?$/p' drivers/pwm/*.c
does the right thing for your driver.
> +
> +#include <linux/delay.h>
> +#include <linux/err.h>
> +#include <linux/module.h>
> +#include <linux/mutex.h>
> +#include <linux/of.h>
> +#include <linux/pwm.h>
> +
> +#include <asm/unaligned.h>
> +
> +#include <linux/spi/spi.h>
> +
> +#define MC33XS2410_GLB_CTRL 0x00
> +#define MC33XS2410_GLB_CTRL_MODE_MASK GENMASK(7, 6)
> +#define MC33XS2410_GLB_CTRL_NORMAL_MODE BIT(6)
> +#define MC33XS2410_GLB_CTRL_SAFE_MODE BIT(7)
> +#define MC33XS2410_OUT1_4_CTRL 0x02
> +#define MC33XS2410_PWM_CTRL1 0x05
> +#define MC33XS2410_PWM_CTRL1_POL_INV(x) BIT(x)
> +#define MC33XS2410_PWM_CTRL3 0x07
> +#define MC33XS2410_PWM_CTRL3_EN(x) BIT(4 + (x))
Maybe add the valid range for x here. Something like:
#define MC33XS2410_PWM_CTRL3_EN(x) BIT(4 + (x)) /* x in {0 ... 3} */
> +#define MC33XS2410_PWM_CTRL3_EN_MASK GENMASK(7, 4)
MC33XS2410_PWM_CTRL3_EN_MASK is unused.
> +#define MC33XS2410_PWM_FREQ1 0x08
> +#define MC33XS2410_PWM_FREQ(x) (MC33XS2410_PWM_FREQ1 + (x))
Huh, is it expected that MC33XS2410_PWM_FREQ(1) != MC33XS2410_PWM_FREQ1?
I guess the hardware manual numbers these registers from 1 .. max but
you're passing hwpwm which starts at 0? Hmm.
I think I'd use:
#define MC33XS2410_PWM_FREQ(x) (MC33XS2410_PWM_FREQ1 + (x) - 1)
and pass hwpwm + 1.
> +#define MC33XS2410_PWM_FREQ_STEP_MASK GENMASK(7, 6)
> +#define MC33XS2410_PWM_FREQ_MASK GENMASK(5, 0)
> +#define MC33XS2410_PWM_DC1 0x0c
> +#define MC33XS2410_PWM_DC(x) (MC33XS2410_PWM_DC1 + (x))
> +#define MC33XS2410_WDT 0x14
> +
> +#define MC33XS2410_IN_OUT_STA 0x01
> +#define MC33XS2410_IN_OUT_STA_OUT_EN(x) BIT(4 + (x))
> +
> +#define MC33XS2410_WR_FLAG BIT(7)
> +#define MC33XS2410_RD_CTRL_FLAG BIT(7)
> +#define MC33XS2410_RD_DATA_MASK GENMASK(13, 0)
> +
> +#define MC33XS2410_PERIOD_MAX 0
> +#define MC33XS2410_PERIOD_MIN 1
This deserves a comment. (Or drop it after following my suggestion to
drop mc33xs2410_period[][].)
> +struct mc33xs2410_pwm {
> + struct pwm_chip chip;
> + struct spi_device *spi;
> + struct mutex lock;
> +};
> +
> +enum mc33xs2410_freq_steps {
> + STEP_05HZ,
> + STEP_2HZ,
> + STEP_8HZ,
> + STEP_32HZ,
> +};
> +
> +/*
> + * When outputs are controlled by SPI, the device supports four frequency ranges
> + * with following steps:
> + * - 0.5 Hz steps from 0.5 Hz to 32 Hz
> + * - 2 Hz steps from 2 Hz to 128 Hz
> + * - 8 Hz steps from 8 Hz to 512 Hz
> + * - 32 Hz steps from 32 Hz to 2048 Hz
> + * Below are the minimum and maximum frequencies converted to periods in ns for
> + * each of the four frequency ranges.
> + */
> +static const u32 mc33xs2410_period[4][2] = {
> + [STEP_05HZ] = { 2000000000, 31250000 },
> + [STEP_2HZ] = { 500000000, 7812500 },
> + [STEP_8HZ] = { 125000000, 1953125 },
> + [STEP_32HZ] = { 31250000, 488281 },
> +};
> +
> +static struct mc33xs2410_pwm *mc33xs2410_pwm_from_chip(struct pwm_chip *chip)
> +{
> + return container_of(chip, struct mc33xs2410_pwm, chip);
> +}
> +
> +static int mc33xs2410_write_reg(struct spi_device *spi, u8 reg, u8 val)
> +{
> + u8 tx[2];
> +
> + tx[0] = reg | MC33XS2410_WR_FLAG;
> + tx[1] = val;
> +
> + return spi_write(spi, tx, 2);
> +}
> +
> +static int mc33xs2410_read_reg(struct spi_device *spi, u8 reg, bool ctrl)
> +{
> + u8 tx[2], rx[2];
> + int ret;
> +
> + tx[0] = reg;
> + tx[1] = ctrl ? MC33XS2410_RD_CTRL_FLAG : 0;
> +
> + ret = spi_write(spi, tx, 2);
> + if (ret < 0)
> + return ret;
> +
> + ret = spi_read(spi, rx, 2);
> + if (ret < 0)
> + return ret;
This could benefit from using spi_write_then_read().
> +
> + return FIELD_GET(MC33XS2410_RD_DATA_MASK, get_unaligned_be16(rx));
> +}
> +
> +static int mc33xs2410_read_reg_ctrl(struct spi_device *spi, u8 reg)
> +{
> + return mc33xs2410_read_reg(spi, reg, true);
> +}
> +
> +static int mc33xs2410_modify_reg(struct spi_device *spi, u8 reg, u8 mask, u8 val)
> +{
> + int ret;
> +
> + ret = mc33xs2410_read_reg_ctrl(spi, reg);
> + if (ret < 0)
> + return ret;
> +
> + ret &= ~mask;
> + ret |= val & mask;
> +
> + return mc33xs2410_write_reg(spi, reg, ret);
> +}
> +
> +static int mc33xs2410_read_reg_diag(struct spi_device *spi, u8 reg)
> +{
> + return mc33xs2410_read_reg(spi, reg, false);
> +}
> +
> +static u8 mc33xs2410_pwm_get_freq(const struct pwm_state *state)
> +{
> + u32 period, freq, max, min;
> + int step;
> + u8 ret;
When reading "ret" I'd expect this to be an integer representing an
error code. Maybe call it "freq" instead?
> + period = state->period;
> + /*
> + * Check if period is within the limits of each of the four frequency
> + * ranges, starting with the highest frequency(lowest period). Higher
> + * frequencies are represented with better resolution by the device.
> + */
> + for (step = STEP_32HZ; step >= STEP_05HZ; step--) {
> + min = mc33xs2410_period[step][MC33XS2410_PERIOD_MIN];
> + max = mc33xs2410_period[step][MC33XS2410_PERIOD_MAX];
> + if ((period <= max) && (period >= min))
> + break;
> + }
Given that mc33xs2410_period[step][0] is 2000000000 >> (2 * step) and
mc33xs2410_period[step][1] = 31250000 >> (2 * step), this can be
calculated without a loop.
Something like:
step = (fls((31250000 - 1) / period) + 1) / 2
or given there are only four options this can also be done as follows:
switch (period) {
case 488281 .. 31250000:
step = 3;
break;
case 31250001 .. 125000000:
...
}
which gives the compiler a real chance to implement it efficiently. Also
then you could drop mc33xs2410_period[][].
> + freq = DIV_ROUND_CLOSEST(max, period) - 1;
> + ret = FIELD_PREP(MC33XS2410_PWM_FREQ_MASK, freq);
> + return (ret | FIELD_PREP(MC33XS2410_PWM_FREQ_STEP_MASK, step));
Also using DIV_ROUND_CLOSEST smells wrong. Did you test with PWM_DEBUG
enabled?
> +}
> +
> +static int mc33xs2410_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
> + const struct pwm_state *state)
> +{
> + struct mc33xs2410_pwm *mc33xs2410 = mc33xs2410_pwm_from_chip(chip);
> + struct spi_device *spi = mc33xs2410->spi;
> + u8 mask, val;
> + int ret;
> +
> + if (state->period > mc33xs2410_period[STEP_05HZ][MC33XS2410_PERIOD_MAX])
> + return -EINVAL;
Please make this:
u64 period = min(state->period, mc33xs2410_period[STEP_05HZ][MC33XS2410_PERIOD_MAX]);
> +
> + if (state->period < mc33xs2410_period[STEP_32HZ][MC33XS2410_PERIOD_MIN])
> + return -EINVAL;
> +
> + guard(mutex)(&mc33xs2410->lock);
Huh, didn't know this syntax for locking. Interesting. However with the
pending changes for the next merge window, calls to .apply() are
serialized per chip already by the core, so you don't need locking.
> + mask = MC33XS2410_PWM_CTRL1_POL_INV(pwm->hwpwm);
> + val = (state->polarity == PWM_POLARITY_INVERSED) ? mask : 0;
> + ret = mc33xs2410_modify_reg(spi, MC33XS2410_PWM_CTRL1, mask, val);
> + if (ret < 0)
> + return ret;
> +
> + ret = mc33xs2410_write_reg(spi, MC33XS2410_PWM_FREQ(pwm->hwpwm),
> + mc33xs2410_pwm_get_freq(state));
> + if (ret < 0)
> + return ret;
> +
> + ret = mc33xs2410_write_reg(spi, MC33XS2410_PWM_DC(pwm->hwpwm),
> + pwm_get_relative_duty_cycle(state, 255));
> + if (ret < 0)
> + return ret;
> +
> + mask = MC33XS2410_PWM_CTRL3_EN(pwm->hwpwm);
> + val = (state->enabled) ? mask : 0;
> + return mc33xs2410_modify_reg(spi, MC33XS2410_PWM_CTRL3, mask, val);
Is this procedure atomic? Or can it happen that the output pin does
something that is neither the old nor the new state in between?
Maybe it's worth the effort doing that in a single spi transfer, both to
make the procedure quicker and (maybe?) atomic.
> +}
> +
> +static int mc33xs2410_pwm_get_state(struct pwm_chip *chip,
> + struct pwm_device *pwm,
> + struct pwm_state *state)
> +{
> + struct mc33xs2410_pwm *mc33xs2410 = mc33xs2410_pwm_from_chip(chip);
> + struct spi_device *spi = mc33xs2410->spi;
> + u32 freq, code, steps;
> + int ret;
> +
> + guard(mutex)(&mc33xs2410->lock);
> + ret = mc33xs2410_read_reg_ctrl(spi, MC33XS2410_PWM_CTRL1);
> + if (ret < 0)
> + return ret;
> +
> + state->polarity = (ret & MC33XS2410_PWM_CTRL1_POL_INV(pwm->hwpwm)) ?
> + PWM_POLARITY_INVERSED : PWM_POLARITY_NORMAL;
> +
> + ret = mc33xs2410_read_reg_ctrl(spi, MC33XS2410_PWM_FREQ(pwm->hwpwm));
> + if (ret < 0)
> + return ret;
> +
> + /* Lowest frequency steps are starting with 0.5Hz, scale them by two. */
> + steps = (FIELD_GET(MC33XS2410_PWM_FREQ_STEP_MASK, ret) * 2) << 1;
You're multiplying by 2 twice here. I fail to follow.
> + code = FIELD_GET(MC33XS2410_PWM_FREQ_MASK, ret);
> + /* Frequency = (code + 1) x steps */
> + freq = (code + 1) * steps;
> + /* Convert frequency to period in ns, considering scaled steps value. */
> + state->period = 2000000000ULL / (freq);
Please make 2000000000ULL a define. This can then be used also in the
calculations that currently involve mc33xs2410_period[][].
Also you need to round up here.
> + ret = mc33xs2410_read_reg_ctrl(spi, MC33XS2410_PWM_DC(pwm->hwpwm));
> + if (ret < 0)
> + return ret;
> +
> + ret = pwm_set_relative_duty_cycle(state, ret, 255);
> + if (ret)
> + return ret;
Pretty sure this is also wrong and fails if you enable PWM_DEBUG.
> + ret = mc33xs2410_read_reg_diag(spi, MC33XS2410_IN_OUT_STA);
> + if (ret < 0)
> + return ret;
> +
> + state->enabled = !!(ret & MC33XS2410_IN_OUT_STA_OUT_EN(pwm->hwpwm));
> +
> + return 0;
> +}
> +
> +static const struct pwm_ops mc33xs2410_pwm_ops = {
> + .apply = mc33xs2410_pwm_apply,
> + .get_state = mc33xs2410_pwm_get_state,
> +};
> +
> +static int mc33xs2410_reset(struct device *dev)
> +{
> + struct gpio_desc *reset_gpio;
> +
> + reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
> + if (IS_ERR_OR_NULL(reset_gpio))
> + return PTR_ERR_OR_ZERO(reset_gpio);
> +
> + fsleep(1000);
> + gpiod_set_value_cansleep(reset_gpio, 0);
> + /* Wake-up time */
> + fsleep(10000);
> +
> + return 0;
> +}
> +
> +static int mc33xs2410_probe(struct spi_device *spi)
> +{
> + struct mc33xs2410_pwm *mc33xs2410;
> + struct device *dev = &spi->dev;
> + int ret;
> +
> + mc33xs2410 = devm_kzalloc(&spi->dev, sizeof(*mc33xs2410), GFP_KERNEL);
After struct device *dev = &spi->dev you could better use dev here
instead of &spi->dev.
> + if (!mc33xs2410)
> + return -ENOMEM;
Please use devm_pwmchip_alloc(). See
11ee0a124cb48bb837a1d90c3504a9c3376e96d1 for a simple example to copy
from.
> + mc33xs2410->chip.dev = dev;
> + mc33xs2410->chip.ops = &mc33xs2410_pwm_ops;
> + mc33xs2410->chip.npwm = 4;
> + mc33xs2410->spi = spi;
> + mutex_init(&mc33xs2410->lock);
> +
> + ret = mc33xs2410_reset(dev);
> + if (ret)
> + return ret;
> +
> + /* Disable watchdog */
> + ret = mc33xs2410_write_reg(spi, MC33XS2410_WDT, 0x0);
> + if (ret < 0)
> + return dev_err_probe(dev, ret, "Failed to disable watchdog\n");
> +
> + /* Transitition to normal mode */
s/Transitition/Transition/
> + ret = mc33xs2410_modify_reg(spi, MC33XS2410_GLB_CTRL,
> + MC33XS2410_GLB_CTRL_MODE_MASK,
> + MC33XS2410_GLB_CTRL_NORMAL_MODE);
> + if (ret < 0)
> + return dev_err_probe(dev, ret,
> + "Failed to transition to normal mode\n");
> +
> + ret = devm_pwmchip_add(dev, &mc33xs2410->chip);
> + if (ret < 0)
> + return dev_err_probe(dev, ret, "Failed to add pwm chip\n");
> +
> + return 0;
> +}
> +
> +static const struct spi_device_id mc33xs2410_spi_id[] = {
> + { "mc33xs2410", 0 },
driver_data is unused here, please drop it.
> + { }
> +};
> +MODULE_DEVICE_TABLE(spi, mc33xs2410_spi_id);
> +
> +static const struct of_device_id mc33xs2410_of_match[] = {
> + { .compatible = "nxp,mc33xs2410" },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, mc33xs2410_of_match);
> +
> +static struct spi_driver mc33xs2410_driver = {
> + .driver = {
> + .name = "mc33xs2410-pwm",
> + .of_match_table = mc33xs2410_of_match,
> + },
> + .probe = mc33xs2410_probe,
> + .id_table = mc33xs2410_spi_id,
> +};
> +module_spi_driver(mc33xs2410_driver);
> +
> +MODULE_DESCRIPTION("NXP MC33XS2410 high-side switch driver");
> +MODULE_AUTHOR("Dimitri Fedrau <dima.fedrau@xxxxxxxxx>");
> +MODULE_LICENSE("GPL");
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Attachment:
signature.asc
Description: PGP signature
