linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] acpi: handle the acpi hotplug schedule error
@ 2017-06-13 11:11 Lee, Chun-Yi
  0 siblings, 0 replies; 6+ messages in thread
From: Lee, Chun-Yi @ 2017-06-13 11:11 UTC (permalink / raw)
  To: Rafael J . Wysocki
  Cc: linux-acpi, linux-kernel, Lee, Chun-Yi, Len Brown, Michal Hocko

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] acpi: handle the acpi hotplug schedule error
  2017-06-28 22:06 ` Rafael J. Wysocki
@ 2017-06-29 23:16   ` joeyli
  0 siblings, 0 replies; 6+ messages in thread
From: joeyli @ 2017-06-29 23:16 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Lee, Chun-Yi, linux-acpi, linux-kernel, Len Brown, Michal Hocko

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);
> >  }
> > 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] acpi: handle the acpi hotplug schedule error
  2017-06-21  7:04 Lee, Chun-Yi
@ 2017-06-28 22:06 ` Rafael J. Wysocki
  2017-06-29 23:16   ` joeyli
  0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2017-06-28 22:06 UTC (permalink / raw)
  To: Lee, Chun-Yi
  Cc: linux-acpi, linux-kernel, Lee, Chun-Yi, Len Brown, Michal Hocko

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);
>  }
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2] acpi: handle the acpi hotplug schedule error
@ 2017-06-21  7:04 Lee, Chun-Yi
  2017-06-28 22:06 ` Rafael J. Wysocki
  0 siblings, 1 reply; 6+ messages in thread
From: Lee, Chun-Yi @ 2017-06-21  7:04 UTC (permalink / raw)
  To: Rafael J . Wysocki
  Cc: linux-acpi, linux-kernel, Lee, Chun-Yi, Len Brown, Michal Hocko

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] acpi: handle the acpi hotplug schedule error
  2017-06-09  4:33 Lee, Chun-Yi
@ 2017-06-09  9:40 ` Andy Shevchenko
  0 siblings, 0 replies; 6+ messages in thread
From: Andy Shevchenko @ 2017-06-09  9:40 UTC (permalink / raw)
  To: Lee, Chun-Yi
  Cc: Rafael J . Wysocki, linux-acpi, linux-kernel, Lee, Chun-Yi, Len Brown

On Fri, Jun 9, 2017 at 7:33 AM, Lee, Chun-Yi <joeyli.kernel@gmail.com> 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>

FWIW,
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Cc: 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
>



-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2] acpi: handle the acpi hotplug schedule error
@ 2017-06-09  4:33 Lee, Chun-Yi
  2017-06-09  9:40 ` Andy Shevchenko
  0 siblings, 1 reply; 6+ messages in thread
From: Lee, Chun-Yi @ 2017-06-09  4:33 UTC (permalink / raw)
  To: Rafael J . Wysocki
  Cc: linux-acpi, linux-kernel, Lee, Chun-Yi, Len Brown, Andy Shevchenko

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: 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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-06-29 23:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-13 11:11 [PATCH v2] acpi: handle the acpi hotplug schedule error Lee, Chun-Yi
  -- strict thread matches above, loose matches on Subject: below --
2017-06-21  7:04 Lee, Chun-Yi
2017-06-28 22:06 ` Rafael J. Wysocki
2017-06-29 23:16   ` joeyli
2017-06-09  4:33 Lee, Chun-Yi
2017-06-09  9:40 ` Andy Shevchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).