[PATCH 1/3] ACPICA: Don't switch task then not allowed

[PATCH 1/3] ACPICA: Don't switch task then not allowed

[Alexey Starikovskiy]

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 include/acpi/platform/aclinux.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index fcb8e4b..9d7febd 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -149,10 +149,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #define ACPI_FREE(a)            kfree(a)
 
 /* Used within ACPICA to show where it is safe to preempt execution */
-
+#include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
 	do { \
-		if (!irqs_disabled()) \
+		if (!in_atomic_preempt_off()) \
 			cond_resched(); \
 	} while (0)
 

[PATCH 2/3] ACPI: EC: use BURST mode only for MSI notebooks

[Alexey Starikovskiy]

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 drivers/acpi/ec.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 78f8380..829e62e 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -627,7 +627,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
 	if (bits != 8 && acpi_strict)
 		return AE_BAD_PARAMETER;
 
-	acpi_ec_burst_enable(ec);
+	if (EC_FLAGS_MSI)
+		acpi_ec_burst_enable(ec);
 
 	if (function == ACPI_READ) {
 		result = acpi_ec_read(ec, address, &temp);
@@ -648,7 +649,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
 		}
 	}
 
-	acpi_ec_burst_disable(ec);
+	if (EC_FLAGS_MSI)
+		acpi_ec_burst_disable(ec);
 
 	switch (result) {
 	case -EINVAL:

Re: [PATCH 2/3] ACPI: EC: use BURST mode only for MSI notebooks

[Len Brown]

applied to ec branch in acpi-test for 2.6.32

The patch needs a check-in comment before it goes upstream, however.

thanks,
Len Brown, Intel Open Source Technology Center

On Fri, 28 Aug 2009, Alexey Starikovskiy wrote:

> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
> ---
> 
>  drivers/acpi/ec.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
> index 78f8380..829e62e 100644
> --- a/drivers/acpi/ec.c
> +++ b/drivers/acpi/ec.c
> @@ -627,7 +627,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
>  	if (bits != 8 && acpi_strict)
>  		return AE_BAD_PARAMETER;
>  
> -	acpi_ec_burst_enable(ec);
> +	if (EC_FLAGS_MSI)
> +		acpi_ec_burst_enable(ec);
>  
>  	if (function == ACPI_READ) {
>  		result = acpi_ec_read(ec, address, &temp);
> @@ -648,7 +649,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
>  		}
>  	}
>  
> -	acpi_ec_burst_disable(ec);
> +	if (EC_FLAGS_MSI)
> +		acpi_ec_burst_disable(ec);
>  
>  	switch (result) {
>  	case -EINVAL:
> 
> --
> 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 3/3] ACPI: EC: Drop orphan comment

[Alexey Starikovskiy]

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 drivers/acpi/ec.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 829e62e..6ccb18b 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -354,10 +354,6 @@ unlock:
 	return status;
 }
 
-/*
- * Note: samsung nv5000 doesn't work with ec burst mode.
- * http://bugzilla.kernel.org/show_bug.cgi?id=4980
- */
 static int acpi_ec_burst_enable(struct acpi_ec *ec)
 {
 	u8 d;

Re: [PATCH 3/3] ACPI: EC: Drop orphan comment

[Len Brown]

applied

thanks,
Len Brown, Intel Open Source Technology Center

Re: [PATCH 1/3] ACPICA: Don't switch task then not allowed

[Len Brown]

applied to acpi-test

again, this could use a check-in commment,
eg. citing the e-mail discussion of the failure
that this addresses

thanks,
Len Brown, Intel Open Source Technology Center