x86: apic - remove dead ifdef from lapic_is_integrated
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 x86: apic,io-apic - generalize lapic_get_version helper
By doing so we are able to not duplicate code inio_apic.c at least in one case.
---
arch/x86/kernel/apic.c +0 -8
@@ -163,14 +163,6 @@ static DEFINE_PER_CPU(struct clock_eventstatic unsigned long apic_phys;/* -* Get the LAPIC version -*/ -static inline int lapic_get_version (void ) -{ -return GET_APIC_VERSION (apic_read (APIC_LVR )); -} - -/* * Check, if the APIC is integrated or a separate chip */ static inline int lapic_is_integrated (void )
arch/x86/kernel/io_apic.c +1 -2
@@ -2759,8 +2759,7 @@ static inline void __init check_timer(volocal_irq_save (flags); - ver =apic_read (APIC_LVR ); - ver =GET_APIC_VERSION (ver); + ver =lapic_get_version ();/* * get/set the timer IRQ vector:
include/asm-x86/apic.h +6 -0
@@ -132,6 +132,12 @@ extern struct apic_ops *apic_ops;#define apic_wait_icr_idle (apic_ops->wait_icr_idle)#define safe_apic_wait_icr_idle (apic_ops->safe_wait_icr_idle) +/* Get the LAPIC version */ +static inline int lapic_get_version (void ) +{ +return GET_APIC_VERSION (apic_read (APIC_LVR )); +} +extern int get_physical_broadcast (void );#ifdef CONFIG_X86_64
PATCH 2/3 x86: apic - simplify lapic_get_maxlvt
In reply to a message not in the archiveLets use lapic_get_version helper and hide
register being read. Also it allow us to
make code a bit tighter.
---
arch/x86/kernel/apic.c +3 -3
@@ -309,14 +309,14 @@ int get_physical_broadcast(void)*/ int lapic_get_maxlvt (void ) { -unsigned int v; +unsigned int ver; - v =apic_read (APIC_LVR ); + ver =lapic_get_version ();/* * - we always have APIC integrated on 64bit mode * - 82489DXs do not report # of LVT entries */ -return APIC_INTEGRATED (GET_APIC_VERSION (v)) ?GET_APIC_MAXLVT (v) :2 ; +return APIC_INTEGRATED (ver) ?GET_APIC_MAXLVT (ver) :2 ; }/*
Re: [patch 2/3] x86: apic - simplify lapic_get_maxlvt
Quoted 16 lines · Cyrill Gorcunov
Lets use
lapic_get_versionhelper and hide
register being read. Also it allow us to
make code a bit tighter.Signed-off-by Cyrill Gorcunov <[email protected]>---
Index:
linux-2.6.git/arch/x86/kernel/apic.c
===================================================================arch/x86/kernel/apic.c +0
-1@@ -309,14 +309,14 @@ int get_physical_broadcast(void)*/ int lapic_get_maxlvt (void ) { -unsigned int v;
arch/x86/kernel/apic.c int get_physical_broadcast(void) · line 319
Quoted 10 lines
arch/x86/kernel/apic.c +3
-2+unsigned int ver; - v =apic_read (APIC_LVR ); + ver =lapic_get_version ();/* * - we always have APIC integrated on 64bit mode * - 82489DXs do not report # of LVT entries */ -return APIC_INTEGRATED (GET_APIC_VERSION (v)) ?GET_APIC_MAXLVT (v) :2 ; +return APIC_INTEGRATED (ver) ?GET_APIC_MAXLVT (ver) :2 ;
^^^
Hi, is this correct?
Does ver have the full content of apic_read(APIC_LVR)?
thanks,
Hiroshi Shimamoto
Re: [patch 2/3] x86: apic - simplify lapic_get_maxlvt
Quoted 28 lines · Hiroshi Shimamoto
Quoted 16 lines · Cyrill Gorcunov
Lets use
lapic_get_versionhelper and hide
register being read. Also it allow us to
make code a bit tighter.Signed-off-by Cyrill Gorcunov <[email protected]>---
Index:
linux-2.6.git/arch/x86/kernel/apic.c
===================================================================arch/x86/kernel/apic.c 2008-09-24 19:33:31.000000000 +0400 renamed from arch/x86/kernel/apic.c 2008-09-24 19:17:20.000000000 +0400 +0
-1@@ -309,14 +309,14 @@ int get_physical_broadcast(void) */ int lapic_get_maxlvt(void) { - unsigned int v;arch/x86/kernel/apic.c 2008-09-24 19:33:31.000000000 +0400 int get_physical_broadcast(void) · line 319
Quoted 10 lines
arch/x86/kernel/apic.c 2008-09-24 19:33:31.000000000 +0400 renamed from arch/x86/kernel/apic.c 2008-09-24 19:17:20.000000000 +0400 +3
-2+ unsigned int ver; - v = apic_read(APIC_LVR); + ver = lapic_get_version(); /* * - we always have APIC integrated on 64bit mode * - 82489DXs do not report # of LVT entries */ - return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2; + return APIC_INTEGRATED(ver) ? GET_APIC_MAXLVT(ver) : 2;^^^
Quoted 2 lines
Hi, is this correct?
Does ver have the full content ofapic_read(APIC_LVR)?
good catch..
YH
Re: [patch 2/3] x86: apic - simplify lapic_get_maxlvt
In reply to Hiroshi Shimamoto[Hiroshi Shimamoto - Wed, Sep 24, 2008 at 11:58:12AM -0700]
| Cyrill Gorcunov wrote: | > Lets use lapic_get_version helper and hide | > register being read. Also it allow us to | > make code a bit tighter. | > | > Signed-off-by: Cyrill Gorcunov <[email protected]> | > --- | > | > Index: linux-2.6.git/arch/x86/kernel/apic.c | > =================================================================== | > --- linux-2.6.git.orig/arch/x86/kernel/apic.c 2008-09-24 19:17:20.000000000 +0400 | > +++ linux-2.6.git/arch/x86/kernel/apic.c 2008-09-24 19:33:31.000000000 +0400 | > @@ -309,14 +309,14 @@ int get_physical_broadcast(void) | > */ | > int lapic_get_maxlvt(void) | > { | > - unsigned int v; | > + unsigned int ver; | > | > - v = apic_read(APIC_LVR); | > + ver = lapic_get_version(); | > /* | > * - we always have APIC integrated on 64bit mode | > * - 82489DXs do not report # of LVT entries | > */ | > - return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2; | > + return APIC_INTEGRATED(ver) ? GET_APIC_MAXLVT(ver) : 2; | ^^^ | Hi, is this correct? | Does ver have the full content of apic_read(APIC_LVR)? | | thanks, | Hiroshi Shimamoto |
Hi Hiroshi,
damn, it seems I made a mistake again!
Thanks a lot, Hiroshi! Checking now!
Somehow missed this.
- Cyrill -
Re: [patch 2/3] x86: apic - simplify lapic_get_maxlvt
In reply to Hiroshi Shimamoto[Hiroshi Shimamoto - Wed, Sep 24, 2008 at 11:58:12AM -0700]
| Cyrill Gorcunov wrote: | > Lets use lapic_get_version helper and hide | > register being read. Also it allow us to | > make code a bit tighter. | > | > Signed-off-by: Cyrill Gorcunov <[email protected]> | > --- | > | > Index: linux-2.6.git/arch/x86/kernel/apic.c | > =================================================================== | > --- linux-2.6.git.orig/arch/x86/kernel/apic.c 2008-09-24 19:17:20.000000000 +0400 | > +++ linux-2.6.git/arch/x86/kernel/apic.c 2008-09-24 19:33:31.000000000 +0400 | > @@ -309,14 +309,14 @@ int get_physical_broadcast(void) | > */ | > int lapic_get_maxlvt(void) | > { | > - unsigned int v; | > + unsigned int ver; | > | > - v = apic_read(APIC_LVR); | > + ver = lapic_get_version(); | > /* | > * - we always have APIC integrated on 64bit mode | > * - 82489DXs do not report # of LVT entries | > */ | > - return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2; | > + return APIC_INTEGRATED(ver) ? GET_APIC_MAXLVT(ver) : 2; | ^^^ | Hi, is this correct? | Does ver have the full content of apic_read(APIC_LVR)? | | thanks, | Hiroshi Shimamoto |
Thanks a lot Hiroshi, I just cutted a half of
register (what a shame) :( Sorry.
Ingo, don't apply this series please!
- Cyrill -
PATCH 3/3 x86: apic - remove dead ifdef from lapic_is_integrated
In reply to a message not in the archiveWe already have #ifdef in apicdef.h which depends
on cpu type so no need to re-introduce it.
---
arch/x86/kernel/apic.c +0 -4
@@ -167,11 +167,7 @@ static unsigned long apic_phys;*/ static inline int lapic_is_integrated (void ) { -#ifdef CONFIG_X86_64 -return 1 ; -#else return APIC_INTEGRATED (lapic_get_version ()); -#endif }/*