diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-13 19:03:42 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-16 07:04:40 -0400 |
commit | 4f0234f4f9da485ecb9729af1b88567700fd4767 (patch) | |
tree | 7073115c86dbf4e691ddac12f5c9ce1c58ce53be /arch/sparc64/prom | |
parent | b3e13fbeb9ac1eb8e7b0791bf56e1775c692972b (diff) |
[SPARC64]: Initial LDOM cpu hotplug support.
Only adding cpus is supports at the moment, removal
will come next.
When new cpus are configured, the machine description is
updated. When we get the configure request we pass in a
cpu mask of to-be-added cpus to the mdesc CPU node parser
so it only fetches information for those cpus. That code
also proceeds to update the SMT/multi-core scheduling bitmaps.
cpu_up() does all the work and we return the status back
over the DS channel.
CPUs via dr-cpu need to be booted straight out of the
hypervisor, and this requires:
1) A new trampoline mechanism. CPUs are booted straight
out of the hypervisor with MMU disabled and running in
physical addresses with no mappings installed in the TLB.
The new hvtramp.S code sets up the critical cpu state,
installs the locked TLB mappings for the kernel, and
turns the MMU on. It then proceeds to follow the logic
of the existing trampoline.S SMP cpu bringup code.
2) All calls into OBP have to be disallowed when domaining
is enabled. Since cpus boot straight into the kernel from
the hypervisor, OBP has no state about that cpu and therefore
cannot handle being invoked on that cpu.
Luckily it's only a handful of interfaces which can be called
after the OBP device tree is obtained. For example, rebooting,
halting, powering-off, and setting options node variables.
CPU removal support will require some infrastructure changes
here. Namely we'll have to process the requests via a true
kernel thread instead of in a workqueue. workqueues run on
a per-cpu thread, but when unconfiguring we might need to
force the thread to execute on another cpu if the current cpu
is the one being removed. Removal of a cpu also causes the kernel
to destroy that cpu's workqueue running thread.
Another issue on removal is that we may have interrupts still
pointing to the cpu-to-be-removed. So new code will be needed
to walk the active INO list and retarget those cpus as-needed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/prom')
-rw-r--r-- | arch/sparc64/prom/misc.c | 8 | ||||
-rw-r--r-- | arch/sparc64/prom/p1275.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 72d272c9de6b..33c5b7da31e5 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
@@ -96,6 +96,10 @@ void prom_cmdline(void) | |||
96 | */ | 96 | */ |
97 | void prom_halt(void) | 97 | void prom_halt(void) |
98 | { | 98 | { |
99 | #ifdef CONFIG_SUN_LDOMS | ||
100 | if (ldom_domaining_enabled) | ||
101 | ldom_power_off(); | ||
102 | #endif | ||
99 | again: | 103 | again: |
100 | p1275_cmd("exit", P1275_INOUT(0, 0)); | 104 | p1275_cmd("exit", P1275_INOUT(0, 0)); |
101 | goto again; /* PROM is out to get me -DaveM */ | 105 | goto again; /* PROM is out to get me -DaveM */ |
@@ -103,6 +107,10 @@ again: | |||
103 | 107 | ||
104 | void prom_halt_power_off(void) | 108 | void prom_halt_power_off(void) |
105 | { | 109 | { |
110 | #ifdef CONFIG_SUN_LDOMS | ||
111 | if (ldom_domaining_enabled) | ||
112 | ldom_power_off(); | ||
113 | #endif | ||
106 | p1275_cmd("SUNW,power-off", P1275_INOUT(0, 0)); | 114 | p1275_cmd("SUNW,power-off", P1275_INOUT(0, 0)); |
107 | 115 | ||
108 | /* if nothing else helps, we just halt */ | 116 | /* if nothing else helps, we just halt */ |
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c index 2b32c489860c..7fcccc0e19cf 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc64/prom/p1275.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/system.h> | 16 | #include <asm/system.h> |
17 | #include <asm/spitfire.h> | 17 | #include <asm/spitfire.h> |
18 | #include <asm/pstate.h> | 18 | #include <asm/pstate.h> |
19 | #include <asm/ldc.h> | ||
19 | 20 | ||
20 | struct { | 21 | struct { |
21 | long prom_callback; /* 0x00 */ | 22 | long prom_callback; /* 0x00 */ |