Pull ec into test branch

1 files changed, 153 insertions, 190 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e6d4b084dca2..d713f769b72d 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -45,35 +45,34 @@ ACPI_MODULE_NAME("acpi_ec")
 #define ACPI_EC_DRIVER_NAME             "ACPI Embedded Controller Driver"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
 #define ACPI_EC_FILE_INFO               "info"
-
+#undef PREFIX
+#define PREFIX                          "ACPI: EC: "
 /* EC status register */
 #define ACPI_EC_FLAG_OBF        0x01    /* Output buffer full */
 #define ACPI_EC_FLAG_IBF        0x02    /* Input buffer full */
 #define ACPI_EC_FLAG_BURST      0x10    /* burst mode */
 #define ACPI_EC_FLAG_SCI        0x20    /* EC-SCI occurred */
-
 /* EC commands */
-#define ACPI_EC_COMMAND_READ    0x80
-#define ACPI_EC_COMMAND_WRITE   0x81
-#define ACPI_EC_BURST_ENABLE    0x82
-#define ACPI_EC_BURST_DISABLE   0x83
-#define ACPI_EC_COMMAND_QUERY   0x84
-
+enum ec_command {
+        ACPI_EC_COMMAND_READ = 0x80,
+        ACPI_EC_COMMAND_WRITE = 0x81,
+        ACPI_EC_BURST_ENABLE = 0x82,
+        ACPI_EC_BURST_DISABLE = 0x83,
+        ACPI_EC_COMMAND_QUERY = 0x84,
+};
 /* EC events */
-enum {
+enum ec_event {
         ACPI_EC_EVENT_OBF_1 = 1,        /* Output buffer full */
-        ACPI_EC_EVENT_IBF_0,            /* Input buffer empty */
+        ACPI_EC_EVENT_IBF_0,    /* Input buffer empty */
 };
 
-#define ACPI_EC_DELAY           50      /* Wait 50ms max. during EC ops */
+#define ACPI_EC_DELAY           500     /* Wait 500ms max. during EC ops */
 #define ACPI_EC_UDELAY_GLK      1000    /* Wait 1ms max. to get global lock */
-#define ACPI_EC_UDELAY         100      /* Poll @ 100us increments */
-#define ACPI_EC_UDELAY_COUNT   1000     /* Wait 10ms max. during EC ops */
 
-enum {
-        EC_INTR = 1,    /* Output buffer full */
-        EC_POLL,        /* Input buffer empty */
-};
+static enum ec_mode {
+        EC_INTR = 1,            /* Output buffer full */
+        EC_POLL,                /* Input buffer empty */
+} acpi_ec_mode = EC_INTR;
 
 static int acpi_ec_remove(struct acpi_device *device, int type);
 static int acpi_ec_start(struct acpi_device *device);
@@ -96,19 +95,18 @@ static struct acpi_driver acpi_ec_driver = {
 struct acpi_ec {
         acpi_handle handle;
         unsigned long uid;
-        unsigned long gpe_bit;
+        unsigned long gpe;
         unsigned long command_addr;
         unsigned long data_addr;
         unsigned long global_lock;
-        struct semaphore sem;
-        unsigned int expect_event;
+        struct mutex lock;
+        atomic_t query_pending;
         atomic_t leaving_burst; /* 0 : No, 1 : Yes, 2: abort */
         wait_queue_head_t wait;
 } *ec_ecdt;
 
 /* External interfaces use first EC only, so remember */
 static struct acpi_device *first_ec;
-static int acpi_ec_mode = EC_INTR;
 
 /* --------------------------------------------------------------------------
                              Transaction Management
@@ -134,54 +132,41 @@ static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data)
         outb(data, ec->data_addr);
 }
 
-static int acpi_ec_check_status(u8 status, u8 event)
+static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event)
 {
-        switch (event) {
-        case ACPI_EC_EVENT_OBF_1:
+        u8 status = acpi_ec_read_status(ec);
+
+        if (event == ACPI_EC_EVENT_OBF_1) {
                 if (status & ACPI_EC_FLAG_OBF)
                         return 1;
-                break;
-        case ACPI_EC_EVENT_IBF_0:
+        } else if (event == ACPI_EC_EVENT_IBF_0) {
                 if (!(status & ACPI_EC_FLAG_IBF))
                         return 1;
-                break;
-        default:
-                break;
         }
 
         return 0;
 }
 
-static int acpi_ec_wait(struct acpi_ec *ec, u8 event)
+static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event)
 {
-        int i = (acpi_ec_mode == EC_POLL) ? ACPI_EC_UDELAY_COUNT : 0;
-        long time_left;
-
-        ec->expect_event = event;
-        if (acpi_ec_check_status(acpi_ec_read_status(ec), event)) {
-                ec->expect_event = 0;
-                return 0;
-        }
-
-        do {
-                if (acpi_ec_mode == EC_POLL) {
-                        udelay(ACPI_EC_UDELAY);
-                } else {
-                        time_left = wait_event_timeout(ec->wait,
-                                    !ec->expect_event,
-                                    msecs_to_jiffies(ACPI_EC_DELAY));
-                        if (time_left > 0) {
-                                ec->expect_event = 0;
+        if (acpi_ec_mode == EC_POLL) {
+                unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
+                while (time_before(jiffies, delay)) {
+                        if (acpi_ec_check_status(ec, event))
                                 return 0;
-                        }
                 }
-                if (acpi_ec_check_status(acpi_ec_read_status(ec), event)) {
-                        ec->expect_event = 0;
+        } else {
+                if (wait_event_timeout(ec->wait,
+                                       acpi_ec_check_status(ec, event),
+                                       msecs_to_jiffies(ACPI_EC_DELAY)) ||
+                    acpi_ec_check_status(ec, event)) {
                         return 0;
+                } else {
+                        printk(KERN_ERR PREFIX "acpi_ec_wait timeout,"
+                               " status = %d, expect_event = %d\n",
+                               acpi_ec_read_status(ec), event);
                 }
-        } while (--i > 0);
-
-        ec->expect_event = 0;
+        }
 
         return -ETIME;
 }
@@ -196,7 +181,6 @@ int acpi_ec_enter_burst_mode(struct acpi_ec *ec)
         u8 tmp = 0;
         u8 status = 0;
 
-
         status = acpi_ec_read_status(ec);
         if (status != -EINVAL && !(status & ACPI_EC_FLAG_BURST)) {
                 status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
@@ -212,7 +196,7 @@ int acpi_ec_enter_burst_mode(struct acpi_ec *ec)
 
         atomic_set(&ec->leaving_burst, 0);
         return 0;
-  end:
+      end:
         ACPI_EXCEPTION((AE_INFO, status, "EC wait, burst mode"));
         return -1;
 }
@@ -221,58 +205,68 @@ int acpi_ec_leave_burst_mode(struct acpi_ec *ec)
 {
         u8 status = 0;
 
-
         status = acpi_ec_read_status(ec);
-        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)){
+        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)) {