mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

m68k/mac: Use '030 reset method on SE/30

Browse source 
The comment says that calling the ROM routine doesn't work. But testing
shows that the 68030 fall-back reset method does work, so just use that.

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Finn Thain 2018-12-22 13:18:01 +11:00 committed by Geert Uytterhoeven
parent bfc7bebe4b
commit 9c0e91f6b7
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/m68k/mac/misc.c
View file

@ -410,9 +410,8 @@ void mac_poweroff(void)
void mac_reset(void) void mac_reset(void)
{ {
if (macintosh_config->adb_type == MAC_ADB_II) { if (macintosh_config->adb_type == MAC_ADB_II &&
unsigned long flags; macintosh_config->ident != MAC_MODEL_SE30) {
/* need ROMBASE in booter */ /* need ROMBASE in booter */
/* indeed, plus need to MAP THE ROM !! */ /* indeed, plus need to MAP THE ROM !! */
@ -422,17 +421,8 @@ void mac_reset(void)
/* works on some */ /* works on some */
rom_reset = (void *) (mac_bi_data.rombase + 0xa); rom_reset = (void *) (mac_bi_data.rombase + 0xa);
if (macintosh_config->ident == MAC_MODEL_SE30) { local_irq_disable();
/* rom_reset();
* MSch: Machines known to crash on ROM reset ...
*/
} else {
local_irq_save(flags);
rom_reset();
local_irq_restore(flags);
}
#ifdef CONFIG_ADB_CUDA #ifdef CONFIG_ADB_CUDA
} else if (macintosh_config->adb_type == MAC_ADB_EGRET || } else if (macintosh_config->adb_type == MAC_ADB_EGRET ||
macintosh_config->adb_type == MAC_ADB_CUDA) { macintosh_config->adb_type == MAC_ADB_CUDA) {