Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3825ac0ee66b50cb0208ee74796fe65f3040e67c

Authored by Paul Mackerras
1 parent 7e9191daf6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

powerpc: Fix crash in early boot on some powermacs 

Some powermac machines were crashing in the quiesce firmware call
in prom_init.c because we have just closed the OF stdin device;
notably my 1999 G3 powerbook does this.  To avoid this, don't
close the OF stdin device on powermacs.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff

arch/powerpc/kernel/prom_init.c
Diff comments   View file @ 3825ac0
... ... @@ -2081,8 +2081,13 @@
2081 2081 prom_printf("copying OF device tree ...\n");
2082 2082 flatten_device_tree();
2083 2083  
2084   - /* in case stdin is USB and still active on IBM machines... */
2085   - prom_close_stdin();
  2084 + /*
  2085 + * in case stdin is USB and still active on IBM machines...
  2086 + * Unfortunately quiesce crashes on some powermacs if we have
  2087 + * closed stdin already (in particular the powerbook 101).
  2088 + */
  2089 + if (RELOC(of_platform) != PLATFORM_POWERMAC)
  2090 + prom_close_stdin();
2086 2091  
2087 2092 /*
2088 2093 * Call OF "quiesce" method to shut down pending DMA's from