5 files changed, 67 insertions, 74 deletions

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index b735458c6e3a..10baa3501ed3 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -373,8 +373,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
         cpumask_t online_policy_cpus;
         struct drv_cmd cmd;
         unsigned int msr;
-        unsigned int next_state = 0;
-        unsigned int next_perf_state = 0;
+        unsigned int next_state = 0; /* Index into freq_table */
+        unsigned int next_perf_state = 0; /* Index into perf table */
         unsigned int i;
         int result = 0;
 
@@ -420,6 +420,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                 msr =
                     (u32) perf->states[next_perf_state].
                     control & INTEL_MSR_RANGE;
+                cmd.val = get_cur_val(online_policy_cpus);
                 cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
                 break;
         case SYSTEM_IO_CAPABLE:
@@ -439,8 +440,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
         else
                 cpu_set(policy->cpu, cmd.mask);
 
-        freqs.old = data->freq_table[perf->state].frequency;
-        freqs.new = data->freq_table[next_perf_state].frequency;
+        freqs.old = perf->states[perf->state].core_frequency * 1000;
+        freqs.new = data->freq_table[next_state].frequency;
         for_each_cpu_mask(i, cmd.mask) {
                 freqs.cpu = i;
                 cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
@@ -677,6 +678,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 valid_states++;
         }
         data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
+        perf->state = 0;
 
         result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
         if (result)
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 6d9c97a690fd..e940e00b96c9 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -52,6 +52,10 @@
 #define CPU_EZRA_T      4
 #define CPU_NEHEMIAH    5
 
+/* Flags */
+#define USE_ACPI_C3             (1 << 1)
+#define USE_NORTHBRIDGE         (1 << 2)
+
 static int cpu_model;
 static unsigned int numscales=16;
 static unsigned int fsb;
@@ -68,7 +72,7 @@ static unsigned int minmult, maxmult;
 static int can_scale_voltage;
 static struct acpi_processor *pr = NULL;
 static struct acpi_processor_cx *cx = NULL;
-static int port22_en;
+static u8 longhaul_flags;
 
 /* Module parameters */
 static int scale_voltage;
@@ -80,7 +84,6 @@ static int ignore_latency;
 /* Clock ratios multiplied by 10 */
 static int clock_ratio[32];
 static int eblcr_table[32];
-static unsigned int highest_speed, lowest_speed; /* kHz */
 static int longhaul_version;
 static struct cpufreq_frequency_table *longhaul_table;
 
@@ -178,7 +181,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
         safe_halt();
         /* Change frequency on next halt or sleep */
         wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        if (port22_en) {
+        if (!cx_address) {
                 ACPI_FLUSH_CPU_CACHE();
                 /* Invoke C1 */
                 halt();
@@ -189,7 +192,6 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                 /* Dummy op - must do something useless after P_LVL3 read */
                 t = inl(acpi_fadt.xpm_tmr_blk.address);
         }
-
         /* Disable bus ratio bit */
         local_irq_disable();
         longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
@@ -243,15 +245,14 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
         outb(0xFF,0xA1);        /* Overkill */
         outb(0xFE,0x21);        /* TMR0 only */
 
-        if (pr->flags.bm_control) {
+        if (longhaul_flags & USE_NORTHBRIDGE) {
+                /* Disable AGP and PCI arbiters */
+                outb(3, 0x22);
+        } else if ((pr != NULL) && pr->flags.bm_control) {
                 /* Disable bus master arbitration */
                 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,
                                   ACPI_MTX_DO_NOT_LOCK);
-        } else if (port22_en) {
-                /* Disable AGP and PCI arbiters */
-                outb(3, 0x22);
         }
-
         switch (longhaul_version) {
 
         /*
@@ -278,22 +279,25 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
          * to work in practice.
          */
         case TYPE_POWERSAVER:
-                /* Don't allow wakeup */
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
-                                  ACPI_MTX_DO_NOT_LOCK);
-                do_powersaver(cx->address, clock_ratio_index);
+                if (longhaul_flags & USE_ACPI_C3) {
+                        /* Don't allow wakeup */
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
+                                          ACPI_MTX_DO_NOT_LOCK);
+                        do_powersaver(cx->address, clock_ratio_index);
+                } else {
+                        do_powersaver(0, clock_ratio_index);
+                }
                 break;
         }
 
-        if (pr->flags.bm_control) {
+        if (longhaul_flags & USE_NORTHBRIDGE) {
+                /* Enable arbiters */
+                outb(0, 0x22);
+        } else if ((pr != NULL) && pr->flags.bm_control) {
                 /* Enable bus master arbitration */
                 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
                                   ACPI_MTX_DO_NOT_LOCK);
-        } else if (port22_en) {
-                /* Enable arbiters */
-                outb(0, 0x22);
         }
-
         outb(pic2_mask,0xA1);   /* restore mask */
         outb(pic1_mask,0x21);
 
@@ -314,12 +318,12 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
 
 #define ROUNDING        0xf
 
-static int _guess(int guess)
+static int _guess(int guess, int mult)