Home » Mailing list archives » linux-kernel » 2008 » August » 17

[PATCH 7/9] x86: apic - unify __setup_APIC_LVTT

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Cyrill Gorcunov <gorcunov@...>
To: <hpa@...>, <mingo@...>, <tglx@...>, <macro@...>
Cc: <linux-kernel@...>, Cyrill Gorcunov <gorcunov@...>
Subject: [PATCH 7/9] x86: apic - unify __setup_APIC_LVTT
Date: Sunday, August 17, 2008 - 3:41 pm

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 arch/x86/kernel/apic_32.c |   10 +++++++---
 arch/x86/kernel/apic_64.c |   12 ++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 3c1562a..65419c7 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -248,8 +248,12 @@ int lapic_get_maxlvt(void)
  * Local APIC timer
  */
 
-/* Clock divisor is set to 16 */
+/* Clock divisor */
+#ifdef CONFG_X86_64
+#define APIC_DIVISOR 1
+#else
 #define APIC_DIVISOR 16
+#endif
 
 /*
  * This function sets up the local APIC timer, with a timeout of
@@ -281,8 +285,8 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
 	 */
 	tmp_value = apic_read(APIC_TDCR);
 	apic_write(APIC_TDCR,
-		   (tmp_value & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |
-		   APIC_TDR_DIV_16);
+		(tmp_value & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |
+		APIC_TDR_DIV_16);
 
 	if (!oneshot)
 		apic_write(APIC_TMICT, clocks / APIC_DIVISOR);
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index e03a76d..a814612 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -259,8 +259,12 @@ int lapic_get_maxlvt(void)
  * Local APIC timer
  */
 
-/* Clock divisor is set to 1 */
+/* Clock divisor */
+#ifdef CONFG_X86_64
 #define APIC_DIVISOR 1
+#else
+#define APIC_DIVISOR 16
+#endif
 
 /*
  * This function sets up the local APIC timer, with a timeout of
@@ -291,9 +295,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
 	 * Divide PICLK by 16
 	 */
 	tmp_value = apic_read(APIC_TDCR);
-	apic_write(APIC_TDCR, (tmp_value
-				& ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE))
-				| APIC_TDR_DIV_16);
+	apic_write(APIC_TDCR,
+		(tmp_value & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE)) |
+		APIC_TDR_DIV_16);
 
 	if (!oneshot)
 		apic_write(APIC_TMICT, clocks / APIC_DIVISOR);
-- 
1.6.0.rc1.34.g0fe8c

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/9] -tip/apic merging one more series, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
Re: [PATCH 0/9] -tip/apic merging one more series, Yinghai Lu, (Sun Aug 17, 5:53 pm)
Re: [PATCH 0/9] -tip/apic merging one more series, Cyrill Gorcunov, (Mon Aug 18, 12:22 am)
Re: [PATCH 0/9] -tip/apic merging one more series, Ingo Molnar, (Mon Aug 18, 3:18 am)
Re: [PATCH 0/9] -tip/apic merging one more series, Ingo Molnar, (Mon Aug 18, 3:24 am)
Re: [PATCH 0/9] -tip/apic merging one more series, Cyrill Gorcunov, (Mon Aug 18, 3:41 am)
[PATCH 6/9] x86: apic - unify lapic_setup_esr, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 9/9] x86: apic - generic_processor_info, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 5/9] x86: apic - unify connect_bsp_APIC, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 3/9] x86: apic - unify disable_local_APIC, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 8/9] x86: apic - unify disconnect_bsp_APIC, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 7/9] x86: apic - unify __setup_APIC_LVTT, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 2/9] x86: apic - unify setup_boot_APIC_clock, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 4/9] x86: apic - unify disable_local_APIC, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)
[PATCH 1/9] x86: apic - rearrange maxcpu definition, Cyrill Gorcunov, (Sun Aug 17, 3:41 pm)