Page MenuHomeFreeBSD
Files F161092619

D42339.diff
No OneTemporary
Actions

D42339.diff
View Options

diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c
--- a/sys/powerpc/powermac/cuda.c
+++ b/sys/powerpc/powermac/cuda.c
@@ -748,7 +748,13 @@
struct cuda_softc *sc = xsc;
uint8_t cmd[] = {CUDA_PSEUDO, 0};
- cmd[1] = (howto & RB_HALT) ? CMD_POWEROFF : CMD_RESET;
+ if ((howto & RB_POWEROFF) != 0)
+ cmd[1] = CMD_POWEROFF;
+ else if ((howto & RB_HALT) == 0)
+ cmd[1] = CMD_RESET;
+ else
+ return;
+
cuda_poll(sc->sc_dev);
cuda_send(sc, 1, 2, cmd);
diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c
--- a/sys/powerpc/powermac/pmu.c
+++ b/sys/powerpc/powermac/pmu.c
@@ -812,10 +812,12 @@
struct pmu_softc *sc = xsc;
uint8_t cmd[] = {'M', 'A', 'T', 'T'};
- if (howto & RB_HALT)
+ if ((howto & RB_POWEROFF) != 0)
pmu_send(sc, PMU_POWER_OFF, 4, cmd, 0, NULL);
- else
+ else if ((howto & RB_HALT) == 0)
pmu_send(sc, PMU_RESET_CPU, 0, NULL, 0, NULL);
+ else
+ return;
for (;;);
}
diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c
--- a/sys/powerpc/powermac/smu.c
+++ b/sys/powerpc/powermac/smu.c
@@ -1317,10 +1317,12 @@
struct smu_cmd cmd;
cmd.cmd = SMU_POWER;
- if (howto & RB_HALT)
+ if ((howto & RB_POWEROFF) != 0)
strcpy(cmd.data, "SHUTDOWN");
- else
+ else if ((howto & RB_HALT) == 0)
strcpy(cmd.data, "RESTART");
+ else
+ return;
cmd.len = strlen(cmd.data);
diff --git a/sys/powerpc/powernv/opal_dev.c b/sys/powerpc/powernv/opal_dev.c
--- a/sys/powerpc/powernv/opal_dev.c
+++ b/sys/powerpc/powernv/opal_dev.c
@@ -344,10 +344,12 @@
opal_shutdown(void *arg, int howto)
{
- if (howto & RB_HALT)
+ if ((howto & RB_POWEROFF) != 0)
opal_call(OPAL_CEC_POWER_DOWN, 0 /* Normal power off */);
- else
+ else if ((howto & RB_HALT) == 0)
opal_call(OPAL_CEC_REBOOT);
+ else
+ return;
opal_call(OPAL_RETURN_CPU);
}
diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c
--- a/sys/powerpc/pseries/rtas_dev.c
+++ b/sys/powerpc/pseries/rtas_dev.c
@@ -155,13 +155,13 @@
{
cell_t token, status;
- if (howto & RB_HALT) {
+ if ((howto & RB_POWEROFF) != 0) {
token = rtas_token_lookup("power-off");
if (token == -1)
return;
rtas_call_method(token, 2, 1, 0, 0, &status);
- } else {
+ } else if ((howto & RB_HALT) == 0) {
token = rtas_token_lookup("system-reboot");
if (token == -1)
return;

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 1, 12:06 PM (21 h, 54 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34559213
Default Alt Text
D42339.diff (2 KB)

Event Timeline