summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-06-24 14:09:33 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-06-24 14:09:33 +0000
commitc8d64656ccb2c153f149f85de484ae6cfdfcd977 (patch)
tree7e215316c16ff7e97c2d09befd7752e66a3ad0c9
parentf14f29fbffb1c2961b1165783ea5a636abdbeb21 (diff)
Do not quiesce the firmware on Quad G5 to let it manage the fans.
This also unbreak "bsd -cd" on such machine since we use OpenFirmware's input at this stage of the boot process.
-rw-r--r--sys/arch/macppc/macppc/ofw_machdep.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c
index e1af15e5086..a3975df2f74 100644
--- a/sys/arch/macppc/macppc/ofw_machdep.c
+++ b/sys/arch/macppc/macppc/ofw_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofw_machdep.c,v 1.52 2015/06/05 10:24:23 mpi Exp $ */
+/* $OpenBSD: ofw_machdep.c,v 1.53 2015/06/24 14:09:32 mpi Exp $ */
/* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -206,7 +206,6 @@ save_ofw_mapping(void)
{
int chosen, memory, root, mmui, mmu = -1;
int acells, scells;
- char model[32];
int i, len;
if ((chosen = OF_finddevice("/chosen")) == -1)
@@ -260,17 +259,6 @@ save_ofw_mapping(void)
}
/*
- * Tell the firmware to stop pending DMAs, and on the machines
- * listed below it is necessary to shut down the fan management
- * thread.
- */
- len = OF_getprop(root, "model", model, sizeof(model));
- model[len] = 0;
- if (strcmp(model, "PowerMac11,2") == 0 ||
- strcmp(model, "PowerMac12,1") == 0)
- OF_quiesce();
-
- /*
* Next time we'll call the firmware make sure we save and
* restore our MMU settings.
*/