[7/8] x86: apic - unify sync_Arb_IDs
diff mbox series

Message ID 20080814184652.317090901@gmail.com
State New, archived
Headers show
Series
  • another one step toward APIC merging
Related show

Commit Message

Cyrill Gorcunov Jan. 1, 1970, midnight UTC
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---

Comments

Maciej W. Rozycki Aug. 14, 2008, 7:41 p.m. UTC | #1
On Thu, 1 Jan 1970, Cyrill Gorcunov wrote:

 Hmm, are you living in the past?

> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
> 
> diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
> index 1d5f830..ec0f18f 100644
> --- a/arch/x86/kernel/apic_32.c
> +++ b/arch/x86/kernel/apic_32.c
> @@ -919,8 +919,7 @@ void __init sync_Arb_IDs(void)
>  	apic_wait_icr_idle();
>  
>  	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
> -	apic_write(APIC_ICR,
> -		   APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
> +	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
>  }
>  
>  /*
[etc...]

 Well, I think this one is backwards...  There are exceptions, but the
general rule is to with within the width of the terminal.

  Maciej
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Cyrill Gorcunov Aug. 14, 2008, 8:10 p.m. UTC | #2
That happend sendmail/quilt sent mail by past :(. I'll fix and resend
tomorrow. thanks.

On 8/14/08, Maciej W. Rozycki <macro@linux-mips.org> wrote:
> On Thu, 1 Jan 1970, Cyrill Gorcunov wrote:
>
>  Hmm, are you living in the past?
>
>> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
>> ---
>>
>> diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
>> index 1d5f830..ec0f18f 100644
>> --- a/arch/x86/kernel/apic_32.c
>> +++ b/arch/x86/kernel/apic_32.c
>> @@ -919,8 +919,7 @@ void __init sync_Arb_IDs(void)
>>  	apic_wait_icr_idle();
>>
>>  	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
>> -	apic_write(APIC_ICR,
>> -		   APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
>> +	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG |
>> APIC_DM_INIT);
>>  }
>>
>>  /*
> [etc...]
>
>  Well, I think this one is backwards...  There are exceptions, but the
> general rule is to with within the width of the terminal.
>
>   Maciej
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Patch
diff mbox series

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 1d5f830..ec0f18f 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -919,8 +919,7 @@  void __init sync_Arb_IDs(void)
 	apic_wait_icr_idle();
 
 	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
-	apic_write(APIC_ICR,
-		   APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
+	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
 }
 
 /*
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5d07689..f8d2918 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -746,8 +746,11 @@  int __init verify_local_APIC(void)
  */
 void __init sync_Arb_IDs(void)
 {
-	/* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 */
-	if (modern_apic())
+	/*
+	 * Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 And not
+	 * needed on AMD.
+	 */
+	if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
 		return;
 
 	/*
@@ -756,8 +759,7 @@  void __init sync_Arb_IDs(void)
 	apic_wait_icr_idle();
 
 	apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
-	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG
-				| APIC_DM_INIT);
+	apic_write(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG | APIC_DM_INIT);
 }
 
 /*