linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] x86: make 64 bit to use default_inquire_remote_apic
@ 2009-04-04  0:13 Yinghai Lu
  2009-04-04  0:15 ` [PATCH] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
  0 siblings, 1 reply; 7+ messages in thread
From: Yinghai Lu @ 2009-04-04  0:13 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel


Impact: restore old behavior

for flat and phys_flat

Signed-off-by: Yinhai Lu <yinghai@kernel.org.

---
 arch/x86/kernel/apic/apic_flat_64.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/kernel/apic/apic_flat_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic/apic_flat_64.c
+++ linux-2.6/arch/x86/kernel/apic/apic_flat_64.c
@@ -212,7 +212,7 @@ struct apic apic_flat =  {
     .trampoline_phys_high        = DEFAULT_TRAMPOLINE_PHYS_HIGH,
     .wait_for_init_deassert        = NULL,
     .smp_callin_clear_local_apic    = NULL,
-    .inquire_remote_apic        = NULL,
+    .inquire_remote_apic        = default_inquire_remote_apic,
 
     .read                = native_apic_mem_read,
     .write                = native_apic_mem_write,
@@ -362,7 +362,7 @@ struct apic apic_physflat =  {
     .trampoline_phys_high        = DEFAULT_TRAMPOLINE_PHYS_HIGH,
     .wait_for_init_deassert        = NULL,
     .smp_callin_clear_local_apic    = NULL,
-    .inquire_remote_apic        = NULL,
+    .inquire_remote_apic        = default_inquire_remote_apic,
 
     .read                = native_apic_mem_read,
     .write                = native_apic_mem_write,

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] x86: make wakeup_secondary_cpu_via_init static
  2009-04-04  0:13 [PATCH] x86: make 64 bit to use default_inquire_remote_apic Yinghai Lu
@ 2009-04-04  0:15 ` Yinghai Lu
  2009-04-04  0:15   ` [PATCH] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC Yinghai Lu
  2009-04-08 13:00   ` [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
  0 siblings, 2 replies; 7+ messages in thread
From: Yinghai Lu @ 2009-04-04  0:15 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel


Impact: cleanup

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 arch/x86/kernel/smpboot.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/x86/kernel/smpboot.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/smpboot.c
+++ linux-2.6/arch/x86/kernel/smpboot.c
@@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical
 	return (send_status | accept_status);
 }
 
-int __devinit
+static int __devinit
 wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC
  2009-04-04  0:15 ` [PATCH] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
@ 2009-04-04  0:15   ` Yinghai Lu
  2009-04-08 13:00     ` [tip:x86/apic] " Yinghai Lu
  2009-04-08 13:00   ` [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
  1 sibling, 1 reply; 7+ messages in thread
From: Yinghai Lu @ 2009-04-04  0:15 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel


Impact: cleanup

didn't set it for UV_NON_UNIQUE_APIC, so don't restore it

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 arch/x86/kernel/smpboot.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6/arch/x86/kernel/smpboot.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/smpboot.c
+++ linux-2.6/arch/x86/kernel/smpboot.c
@@ -822,10 +822,12 @@ do_rest:
 	/* mark "stuck" area as not stuck */
 	*((volatile unsigned long *)trampoline_base) = 0;
 
-	/*
-	 * Cleanup possible dangling ends...
-	 */
-	smpboot_restore_warm_reset_vector();
+	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
+		/*
+		 * Cleanup possible dangling ends...
+		 */
+		smpboot_restore_warm_reset_vector();
+	}
 
 	return boot_error;
 }

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static
  2009-04-04  0:15 ` [PATCH] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
  2009-04-04  0:15   ` [PATCH] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC Yinghai Lu
@ 2009-04-08 13:00   ` Yinghai Lu
  2009-04-08 18:39     ` Cyrill Gorcunov
  1 sibling, 1 reply; 7+ messages in thread
From: Yinghai Lu @ 2009-04-08 13:00 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, yinghai, tglx, mingo

Commit-ID:  cdc1cb0d4445f39561a65204d26f89365f917550
Gitweb:     http://git.kernel.org/tip/cdc1cb0d4445f39561a65204d26f89365f917550
Author:     Yinghai Lu <yinghai@kernel.org>
AuthorDate: Fri, 3 Apr 2009 17:15:14 -0700
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 8 Apr 2009 14:50:28 +0200

x86: make wakeup_secondary_cpu_via_init static

Impact: cleanup

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <49D6A692.6040400@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/kernel/smpboot.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 58d24ef..bddf2cc 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
 	return (send_status | accept_status);
 }
 
-int __devinit
+static int __devinit
 wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [tip:x86/apic] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC
  2009-04-04  0:15   ` [PATCH] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC Yinghai Lu
@ 2009-04-08 13:00     ` Yinghai Lu
  0 siblings, 0 replies; 7+ messages in thread
From: Yinghai Lu @ 2009-04-08 13:00 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, yinghai, tglx, mingo

Commit-ID:  02421f98ec55c3ff118f358740ff640f096c7ad6
Gitweb:     http://git.kernel.org/tip/02421f98ec55c3ff118f358740ff640f096c7ad6
Author:     Yinghai Lu <yinghai@kernel.org>
AuthorDate: Fri, 3 Apr 2009 17:15:53 -0700
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 8 Apr 2009 14:50:28 +0200

x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC

