Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1671410 > unrolled thread

[PATCH v2] acpi: handle the acpi hotplug schedule error

Started by"Lee, Chun-Yi" <joeyli.kernel@gmail.com>
First post2017-06-21 09:10 +0200
Last post2017-06-30 01:20 +0200
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v2] acpi: handle the acpi hotplug schedule error "Lee, Chun-Yi" <joeyli.kernel@gmail.com> - 2017-06-21 09:10 +0200
    Re: [PATCH v2] acpi: handle the acpi hotplug schedule error "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-06-29 00:20 +0200
      Re: [PATCH v2] acpi: handle the acpi hotplug schedule error joeyli <jlee@suse.com> - 2017-06-30 01:20 +0200

#1671410 — [PATCH v2] acpi: handle the acpi hotplug schedule error

From"Lee, Chun-Yi" <joeyli.kernel@gmail.com>
Date2017-06-21 09:10 +0200
Subject[PATCH v2] acpi: handle the acpi hotplug schedule error
Message-ID<tUHW2-2Wh-15@gated-at.bofh.it>
Kernel should decrements the reference count of acpi device
when the scheduling of acpi hotplug work is failed, and
evaluates _OST to notify BIOS the failure.

v2:
To simplify the code. (Andy Shevchenko)

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Michal Hocko <mhocko@suse.cz>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
---
 drivers/acpi/bus.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 34fbe02..91adb71 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -427,12 +427,17 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
 	    (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))
 		driver->ops.notify(adev, type);
 
-	if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
-		return;
+	if (hotplug_event) {
+		if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
+			return;
+		goto err_put_device;
+	}
 
 	acpi_bus_put_acpi_device(adev);
 	return;
 
+ err_put_device:
+	acpi_bus_put_acpi_device(adev);
  err:
 	acpi_evaluate_ost(handle, type, ost_code, NULL);
 }
-- 
2.10.2

[toc] | [next] | [standalone]


#1677233

From"Rafael J. Wysocki" <rjw@rjwysocki.net>
Date2017-06-29 00:20 +0200
Message-ID<tXttw-ZE-15@gated-at.bofh.it>
In reply to#1671410
On Wednesday, June 21, 2017 03:04:34 PM Lee, Chun-Yi wrote:
> Kernel should decrements the reference count of acpi device
> when the scheduling of acpi hotplug work is failed, and
> evaluates _OST to notify BIOS the failure.
> 
> v2:
> To simplify the code. (Andy Shevchenko)
> 
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Len Brown <lenb@kernel.org>
> Cc: Michal Hocko <mhocko@suse.cz>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>

Well, what about:

    if (!hotplug_event) {
        acpi_bus_put_acpi_device(adev);
        return;
    }

    if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
        return;

    acpi_bus_put_acpi_device(adev);

err:
    acpi_evaluate_ost(handle, type, ost_code, NULL);

This achieves the same as the patch below to my eyes, but looks
less convoluted IMO.


> ---
>  drivers/acpi/bus.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 34fbe02..91adb71 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -427,12 +427,17 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
>  	    (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))
>  		driver->ops.notify(adev, type);
>  
> -	if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
> -		return;
> +	if (hotplug_event) {
> +		if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
> +			return;
> +		goto err_put_device;
> +	}
>  
>  	acpi_bus_put_acpi_device(adev);
>  	return;
>  
> + err_put_device:
> +	acpi_bus_put_acpi_device(adev);
>   err:
>  	acpi_evaluate_ost(handle, type, ost_code, NULL);
>  }
> 

[toc] | [prev] | [next] | [standalone]


#1678284

Fromjoeyli <jlee@suse.com>
Date2017-06-30 01:20 +0200
Message-ID<tXQT8-5RT-13@gated-at.bofh.it>
In reply to#1677233
Hi Rafael, 

Thanks for your review.

On Thu, Jun 29, 2017 at 12:06:20AM +0200, Rafael J. Wysocki wrote:
> On Wednesday, June 21, 2017 03:04:34 PM Lee, Chun-Yi wrote:
> > Kernel should decrements the reference count of acpi device
> > when the scheduling of acpi hotplug work is failed, and
> > evaluates _OST to notify BIOS the failure.
> > 
> > v2:
> > To simplify the code. (Andy Shevchenko)
> > 
> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> > Cc: Len Brown <lenb@kernel.org>
> > Cc: Michal Hocko <mhocko@suse.cz>
> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> > Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
> 
> Well, what about:
> 
>     if (!hotplug_event) {
>         acpi_bus_put_acpi_device(adev);
>         return;
>     }
> 
>     if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
>         return;
> 
>     acpi_bus_put_acpi_device(adev);
> 
> err:
>     acpi_evaluate_ost(handle, type, ost_code, NULL);
> 
> This achieves the same as the patch below to my eyes, but looks
> less convoluted IMO.
> 

Yes, that's better. I will send v3 patch.

Joey Lee

> 
> > ---
> >  drivers/acpi/bus.c | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > index 34fbe02..91adb71 100644
> > --- a/drivers/acpi/bus.c
> > +++ b/drivers/acpi/bus.c
> > @@ -427,12 +427,17 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
> >  	    (driver->flags & ACPI_DRIVER_ALL_NOTIFY_EVENTS))
> >  		driver->ops.notify(adev, type);
> >  
> > -	if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
> > -		return;
> > +	if (hotplug_event) {
> > +		if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
> > +			return;
> > +		goto err_put_device;
> > +	}
> >  
> >  	acpi_bus_put_acpi_device(adev);
> >  	return;
> >  
> > + err_put_device:
> > +	acpi_bus_put_acpi_device(adev);
> >   err:
> >  	acpi_evaluate_ost(handle, type, ost_code, NULL);
> >  }
> > 
> 

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web