[PATCH 0/2] Fixes to device-managed work-queue series

[PATCH 0/2] Fixes to device-managed work-queue series

[Matti Vaittinen]

The series "Add managed version of delayed work init" was applied to
driver-core by Greg. Few issues were reported afterwards.

Chen-Yu Tsai reported problem in axp20x_usb_power power-supply driver.
Work-queue initialization and request IRQ ordering was wrong and
work-queue was initialized twice. This was originated by my incorrect
rebase where I missed a fixup done between my patch revisions.

Additional print was reuqested on work-queue initialization error path
at extcon-gpio.c by Chanwoo Choi.

This series fixes both of these issues.

Series is done based on driver-core-next.

---

Matti Vaittinen (2):
  extcon: extcon-gpio: Log error if work-queue init fails
  power: supply: axp20x_usb_power: fix work-queue init

 drivers/extcon/extcon-gpio.c            |  4 +++-
 drivers/power/supply/axp20x_usb_power.c | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)


base-commit: a7d30f3f41cf40aad1c4557fa180fe320d5b7c74
-- 
2.25.4


-- 
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =] 

[PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails

[Matti Vaittinen]

Add error print for probe failure when resource managed work-queue
initialization fails.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Suggested-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 drivers/extcon/extcon-gpio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 4105df74f2b0..8ea2cda8f7f3 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -114,8 +114,10 @@ static int gpio_extcon_probe(struct platform_device *pdev)
 		return ret;
 
 	ret = devm_delayed_work_autocancel(dev, &data->work, gpio_extcon_work);
-	if (ret)
+	if (ret) {
+		dev_err(dev, "Failed to initialize delayed_work");
 		return ret;
+	}
 
 	/*
 	 * Request the interrupt of gpio to detect whether external connector
-- 
2.25.4


-- 
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =] 

[PATCH 2/2] power: supply: axp20x_usb_power: fix work-queue init

[Matti Vaittinen]

The commit 6d0c5de2fd84
("power: supply: Clean-up few drivers by using managed work init")
Re-introduced wrong order of initializing work-queue and requesting
the IRQs which was originally fixed by the commit b5e8642ed95f
("power: supply: axp20x_usb_power: Init work before enabling IRQs")

In addition this caused the work queue to be initialized twice.

Fix it again.

Fixes: 6d0c5de2fd84 ("power: supply: Clean-up few drivers by using managed work init")

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reported-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/power/supply/axp20x_usb_power.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
index 4259709e3491..e954970b50e6 100644
--- a/drivers/power/supply/axp20x_usb_power.c
+++ b/drivers/power/supply/axp20x_usb_power.c
@@ -594,7 +594,11 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
 	power->axp20x_id = axp_data->axp20x_id;
 	power->regmap = axp20x->regmap;
 	power->num_irqs = axp_data->num_irq_names;
-	INIT_DELAYED_WORK(&power->vbus_detect, axp20x_usb_power_poll_vbus);
+
+	ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
+					   axp20x_usb_power_poll_vbus);
+	if (ret)
+		return ret;
 
 	if (power->axp20x_id == AXP202_ID) {
 		/* Enable vbus valid checking */
@@ -647,10 +651,6 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
 		}
 	}
 
-	ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
-					   axp20x_usb_power_poll_vbus);
-	if (ret)
-		return ret;
 	if (axp20x_usb_vbus_needs_polling(power))
 		queue_delayed_work(system_power_efficient_wq, &power->vbus_detect, 0);
 
-- 
2.25.4


-- 
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =] 

