From: Cyrill Gorcunov <gorcunov@gmail.com>
To: hpa@zytor.com, mingo@elte.hu, tglx@linutronix.de, macro@linux-mips.org
Cc: linux-kernel@vger.kernel.org, Cyrill Gorcunov <gorcunov@gmail.com>
Subject: [PATCH 7/9] x86: apic - unify __setup_APIC_LVTT
Date: Sun, 17 Aug 2008 23:41:45 +0400 [thread overview]
Message-ID: <3ef65d4fd53bf27437e5ad15ffd36bc75baed3d8.1219001352.git.gorcunov@gmail.com> (raw)
In-Reply-To: <1219002107-21832-1-git-send-email-gorcunov@gmail.com>
In-Reply-To: <68106c6e85398a15b2a5d556764159541e1d66fe.1219001352.git.gorcunov@gmail.com>
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
next prev parent reply other threads:[~2008-08-17 19:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-17 19:41 [PATCH 0/9] -tip/apic merging one more series Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 1/9] x86: apic - rearrange maxcpu definition Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 2/9] x86: apic - unify setup_boot_APIC_clock Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 3/9] x86: apic - unify disable_local_APIC Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 4/9] " Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 5/9] x86: apic - unify connect_bsp_APIC Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 6/9] x86: apic - unify lapic_setup_esr Cyrill Gorcunov
2008-08-17 19:41 ` Cyrill Gorcunov [this message]
2008-08-17 19:41 ` [PATCH 8/9] x86: apic - unify disconnect_bsp_APIC Cyrill Gorcunov
2008-08-17 19:41 ` [PATCH 9/9] x86: apic - generic_processor_info Cyrill Gorcunov
2008-08-17 21:53 ` [PATCH 0/9] -tip/apic merging one more series Yinghai Lu
2008-08-18 4:22 ` Cyrill Gorcunov
2008-08-18 7:18 ` Ingo Molnar
2008-08-18 7:24 ` Ingo Molnar
2008-08-18 7:41 ` Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3ef65d4fd53bf27437e5ad15ffd36bc75baed3d8.1219001352.git.gorcunov@gmail.com \
--to=gorcunov@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®