* [PATCH v4 1/9] reset: amlogic: convert driver to regmap
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 14:19 ` Philipp Zabel
2024-09-06 13:34 ` [PATCH v4 2/9] reset: amlogic: use generic data matching function Jerome Brunet
` (7 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
To allow using the same driver for the main reset controller and the
auxiliary ones embedded in the clock controllers, convert the
the Amlogic reset driver to regmap.
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 79 ++++++++++++++++++++++++---------------------
1 file changed, 43 insertions(+), 36 deletions(-)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 1e9fca3e30e8..9dd38cc209e2 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -11,36 +11,43 @@
#include <linux/of.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/regmap.h>
#include <linux/reset-controller.h>
#include <linux/slab.h>
#include <linux/types.h>
-#define BITS_PER_REG 32
-
struct meson_reset_param {
int reg_count;
int level_offset;
};
struct meson_reset {
- void __iomem *reg_base;
const struct meson_reset_param *param;
struct reset_controller_dev rcdev;
- spinlock_t lock;
+ struct regmap *map;
};
+static void meson_reset_offset_and_bit(struct meson_reset *data,
+ unsigned long id,
+ unsigned int *offset,
+ unsigned int *bit)
+{
+ unsigned int stride = regmap_get_reg_stride(data->map);
+
+ *offset = (id / (stride * BITS_PER_BYTE)) * stride;
+ *bit = id % (stride * BITS_PER_BYTE);
+}
+
static int meson_reset_reset(struct reset_controller_dev *rcdev,
- unsigned long id)
+ unsigned long id)
{
struct meson_reset *data =
container_of(rcdev, struct meson_reset, rcdev);
- unsigned int bank = id / BITS_PER_REG;
- unsigned int offset = id % BITS_PER_REG;
- void __iomem *reg_addr = data->reg_base + (bank << 2);
+ unsigned int offset, bit;
- writel(BIT(offset), reg_addr);
+ meson_reset_offset_and_bit(data, id, &offset, &bit);
- return 0;
+ return regmap_write(data->map, offset, BIT(bit));
}
static int meson_reset_level(struct reset_controller_dev *rcdev,
@@ -48,25 +55,13 @@ static int meson_reset_level(struct reset_controller_dev *rcdev,
{
struct meson_reset *data =
container_of(rcdev, struct meson_reset, rcdev);
- unsigned int bank = id / BITS_PER_REG;
- unsigned int offset = id % BITS_PER_REG;
- void __iomem *reg_addr;
- unsigned long flags;
- u32 reg;
+ unsigned int offset, bit;
- reg_addr = data->reg_base + data->param->level_offset + (bank << 2);
+ meson_reset_offset_and_bit(data, id, &offset, &bit);
+ offset += data->param->level_offset;
- spin_lock_irqsave(&data->lock, flags);
-
- reg = readl(reg_addr);
- if (assert)
- writel(reg & ~BIT(offset), reg_addr);
- else
- writel(reg | BIT(offset), reg_addr);
-
- spin_unlock_irqrestore(&data->lock, flags);
-
- return 0;
+ return regmap_update_bits(data->map, offset,
+ BIT(bit), assert ? 0 : BIT(bit));
}
static int meson_reset_assert(struct reset_controller_dev *rcdev,
@@ -119,30 +114,42 @@ static const struct of_device_id meson_reset_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, meson_reset_dt_ids);
+static const struct regmap_config regmap_config = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = 4,
+};
+
static int meson_reset_probe(struct platform_device *pdev)
{
+ struct device *dev = &pdev->dev;
struct meson_reset *data;
+ void __iomem *base;
- data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
- data->reg_base = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(data->reg_base))
- return PTR_ERR(data->reg_base);
+ base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
- data->param = of_device_get_match_data(&pdev->dev);
+ data->param = of_device_get_match_data(dev);
if (!data->param)
return -ENODEV;
- spin_lock_init(&data->lock);
+ data->map = devm_regmap_init_mmio(dev, base, ®map_config);
+ if (IS_ERR(data->map))
+ return dev_err_probe(dev, PTR_ERR(data->map),
+ "can't init regmap mmio region\n");
data->rcdev.owner = THIS_MODULE;
- data->rcdev.nr_resets = data->param->reg_count * BITS_PER_REG;
+ data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE
+ * regmap_config.reg_stride;
data->rcdev.ops = &meson_reset_ops;
- data->rcdev.of_node = pdev->dev.of_node;
+ data->rcdev.of_node = dev->of_node;
- return devm_reset_controller_register(&pdev->dev, &data->rcdev);
+ return devm_reset_controller_register(dev, &data->rcdev);
}
static struct platform_driver meson_reset_driver = {
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v4 1/9] reset: amlogic: convert driver to regmap
2024-09-06 13:34 ` [PATCH v4 1/9] reset: amlogic: convert driver to regmap Jerome Brunet
@ 2024-09-06 14:19 ` Philipp Zabel
2024-09-06 14:46 ` Jerome Brunet
0 siblings, 1 reply; 15+ messages in thread
From: Philipp Zabel @ 2024-09-06 14:19 UTC (permalink / raw)
To: Jerome Brunet, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
On Fr, 2024-09-06 at 15:34 +0200, Jerome Brunet wrote:
> To allow using the same driver for the main reset controller and the
> auxiliary ones embedded in the clock controllers, convert the
> the Amlogic reset driver to regmap.
>
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> drivers/reset/reset-meson.c | 79 ++++++++++++++++++++++++---------------------
This patch should also make RESET_MESON select REGMAP.
> 1 file changed, 43 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
> index 1e9fca3e30e8..9dd38cc209e2 100644
> --- a/drivers/reset/reset-meson.c
> +++ b/drivers/reset/reset-meson.c
> @@ -11,36 +11,43 @@
> #include <linux/of.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> +#include <linux/regmap.h>
> #include <linux/reset-controller.h>
> #include <linux/slab.h>
> #include <linux/types.h>
>
> -#define BITS_PER_REG 32
> -
> struct meson_reset_param {
> int reg_count;
> int level_offset;
> };
>
> struct meson_reset {
> - void __iomem *reg_base;
> const struct meson_reset_param *param;
> struct reset_controller_dev rcdev;
> - spinlock_t lock;
> + struct regmap *map;
> };
>
> +static void meson_reset_offset_and_bit(struct meson_reset *data,
> + unsigned long id,
> + unsigned int *offset,
> + unsigned int *bit)
> +{
> + unsigned int stride = regmap_get_reg_stride(data->map);
You know this is always 4. Having a #define for this (that is also used
to initialize regmap_config.reg_stride, and for now nr_resets, below)
instead of going through an exported function would allow the compiler
to optimize this all away:
> +
> + *offset = (id / (stride * BITS_PER_BYTE)) * stride;
> + *bit = id % (stride * BITS_PER_BYTE);
> +}
> +
> static int meson_reset_reset(struct reset_controller_dev *rcdev,
> - unsigned long id)
> + unsigned long id)
> {
> struct meson_reset *data =
> container_of(rcdev, struct meson_reset, rcdev);
> - unsigned int bank = id / BITS_PER_REG;
> - unsigned int offset = id % BITS_PER_REG;
> - void __iomem *reg_addr = data->reg_base + (bank << 2);
> + unsigned int offset, bit;
>
> - writel(BIT(offset), reg_addr);
> + meson_reset_offset_and_bit(data, id, &offset, &bit);
>
> - return 0;
> + return regmap_write(data->map, offset, BIT(bit));
> }
>
> static int meson_reset_level(struct reset_controller_dev *rcdev,
> @@ -48,25 +55,13 @@ static int meson_reset_level(struct reset_controller_dev *rcdev,
> {
> struct meson_reset *data =
> container_of(rcdev, struct meson_reset, rcdev);
> - unsigned int bank = id / BITS_PER_REG;
> - unsigned int offset = id % BITS_PER_REG;
> - void __iomem *reg_addr;
> - unsigned long flags;
> - u32 reg;
> + unsigned int offset, bit;
>
> - reg_addr = data->reg_base + data->param->level_offset + (bank << 2);
> + meson_reset_offset_and_bit(data, id, &offset, &bit);
> + offset += data->param->level_offset;
>
> - spin_lock_irqsave(&data->lock, flags);
> -
> - reg = readl(reg_addr);
> - if (assert)
> - writel(reg & ~BIT(offset), reg_addr);
> - else
> - writel(reg | BIT(offset), reg_addr);
> -
> - spin_unlock_irqrestore(&data->lock, flags);
> -
> - return 0;
> + return regmap_update_bits(data->map, offset,
> + BIT(bit), assert ? 0 : BIT(bit));
Matter of taste, perhaps, but the BIT() could be moved into
meson_reset_offset_and_bit().
> }
>
> static int meson_reset_assert(struct reset_controller_dev *rcdev,
> @@ -119,30 +114,42 @@ static const struct of_device_id meson_reset_dt_ids[] = {
> };
> MODULE_DEVICE_TABLE(of, meson_reset_dt_ids);
>
> +static const struct regmap_config regmap_config = {
> + .reg_bits = 32,
> + .val_bits = 32,
> + .reg_stride = 4,
> +};
> +
> static int meson_reset_probe(struct platform_device *pdev)
> {
> + struct device *dev = &pdev->dev;
> struct meson_reset *data;
> + void __iomem *base;
>
> - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
> if (!data)
> return -ENOMEM;
>
> - data->reg_base = devm_platform_ioremap_resource(pdev, 0);
> - if (IS_ERR(data->reg_base))
> - return PTR_ERR(data->reg_base);
> + base = devm_platform_ioremap_resource(pdev, 0);
> + if (IS_ERR(base))
> + return PTR_ERR(base);
>
> - data->param = of_device_get_match_data(&pdev->dev);
> + data->param = of_device_get_match_data(dev);
> if (!data->param)
> return -ENODEV;
>
> - spin_lock_init(&data->lock);
> + data->map = devm_regmap_init_mmio(dev, base, ®map_config);
> + if (IS_ERR(data->map))
> + return dev_err_probe(dev, PTR_ERR(data->map),
> + "can't init regmap mmio region\n");
>
> data->rcdev.owner = THIS_MODULE;
> - data->rcdev.nr_resets = data->param->reg_count * BITS_PER_REG;
> + data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE
> + * regmap_config.reg_stride;
> data->rcdev.ops = &meson_reset_ops;
> - data->rcdev.of_node = pdev->dev.of_node;
> + data->rcdev.of_node = dev->of_node;
>
> - return devm_reset_controller_register(&pdev->dev, &data->rcdev);
> + return devm_reset_controller_register(dev, &data->rcdev);
> }
>
> static struct platform_driver meson_reset_driver = {
regards
Philipp
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v4 1/9] reset: amlogic: convert driver to regmap
2024-09-06 14:19 ` Philipp Zabel
@ 2024-09-06 14:46 ` Jerome Brunet
2024-09-10 8:20 ` Philipp Zabel
0 siblings, 1 reply; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 14:46 UTC (permalink / raw)
To: Philipp Zabel
Cc: Stephen Boyd, Neil Armstrong, Kevin Hilman, Martin Blumenstingl,
Jiucheng Xu, linux-arm-kernel, linux-amlogic, linux-kernel
On Fri 06 Sep 2024 at 16:19, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> On Fr, 2024-09-06 at 15:34 +0200, Jerome Brunet wrote:
>> To allow using the same driver for the main reset controller and the
>> auxiliary ones embedded in the clock controllers, convert the
>> the Amlogic reset driver to regmap.
>>
>> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
>> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
>> ---
>> drivers/reset/reset-meson.c | 79 ++++++++++++++++++++++++---------------------
>
> This patch should also make RESET_MESON select REGMAP.
Indeed
>
>> 1 file changed, 43 insertions(+), 36 deletions(-)
>>
>> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
>> index 1e9fca3e30e8..9dd38cc209e2 100644
>> --- a/drivers/reset/reset-meson.c
>> +++ b/drivers/reset/reset-meson.c
>> @@ -11,36 +11,43 @@
>> #include <linux/of.h>
>> #include <linux/module.h>
>> #include <linux/platform_device.h>
>> +#include <linux/regmap.h>
>> #include <linux/reset-controller.h>
>> #include <linux/slab.h>
>> #include <linux/types.h>
>>
>> -#define BITS_PER_REG 32
>> -
>> struct meson_reset_param {
>> int reg_count;
>> int level_offset;
>> };
>>
>> struct meson_reset {
>> - void __iomem *reg_base;
>> const struct meson_reset_param *param;
>> struct reset_controller_dev rcdev;
>> - spinlock_t lock;
>> + struct regmap *map;
>> };
>>
>> +static void meson_reset_offset_and_bit(struct meson_reset *data,
>> + unsigned long id,
>> + unsigned int *offset,
>> + unsigned int *bit)
>> +{
>> + unsigned int stride = regmap_get_reg_stride(data->map);
>
> You know this is always 4. Having a #define for this (that is also used
> to initialize regmap_config.reg_stride, and for now nr_resets, below)
> instead of going through an exported function would allow the compiler
> to optimize this all away:
Yes, for now. However, with the auxiliary you may get a regmap with
different value. I've seen example with stride = 1.
I'll admit is very unlikely but I does not really worth it considering
how often we'll get through this and how difficult it will be to debug
if stride ever get different.
>
>> +
>> + *offset = (id / (stride * BITS_PER_BYTE)) * stride;
>> + *bit = id % (stride * BITS_PER_BYTE);
>> +}
>> +
>> static int meson_reset_reset(struct reset_controller_dev *rcdev,
>> - unsigned long id)
>> + unsigned long id)
>> {
>> struct meson_reset *data =
>> container_of(rcdev, struct meson_reset, rcdev);
>> - unsigned int bank = id / BITS_PER_REG;
>> - unsigned int offset = id % BITS_PER_REG;
>> - void __iomem *reg_addr = data->reg_base + (bank << 2);
>> + unsigned int offset, bit;
>>
>> - writel(BIT(offset), reg_addr);
>> + meson_reset_offset_and_bit(data, id, &offset, &bit);
>>
>> - return 0;
>> + return regmap_write(data->map, offset, BIT(bit));
>> }
>>
>> static int meson_reset_level(struct reset_controller_dev *rcdev,
>> @@ -48,25 +55,13 @@ static int meson_reset_level(struct reset_controller_dev *rcdev,
>> {
>> struct meson_reset *data =
>> container_of(rcdev, struct meson_reset, rcdev);
>> - unsigned int bank = id / BITS_PER_REG;
>> - unsigned int offset = id % BITS_PER_REG;
>> - void __iomem *reg_addr;
>> - unsigned long flags;
>> - u32 reg;
>> + unsigned int offset, bit;
>>
>> - reg_addr = data->reg_base + data->param->level_offset + (bank << 2);
>> + meson_reset_offset_and_bit(data, id, &offset, &bit);
>> + offset += data->param->level_offset;
>>
>> - spin_lock_irqsave(&data->lock, flags);
>> -
>> - reg = readl(reg_addr);
>> - if (assert)
>> - writel(reg & ~BIT(offset), reg_addr);
>> - else
>> - writel(reg | BIT(offset), reg_addr);
>> -
>> - spin_unlock_irqrestore(&data->lock, flags);
>> -
>> - return 0;
>> + return regmap_update_bits(data->map, offset,
>> + BIT(bit), assert ? 0 : BIT(bit));
>
> Matter of taste, perhaps, but the BIT() could be moved into
> meson_reset_offset_and_bit().
It's not really related to this particular patch which is about moving
to regmap.
I can add it to another patch if you want
>
>> }
>>
>> static int meson_reset_assert(struct reset_controller_dev *rcdev,
>> @@ -119,30 +114,42 @@ static const struct of_device_id meson_reset_dt_ids[] = {
>> };
>> MODULE_DEVICE_TABLE(of, meson_reset_dt_ids);
>>
>> +static const struct regmap_config regmap_config = {
>> + .reg_bits = 32,
>> + .val_bits = 32,
>> + .reg_stride = 4,
>> +};
>> +
>> static int meson_reset_probe(struct platform_device *pdev)
>> {
>> + struct device *dev = &pdev->dev;
>> struct meson_reset *data;
>> + void __iomem *base;
>>
>> - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
>> + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
>> if (!data)
>> return -ENOMEM;
>>
>> - data->reg_base = devm_platform_ioremap_resource(pdev, 0);
>> - if (IS_ERR(data->reg_base))
>> - return PTR_ERR(data->reg_base);
>> + base = devm_platform_ioremap_resource(pdev, 0);
>> + if (IS_ERR(base))
>> + return PTR_ERR(base);
>>
>> - data->param = of_device_get_match_data(&pdev->dev);
>> + data->param = of_device_get_match_data(dev);
>> if (!data->param)
>> return -ENODEV;
>>
>> - spin_lock_init(&data->lock);
>> + data->map = devm_regmap_init_mmio(dev, base, ®map_config);
>> + if (IS_ERR(data->map))
>> + return dev_err_probe(dev, PTR_ERR(data->map),
>> + "can't init regmap mmio region\n");
>>
>> data->rcdev.owner = THIS_MODULE;
>> - data->rcdev.nr_resets = data->param->reg_count * BITS_PER_REG;
>> + data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE
>> + * regmap_config.reg_stride;
>> data->rcdev.ops = &meson_reset_ops;
>> - data->rcdev.of_node = pdev->dev.of_node;
>> + data->rcdev.of_node = dev->of_node;
>>
>> - return devm_reset_controller_register(&pdev->dev, &data->rcdev);
>> + return devm_reset_controller_register(dev, &data->rcdev);
>> }
>>
>> static struct platform_driver meson_reset_driver = {
>
> regards
> Philipp
--
Jerome
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v4 1/9] reset: amlogic: convert driver to regmap
2024-09-06 14:46 ` Jerome Brunet
@ 2024-09-10 8:20 ` Philipp Zabel
0 siblings, 0 replies; 15+ messages in thread
From: Philipp Zabel @ 2024-09-10 8:20 UTC (permalink / raw)
To: Jerome Brunet
Cc: Stephen Boyd, Neil Armstrong, Kevin Hilman, Martin Blumenstingl,
Jiucheng Xu, linux-arm-kernel, linux-amlogic, linux-kernel
On Fr, 2024-09-06 at 16:46 +0200, Jerome Brunet wrote:
> On Fri 06 Sep 2024 at 16:19, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> > On Fr, 2024-09-06 at 15:34 +0200, Jerome Brunet wrote:
[...]
> > > +static void meson_reset_offset_and_bit(struct meson_reset *data,
> > > + unsigned long id,
> > > + unsigned int *offset,
> > > + unsigned int *bit)
> > > +{
> > > + unsigned int stride = regmap_get_reg_stride(data->map);
> >
> > You know this is always 4. Having a #define for this (that is also used
> > to initialize regmap_config.reg_stride, and for now nr_resets, below)
> > instead of going through an exported function would allow the compiler
> > to optimize this all away:
>
> Yes, for now. However, with the auxiliary you may get a regmap with
> different value. I've seen example with stride = 1.
>
> I'll admit is very unlikely but I does not really worth it considering
> how often we'll get through this and how difficult it will be to debug
> if stride ever get different.
Oh right, the aux regmap being passed in from the outside in a later
patch invalidates my point.
[...]
> > > @@ -48,25 +55,13 @@ static int meson_reset_level(struct reset_controller_dev *rcdev,
> > > {
> > > struct meson_reset *data =
> > > container_of(rcdev, struct meson_reset, rcdev);
> > > - unsigned int bank = id / BITS_PER_REG;
> > > - unsigned int offset = id % BITS_PER_REG;
> > > - void __iomem *reg_addr;
> > > - unsigned long flags;
> > > - u32 reg;
> > > + unsigned int offset, bit;
> > >
> > > - reg_addr = data->reg_base + data->param->level_offset + (bank << 2);
> > > + meson_reset_offset_and_bit(data, id, &offset, &bit);
> > > + offset += data->param->level_offset;
> > >
> > > - spin_lock_irqsave(&data->lock, flags);
> > > -
> > > - reg = readl(reg_addr);
> > > - if (assert)
> > > - writel(reg & ~BIT(offset), reg_addr);
> > > - else
> > > - writel(reg | BIT(offset), reg_addr);
> > > -
> > > - spin_unlock_irqrestore(&data->lock, flags);
> > > -
> > > - return 0;
> > > + return regmap_update_bits(data->map, offset,
> > > + BIT(bit), assert ? 0 : BIT(bit));
> >
> > Matter of taste, perhaps, but the BIT() could be moved into
> > meson_reset_offset_and_bit().
>
> It's not really related to this particular patch which is about moving
> to regmap.
>
> I can add it to another patch if you want
Either way is fine.
regards
Philipp
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v4 2/9] reset: amlogic: use generic data matching function
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 1/9] reset: amlogic: convert driver to regmap Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 3/9] reset: amlogic: make parameters unsigned Jerome Brunet
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
There is no need to use the DT specific function to get
matching data, use the generic one instead
Suggested-by: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 9dd38cc209e2..848c2d88503e 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -134,7 +134,7 @@ static int meson_reset_probe(struct platform_device *pdev)
if (IS_ERR(base))
return PTR_ERR(base);
- data->param = of_device_get_match_data(dev);
+ data->param = device_get_match_data(dev);
if (!data->param)
return -ENODEV;
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 3/9] reset: amlogic: make parameters unsigned
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 1/9] reset: amlogic: convert driver to regmap Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 2/9] reset: amlogic: use generic data matching function Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 4/9] reset: amlogic: add driver parameters Jerome Brunet
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
register count and offset cannot be negative. Use unsigned integer
for this.
Suggested-by: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 848c2d88503e..50bd2241ef2f 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -17,8 +17,8 @@
#include <linux/types.h>
struct meson_reset_param {
- int reg_count;
- int level_offset;
+ unsigned int reg_count;
+ unsigned int level_offset;
};
struct meson_reset {
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 4/9] reset: amlogic: add driver parameters
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
` (2 preceding siblings ...)
2024-09-06 13:34 ` [PATCH v4 3/9] reset: amlogic: make parameters unsigned Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 5/9] reset: amlogic: use reset number instead of register count Jerome Brunet
` (4 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
To allow using the same driver for the main reset controller and the
auxiliary ones embedded in the clock controllers, allow to customise
the reset offset, same as the level offset. Also add an option to make
the level reset active low or high.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 50bd2241ef2f..6a90613c8095 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -18,7 +18,9 @@
struct meson_reset_param {
unsigned int reg_count;
+ unsigned int reset_offset;
unsigned int level_offset;
+ bool level_low_reset;
};
struct meson_reset {
@@ -46,6 +48,7 @@ static int meson_reset_reset(struct reset_controller_dev *rcdev,
unsigned int offset, bit;
meson_reset_offset_and_bit(data, id, &offset, &bit);
+ offset += data->param->reset_offset;
return regmap_write(data->map, offset, BIT(bit));
}
@@ -59,9 +62,10 @@ static int meson_reset_level(struct reset_controller_dev *rcdev,
meson_reset_offset_and_bit(data, id, &offset, &bit);
offset += data->param->level_offset;
+ assert ^= data->param->level_low_reset;
return regmap_update_bits(data->map, offset,
- BIT(bit), assert ? 0 : BIT(bit));
+ BIT(bit), assert ? BIT(bit) : 0);
}
static int meson_reset_assert(struct reset_controller_dev *rcdev,
@@ -84,22 +88,30 @@ static const struct reset_control_ops meson_reset_ops = {
static const struct meson_reset_param meson8b_param = {
.reg_count = 8,
+ .reset_offset = 0x0,
.level_offset = 0x7c,
+ .level_low_reset = true,
};
static const struct meson_reset_param meson_a1_param = {
.reg_count = 3,
+ .reset_offset = 0x0,
.level_offset = 0x40,
+ .level_low_reset = true,
};
static const struct meson_reset_param meson_s4_param = {
.reg_count = 6,
+ .reset_offset = 0x0,
.level_offset = 0x40,
+ .level_low_reset = true,
};
static const struct meson_reset_param t7_param = {
.reg_count = 7,
+ .reset_offset = 0x0,
.level_offset = 0x40,
+ .level_low_reset = true,
};
static const struct of_device_id meson_reset_dt_ids[] = {
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 5/9] reset: amlogic: use reset number instead of register count
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
` (3 preceding siblings ...)
2024-09-06 13:34 ` [PATCH v4 4/9] reset: amlogic: add driver parameters Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 6/9] reset: amlogic: add reset status support Jerome Brunet
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
The reset driver from audio clock controller may register less
reset than a register can hold. To avoid making any change while
switching to auxiliary support, use the number of reset instead of the
register count to define the bounds of the reset controller.
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 6a90613c8095..e31c1b7c9e4d 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -17,7 +17,7 @@
#include <linux/types.h>
struct meson_reset_param {
- unsigned int reg_count;
+ unsigned int reset_num;
unsigned int reset_offset;
unsigned int level_offset;
bool level_low_reset;
@@ -87,28 +87,28 @@ static const struct reset_control_ops meson_reset_ops = {
};
static const struct meson_reset_param meson8b_param = {
- .reg_count = 8,
+ .reset_num = 256,
.reset_offset = 0x0,
.level_offset = 0x7c,
.level_low_reset = true,
};
static const struct meson_reset_param meson_a1_param = {
- .reg_count = 3,
+ .reset_num = 96,
.reset_offset = 0x0,
.level_offset = 0x40,
.level_low_reset = true,
};
static const struct meson_reset_param meson_s4_param = {
- .reg_count = 6,
+ .reset_num = 192,
.reset_offset = 0x0,
.level_offset = 0x40,
.level_low_reset = true,
};
static const struct meson_reset_param t7_param = {
- .reg_count = 7,
+ .reset_num = 224,
.reset_offset = 0x0,
.level_offset = 0x40,
.level_low_reset = true,
@@ -156,8 +156,7 @@ static int meson_reset_probe(struct platform_device *pdev)
"can't init regmap mmio region\n");
data->rcdev.owner = THIS_MODULE;
- data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE
- * regmap_config.reg_stride;
+ data->rcdev.nr_resets = data->param->reset_num;
data->rcdev.ops = &meson_reset_ops;
data->rcdev.of_node = dev->of_node;
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 6/9] reset: amlogic: add reset status support
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
` (4 preceding siblings ...)
2024-09-06 13:34 ` [PATCH v4 5/9] reset: amlogic: use reset number instead of register count Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 7/9] reset: amlogic: move drivers to a dedicated directory Jerome Brunet
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
Add a callback to check the status of the level reset, as done in
the reset driver of the audio clock controller.
This is done keep the functionality when the audio reset controller
get migrated to meson-reset.
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index e31c1b7c9e4d..af690d3012ec 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -68,6 +68,22 @@ static int meson_reset_level(struct reset_controller_dev *rcdev,
BIT(bit), assert ? BIT(bit) : 0);
}
+static int meson_reset_status(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ struct meson_reset *data =
+ container_of(rcdev, struct meson_reset, rcdev);
+ unsigned int val, offset, bit;
+
+ meson_reset_offset_and_bit(data, id, &offset, &bit);
+ offset += data->param->level_offset;
+
+ regmap_read(data->map, offset, &val);
+ val = !!(BIT(bit) & val);
+
+ return val ^ data->param->level_low_reset;
+}
+
static int meson_reset_assert(struct reset_controller_dev *rcdev,
unsigned long id)
{
@@ -84,6 +100,7 @@ static const struct reset_control_ops meson_reset_ops = {
.reset = meson_reset_reset,
.assert = meson_reset_assert,
.deassert = meson_reset_deassert,
+ .status = meson_reset_status,
};
static const struct meson_reset_param meson8b_param = {
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 7/9] reset: amlogic: move drivers to a dedicated directory
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
` (5 preceding siblings ...)
2024-09-06 13:34 ` [PATCH v4 6/9] reset: amlogic: add reset status support Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 8/9] reset: amlogic: split the device core and platform probe Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support Jerome Brunet
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
The meson reset driver will be split in two part, one implemeting the ops,
the other providing the platform driver support. This will be done to
facilitate the addition of the auxiliary bus support.
To avoid making a mess in drivers/reset/ while doing so, move the amlogic
reset drivers to a dedicated directory.
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/Kconfig | 15 +--------------
drivers/reset/Makefile | 3 +--
drivers/reset/amlogic/Kconfig | 13 +++++++++++++
drivers/reset/amlogic/Makefile | 2 ++
drivers/reset/{ => amlogic}/reset-meson-audio-arb.c | 0
drivers/reset/{ => amlogic}/reset-meson.c | 0
6 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 5484a65f66b9..d28c4401a310 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -153,20 +153,6 @@ config RESET_MCHP_SPARX5
help
This driver supports switch core reset for the Microchip Sparx5 SoC.
-config RESET_MESON
- tristate "Meson Reset Driver"
- depends on ARCH_MESON || COMPILE_TEST
- default ARCH_MESON
- help
- This enables the reset driver for Amlogic Meson SoCs.
-
-config RESET_MESON_AUDIO_ARB
- tristate "Meson Audio Memory Arbiter Reset Driver"
- depends on ARCH_MESON || COMPILE_TEST
- help
- This enables the reset driver for Audio Memory Arbiter of
- Amlogic's A113 based SoCs
-
config RESET_NPCM
bool "NPCM BMC Reset Driver" if COMPILE_TEST
default ARCH_NPCM
@@ -356,6 +342,7 @@ config RESET_ZYNQMP
help
This enables the reset controller driver for Xilinx ZynqMP SoCs.
+source "drivers/reset/amlogic/Kconfig"
source "drivers/reset/starfive/Kconfig"
source "drivers/reset/sti/Kconfig"
source "drivers/reset/hisilicon/Kconfig"
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 4411a2a124d7..677c4d1e2632 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += core.o
+obj-y += amlogic/
obj-y += hisilicon/
obj-y += starfive/
obj-y += sti/
@@ -21,8 +22,6 @@ obj-$(CONFIG_RESET_K210) += reset-k210.o
obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o
obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o
obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o
-obj-$(CONFIG_RESET_MESON) += reset-meson.o
-obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
obj-$(CONFIG_RESET_NPCM) += reset-npcm.o
obj-$(CONFIG_RESET_NUVOTON_MA35D1) += reset-ma35d1.o
obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o
diff --git a/drivers/reset/amlogic/Kconfig b/drivers/reset/amlogic/Kconfig
new file mode 100644
index 000000000000..7ed9cf50f038
--- /dev/null
+++ b/drivers/reset/amlogic/Kconfig
@@ -0,0 +1,13 @@
+config RESET_MESON
+ tristate "Meson Reset Driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ default ARCH_MESON
+ help
+ This enables the reset driver for Amlogic Meson SoCs.
+
+config RESET_MESON_AUDIO_ARB
+ tristate "Meson Audio Memory Arbiter Reset Driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ help
+ This enables the reset driver for Audio Memory Arbiter of
+ Amlogic's A113 based SoCs
diff --git a/drivers/reset/amlogic/Makefile b/drivers/reset/amlogic/Makefile
new file mode 100644
index 000000000000..55509fc78513
--- /dev/null
+++ b/drivers/reset/amlogic/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_RESET_MESON) += reset-meson.o
+obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/amlogic/reset-meson-audio-arb.c
similarity index 100%
rename from drivers/reset/reset-meson-audio-arb.c
rename to drivers/reset/amlogic/reset-meson-audio-arb.c
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/amlogic/reset-meson.c
similarity index 100%
rename from drivers/reset/reset-meson.c
rename to drivers/reset/amlogic/reset-meson.c
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 8/9] reset: amlogic: split the device core and platform probe
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
` (6 preceding siblings ...)
2024-09-06 13:34 ` [PATCH v4 7/9] reset: amlogic: move drivers to a dedicated directory Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-06 13:34 ` [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support Jerome Brunet
8 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
To prepare the addition of the auxiliary device support, split
out the device coomon functions from the probe of the platform device.
The device core function will be common to both the platform and auxiliary
driver.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/amlogic/Kconfig | 8 +-
drivers/reset/amlogic/Makefile | 1 +
drivers/reset/amlogic/reset-meson-common.c | 121 ++++++++++++++++++++++++++++
drivers/reset/amlogic/reset-meson.c | 122 ++++-------------------------
drivers/reset/amlogic/reset-meson.h | 24 ++++++
5 files changed, 168 insertions(+), 108 deletions(-)
diff --git a/drivers/reset/amlogic/Kconfig b/drivers/reset/amlogic/Kconfig
index 7ed9cf50f038..1d77987088f4 100644
--- a/drivers/reset/amlogic/Kconfig
+++ b/drivers/reset/amlogic/Kconfig
@@ -1,9 +1,15 @@
+config RESET_MESON_COMMON
+ tristate
+ select REGMAP
+
config RESET_MESON
tristate "Meson Reset Driver"
depends on ARCH_MESON || COMPILE_TEST
default ARCH_MESON
+ select REGMAP_MMIO
+ select RESET_MESON_COMMON
help
- This enables the reset driver for Amlogic Meson SoCs.
+ This enables the reset driver for Amlogic SoCs.
config RESET_MESON_AUDIO_ARB
tristate "Meson Audio Memory Arbiter Reset Driver"
diff --git a/drivers/reset/amlogic/Makefile b/drivers/reset/amlogic/Makefile
index 55509fc78513..74aaa2fb5e13 100644
--- a/drivers/reset/amlogic/Makefile
+++ b/drivers/reset/amlogic/Makefile
@@ -1,2 +1,3 @@
obj-$(CONFIG_RESET_MESON) += reset-meson.o
+obj-$(CONFIG_RESET_MESON_COMMON) += reset-meson-common.o
obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
diff --git a/drivers/reset/amlogic/reset-meson-common.c b/drivers/reset/amlogic/reset-meson-common.c
new file mode 100644
index 000000000000..d57544801ae9
--- /dev/null
+++ b/drivers/reset/amlogic/reset-meson-common.c
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+/*
+ * Amlogic Meson Reset core functions
+ *
+ * Copyright (c) 2016-2024 BayLibre, SAS.
+ * Authors: Neil Armstrong <narmstrong@baylibre.com>
+ * Jerome Brunet <jbrunet@baylibre.com>
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/reset-controller.h>
+
+#include "reset-meson.h"
+
+struct meson_reset {
+ const struct meson_reset_param *param;
+ struct reset_controller_dev rcdev;
+ struct regmap *map;
+};
+
+static void meson_reset_offset_and_bit(struct meson_reset *data,
+ unsigned long id,
+ unsigned int *offset,
+ unsigned int *bit)
+{
+ unsigned int stride = regmap_get_reg_stride(data->map);
+
+ *offset = (id / (stride * BITS_PER_BYTE)) * stride;
+ *bit = id % (stride * BITS_PER_BYTE);
+}
+
+static int meson_reset_reset(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ struct meson_reset *data =
+ container_of(rcdev, struct meson_reset, rcdev);
+ unsigned int offset, bit;
+
+ meson_reset_offset_and_bit(data, id, &offset, &bit);
+ offset += data->param->reset_offset;
+
+ return regmap_write(data->map, offset, BIT(bit));
+}
+
+static int meson_reset_level(struct reset_controller_dev *rcdev,
+ unsigned long id, bool assert)
+{
+ struct meson_reset *data =
+ container_of(rcdev, struct meson_reset, rcdev);
+ unsigned int offset, bit;
+
+ meson_reset_offset_and_bit(data, id, &offset, &bit);
+ offset += data->param->level_offset;
+ assert ^= data->param->level_low_reset;
+
+ return regmap_update_bits(data->map, offset,
+ BIT(bit), assert ? BIT(bit) : 0);
+}
+
+static int meson_reset_status(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ struct meson_reset *data =
+ container_of(rcdev, struct meson_reset, rcdev);
+ unsigned int val, offset, bit;
+
+ meson_reset_offset_and_bit(data, id, &offset, &bit);
+ offset += data->param->level_offset;
+
+ regmap_read(data->map, offset, &val);
+ val = !!(BIT(bit) & val);
+
+ return val ^ data->param->level_low_reset;
+}
+
+static int meson_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return meson_reset_level(rcdev, id, true);
+}
+
+static int meson_reset_deassert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return meson_reset_level(rcdev, id, false);
+}
+
+static const struct reset_control_ops meson_reset_ops = {
+ .reset = meson_reset_reset,
+ .assert = meson_reset_assert,
+ .deassert = meson_reset_deassert,
+ .status = meson_reset_status,
+};
+
+int meson_reset_controller_register(struct device *dev, struct regmap *map,
+ const struct meson_reset_param *param)
+{
+ struct meson_reset *data;
+
+ data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->param = param;
+ data->map = map;
+ data->rcdev.owner = dev->driver->owner;
+ data->rcdev.nr_resets = param->reset_num;
+ data->rcdev.ops = &meson_reset_ops;
+ data->rcdev.of_node = dev->of_node;
+
+ return devm_reset_controller_register(dev, &data->rcdev);
+}
+EXPORT_SYMBOL_NS_GPL(meson_reset_controller_register, MESON_RESET);
+
+MODULE_DESCRIPTION("Amlogic Meson Reset Core function");
+MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_IMPORT_NS(MESON_RESET);
diff --git a/drivers/reset/amlogic/reset-meson.c b/drivers/reset/amlogic/reset-meson.c
index af690d3012ec..feb19bf6da77 100644
--- a/drivers/reset/amlogic/reset-meson.c
+++ b/drivers/reset/amlogic/reset-meson.c
@@ -2,106 +2,20 @@
/*
* Amlogic Meson Reset Controller driver
*
- * Copyright (c) 2016 BayLibre, SAS.
- * Author: Neil Armstrong <narmstrong@baylibre.com>
+ * Copyright (c) 2016-2024 BayLibre, SAS.
+ * Authors: Neil Armstrong <narmstrong@baylibre.com>
+ * Jerome Brunet <jbrunet@baylibre.com>
*/
+
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/reset-controller.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-
-struct meson_reset_param {
- unsigned int reset_num;
- unsigned int reset_offset;
- unsigned int level_offset;
- bool level_low_reset;
-};
-
-struct meson_reset {
- const struct meson_reset_param *param;
- struct reset_controller_dev rcdev;
- struct regmap *map;
-};
-
-static void meson_reset_offset_and_bit(struct meson_reset *data,
- unsigned long id,
- unsigned int *offset,
- unsigned int *bit)
-{
- unsigned int stride = regmap_get_reg_stride(data->map);
-
- *offset = (id / (stride * BITS_PER_BYTE)) * stride;
- *bit = id % (stride * BITS_PER_BYTE);
-}
-
-static int meson_reset_reset(struct reset_controller_dev *rcdev,
- unsigned long id)
-{
- struct meson_reset *data =
- container_of(rcdev, struct meson_reset, rcdev);
- unsigned int offset, bit;
-
- meson_reset_offset_and_bit(data, id, &offset, &bit);
- offset += data->param->reset_offset;
-
- return regmap_write(data->map, offset, BIT(bit));
-}
-
-static int meson_reset_level(struct reset_controller_dev *rcdev,
- unsigned long id, bool assert)
-{
- struct meson_reset *data =
- container_of(rcdev, struct meson_reset, rcdev);
- unsigned int offset, bit;
-
- meson_reset_offset_and_bit(data, id, &offset, &bit);
- offset += data->param->level_offset;
- assert ^= data->param->level_low_reset;
- return regmap_update_bits(data->map, offset,
- BIT(bit), assert ? BIT(bit) : 0);
-}
-
-static int meson_reset_status(struct reset_controller_dev *rcdev,
- unsigned long id)
-{
- struct meson_reset *data =
- container_of(rcdev, struct meson_reset, rcdev);
- unsigned int val, offset, bit;
-
- meson_reset_offset_and_bit(data, id, &offset, &bit);
- offset += data->param->level_offset;
-
- regmap_read(data->map, offset, &val);
- val = !!(BIT(bit) & val);
-
- return val ^ data->param->level_low_reset;
-}
-
-static int meson_reset_assert(struct reset_controller_dev *rcdev,
- unsigned long id)
-{
- return meson_reset_level(rcdev, id, true);
-}
-
-static int meson_reset_deassert(struct reset_controller_dev *rcdev,
- unsigned long id)
-{
- return meson_reset_level(rcdev, id, false);
-}
-
-static const struct reset_control_ops meson_reset_ops = {
- .reset = meson_reset_reset,
- .assert = meson_reset_assert,
- .deassert = meson_reset_deassert,
- .status = meson_reset_status,
-};
+#include "reset-meson.h"
static const struct meson_reset_param meson8b_param = {
.reset_num = 256,
@@ -151,33 +65,25 @@ static const struct regmap_config regmap_config = {
static int meson_reset_probe(struct platform_device *pdev)
{
+ const struct meson_reset_param *param;
struct device *dev = &pdev->dev;
- struct meson_reset *data;
+ struct regmap *map;
void __iomem *base;
- data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
- if (!data)
- return -ENOMEM;
-
base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base))
return PTR_ERR(base);
- data->param = device_get_match_data(dev);
- if (!data->param)
+ param = device_get_match_data(dev);
+ if (!param)
return -ENODEV;
- data->map = devm_regmap_init_mmio(dev, base, ®map_config);
- if (IS_ERR(data->map))
- return dev_err_probe(dev, PTR_ERR(data->map),
+ map = devm_regmap_init_mmio(dev, base, ®map_config);
+ if (IS_ERR(map))
+ return dev_err_probe(dev, PTR_ERR(map),
"can't init regmap mmio region\n");
- data->rcdev.owner = THIS_MODULE;
- data->rcdev.nr_resets = data->param->reset_num;
- data->rcdev.ops = &meson_reset_ops;
- data->rcdev.of_node = dev->of_node;
-
- return devm_reset_controller_register(dev, &data->rcdev);
+ return meson_reset_controller_register(dev, map, param);
}
static struct platform_driver meson_reset_driver = {
@@ -191,4 +97,6 @@ module_platform_driver(meson_reset_driver);
MODULE_DESCRIPTION("Amlogic Meson Reset Controller driver");
MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
MODULE_LICENSE("Dual BSD/GPL");
+MODULE_IMPORT_NS(MESON_RESET);
diff --git a/drivers/reset/amlogic/reset-meson.h b/drivers/reset/amlogic/reset-meson.h
new file mode 100644
index 000000000000..4e1dbd7569c5
--- /dev/null
+++ b/drivers/reset/amlogic/reset-meson.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
+ * Copyright (c) 2024 BayLibre, SAS.
+ * Author: Jerome Brunet <jbrunet@baylibre.com>
+ */
+
+#ifndef __MESON_RESET_H
+#define __MESON_RESET_H
+
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/reset-controller.h>
+
+struct meson_reset_param {
+ unsigned int reset_num;
+ unsigned int reset_offset;
+ unsigned int level_offset;
+ bool level_low_reset;
+};
+
+int meson_reset_controller_register(struct device *dev, struct regmap *map,
+ const struct meson_reset_param *param);
+
+#endif /* __MESON_RESET_H */
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support
2024-09-06 13:34 [PATCH v4 0/9] reset: amlogic: move audio reset drivers out of CCF Jerome Brunet
` (7 preceding siblings ...)
2024-09-06 13:34 ` [PATCH v4 8/9] reset: amlogic: split the device core and platform probe Jerome Brunet
@ 2024-09-06 13:34 ` Jerome Brunet
2024-09-09 16:42 ` kernel test robot
8 siblings, 1 reply; 15+ messages in thread
From: Jerome Brunet @ 2024-09-06 13:34 UTC (permalink / raw)
To: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, Jiucheng Xu
Cc: linux-arm-kernel, linux-amlogic, linux-kernel
Add support for the reset controller present in the audio clock
controller of the g12 and sm1 SoC families, using the auxiliary bus.
This is expected to replace the driver currently present directly
within the related clock driver.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/amlogic/Kconfig | 8 ++
drivers/reset/amlogic/Makefile | 1 +
drivers/reset/amlogic/reset-meson-aux.c | 136 +++++++++++++++++++++++++++++
drivers/reset/amlogic/reset-meson-common.c | 25 +++++-
drivers/reset/amlogic/reset-meson.c | 3 +
drivers/reset/amlogic/reset-meson.h | 4 +
include/soc/amlogic/reset-meson-aux.h | 23 +++++
7 files changed, 198 insertions(+), 2 deletions(-)
diff --git a/drivers/reset/amlogic/Kconfig b/drivers/reset/amlogic/Kconfig
index 1d77987088f4..e73ee5d63264 100644
--- a/drivers/reset/amlogic/Kconfig
+++ b/drivers/reset/amlogic/Kconfig
@@ -11,6 +11,14 @@ config RESET_MESON
help
This enables the reset driver for Amlogic SoCs.
+config RESET_MESON_AUX
+ tristate "Meson Reset Auxiliary Driver"
+ depends on ARCH_MESON || COMPILE_TEST
+ select AUXILIARY_BUS
+ select RESET_MESON_CORE
+ help
+ This enables the reset auxiliary driver for Amlogic SoCs.
+
config RESET_MESON_AUDIO_ARB
tristate "Meson Audio Memory Arbiter Reset Driver"
depends on ARCH_MESON || COMPILE_TEST
diff --git a/drivers/reset/amlogic/Makefile b/drivers/reset/amlogic/Makefile
index 74aaa2fb5e13..ca99a691282c 100644
--- a/drivers/reset/amlogic/Makefile
+++ b/drivers/reset/amlogic/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_RESET_MESON) += reset-meson.o
+obj-$(CONFIG_RESET_MESON_AUX) += reset-meson-aux.o
obj-$(CONFIG_RESET_MESON_COMMON) += reset-meson-common.o
obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
diff --git a/drivers/reset/amlogic/reset-meson-aux.c b/drivers/reset/amlogic/reset-meson-aux.c
new file mode 100644
index 000000000000..dd8453001db9
--- /dev/null
+++ b/drivers/reset/amlogic/reset-meson-aux.c
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+/*
+ * Amlogic Meson Reset Auxiliary driver
+ *
+ * Copyright (c) 2024 BayLibre, SAS.
+ * Author: Jerome Brunet <jbrunet@baylibre.com>
+ */
+
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/auxiliary_bus.h>
+#include <linux/regmap.h>
+#include <linux/reset-controller.h>
+#include <linux/slab.h>
+
+#include "reset-meson.h"
+#include <soc/amlogic/reset-meson-aux.h>
+
+static DEFINE_IDA(meson_rst_aux_ida);
+
+struct meson_reset_adev {
+ struct auxiliary_device adev;
+ struct regmap *map;
+};
+
+#define to_meson_reset_adev(_adev) \
+ container_of((_adev), struct meson_reset_adev, adev)
+
+static const struct meson_reset_param meson_g12a_audio_param = {
+ .reset_ops = &meson_reset_toggle_ops,
+ .reset_num = 26,
+ .level_offset = 0x24,
+};
+
+static const struct meson_reset_param meson_sm1_audio_param = {
+ .reset_ops = &meson_reset_toggle_ops,
+ .reset_num = 39,
+ .level_offset = 0x28,
+};
+
+static const struct auxiliary_device_id meson_reset_aux_ids[] = {
+ {
+ .name = "axg-audio-clkc.rst-g12a",
+ .driver_data = (kernel_ulong_t)&meson_g12a_audio_param,
+ }, {
+ .name = "axg-audio-clkc.rst-sm1",
+ .driver_data = (kernel_ulong_t)&meson_sm1_audio_param,
+ }, {}
+};
+MODULE_DEVICE_TABLE(auxiliary, meson_reset_aux_ids);
+
+static int meson_reset_aux_probe(struct auxiliary_device *adev,
+ const struct auxiliary_device_id *id)
+{
+ const struct meson_reset_param *param =
+ (const struct meson_reset_param *)(id->driver_data);
+ struct meson_reset_adev *raux =
+ to_meson_reset_adev(adev);
+
+ return meson_reset_controller_register(&adev->dev, raux->map, param);
+}
+
+static struct auxiliary_driver meson_reset_aux_driver = {
+ .probe = meson_reset_aux_probe,
+ .id_table = meson_reset_aux_ids,
+};
+module_auxiliary_driver(meson_reset_aux_driver);
+
+static void meson_rst_aux_release(struct device *dev)
+{
+ struct auxiliary_device *adev = to_auxiliary_dev(dev);
+ struct meson_reset_adev *raux =
+ to_meson_reset_adev(adev);
+
+ ida_free(&meson_rst_aux_ida, adev->id);
+ kfree(raux);
+}
+
+static void meson_rst_aux_unregister_adev(void *_adev)
+{
+ struct auxiliary_device *adev = _adev;
+
+ auxiliary_device_delete(adev);
+ auxiliary_device_uninit(adev);
+}
+
+int devm_meson_rst_aux_register(struct device *dev,
+ struct regmap *map,
+ const char *adev_name)
+{
+ struct meson_reset_adev *raux;
+ struct auxiliary_device *adev;
+ int ret;
+
+ raux = kzalloc(sizeof(*raux), GFP_KERNEL);
+ if (!raux)
+ return -ENOMEM;
+
+ ret = ida_alloc(&meson_rst_aux_ida, GFP_KERNEL);
+ if (ret < 0)
+ goto raux_free;
+
+ raux->map = map;
+
+ adev = &raux->adev;
+ adev->id = ret;
+ adev->name = adev_name;
+ adev->dev.parent = dev;
+ adev->dev.release = meson_rst_aux_release;
+ device_set_of_node_from_dev(&adev->dev, dev);
+
+ ret = auxiliary_device_init(adev);
+ if (ret)
+ goto ida_free;
+
+ ret = __auxiliary_device_add(adev, dev->driver->name);
+ if (ret) {
+ auxiliary_device_uninit(adev);
+ return ret;
+ }
+
+ return devm_add_action_or_reset(dev, meson_rst_aux_unregister_adev,
+ adev);
+
+ida_free:
+ ida_free(&meson_rst_aux_ida, adev->id);
+raux_free:
+ kfree(raux);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(devm_meson_rst_aux_register);
+
+MODULE_DESCRIPTION("Amlogic Meson Reset Auxiliary driver");
+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_IMPORT_NS(MESON_RESET);
diff --git a/drivers/reset/amlogic/reset-meson-common.c b/drivers/reset/amlogic/reset-meson-common.c
index d57544801ae9..a7b1b250a64d 100644
--- a/drivers/reset/amlogic/reset-meson-common.c
+++ b/drivers/reset/amlogic/reset-meson-common.c
@@ -87,12 +87,33 @@ static int meson_reset_deassert(struct reset_controller_dev *rcdev,
return meson_reset_level(rcdev, id, false);
}
-static const struct reset_control_ops meson_reset_ops = {
+static int meson_reset_level_toggle(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ int ret;
+
+ ret = meson_reset_assert(rcdev, id);
+ if (ret)
+ return ret;
+
+ return meson_reset_deassert(rcdev, id);
+}
+
+const struct reset_control_ops meson_reset_ops = {
.reset = meson_reset_reset,
.assert = meson_reset_assert,
.deassert = meson_reset_deassert,
.status = meson_reset_status,
};
+EXPORT_SYMBOL_NS_GPL(meson_reset_ops, MESON_RESET);
+
+const struct reset_control_ops meson_reset_toggle_ops = {
+ .reset = meson_reset_level_toggle,
+ .assert = meson_reset_assert,
+ .deassert = meson_reset_deassert,
+ .status = meson_reset_status,
+};
+EXPORT_SYMBOL_NS_GPL(meson_reset_toggle_ops, MESON_RESET);
int meson_reset_controller_register(struct device *dev, struct regmap *map,
const struct meson_reset_param *param)
@@ -107,7 +128,7 @@ int meson_reset_controller_register(struct device *dev, struct regmap *map,
data->map = map;
data->rcdev.owner = dev->driver->owner;
data->rcdev.nr_resets = param->reset_num;
- data->rcdev.ops = &meson_reset_ops;
+ data->rcdev.ops = data->param->reset_ops;
data->rcdev.of_node = dev->of_node;
return devm_reset_controller_register(dev, &data->rcdev);
diff --git a/drivers/reset/amlogic/reset-meson.c b/drivers/reset/amlogic/reset-meson.c
index feb19bf6da77..6ae4ed6b7f8b 100644
--- a/drivers/reset/amlogic/reset-meson.c
+++ b/drivers/reset/amlogic/reset-meson.c
@@ -18,6 +18,7 @@
#include "reset-meson.h"
static const struct meson_reset_param meson8b_param = {
+ .reset_ops = &meson_reset_ops,
.reset_num = 256,
.reset_offset = 0x0,
.level_offset = 0x7c,
@@ -25,6 +26,7 @@ static const struct meson_reset_param meson8b_param = {
};
static const struct meson_reset_param meson_a1_param = {
+ .reset_ops = &meson_reset_ops,
.reset_num = 96,
.reset_offset = 0x0,
.level_offset = 0x40,
@@ -32,6 +34,7 @@ static const struct meson_reset_param meson_a1_param = {
};
static const struct meson_reset_param meson_s4_param = {
+ .reset_ops = &meson_reset_ops,
.reset_num = 192,
.reset_offset = 0x0,
.level_offset = 0x40,
diff --git a/drivers/reset/amlogic/reset-meson.h b/drivers/reset/amlogic/reset-meson.h
index 4e1dbd7569c5..2051e126dc3a 100644
--- a/drivers/reset/amlogic/reset-meson.h
+++ b/drivers/reset/amlogic/reset-meson.h
@@ -12,6 +12,7 @@
#include <linux/reset-controller.h>
struct meson_reset_param {
+ const struct reset_control_ops *reset_ops;
unsigned int reset_num;
unsigned int reset_offset;
unsigned int level_offset;
@@ -21,4 +22,7 @@ struct meson_reset_param {
int meson_reset_controller_register(struct device *dev, struct regmap *map,
const struct meson_reset_param *param);
+extern const struct reset_control_ops meson_reset_ops;
+extern const struct reset_control_ops meson_reset_toggle_ops;
+
#endif /* __MESON_RESET_H */
diff --git a/include/soc/amlogic/reset-meson-aux.h b/include/soc/amlogic/reset-meson-aux.h
new file mode 100644
index 000000000000..d8a15d48c984
--- /dev/null
+++ b/include/soc/amlogic/reset-meson-aux.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __SOC_RESET_MESON_AUX_H
+#define __SOC_RESET_MESON_AUX_H
+
+#include <linux/err.h>
+
+struct device;
+struct regmap;
+
+#if IS_ENABLED(CONFIG_RESET_MESON_AUX)
+int devm_meson_rst_aux_register(struct device *dev,
+ struct regmap *map,
+ const char *adev_name);
+#else
+static inline int devm_meson_rst_aux_register(struct device *dev,
+ struct regmap *map,
+ const char *adev_name)
+{
+ return 0;
+}
+#endif
+
+#endif /* __SOC_RESET_MESON_AUX_H */
--
2.45.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support
2024-09-06 13:34 ` [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support Jerome Brunet
@ 2024-09-09 16:42 ` kernel test robot
2024-09-09 17:31 ` Jerome Brunet
0 siblings, 1 reply; 15+ messages in thread
From: kernel test robot @ 2024-09-09 16:42 UTC (permalink / raw)
To: Jerome Brunet, Philipp Zabel, Stephen Boyd, Neil Armstrong,
Kevin Hilman, Martin Blumenstingl, Jiucheng Xu
Cc: oe-kbuild-all, linux-arm-kernel, linux-amlogic, linux-kernel
Hi Jerome,
kernel test robot noticed the following build errors:
[auto build test ERROR on 487b1b32e317b85c2948eb4013f3e089a0433d49]
url: https://github.com/intel-lab-lkp/linux/commits/Jerome-Brunet/reset-amlogic-convert-driver-to-regmap/20240906-213857
base: 487b1b32e317b85c2948eb4013f3e089a0433d49
patch link: https://lore.kernel.org/r/20240906-meson-rst-aux-v4-9-08824c3d108b%40baylibre.com
patch subject: [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support
config: parisc-randconfig-r123-20240909 (https://download.01.org/0day-ci/archive/20240910/202409100033.EPfBtwfK-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 14.1.0
reproduce: (https://download.01.org/0day-ci/archive/20240910/202409100033.EPfBtwfK-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409100033.EPfBtwfK-lkp@intel.com/
All errors (new ones prefixed by >>):
hppa-linux-ld: drivers/reset/amlogic/reset-meson-aux.o: in function `meson_reset_aux_probe':
>> (.text+0xc): undefined reference to `meson_reset_controller_register'
>> hppa-linux-ld: drivers/reset/amlogic/reset-meson-aux.o:(.rodata+0x88): undefined reference to `meson_reset_toggle_ops'
hppa-linux-ld: drivers/reset/amlogic/reset-meson-aux.o:(.rodata+0x9c): undefined reference to `meson_reset_toggle_ops'
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support
2024-09-09 16:42 ` kernel test robot
@ 2024-09-09 17:31 ` Jerome Brunet
0 siblings, 0 replies; 15+ messages in thread
From: Jerome Brunet @ 2024-09-09 17:31 UTC (permalink / raw)
To: kernel test robot
Cc: Philipp Zabel, Stephen Boyd, Neil Armstrong, Kevin Hilman,
Martin Blumenstingl, Jiucheng Xu, oe-kbuild-all, linux-arm-kernel,
linux-amlogic, linux-kernel
On Tue 10 Sep 2024 at 00:42, kernel test robot <lkp@intel.com> wrote:
> Hi Jerome,
>
> kernel test robot noticed the following build errors:
>
> [auto build test ERROR on 487b1b32e317b85c2948eb4013f3e089a0433d49]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Jerome-Brunet/reset-amlogic-convert-driver-to-regmap/20240906-213857
> base: 487b1b32e317b85c2948eb4013f3e089a0433d49
> patch link: https://lore.kernel.org/r/20240906-meson-rst-aux-v4-9-08824c3d108b%40baylibre.com
> patch subject: [PATCH v4 9/9] reset: amlogic: add auxiliary reset driver support
> config: parisc-randconfig-r123-20240909 (https://download.01.org/0day-ci/archive/20240910/202409100033.EPfBtwfK-lkp@intel.com/config)
> compiler: hppa-linux-gcc (GCC) 14.1.0
> reproduce: (https://download.01.org/0day-ci/archive/20240910/202409100033.EPfBtwfK-lkp@intel.com/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202409100033.EPfBtwfK-lkp@intel.com/
>
> All errors (new ones prefixed by >>):
>
> hppa-linux-ld: drivers/reset/amlogic/reset-meson-aux.o: in function `meson_reset_aux_probe':
>>> (.text+0xc): undefined reference to `meson_reset_controller_register'
>>> hppa-linux-ld: drivers/reset/amlogic/reset-meson-aux.o:(.rodata+0x88): undefined reference to `meson_reset_toggle_ops'
> hppa-linux-ld: drivers/reset/amlogic/reset-meson-aux.o:(.rodata+0x9c): undefined reference to `meson_reset_toggle_ops'
In the config the COMMON part is built as module while the AUX part is
built-in. Of course, this should not be allowed. The error was
introduced in the last patchset version due to another renaming.
Will be fixed this next one.
--
Jerome
^ permalink raw reply [flat|nested] 15+ messages in thread