diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/entry.S | 12 | ||||
-rw-r--r-- | arch/sparc64/kernel/hvapi.c | 3 | ||||
-rw-r--r-- | arch/sparc64/kernel/power.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/sstate.c | 104 | ||||
-rw-r--r-- | arch/sparc64/mm/init.c | 3 | ||||
-rw-r--r-- | arch/sparc64/prom/misc.c | 19 |
8 files changed, 148 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile index c749dccacc32..18e31a8db017 100644 --- a/arch/sparc64/kernel/Makefile +++ b/arch/sparc64/kernel/Makefile | |||
@@ -12,7 +12,7 @@ obj-y := process.o setup.o cpu.o idprom.o \ | |||
12 | irq.o ptrace.o time.o sys_sparc.o signal.o \ | 12 | irq.o ptrace.o time.o sys_sparc.o signal.o \ |
13 | unaligned.o central.o pci.o starfire.o semaphore.o \ | 13 | unaligned.o central.o pci.o starfire.o semaphore.o \ |
14 | power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \ | 14 | power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \ |
15 | visemul.o prom.o of_device.o hvapi.o | 15 | visemul.o prom.o of_device.o hvapi.o sstate.o |
16 | 16 | ||
17 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 17 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
18 | obj-$(CONFIG_PCI) += ebus.o isa.o pci_common.o pci_iommu.o \ | 18 | obj-$(CONFIG_PCI) += ebus.o isa.o pci_common.o pci_iommu.o \ |
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index 732b77cb71f8..b5dbd5709155 100644 --- a/arch/sparc64/kernel/entry.S +++ b/arch/sparc64/kernel/entry.S | |||
@@ -1937,3 +1937,15 @@ sun4v_con_write: | |||
1937 | stx %o1, [%o4] | 1937 | stx %o1, [%o4] |
1938 | retl | 1938 | retl |
1939 | nop | 1939 | nop |
1940 | |||
1941 | /* %o0: soft state | ||
1942 | * %o1: address of description string | ||
1943 | * | ||
1944 | * returns %o0: status | ||
1945 | */ | ||
1946 | .globl sun4v_mach_set_soft_state | ||
1947 | sun4v_mach_set_soft_state: | ||
1948 | mov HV_FAST_MACH_SET_SOFT_STATE, %o5 | ||
1949 | ta HV_FAST_TRAP | ||
1950 | retl | ||
1951 | nop | ||
diff --git a/arch/sparc64/kernel/hvapi.c b/arch/sparc64/kernel/hvapi.c index f54b3ed3b09e..f34f5d6181ef 100644 --- a/arch/sparc64/kernel/hvapi.c +++ b/arch/sparc64/kernel/hvapi.c | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include <asm/hypervisor.h> | 10 | #include <asm/hypervisor.h> |
11 | #include <asm/oplib.h> | 11 | #include <asm/oplib.h> |
12 | #include <asm/sstate.h> | ||
12 | 13 | ||
13 | /* If the hypervisor indicates that the API setting | 14 | /* If the hypervisor indicates that the API setting |
14 | * calls are unsupported, by returning HV_EBADTRAP or | 15 | * calls are unsupported, by returning HV_EBADTRAP or |
@@ -179,6 +180,8 @@ void __init sun4v_hvapi_init(void) | |||
179 | if (sun4v_hvapi_register(group, major, &minor)) | 180 | if (sun4v_hvapi_register(group, major, &minor)) |
180 | goto bad; | 181 | goto bad; |
181 | 182 | ||
183 | sun4v_sstate_init(); | ||
184 | |||
182 | return; | 185 | return; |
183 | 186 | ||
184 | bad: | 187 | bad: |
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c index 699b24b890df..5d6adea3967f 100644 --- a/arch/sparc64/kernel/power.c +++ b/arch/sparc64/kernel/power.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/prom.h> | 19 | #include <asm/prom.h> |
20 | #include <asm/of_device.h> | 20 | #include <asm/of_device.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/sstate.h> | ||
22 | 23 | ||
23 | #include <linux/unistd.h> | 24 | #include <linux/unistd.h> |
24 | 25 | ||
@@ -53,6 +54,7 @@ static void (*poweroff_method)(void) = machine_alt_power_off; | |||
53 | 54 | ||
54 | void machine_power_off(void) | 55 | void machine_power_off(void) |
55 | { | 56 | { |
57 | sstate_poweroff(); | ||
56 | if (!serial_console || scons_pwroff) { | 58 | if (!serial_console || scons_pwroff) { |
57 | #ifdef CONFIG_PCI | 59 | #ifdef CONFIG_PCI |
58 | if (power_reg) { | 60 | if (power_reg) { |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 952762bfb4c0..f5f97e2c669c 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <asm/mmu_context.h> | 45 | #include <asm/mmu_context.h> |
46 | #include <asm/unistd.h> | 46 | #include <asm/unistd.h> |
47 | #include <asm/hypervisor.h> | 47 | #include <asm/hypervisor.h> |
48 | #include <asm/sstate.h> | ||
48 | 49 | ||
49 | /* #define VERBOSE_SHOWREGS */ | 50 | /* #define VERBOSE_SHOWREGS */ |
50 | 51 | ||
@@ -106,6 +107,7 @@ extern void (*prom_keyboard)(void); | |||
106 | 107 | ||
107 | void machine_halt(void) | 108 | void machine_halt(void) |
108 | { | 109 | { |
110 | sstate_halt(); | ||
109 | if (!serial_console && prom_palette) | 111 | if (!serial_console && prom_palette) |
110 | prom_palette (1); | 112 | prom_palette (1); |
111 | if (prom_keyboard) | 113 | if (prom_keyboard) |
@@ -116,6 +118,7 @@ void machine_halt(void) | |||
116 | 118 | ||
117 | void machine_alt_power_off(void) | 119 | void machine_alt_power_off(void) |
118 | { | 120 | { |
121 | sstate_poweroff(); | ||
119 | if (!serial_console && prom_palette) | 122 | if (!serial_console && prom_palette) |
120 | prom_palette(1); | 123 | prom_palette(1); |
121 | if (prom_keyboard) | 124 | if (prom_keyboard) |
@@ -128,6 +131,7 @@ void machine_restart(char * cmd) | |||
128 | { | 131 | { |
129 | char *p; | 132 | char *p; |
130 | 133 | ||
134 | sstate_reboot(); | ||
131 | p = strchr (reboot_command, '\n'); | 135 | p = strchr (reboot_command, '\n'); |
132 | if (p) *p = 0; | 136 | if (p) *p = 0; |
133 | if (!serial_console && prom_palette) | 137 | if (!serial_console && prom_palette) |
diff --git a/arch/sparc64/kernel/sstate.c b/arch/sparc64/kernel/sstate.c new file mode 100644 index 000000000000..5b6e75b7f052 --- /dev/null +++ b/arch/sparc64/kernel/sstate.c | |||
@@ -0,0 +1,104 @@ | |||
1 | /* sstate.c: System soft state support. | ||
2 | * | ||
3 | * Copyright (C) 2007 David S. Miller <davem@davemloft.net> | ||
4 | */ | ||
5 | |||
6 | #include <linux/kernel.h> | ||
7 | #include <linux/notifier.h> | ||
8 | #include <linux/init.h> | ||
9 | |||
10 | #include <asm/hypervisor.h> | ||
11 | #include <asm/sstate.h> | ||
12 | #include <asm/oplib.h> | ||
13 | #include <asm/head.h> | ||
14 | #include <asm/io.h> | ||
15 | |||
16 | static int hv_supports_soft_state; | ||
17 | |||
18 | static unsigned long kimage_addr_to_ra(const char *p) | ||
19 | { | ||
20 | unsigned long val = (unsigned long) p; | ||
21 | |||
22 | return kern_base + (val - KERNBASE); | ||
23 | } | ||
24 | |||
25 | static void do_set_sstate(unsigned long state, const char *msg) | ||
26 | { | ||
27 | unsigned long err; | ||
28 | |||
29 | if (!hv_supports_soft_state) | ||
30 | return; | ||
31 | |||
32 | err = sun4v_mach_set_soft_state(state, kimage_addr_to_ra(msg)); | ||
33 | if (err) { | ||
34 | printk(KERN_WARNING "SSTATE: Failed to set soft-state to " | ||
35 | "state[%lx] msg[%s], err=%lu\n", | ||
36 | state, msg, err); | ||
37 | } | ||
38 | } | ||
39 | |||
40 | static const char booting_msg[32] __attribute__((aligned(32))) = | ||
41 | "Linux booting"; | ||
42 | static const char running_msg[32] __attribute__((aligned(32))) = | ||
43 | "Linux running"; | ||
44 | static const char halting_msg[32] __attribute__((aligned(32))) = | ||
45 | "Linux halting"; | ||
46 | static const char poweroff_msg[32] __attribute__((aligned(32))) = | ||
47 | "Linux powering off"; | ||
48 | static const char rebooting_msg[32] __attribute__((aligned(32))) = | ||
49 | "Linux rebooting"; | ||
50 | static const char panicing_msg[32] __attribute__((aligned(32))) = | ||
51 | "Linux panicing"; | ||
52 | |||
53 | void sstate_booting(void) | ||
54 | { | ||
55 | do_set_sstate(HV_SOFT_STATE_TRANSITION, booting_msg); | ||
56 | } | ||
57 | |||
58 | void sstate_running(void) | ||
59 | { | ||
60 | do_set_sstate(HV_SOFT_STATE_NORMAL, running_msg); | ||
61 | } | ||
62 | |||
63 | void sstate_halt(void) | ||
64 | { | ||
65 | do_set_sstate(HV_SOFT_STATE_TRANSITION, halting_msg); | ||
66 | } | ||
67 | |||
68 | void sstate_poweroff(void) | ||
69 | { | ||
70 | do_set_sstate(HV_SOFT_STATE_TRANSITION, poweroff_msg); | ||
71 | } | ||
72 | |||
73 | void sstate_reboot(void) | ||
74 | { | ||
75 | do_set_sstate(HV_SOFT_STATE_TRANSITION, rebooting_msg); | ||
76 | } | ||
77 | |||
78 | static int sstate_panic_event(struct notifier_block *n, unsigned long event, void *ptr) | ||
79 | { | ||
80 | do_set_sstate(HV_SOFT_STATE_TRANSITION, panicing_msg); | ||
81 | |||
82 | return NOTIFY_DONE; | ||
83 | } | ||
84 | |||
85 | static struct notifier_block sstate_panic_block = { | ||
86 | .notifier_call = sstate_panic_event, | ||
87 | .priority = INT_MAX, | ||
88 | }; | ||
89 | |||
90 | void __init sun4v_sstate_init(void) | ||
91 | { | ||
92 | unsigned long major, minor; | ||
93 | |||
94 | major = 1; | ||
95 | minor = 0; | ||
96 | if (sun4v_hvapi_register(HV_GRP_SOFT_STATE, major, &minor)) | ||
97 | return; | ||
98 | |||
99 | hv_supports_soft_state = 1; | ||
100 | |||
101 | prom_sun4v_guest_soft_state(); | ||
102 | atomic_notifier_chain_register(&panic_notifier_list, | ||
103 | &sstate_panic_block); | ||
104 | } | ||
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 6e5b01d779d2..0c9995c3b8ed 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <asm/tsb.h> | 43 | #include <asm/tsb.h> |
44 | #include <asm/hypervisor.h> | 44 | #include <asm/hypervisor.h> |
45 | #include <asm/prom.h> | 45 | #include <asm/prom.h> |
46 | #include <asm/sstate.h> | ||
46 | 47 | ||
47 | extern void device_scan(void); | 48 | extern void device_scan(void); |
48 | 49 | ||
@@ -1348,6 +1349,8 @@ void __init paging_init(void) | |||
1348 | kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL; | 1349 | kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL; |
1349 | kern_size = (unsigned long)&_end - (unsigned long)KERNBASE; | 1350 | kern_size = (unsigned long)&_end - (unsigned long)KERNBASE; |
1350 | 1351 | ||
1352 | sstate_booting(); | ||
1353 | |||
1351 | /* Invalidate both kernel TSBs. */ | 1354 | /* Invalidate both kernel TSBs. */ |
1352 | memset(swapper_tsb, 0x40, sizeof(swapper_tsb)); | 1355 | memset(swapper_tsb, 0x40, sizeof(swapper_tsb)); |
1353 | #ifndef CONFIG_DEBUG_PAGEALLOC | 1356 | #ifndef CONFIG_DEBUG_PAGEALLOC |
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 0b4213720d43..f3e0c14e9eef 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
@@ -15,6 +15,25 @@ | |||
15 | #include <asm/oplib.h> | 15 | #include <asm/oplib.h> |
16 | #include <asm/system.h> | 16 | #include <asm/system.h> |
17 | 17 | ||
18 | int prom_service_exists(const char *service_name) | ||
19 | { | ||
20 | int err = p1275_cmd("test", P1275_ARG(0, P1275_ARG_IN_STRING) | | ||
21 | P1275_INOUT(1, 1), service_name); | ||
22 | |||
23 | if (err) | ||
24 | return 0; | ||
25 | return 1; | ||
26 | } | ||
27 | |||
28 | void prom_sun4v_guest_soft_state(void) | ||
29 | { | ||
30 | const char *svc = "SUNW,soft-state-supported"; | ||
31 | |||
32 | if (!prom_service_exists(svc)) | ||
33 | return; | ||
34 | p1275_cmd(svc, P1275_INOUT(0, 0)); | ||
35 | } | ||
36 | |||
18 | /* Reset and reboot the machine with the command 'bcommand'. */ | 37 | /* Reset and reboot the machine with the command 'bcommand'. */ |
19 | void prom_reboot(const char *bcommand) | 38 | void prom_reboot(const char *bcommand) |
20 | { | 39 | { |