Skip to contentSkip to conversation

m68k/sun3: Fix virtual addresses of clock and interrupt register

PATCH In review Alexander Kuleshov 3 participants 5 messages Sep 14, 2015 – Sep 25, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k/sun3: Fix virtual addresses of clock and interrupt register

The MMU base is 32 bits size - 0xfe000000, seems that we missed one zero in the definition of the clock and interrupt register addresses.

---
 arch/m68k/sun3/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/m68k/sun3/config.c +2 -2
index a8b942b..c9c388f 100644
@@ -61,8 +61,8 @@ void __init sun3_init(void)
 	m68k_cputype = CPU_68020;
 	m68k_fputype = FPU_68881; /* mc68881 actually */
 	m68k_mmutype = MMU_SUN3;
-	clock_va    =          (char *) 0xfe06000;	/* dark  */
-	sun3_intreg = (unsigned char *) 0xfe0a000;	/* magic */
+	clock_va    =          (char *) 0xfe006000;	/* dark  */
+	sun3_intreg = (unsigned char *) 0xfe00a000;	/* magic */
 	sun3_disable_interrupts();
 
 	prom_init((void *)LINUX_OPPROM_BEGVM);
Signature · 1 line
2.5.0
#1 lore raw

Hi Alexander,

Quoted 3 lines · Alexander Kuleshov

The MMU base is 32 bits size - 0xfe000000, seems that we missed one zero in the definition of the clock and interrupt register addresses.

Thanks for your patch!

Have you tested this?

This means enabling/disabling interrupts never worked on Sun 3, which I find a bit difficult to believe.
There are other 0x0f?????? addresses in arch/m68k/sun3/mmu_emu.c.

Quoted 10 lines
---
 arch/m68k/sun3/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/m68k/sun3/config.c +0 -0
index a8b942b..c9c388f 100644

arch/m68k/sun3/config.c void __init sun3_init(void) · line 66

Quoted 8 lines
arch/m68k/sun3/config.c +2 -2
@@ -61,8 +61,8 @@ void __init sun3_init(void)
        m68k_cputype = CPU_68020;
        m68k_fputype = FPU_68881; /* mc68881 actually */
        m68k_mmutype = MMU_SUN3;
-       clock_va    =          (char *) 0xfe06000;      /* dark  */
-       sun3_intreg = (unsigned char *) 0xfe0a000;      /* magic */
+       clock_va    =          (char *) 0xfe006000;     /* dark  */
+       sun3_intreg = (unsigned char *) 0xfe00a000;     /* magic */
        sun3_disable_interrupts();

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw

Hello Geert

Quoted 6 lines · Geert Uytterhoeven

Have you tested this?

This means enabling/disabling interrupts never worked on Sun 3, which I find a bit difficult to believe.
There are other 0x0f?????? addresses in arch/m68k/sun3/mmu_emu.c.

Nope, just trying to do it in virtual machine, I'm learning sun3 architecture now
and have some cleanups patches for it. I'll send these patches and provide more feedback when I'm able to test it.

#3 lore raw
In reply to Geert Uytterhoeven

Hello Geert

Quoted 6 lines · Geert Uytterhoeven

Have you tested this?

This means enabling/disabling interrupts never worked on Sun 3, which I find a bit difficult to believe.
There are other 0x0f?????? addresses in arch/m68k/sun3/mmu_emu.c.

Nope, just trying to do it in virtual machine, I'm learning sun3 architecture now
and have some cleanups patches for it. I'll send these patches and provide more feedback when I'm able to test it.

#4 lore raw
In reply to Geert Uytterhoeven
Quoted 6 lines · Geert Uytterhoeven
Quoted 3 lines · Alexander Kuleshov

The MMU base is 32 bits size - 0xfe000000, seems that we missed one zero in the definition of the clock and interrupt register addresses.

Quoted 7 lines

Thanks for your patch!

Have you tested this?

This means enabling/disabling interrupts never worked on Sun 3, which I find a bit difficult to believe.
There are other 0x0f?????? addresses in arch/m68k/sun3/mmu_emu.c.

which are the correct one. Sun3 MMU doesn't even handle full 32bit addresses, it's only capable of 28 bits. That's the reason why normal m68k linux user space binaries can't work.

So this patch is broken. And I'm sure the unpatched version works.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]