5 files changed, 62 insertions, 33 deletions

diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index 1f4128487dd4..dee86925a9a1 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -602,7 +602,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
         crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1);
         ret = n;
 out:
-        acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !ret);
+        acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, ret >= 0);
         return ret;
 }
 
@@ -672,7 +672,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
         crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);
         ret = n;
 out:
-        acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !ret);
+        acpi_aml_unlock_fifo(ACPI_AML_IN_USER, ret >= 0);
         return n;
 }
 
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index b5e2b0ada0ab..297f6aacd7d4 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -46,6 +46,7 @@
 #include "acnamesp.h"
 #include "acdispat.h"
 #include "actables.h"
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsload")
@@ -78,6 +79,8 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
 
         ACPI_FUNCTION_TRACE(ns_load_table);
 
+        acpi_ex_enter_interpreter();
+
         /*
          * Parse the table and load the namespace with all named
          * objects found within. Control methods are NOT parsed
@@ -89,7 +92,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
          */
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
+                goto unlock_interp;
         }
 
         /* If table already loaded into namespace, just return */
@@ -130,6 +133,8 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
 
 unlock:
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+unlock_interp:
+        (void)acpi_ex_exit_interpreter();
 
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 1783cd7e1446..f631a47724f0 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -47,7 +47,6 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "actables.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsparse")
@@ -171,8 +170,6 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
 
         ACPI_FUNCTION_TRACE(ns_parse_table);
 
-        acpi_ex_enter_interpreter();
-
         /*
          * AML Parse, pass 1
          *
@@ -188,7 +185,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
                                             table_index, start_node);
         if (ACPI_FAILURE(status)) {
-                goto error_exit;
+                return_ACPI_STATUS(status);
         }
 
         /*
@@ -204,10 +201,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
                                             table_index, start_node);
         if (ACPI_FAILURE(status)) {
-                goto error_exit;
+                return_ACPI_STATUS(status);
         }
 
-error_exit:
-        acpi_ex_exit_interpreter();
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 4ed4061813e6..c983bf733ad3 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -470,6 +470,7 @@ static int acpi_irq_pci_sharing_penalty(int irq)
 {
         struct acpi_pci_link *link;
         int penalty = 0;
+        int i;
 
         list_for_each_entry(link, &acpi_link_list, list) {
                 /*
@@ -478,18 +479,14 @@ static int acpi_irq_pci_sharing_penalty(int irq)
                  */
                 if (link->irq.active && link->irq.active == irq)
                         penalty += PIRQ_PENALTY_PCI_USING;
-                else {
-                        int i;
-
-                        /*
-                         * If a link is inactive, penalize the IRQs it
-                         * might use, but not as severely.
-                         */
-                        for (i = 0; i < link->irq.possible_count; i++)
-                                if (link->irq.possible[i] == irq)
-                                        penalty += PIRQ_PENALTY_PCI_POSSIBLE /
-                                                link->irq.possible_count;
-                }
+
+                /*
+                 * penalize the IRQs PCI might use, but not as severely.
+                 */
+                for (i = 0; i < link->irq.possible_count; i++)
+                        if (link->irq.possible[i] == irq)
+                                penalty += PIRQ_PENALTY_PCI_POSSIBLE /
+                                        link->irq.possible_count;
         }
 
         return penalty;
@@ -499,9 +496,6 @@ static int acpi_irq_get_penalty(int irq)
 {
         int penalty = 0;
 
-        if (irq < ACPI_MAX_ISA_IRQS)
-                penalty += acpi_isa_irq_penalty[irq];
-
         /*
         * Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict
         * with PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be
@@ -516,10 +510,49 @@ static int acpi_irq_get_penalty(int irq)
                         penalty += PIRQ_PENALTY_PCI_USING;
         }
 
+        if (irq < ACPI_MAX_ISA_IRQS)
+                return penalty + acpi_isa_irq_penalty[irq];
+
         penalty += acpi_irq_pci_sharing_penalty(irq);
         return penalty;
 }
 
+int __init acpi_irq_penalty_init(void)
+{
+        struct acpi_pci_link *link;
+        int i;
+
+        /*
+         * Update penalties to facilitate IRQ balancing.
+         */
+        list_for_each_entry(link, &acpi_link_list, list) {
+
+                /*
+                 * reflect the possible and active irqs in the penalty table --
+                 * useful for breaking ties.
+                 */
+                if (link->irq.possible_count) {
+                        int penalty =
+                            PIRQ_PENALTY_PCI_POSSIBLE /
+                            link->irq.possible_count;
+
+                        for (i = 0; i < link->irq.possible_count; i++) {
+                                if (link->irq.possible[i] < ACPI_MAX_ISA_IRQS)
+                                        acpi_isa_irq_penalty[link->irq.
+                                                         possible[i]] +=
+                                            penalty;
+                        }
+
+                } else if (link->irq.active &&
+                                (link->irq.active < ACPI_MAX_ISA_IRQS)) {
+                        acpi_isa_irq_penalty[link->irq.active] +=
+                            PIRQ_PENALTY_PCI_POSSIBLE;
+                }
+        }
+
+        return 0;
+}
+
 static int acpi_irq_balance = -1;       /* 0: static, 1: balance */
 
 static int acpi_pci_link_allocate(struct acpi_pci_link *link)
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index a4d0059e232c..c73207abb5a4 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -173,7 +173,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
 
         struct cpuidle_state *target_state = &drv->states[index];
         bool broadcast = !!(target_state->flags & CPUIDLE_FLAG_TIMER_STOP);
-        u64 time_start, time_end;
+        ktime_t time_start, time_end;
         s64 diff;
 
         /*
@@ -195,13 +195,13 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         sched_idle_set_state(target_state);
 
         trace_cpu_idle_rcuidle(index, dev->cpu);
-        time_start = local_clock();
+        time_start = ns_to_ktime(local_clock());
 
         stop_critical_timings();
         entered_state = target_state->enter(dev, drv, index);
         start_critical_timings();
 
-        time_end = local_clock();
+        time_end = ns_to_ktime(local_clock());
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
         /* The cpu is no longer idle or about to enter idle. */
@@ -217,11 +217,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         if (!cpuidle_state_is_coupled(drv, index))
                 local_irq_enable();
 
-        /*
-         * local_clock() returns the time in nanosecond, let's shift
-         * by 10 (divide by 1024) to have microsecond based time.
-         */
-        diff = (time_end - time_start) >> 10;
+        diff = ktime_us_delta(time_end, time_start);
         if (diff > INT_MAX)
                 diff = INT_MAX;