[patch 09/23] ACPI: Always report a sync event after a lid state change

[patch 09/23] ACPI: Always report a sync event after a lid state change

[Greg KH]

[-- Attachment #1: acpi-always-report-a-sync-event-after-a-lid-state-change.patch --]
[-- Type: text/plain, Size: 1529 bytes --]

2.6.26-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Guillem Jover <guillem.jover@nokia.com>

upstream commit df316e939100e789b3c5d4d102619ccf5834bd00

Currently not always an EV_SYN event is reported to userland
after the EV_SW SW_LID event has been sent. This is easy to verify
by using “input-events” from input-utils and just closing and opening
the lid.

Signed-off-by: Guillem Jover <guillem.jover@nokia.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/acpi/button.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -262,6 +262,7 @@ static int acpi_lid_send_state(struct ac
 		return -ENODEV;
 	/* input layer checks if event is redundant */
 	input_report_switch(button->input, SW_LID, !state);
+	input_sync(button->input);
 	return 0;
 }
 
@@ -285,8 +286,8 @@ static void acpi_button_notify(acpi_hand
 			input_report_key(input, keycode, 1);
 			input_sync(input);
 			input_report_key(input, keycode, 0);
+			input_sync(input);
 		}
-		input_sync(input);
 
 		acpi_bus_generate_proc_event(button->device, event,
 					++button->pushed);

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

[patch 20/23] ACPI: dock: avoid check _STA method

[Greg KH]

[-- Attachment #1: acpi-dock-avoid-check-_sta-method.patch --]
[-- Type: text/plain, Size: 1392 bytes --]

2.6.26-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Shaohua Li <shaohua.li@intel.com>

commit 8b59560a3baf2e7c24e0fb92ea5d09eca92805db upstream.

ACPI: dock: avoid check _STA method

In some BIOSes, every _STA method call will send a notification again,
this cause freeze. And in some BIOSes, it appears _STA should be called
after _DCK. This tries to avoid calls _STA, and still keep the device
present check.

http://bugzilla.kernel.org/show_bug.cgi?id=10431

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/acpi/dock.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -599,14 +599,17 @@ static int handle_eject_request(struct d
 static void dock_notify(acpi_handle handle, u32 event, void *data)
 {
 	struct dock_station *ds = data;
+	struct acpi_device *tmp;
 
 	switch (event) {
 	case ACPI_NOTIFY_BUS_CHECK:
-		if (!dock_in_progress(ds) && dock_present(ds)) {
+		if (!dock_in_progress(ds) && acpi_bus_get_device(ds->handle,
+		   &tmp)) {
 			begin_dock(ds);
 			dock(ds);
 			if (!dock_present(ds)) {
 				printk(KERN_ERR PREFIX "Unable to dock!\n");
+				complete_dock(ds);
 				break;
 			}
 			atomic_notifier_call_chain(&dock_notifier_list,

-- 

Re: [patch 20/23] ACPI: dock: avoid check _STA method

[Holger Macht]

On Fri 07. Nov - 15:16:06, Greg KH wrote:
> 2.6.26-stable review patch.  If anyone has any objections, please let us know.

Objecting. This will only work in conjunction with

  commit 39a0ad871000d2a016a4fa113a6e53d22aabf25d
  Author: Zhao Yakui <yakui.zhao@intel.com>
  Date:   Mon Aug 11 13:40:22 2008 +0800

      ACPI : Load device driver according to the status of acpi device

Otherwise a device struct already exists although the device is not
present.

Regards,
	Holger

> 
> ------------------
> 
> From: Shaohua Li <shaohua.li@intel.com>
> 
> commit 8b59560a3baf2e7c24e0fb92ea5d09eca92805db upstream.
> 
> ACPI: dock: avoid check _STA method
> 
> In some BIOSes, every _STA method call will send a notification again,
> this cause freeze. And in some BIOSes, it appears _STA should be called
> after _DCK. This tries to avoid calls _STA, and still keep the device
> present check.
> 
> http://bugzilla.kernel.org/show_bug.cgi?id=10431
> 
> Signed-off-by: Shaohua Li <shaohua.li@intel.com>
> Signed-off-by: Len Brown <len.brown@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> 
> ---
>  drivers/acpi/dock.c |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> --- a/drivers/acpi/dock.c
> +++ b/drivers/acpi/dock.c
> @@ -599,14 +599,17 @@ static int handle_eject_request(struct d
>  static void dock_notify(acpi_handle handle, u32 event, void *data)
>  {
>  	struct dock_station *ds = data;
> +	struct acpi_device *tmp;
>  
>  	switch (event) {
>  	case ACPI_NOTIFY_BUS_CHECK:
> -		if (!dock_in_progress(ds) && dock_present(ds)) {
> +		if (!dock_in_progress(ds) && acpi_bus_get_device(ds->handle,
> +		   &tmp)) {
>  			begin_dock(ds);
>  			dock(ds);
>  			if (!dock_present(ds)) {
>  				printk(KERN_ERR PREFIX "Unable to dock!\n");
> +				complete_dock(ds);
>  				break;
>  			}
>  			atomic_notifier_call_chain(&dock_notifier_list,
> 

Re: [stable] [patch 20/23] ACPI: dock: avoid check _STA method

[Greg KH]

On Tue, Nov 11, 2008 at 01:16:07PM +0100, Holger Macht wrote:
> On Fri 07. Nov - 15:16:06, Greg KH wrote:
> > 2.6.26-stable review patch.  If anyone has any objections, please let us know.
> 
> Objecting. This will only work in conjunction with
> 
>   commit 39a0ad871000d2a016a4fa113a6e53d22aabf25d
>   Author: Zhao Yakui <yakui.zhao@intel.com>
>   Date:   Mon Aug 11 13:40:22 2008 +0800
> 
>       ACPI : Load device driver according to the status of acpi device
> 
> Otherwise a device struct already exists although the device is not
> present.

So do you feel we should also add this patch to the 2.6.27-stable tree
to solve this issue?

thanks,

greg k-h

Re: [stable] [patch 20/23] ACPI: dock: avoid check _STA method

[Holger Macht]

On Thu 13. Nov - 13:23:05, Greg KH wrote:
> On Tue, Nov 11, 2008 at 01:16:07PM +0100, Holger Macht wrote:
> > On Fri 07. Nov - 15:16:06, Greg KH wrote:
> > > 2.6.26-stable review patch.  If anyone has any objections, please let us know.
> > 
> > Objecting. This will only work in conjunction with
> > 
> >   commit 39a0ad871000d2a016a4fa113a6e53d22aabf25d
> >   Author: Zhao Yakui <yakui.zhao@intel.com>
> >   Date:   Mon Aug 11 13:40:22 2008 +0800
> > 
> >       ACPI : Load device driver according to the status of acpi device
> > 
> > Otherwise a device struct already exists although the device is not
> > present.
> 
> So do you feel we should also add this patch to the 2.6.27-stable tree
> to solve this issue?

Yes, I think so.

Regards,
	Holger

Re: [stable] [patch 20/23] ACPI: dock: avoid check _STA method

[Greg KH]

On Mon, Nov 17, 2008 at 12:36:02AM +0100, Holger Macht wrote:
> On Thu 13. Nov - 13:23:05, Greg KH wrote:
> > On Tue, Nov 11, 2008 at 01:16:07PM +0100, Holger Macht wrote:
> > > On Fri 07. Nov - 15:16:06, Greg KH wrote:
> > > > 2.6.26-stable review patch.  If anyone has any objections, please let us know.
> > > 
> > > Objecting. This will only work in conjunction with
> > > 
> > >   commit 39a0ad871000d2a016a4fa113a6e53d22aabf25d
> > >   Author: Zhao Yakui <yakui.zhao@intel.com>
> > >   Date:   Mon Aug 11 13:40:22 2008 +0800
> > > 
> > >       ACPI : Load device driver according to the status of acpi device
> > > 
> > > Otherwise a device struct already exists although the device is not
> > > present.
> > 
> > So do you feel we should also add this patch to the 2.6.27-stable tree
> > to solve this issue?
> 
> Yes, I think so.

Ok, thanks, I've queued it up now.

greg k-h