lkml.org 
[lkml]   [2008]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] x86: APIC: Remove apic_write_around(); use alternatives
    On Fri, Jul 18, 2008 at 02:03:48PM -0700, Ingo Molnar wrote:
    >
    > * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
    >
    > > > git merge tip/x86/x2apic
    > > CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
    > > CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
    > > CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
    > > CONFLICT (content): Merge conflict in arch/x86/kernel/vmi_32.c
    > > CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
    > > CONFLICT (content): Merge conflict in include/asm-x86/apic.h
    > > CONFLICT (content): Merge conflict in include/asm-x86/paravirt.h
    >
    > that's due to the changes in tip/x86/apic and in tip/x86/uv.
    >
    > ok, i've just merged x86/apic into x86/x2apic and x86/uv as well, and
    > pushed out the result.
    >
    > Note: it's a first raw merge and completely untested. It will now merge
    > cleanly into tip/master. There are probably a few details missing.

    Ingo, thanks for doing this. While I was testing my merge changes, you posted
    yours... anyhow we need this piece, which is missing from your merge.

    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    ---
    diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
    index dcb897f..8728f54 100644
    --- a/arch/x86/kernel/apic_32.c
    +++ b/arch/x86/kernel/apic_32.c
    @@ -174,8 +174,8 @@ u32 safe_xapic_wait_icr_idle(void)

    void xapic_icr_write(u32 low, u32 id)
    {
    - apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(id));
    - apic_write_around(APIC_ICR, low);
    + apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));
    + apic_write(APIC_ICR, low);
    }

    u64 xapic_icr_read(void)
    @@ -191,7 +191,6 @@ u64 xapic_icr_read(void)
    static struct apic_ops xapic_ops = {
    .read = native_apic_mem_read,
    .write = native_apic_mem_write,
    - .write_atomic = native_apic_mem_write_atomic,
    .icr_read = xapic_icr_read,
    .icr_write = xapic_icr_write,
    .wait_icr_idle = xapic_wait_icr_idle,
    diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
    index 46e6124..a850bc6 100644
    --- a/arch/x86/kernel/apic_64.c
    +++ b/arch/x86/kernel/apic_64.c
    @@ -167,7 +167,6 @@ u64 xapic_icr_read(void)
    static struct apic_ops xapic_ops = {
    .read = native_apic_mem_read,
    .write = native_apic_mem_write,
    - .write_atomic = native_apic_mem_write_atomic,
    .icr_read = xapic_icr_read,
    .icr_write = xapic_icr_write,
    .wait_icr_idle = xapic_wait_icr_idle,
    @@ -206,7 +205,6 @@ u64 x2apic_icr_read(void)
    static struct apic_ops x2apic_ops = {
    .read = native_apic_msr_read,
    .write = native_apic_msr_write,
    - .write_atomic = native_apic_msr_write,
    .icr_read = x2apic_icr_read,
    .icr_write = x2apic_icr_write,
    .wait_icr_idle = x2apic_wait_icr_idle,

    \
     
     \ /
      Last update: 2008-07-19 01:01    [W:0.027 / U:0.452 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site