lkml.org 
[lkml]   [2018]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] m68k/mac: Use '030 reset method on SE/30
    Date
    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>
    ---
    arch/m68k/mac/misc.c | 18 ++++--------------
    1 file changed, 4 insertions(+), 14 deletions(-)

    diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
    index ebb3b6d169ea..2d8da060f875 100644
    --- a/arch/m68k/mac/misc.c
    +++ b/arch/m68k/mac/misc.c
    @@ -410,9 +410,8 @@ void mac_poweroff(void)

    void mac_reset(void)
    {
    - if (macintosh_config->adb_type == MAC_ADB_II) {
    - unsigned long flags;
    -
    + if (macintosh_config->adb_type == MAC_ADB_II &&
    + macintosh_config->ident != MAC_MODEL_SE30) {
    /* need ROMBASE in booter */
    /* indeed, plus need to MAP THE ROM !! */

    @@ -422,17 +421,8 @@ void mac_reset(void)
    /* works on some */
    rom_reset = (void *) (mac_bi_data.rombase + 0xa);

    - if (macintosh_config->ident == MAC_MODEL_SE30) {
    - /*
    - * MSch: Machines known to crash on ROM reset ...
    - */
    - } else {
    - local_irq_save(flags);
    -
    - rom_reset();
    -
    - local_irq_restore(flags);
    - }
    + local_irq_disable();
    + rom_reset();
    #ifdef CONFIG_ADB_CUDA
    } else if (macintosh_config->adb_type == MAC_ADB_EGRET ||
    macintosh_config->adb_type == MAC_ADB_CUDA) {
    --
    2.19.2
    \
     
     \ /
      Last update: 2018-12-22 04:08    [W:4.131 / U:0.732 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site