Re: [PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails

[Hans de Goede]

Hi,

On 3/24/21 10:21 AM, Matti Vaittinen wrote:
> Add error print for probe failure when resource managed work-queue
> initialization fails.
> 
> Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
> Suggested-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
>  drivers/extcon/extcon-gpio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
> index 4105df74f2b0..8ea2cda8f7f3 100644
> --- a/drivers/extcon/extcon-gpio.c
> +++ b/drivers/extcon/extcon-gpio.c
> @@ -114,8 +114,10 @@ static int gpio_extcon_probe(struct platform_device *pdev)
>  		return ret;
>  
>  	ret = devm_delayed_work_autocancel(dev, &data->work, gpio_extcon_work);
> -	if (ret)
> +	if (ret) {
> +		dev_err(dev, "Failed to initialize delayed_work");
>  		return ret;
> +	}

The only ret which we can have here is -ENOMEM and as a rule we don't log
errors for those, because the kernel memory-management code already complains
loudly when this happens.

So IMHO this patch should be dropped.

Regards,

Hans




>  
>  	/*
>  	 * Request the interrupt of gpio to detect whether external connector
> 

Re: [PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails

[Vaittinen, Matti]

Hello Hans, Chanwoo, Greg,

On Wed, 2021-03-24 at 10:25 +0100, Hans de Goede wrote:
> Hi,
> 
> On 3/24/21 10:21 AM, Matti Vaittinen wrote:
> > Add error print for probe failure when resource managed work-queue
> > initialization fails.
> > 
> > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
> > Suggested-by: Chanwoo Choi <cw00.choi@samsung.com>
> > ---
> >  drivers/extcon/extcon-gpio.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-
> > gpio.c
> > index 4105df74f2b0..8ea2cda8f7f3 100644
> > --- a/drivers/extcon/extcon-gpio.c
> > +++ b/drivers/extcon/extcon-gpio.c
> > @@ -114,8 +114,10 @@ static int gpio_extcon_probe(struct
> > platform_device *pdev)
> >  		return ret;
> >  
> >  	ret = devm_delayed_work_autocancel(dev, &data->work,
> > gpio_extcon_work);
> > -	if (ret)
> > +	if (ret) {
> > +		dev_err(dev, "Failed to initialize delayed_work");
> >  		return ret;
> > +	}
> 
> The only ret which we can have here is -ENOMEM and as a rule we don't
> log
> errors for those, because the kernel memory-management code already
> complains
> loudly when this happens.

I know. This is why I originally omitted the print. Besides, if the
memory is so low that devres adding fails - then we probably have
plenty of other complaints as well... But as Chanwoo maintains the
driver and wanted to have the print - I do not have objections to that
either. Maybe someone some-day adds another error path to wq
initialization in which case seeing it failed could make sense.

> So IMHO this patch should be dropped.
Fine for me - as well as keeping it. I have no strong opinion on this.

Br,
	Matti

Re: [PATCH 2/2] power: supply: axp20x_usb_power: fix work-queue init

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 2501 bytes --]

Hi,

On Wed, Mar 24, 2021 at 11:21:34AM +0200, Matti Vaittinen wrote:
> The commit 6d0c5de2fd84
> ("power: supply: Clean-up few drivers by using managed work init")
> Re-introduced wrong order of initializing work-queue and requesting
> the IRQs which was originally fixed by the commit b5e8642ed95f
> ("power: supply: axp20x_usb_power: Init work before enabling IRQs")
> 
> In addition this caused the work queue to be initialized twice.
> 
> Fix it again.
> 
> Fixes: 6d0c5de2fd84 ("power: supply: Clean-up few drivers by using managed work init")
> 
> Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
> Reported-by: Chen-Yu Tsai <wens@csie.org>
> ---

Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Needs to be merged by Greg, since I do not have 6d0c5de2fd84 in
my tree.

-- Sebastian

>  drivers/power/supply/axp20x_usb_power.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
> index 4259709e3491..e954970b50e6 100644
> --- a/drivers/power/supply/axp20x_usb_power.c
> +++ b/drivers/power/supply/axp20x_usb_power.c
> @@ -594,7 +594,11 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
>  	power->axp20x_id = axp_data->axp20x_id;
>  	power->regmap = axp20x->regmap;
>  	power->num_irqs = axp_data->num_irq_names;
> -	INIT_DELAYED_WORK(&power->vbus_detect, axp20x_usb_power_poll_vbus);
> +
> +	ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
> +					   axp20x_usb_power_poll_vbus);
> +	if (ret)
> +		return ret;
>  
>  	if (power->axp20x_id == AXP202_ID) {
>  		/* Enable vbus valid checking */
> @@ -647,10 +651,6 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
>  		}
>  	}
>  
> -	ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
> -					   axp20x_usb_power_poll_vbus);
> -	if (ret)
> -		return ret;
>  	if (axp20x_usb_vbus_needs_polling(power))
>  		queue_delayed_work(system_power_efficient_wq, &power->vbus_detect, 0);
>  
> -- 
> 2.25.4
> 
> 
> -- 
> Matti Vaittinen, Linux device drivers
> ROHM Semiconductors, Finland SWDC
> Kiviharjunlenkki 1E
> 90220 OULU
> FINLAND
> 
> ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
> Simon says - in Latin please.
> ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
> Thanks to Simon Glass for the translation =] 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails

[Chanwoo Choi]

