diff mbox

[v3] acpi: handle the acpi hotplug schedule error

Message ID 20170707062242.29588-1-jlee@suse.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Chun-Yi Lee July 7, 2017, 6:22 a.m. UTC
Kernel should decrements the reference count of acpi device
when the scheduling of acpi hotplug work failed, and evaluates
_OST to notify BIOS the failure.

v3:
More simplify the code. (Rafael J. Wysocki)

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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Rafael J. Wysocki July 7, 2017, 1:16 p.m. UTC | #1
On Friday, July 07, 2017 02:22:42 PM Lee, Chun-Yi wrote:
> Kernel should decrements the reference count of acpi device
> when the scheduling of acpi hotplug work failed, and evaluates
> _OST to notify BIOS the failure.
> 
> v3:
> More simplify the code. (Rafael J. Wysocki)
> 
> 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>

This has been applied too AFAICS.

> ---
>  drivers/acpi/bus.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 784bda6..9d4fea6 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -432,11 +432,15 @@ 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)))
> +	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);
> -	return;
>  
>   err:
>  	acpi_evaluate_ost(handle, type, ost_code, NULL);
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
joeyli July 8, 2017, 3:25 a.m. UTC | #2
Hi Rafael,

On Fri, Jul 07, 2017 at 03:16:40PM +0200, Rafael J. Wysocki wrote:
> On Friday, July 07, 2017 02:22:42 PM Lee, Chun-Yi wrote:
> > Kernel should decrements the reference count of acpi device
> > when the scheduling of acpi hotplug work failed, and evaluates
> > _OST to notify BIOS the failure.
> > 
> > v3:
> > More simplify the code. (Rafael J. Wysocki)
> > 
> > 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>
> 
> This has been applied too AFAICS.
> 

I saw patches in linux-next.

Thanks for your review.

Joey Lee

> > ---
> >  drivers/acpi/bus.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > index 784bda6..9d4fea6 100644
> > --- a/drivers/acpi/bus.c
> > +++ b/drivers/acpi/bus.c
> > @@ -432,11 +432,15 @@ 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)))
> > +	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);
> > -	return;
> >  
> >   err:
> >  	acpi_evaluate_ost(handle, type, ost_code, NULL);
> > 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 784bda6..9d4fea6 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -432,11 +432,15 @@  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)))
+	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);
-	return;
 
  err:
 	acpi_evaluate_ost(handle, type, ost_code, NULL);