Skip to contentSkip to conversation

m68k: amiga: Fix Denise detection on OCS

PATCH Applied Geert Uytterhoeven 1 participant 2 messages Jan 12, 2020 – Aug 26, 2020 m68k architecture

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH 1/1 m68k: amiga: Fix Denise detection on OCS

The "default" statement for detecting an original Denise chip seems to be misplaced, causing original Denise chips not being detected.

Fix this by moving it from the outer to the inner "switch" statement.

Fortunately no code relies on this, but the detected version is printed during boot, and available through /proc/hardware.

---
Untested due to lack of hardware.

- Anyone with an old A2000 with accelerator running Linux?
- The initital version of Denise does not have the DENISEID register, and reading it returns random data (last value seen on the bus). Has anyone ever seen it being mis-identified by Linux as Denise HR or Lisa?

---
 arch/m68k/amiga/config.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68k/amiga/config.c +3 -3
index c32ab8041cf6b8dc..95bcd4a13bf86741 100644
@@ -278,11 +278,11 @@ static void __init amiga_identify(void)
 			case 0x08:
 				AMIGAHW_SET(LISA);
 				break;
+			default:
+				AMIGAHW_SET(DENISE);
+				break;
 			}
 			break;
-		default:
-			AMIGAHW_SET(DENISE);
-			break;
 		}
 		switch ((amiga_custom.vposr>>8) & 0x7f) {
 		case 0x00:
Signature · 1 line
2.17.1
author maintainer Applied
#1 lore raw
Quoted 9 lines · Geert Uytterhoeven

The "default" statement for detecting an original Denise chip seems to be misplaced, causing original Denise chips not being detected.

Fix this by moving it from the outer to the inner "switch" statement.

Fortunately no code relies on this, but the detected version is printed during boot, and available through /proc/hardware.

Applied, and queued in the m68k for-v5.10 branch.

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