On 3/24/21 6:51 PM, Vaittinen, Matti wrote:
> Hello Hans, Chanwoo, Greg,
> 
> On Wed, 2021-03-24 at 10:25 +0100, Hans de Goede wrote:
>> Hi,
>>
>> On 3/24/21 10:21 AM, Matti Vaittinen wrote:
>>> Add error print for probe failure when resource managed work-queue
>>> initialization fails.
>>>
>>> Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
>>> Suggested-by: Chanwoo Choi <cw00.choi@samsung.com>
>>> ---
>>>  drivers/extcon/extcon-gpio.c | 4 +++-
>>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-
>>> gpio.c
>>> index 4105df74f2b0..8ea2cda8f7f3 100644
>>> --- a/drivers/extcon/extcon-gpio.c
>>> +++ b/drivers/extcon/extcon-gpio.c
>>> @@ -114,8 +114,10 @@ static int gpio_extcon_probe(struct
>>> platform_device *pdev)
>>>  		return ret;
>>>  
>>>  	ret = devm_delayed_work_autocancel(dev, &data->work,
>>> gpio_extcon_work);
>>> -	if (ret)
>>> +	if (ret) {
>>> +		dev_err(dev, "Failed to initialize delayed_work");
>>>  		return ret;
>>> +	}
>>
>> The only ret which we can have here is -ENOMEM and as a rule we don't
>> log
>> errors for those, because the kernel memory-management code already
>> complains
>> loudly when this happens.
> 
> I know. This is why I originally omitted the print. Besides, if the
> memory is so low that devres adding fails - then we probably have
> plenty of other complaints as well... But as Chanwoo maintains the
> driver and wanted to have the print - I do not have objections to that
> either. Maybe someone some-day adds another error path to wq
> initialization in which case seeing it failed could make sense.
> 
>> So IMHO this patch should be dropped.
> Fine for me - as well as keeping it. I have no strong opinion on this.

If it is the same handling way for -ENOMEM, don't need to add log ss Hans said. 
Thanks for Hans.

> 
> Br,
> 	Matti
> 


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails

[Vaittinen, Matti]

On Thu, 2021-03-25 at 09:49 +0900, Chanwoo Choi wrote:
> On 3/24/21 6:51 PM, Vaittinen, Matti wrote:
> > Hello Hans, Chanwoo, Greg,
> > 
> > On Wed, 2021-03-24 at 10:25 +0100, Hans de Goede wrote:
> > > Hi,
> > > 
> > > On 3/24/21 10:21 AM, Matti Vaittinen wrote:
> > > > Add error print for probe failure when resource managed work-
> > > > queue
> > > > initialization fails.
> > > > 
> > > > Signed-off-by: Matti Vaittinen <
> > > > matti.vaittinen@fi.rohmeurope.com>
> > > > Suggested-by: Chanwoo Choi <cw00.choi@samsung.com>
> > > > ---
> > > >  drivers/extcon/extcon-gpio.c | 4 +++-
> > > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/drivers/extcon/extcon-gpio.c
> > > > b/drivers/extcon/extcon-
> > > > gpio.c
> > > > index 4105df74f2b0..8ea2cda8f7f3 100644
> > > > --- a/drivers/extcon/extcon-gpio.c
> > > > +++ b/drivers/extcon/extcon-gpio.c
> > > > @@ -114,8 +114,10 @@ static int gpio_extcon_probe(struct
> > > > platform_device *pdev)
> > > >  		return ret;
> > > >  
> > > >  	ret = devm_delayed_work_autocancel(dev, &data->work,
> > > > gpio_extcon_work);
> > > > -	if (ret)
> > > > +	if (ret) {
> > > > +		dev_err(dev, "Failed to initialize
> > > > delayed_work");
> > > >  		return ret;
> > > > +	}
> > > 
> > > The only ret which we can have here is -ENOMEM and as a rule we
> > > don't
> > > log
> > > errors for those, because the kernel memory-management code
> > > already
> > > complains
> > > loudly when this happens.
> > 
> > I know. This is why I originally omitted the print. Besides, if the
> > memory is so low that devres adding fails - then we probably have
> > plenty of other complaints as well... But as Chanwoo maintains the
> > driver and wanted to have the print - I do not have objections to
> > that
> > either. Maybe someone some-day adds another error path to wq
> > initialization in which case seeing it failed could make sense.
> > 
> > > So IMHO this patch should be dropped.
> > Fine for me - as well as keeping it. I have no strong opinion on
> > this.
> 
> If it is the same handling way for -ENOMEM, don't need to add log ss
> Hans said. 
> Thanks for Hans.

So be it :)
Greg, can you just apply the patch 2/2 and drop this one? (There should
be no dependency between these) or do you want me to resend 2/2 alone?

