Merge commit 'v2.6.28-rc9' into x86/apic
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:23:23 +0000 (16:23 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:23:23 +0000 (16:23 +0100)
1  2 
arch/x86/kernel/apic.c

diff --combined arch/x86/kernel/apic.c
index 1d410ee4b06467cd79fc25d083783419014585c4,16f94879b52578aba3e689d7a8adcccf59ab8ecb..fc26ff390f1424cfda1e5e73c209db3fae2233b7
@@@ -441,7 -441,6 +441,7 @@@ static void lapic_timer_setup(enum cloc
                v = apic_read(APIC_LVTT);
                v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
                apic_write(APIC_LVTT, v);
 +              apic_write(APIC_TMICT, 0xffffffff);
                break;
        case CLOCK_EVT_MODE_RESUME:
                /* Nothing to do here */
@@@ -560,13 -559,13 +560,13 @@@ static int __init calibrate_by_pmtimer(
        } else {
                res = (((u64)deltapm) *  mult) >> 22;
                do_div(res, 1000000);
 -              printk(KERN_WARNING "APIC calibration not consistent "
 +              pr_warning("APIC calibration not consistent "
                        "with PM Timer: %ldms instead of 100ms\n",
                        (long)res);
                /* Correct the lapic counter value */
                res = (((u64)(*delta)) * pm_100ms);
                do_div(res, deltapm);
 -              printk(KERN_INFO "APIC delta adjusted to PM-Timer: "
 +              pr_info("APIC delta adjusted to PM-Timer: "
                        "%lu (%ld)\n", (unsigned long)res, *delta);
                *delta = (long)res;
        }
@@@ -646,7 -645,8 +646,7 @@@ static int __init calibrate_APIC_clock(
         */
        if (calibration_result < (1000000 / HZ)) {
                local_irq_enable();
 -              printk(KERN_WARNING
 -                     "APIC frequency too slow, disabling apic timer\n");
 +              pr_warning("APIC frequency too slow, disabling apic timer\n");
                return -1;
        }
  
                while (lapic_cal_loops <= LAPIC_CAL_LOOPS)
                        cpu_relax();
  
 -              local_irq_disable();
 -
                /* Stop the lapic timer */
                lapic_timer_setup(CLOCK_EVT_MODE_SHUTDOWN, levt);
  
 -              local_irq_enable();
 -
                /* Jiffies delta */
                deltaj = lapic_cal_j2 - lapic_cal_j1;
                apic_printk(APIC_VERBOSE, "... jiffies delta = %lu\n", deltaj);
                local_irq_enable();
  
        if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
 -              printk(KERN_WARNING
 -                     "APIC timer disabled due to verification failure.\n");
 +              pr_warning("APIC timer disabled due to verification failure.\n");
                        return -1;
        }
  
@@@ -709,7 -714,7 +709,7 @@@ void __init setup_boot_APIC_clock(void
         * broadcast mechanism is used. On UP systems simply ignore it.
         */
        if (disable_apic_timer) {
 -              printk(KERN_INFO "Disabling APIC timer\n");
 +              pr_info("Disabling APIC timer\n");
                /* No broadcast on UP ! */
                if (num_possible_cpus() > 1) {
                        lapic_clockevent.mult = 1;
        if (nmi_watchdog != NMI_IO_APIC)
                lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
        else
 -              printk(KERN_WARNING "APIC timer registered as dummy,"
 +              pr_warning("APIC timer registered as dummy,"
                        " due to nmi_watchdog=%d!\n", nmi_watchdog);
  
        /* Setup the lapic or request the broadcast */
@@@ -768,7 -773,8 +768,7 @@@ static void local_apic_timer_interrupt(
         * spurious.
         */
        if (!evt->event_handler) {
 -              printk(KERN_WARNING
 -                     "Spurious LAPIC timer interrupt on cpu %d\n", cpu);
 +              pr_warning("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
                /* Switch it off */
                lapic_timer_setup(CLOCK_EVT_MODE_SHUTDOWN, evt);
                return;
@@@ -1087,7 -1093,7 +1087,7 @@@ static void __cpuinit lapic_setup_esr(v
        unsigned int oldvalue, value, maxlvt;
  
        if (!lapic_is_integrated()) {
 -              printk(KERN_INFO "No ESR for 82489DX.\n");
 +              pr_info("No ESR for 82489DX.\n");
                return;
        }
  
                 * ESR disabled - we can't do anything useful with the
                 * errors anyway - mbligh
                 */
 -              printk(KERN_INFO "Leaving ESR disabled.\n");
 +              pr_info("Leaving ESR disabled.\n");
                return;
        }
  
@@@ -1292,7 -1298,7 +1292,7 @@@ void check_x2apic(void
        rdmsr(MSR_IA32_APICBASE, msr, msr2);
  
        if (msr & X2APIC_ENABLE) {
 -              printk("x2apic enabled by BIOS, switching to x2apic ops\n");
 +              pr_info("x2apic enabled by BIOS, switching to x2apic ops\n");
                x2apic_preenabled = x2apic = 1;
                apic_ops = &x2apic_ops;
        }
@@@ -1304,12 -1310,12 +1304,12 @@@ void enable_x2apic(void
  
        rdmsr(MSR_IA32_APICBASE, msr, msr2);
        if (!(msr & X2APIC_ENABLE)) {
 -              printk("Enabling x2apic\n");
 +              pr_info("Enabling x2apic\n");
                wrmsr(MSR_IA32_APICBASE, msr | X2APIC_ENABLE, 0);
        }
  }
  
- void enable_IR_x2apic(void)
+ void __init enable_IR_x2apic(void)
  {
  #ifdef CONFIG_INTR_REMAP
        int ret;
                return;
  
        if (!x2apic_preenabled && disable_x2apic) {
 -              printk(KERN_INFO
 -                     "Skipped enabling x2apic and Interrupt-remapping "
 -                     "because of nox2apic\n");
 +              pr_info("Skipped enabling x2apic and Interrupt-remapping "
 +                      "because of nox2apic\n");
                return;
        }
  
                panic("Bios already enabled x2apic, can't enforce nox2apic");
  
        if (!x2apic_preenabled && skip_ioapic_setup) {
 -              printk(KERN_INFO
 -                     "Skipped enabling x2apic and Interrupt-remapping "
 -                     "because of skipping io-apic setup\n");
 +              pr_info("Skipped enabling x2apic and Interrupt-remapping "
 +                      "because of skipping io-apic setup\n");
                return;
        }
  
        ret = dmar_table_init();
        if (ret) {
 -              printk(KERN_INFO
 -                     "dmar_table_init() failed with %d:\n", ret);
 +              pr_info("dmar_table_init() failed with %d:\n", ret);
  
                if (x2apic_preenabled)
                        panic("x2apic enabled by bios. But IR enabling failed");
                else
 -                      printk(KERN_INFO
 -                             "Not enabling x2apic,Intr-remapping\n");
 +                      pr_info("Not enabling x2apic,Intr-remapping\n");
                return;
        }
  
  
        ret = save_mask_IO_APIC_setup();
        if (ret) {
 -              printk(KERN_INFO "Saving IO-APIC state failed: %d\n", ret);
 +              pr_info("Saving IO-APIC state failed: %d\n", ret);
                goto end;
        }
  
  
        if (!ret) {
                if (!x2apic_preenabled)
 -                      printk(KERN_INFO
 -                             "Enabled x2apic and interrupt-remapping\n");
 +                      pr_info("Enabled x2apic and interrupt-remapping\n");
                else
 -                      printk(KERN_INFO
 -                             "Enabled Interrupt-remapping\n");
 +                      pr_info("Enabled Interrupt-remapping\n");
        } else
 -              printk(KERN_ERR
 -                     "Failed to enable Interrupt-remapping and x2apic\n");
 +              pr_err("Failed to enable Interrupt-remapping and x2apic\n");
  #else
        if (!cpu_has_x2apic)
                return;
                panic("x2apic enabled prior OS handover,"
                      " enable CONFIG_INTR_REMAP");
  
 -      printk(KERN_INFO "Enable CONFIG_INTR_REMAP for enabling intr-remapping "
 -             " and x2apic\n");
 +      pr_info("Enable CONFIG_INTR_REMAP for enabling intr-remapping "
 +              " and x2apic\n");
  #endif
  
        return;
  static int __init detect_init_APIC(void)
  {
        if (!cpu_has_apic) {
 -              printk(KERN_INFO "No local APIC present\n");
 +              pr_info("No local APIC present\n");
                return -1;
        }
  
@@@ -1456,8 -1469,8 +1456,8 @@@ static int __init detect_init_APIC(void
                 * "lapic" specified.
                 */
                if (!force_enable_local_apic) {
 -                      printk(KERN_INFO "Local APIC disabled by BIOS -- "
 -                             "you can enable it with \"lapic\"\n");
 +                      pr_info("Local APIC disabled by BIOS -- "
 +                              "you can enable it with \"lapic\"\n");
                        return -1;
                }
                /*
                 */
                rdmsr(MSR_IA32_APICBASE, l, h);
                if (!(l & MSR_IA32_APICBASE_ENABLE)) {
 -                      printk(KERN_INFO
 -                             "Local APIC disabled by BIOS -- reenabling.\n");
 +                      pr_info("Local APIC disabled by BIOS -- reenabling.\n");
                        l &= ~MSR_IA32_APICBASE_BASE;
                        l |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE;
                        wrmsr(MSR_IA32_APICBASE, l, h);
         */
        features = cpuid_edx(1);
        if (!(features & (1 << X86_FEATURE_APIC))) {
 -              printk(KERN_WARNING "Could not enable APIC!\n");
 +              pr_warning("Could not enable APIC!\n");
                return -1;
        }
        set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
        if (l & MSR_IA32_APICBASE_ENABLE)
                mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;
  
 -      printk(KERN_INFO "Found and enabled local APIC!\n");
 +      pr_info("Found and enabled local APIC!\n");
  
        apic_pm_activate();
  
        return 0;
  
  no_apic:
 -      printk(KERN_INFO "No local APIC present or hardware disabled\n");
 +      pr_info("No local APIC present or hardware disabled\n");
        return -1;
  }
  #endif
@@@ -1574,12 -1588,12 +1574,12 @@@ int __init APIC_init_uniprocessor(void
  {
  #ifdef CONFIG_X86_64
        if (disable_apic) {
 -              printk(KERN_INFO "Apic disabled\n");
 +              pr_info("Apic disabled\n");
                return -1;
        }
        if (!cpu_has_apic) {
                disable_apic = 1;
 -              printk(KERN_INFO "Apic disabled by BIOS\n");
 +              pr_info("Apic disabled by BIOS\n");
                return -1;
        }
  #else
         */
        if (!cpu_has_apic &&
            APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {
 -              printk(KERN_ERR "BIOS bug, local APIC 0x%x not detected!...\n",
 -                     boot_cpu_physical_apicid);
 +              pr_err("BIOS bug, local APIC 0x%x not detected!...\n",
 +                      boot_cpu_physical_apicid);
                clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
                return -1;
        }
@@@ -1685,8 -1699,8 +1685,8 @@@ void smp_spurious_interrupt(struct pt_r
        add_pda(irq_spurious_count, 1);
  #else
        /* see sw-dev-man vol 3, chapter 7.4.13.5 */
 -      printk(KERN_INFO "spurious APIC interrupt on CPU#%d, "
 -             "should never happen.\n", smp_processor_id());
 +      pr_info("spurious APIC interrupt on CPU#%d, "
 +              "should never happen.\n", smp_processor_id());
        __get_cpu_var(irq_stat).irq_spurious_count++;
  #endif
        irq_exit();
@@@ -1710,18 -1724,17 +1710,18 @@@ void smp_error_interrupt(struct pt_reg
        ack_APIC_irq();
        atomic_inc(&irq_err_count);
  
 -      /* Here is what the APIC error bits mean:
 -         0: Send CS error
 -         1: Receive CS error
 -         2: Send accept error
 -         3: Receive accept error
 -         4: Reserved
 -         5: Send illegal vector
 -         6: Received illegal vector
 -         7: Illegal register address
 -      */
 -      printk(KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
 +      /*
 +       * Here is what the APIC error bits mean:
 +       * 0: Send CS error
 +       * 1: Receive CS error
 +       * 2: Send accept error
 +       * 3: Receive accept error
 +       * 4: Reserved
 +       * 5: Send illegal vector
 +       * 6: Received illegal vector
 +       * 7: Illegal register address
 +       */
 +      pr_debug("APIC error on CPU%d: %02x(%02x)\n",
                smp_processor_id(), v , v1);
        irq_exit();
  }
@@@ -1825,15 -1838,15 +1825,15 @@@ void __cpuinit generic_processor_info(i
         * Validate version
         */
        if (version == 0x0) {
 -              printk(KERN_WARNING "BIOS bug, APIC version is 0 for CPU#%d! "
 -                              "fixing up to 0x10. (tell your hw vendor)\n",
 -                              version);
 +              pr_warning("BIOS bug, APIC version is 0 for CPU#%d! "
 +                      "fixing up to 0x10. (tell your hw vendor)\n",
 +                      version);
                version = 0x10;
        }
        apic_version[apicid] = version;
  
        if (num_processors >= NR_CPUS) {
 -              printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
 +              pr_warning("WARNING: NR_CPUS limit of %i reached."
                        "  Processor ignored.\n", NR_CPUS);
                return;
        }
@@@ -2196,7 -2209,7 +2196,7 @@@ static int __init apic_set_verbosity(ch
        else if (strcmp("verbose", arg) == 0)
                apic_verbosity = APIC_VERBOSE;
        else {
 -              printk(KERN_WARNING "APIC Verbosity level %s not recognised"
 +              pr_warning("APIC Verbosity level %s not recognised"
                        " use apic=verbose or apic=debug\n", arg);
                return -EINVAL;
        }