Impact: cleanup

didn't set it for UV_NON_UNIQUE_APIC, so don't restore it

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <49D6A6B9.6060501@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/kernel/smpboot.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index bddf2cc..bf8ad63 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -822,10 +822,12 @@ do_rest:
 	/* mark "stuck" area as not stuck */
 	*((volatile unsigned long *)trampoline_base) = 0;
 
-	/*
-	 * Cleanup possible dangling ends...
-	 */
-	smpboot_restore_warm_reset_vector();
+	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
+		/*
+		 * Cleanup possible dangling ends...
+		 */
+		smpboot_restore_warm_reset_vector();
+	}
 
 	return boot_error;
 }

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static
  2009-04-08 13:00   ` [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
@ 2009-04-08 18:39     ` Cyrill Gorcunov
  2009-04-08 19:10       ` Yinghai Lu
  0 siblings, 1 reply; 7+ messages in thread
From: Cyrill Gorcunov @ 2009-04-08 18:39 UTC (permalink / raw)
  To: mingo, hpa, linux-kernel, yinghai, tglx, mingo; +Cc: linux-tip-commits

[Yinghai Lu - Wed, Apr 08, 2009 at 01:00:32PM +0000]
| Commit-ID:  cdc1cb0d4445f39561a65204d26f89365f917550
| Gitweb:     http://git.kernel.org/tip/cdc1cb0d4445f39561a65204d26f89365f917550
| Author:     Yinghai Lu <yinghai@kernel.org>
| AuthorDate: Fri, 3 Apr 2009 17:15:14 -0700
| Committer:  Ingo Molnar <mingo@elte.hu>
| CommitDate: Wed, 8 Apr 2009 14:50:28 +0200
| 
| x86: make wakeup_secondary_cpu_via_init static
| 
| Impact: cleanup
| 
| Signed-off-by: Yinghai Lu <yinghai@kernel.org>
| LKML-Reference: <49D6A692.6040400@kernel.org>
| Signed-off-by: Ingo Molnar <mingo@elte.hu>
| 
| 
| ---
|  arch/x86/kernel/smpboot.c |    2 +-
|  1 files changed, 1 insertions(+), 1 deletions(-)
| 
| diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
| index 58d24ef..bddf2cc 100644
| --- a/arch/x86/kernel/smpboot.c
| +++ b/arch/x86/kernel/smpboot.c
| @@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
|  	return (send_status | accept_status);
|  }
|  
| -int __devinit
| +static int __devinit
|  wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
|  {
|  	unsigned long send_status, accept_status = 0;

Hi Yinghai,

just curious why it's not __cpuinit? Did I miss something?

       Cyrill

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static
  2009-04-08 18:39     ` Cyrill Gorcunov
@ 2009-04-08 19:10       ` Yinghai Lu
  0 siblings, 0 replies; 7+ messages in thread
From: Yinghai Lu @ 2009-04-08 19:10 UTC (permalink / raw)
  To: Cyrill Gorcunov; +Cc: mingo, hpa, linux-kernel, tglx, mingo, linux-tip-commits

Cyrill Gorcunov wrote:
> [Yinghai Lu - Wed, Apr 08, 2009 at 01:00:32PM +0000]
> | Commit-ID:  cdc1cb0d4445f39561a65204d26f89365f917550
> | Gitweb:     http://git.kernel.org/tip/cdc1cb0d4445f39561a65204d26f89365f917550
> | Author:     Yinghai Lu <yinghai@kernel.org>
> | AuthorDate: Fri, 3 Apr 2009 17:15:14 -0700
> | Committer:  Ingo Molnar <mingo@elte.hu>
> | CommitDate: Wed, 8 Apr 2009 14:50:28 +0200
> | 
> | x86: make wakeup_secondary_cpu_via_init static
> | 
> | Impact: cleanup
> | 
> | Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> | LKML-Reference: <49D6A692.6040400@kernel.org>
> | Signed-off-by: Ingo Molnar <mingo@elte.hu>
> | 
> | 
> | ---
> |  arch/x86/kernel/smpboot.c |    2 +-
> |  1 files changed, 1 insertions(+), 1 deletions(-)
> | 
> | diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> | index 58d24ef..bddf2cc 100644
> | --- a/arch/x86/kernel/smpboot.c
> | +++ b/arch/x86/kernel/smpboot.c
> | @@ -538,7 +538,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
> |  	return (send_status | accept_status);
> |  }
> |  
> | -int __devinit
> | +static int __devinit
> |  wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
> |  {
> |  	unsigned long send_status, accept_status = 0;
> 
> Hi Yinghai,
> 
> just curious why it's not __cpuinit? Did I miss something?
> 

you could change that to __cpuinit.

also other three wakeup_seconary_cpu.

YH

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2009-04-08 19:11 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-04  0:13 [PATCH] x86: make 64 bit to use default_inquire_remote_apic Yinghai Lu
2009-04-04  0:15 ` [PATCH] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
2009-04-04  0:15   ` [PATCH] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC Yinghai Lu
2009-04-08 13:00     ` [tip:x86/apic] " Yinghai Lu
2009-04-08 13:00   ` [tip:x86/apic] x86: make wakeup_secondary_cpu_via_init static Yinghai Lu
2009-04-08 18:39     ` Cyrill Gorcunov
2009-04-08 19:10       ` Yinghai Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).