> > Br,
> > 	Matti
> > 
> 
> 

Re: [PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails

[gregkh]

On Thu, Mar 25, 2021 at 04:52:12AM +0000, Vaittinen, Matti wrote:
> 
> On Thu, 2021-03-25 at 09:49 +0900, Chanwoo Choi wrote:
> > On 3/24/21 6:51 PM, Vaittinen, Matti wrote:
> > > Hello Hans, Chanwoo, Greg,
> > > 
> > > On Wed, 2021-03-24 at 10:25 +0100, Hans de Goede wrote:
> > > > Hi,
> > > > 
> > > > On 3/24/21 10:21 AM, Matti Vaittinen wrote:
> > > > > Add error print for probe failure when resource managed work-
> > > > > queue
> > > > > initialization fails.
> > > > > 
> > > > > Signed-off-by: Matti Vaittinen <
> > > > > matti.vaittinen@fi.rohmeurope.com>
> > > > > Suggested-by: Chanwoo Choi <cw00.choi@samsung.com>
> > > > > ---
> > > > >  drivers/extcon/extcon-gpio.c | 4 +++-
> > > > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/drivers/extcon/extcon-gpio.c
> > > > > b/drivers/extcon/extcon-
> > > > > gpio.c
> > > > > index 4105df74f2b0..8ea2cda8f7f3 100644
> > > > > --- a/drivers/extcon/extcon-gpio.c
> > > > > +++ b/drivers/extcon/extcon-gpio.c
> > > > > @@ -114,8 +114,10 @@ static int gpio_extcon_probe(struct
> > > > > platform_device *pdev)
> > > > >  		return ret;
> > > > >  
> > > > >  	ret = devm_delayed_work_autocancel(dev, &data->work,
> > > > > gpio_extcon_work);
> > > > > -	if (ret)
> > > > > +	if (ret) {
> > > > > +		dev_err(dev, "Failed to initialize
> > > > > delayed_work");
> > > > >  		return ret;
> > > > > +	}
> > > > 
> > > > The only ret which we can have here is -ENOMEM and as a rule we
> > > > don't
> > > > log
> > > > errors for those, because the kernel memory-management code
> > > > already
> > > > complains
> > > > loudly when this happens.
> > > 
> > > I know. This is why I originally omitted the print. Besides, if the
> > > memory is so low that devres adding fails - then we probably have
> > > plenty of other complaints as well... But as Chanwoo maintains the
> > > driver and wanted to have the print - I do not have objections to
> > > that
> > > either. Maybe someone some-day adds another error path to wq
> > > initialization in which case seeing it failed could make sense.
> > > 
> > > > So IMHO this patch should be dropped.
> > > Fine for me - as well as keeping it. I have no strong opinion on
> > > this.
> > 
> > If it is the same handling way for -ENOMEM, don't need to add log ss
> > Hans said. 
> > Thanks for Hans.
> 
> So be it :)
> Greg, can you just apply the patch 2/2 and drop this one? (There should
> be no dependency between these) or do you want me to resend 2/2 alone?

I'll just take the 2/2 patch, thanks.

greg k-h

Re: [PATCH 2/2] power: supply: axp20x_usb_power: fix work-queue init

[Greg Kroah-Hartman]

On Wed, Mar 24, 2021 at 11:25:06AM +0100, Sebastian Reichel wrote:
> Hi,
> 
> On Wed, Mar 24, 2021 at 11:21:34AM +0200, Matti Vaittinen wrote:
> > The commit 6d0c5de2fd84
> > ("power: supply: Clean-up few drivers by using managed work init")
> > Re-introduced wrong order of initializing work-queue and requesting
> > the IRQs which was originally fixed by the commit b5e8642ed95f
> > ("power: supply: axp20x_usb_power: Init work before enabling IRQs")
> > 
> > In addition this caused the work queue to be initialized twice.
> > 
> > Fix it again.
> > 
> > Fixes: 6d0c5de2fd84 ("power: supply: Clean-up few drivers by using managed work init")
> > 
> > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
> > Reported-by: Chen-Yu Tsai <wens@csie.org>
> > ---
> 
> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> 
> Needs to be merged by Greg, since I do not have 6d0c5de2fd84 in
> my tree.

Now merged, thanks.

greg k-h