Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
powerpc/powermac: Use sane default baudrate for SCC debugging
When using the "sccdbg" option to route early kernel messages and
xmon to the SCC serial port on PowerMacs, when this wasn't the
configured output port of Open Firmware, we initialize the baudrate
to 57600bps. This isn't a very good default on some powermacs where
both the FW and pmac_zilog will default to 38400. This fixes it to
use the same logic as pmac_zilog to pick a default speed.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+11
-1
arch/powerpc/platforms/powermac/udbg_scc.c
+11
-1
arch/powerpc/platforms/powermac/udbg_scc.c
···
125
125
out_8(sccc, 0xc0);
126
126
127
127
/* If SCC was the OF output port, read the BRG value, else
128
-
* Setup for 57600 8N1
128
+
* Setup for 38400 or 57600 8N1 depending on the machine
129
129
*/
130
130
if (ch_def != NULL) {
131
131
out_8(sccc, 13);
132
132
scc_inittab[1] = in_8(sccc);
133
133
out_8(sccc, 12);
134
134
scc_inittab[3] = in_8(sccc);
135
+
} else if (machine_is_compatible("RackMac1,1")
136
+
|| machine_is_compatible("RackMac1,2")
137
+
|| machine_is_compatible("MacRISC4")) {
138
+
/* Xserves and G5s default to 57600 */
139
+
scc_inittab[1] = 0;
140
+
scc_inittab[3] = 0;
141
+
} else {
142
+
/* Others default to 38400 */
143
+
scc_inittab[1] = 0;
144
+
scc_inittab[3] = 1;
135
145
}
136
146
137
147
for (i = 0; i < sizeof(scc_inittab); ++i)