Skip to contentSkip to conversation

amiga: turn off all incoming interrupts from the Warp1260

PATCH Superseded Paolo Pisati 3 participants 4 messages May 29, 2024 – May 30, 2024 m68k architecture

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover amiga: turn off all incoming interrupts from the Warp1260

The CS-Lab people told me where to find the interrupt ctrl register (and its layout), so here is a patch that turn off all incoming interrupts during config.c::amiga_parse_bootinfo().

With this patch applied, Linux finally boots on my Amiga 1200 + Warp 1260 board.

Paolo Pisati (1):
m68k: amiga: config: upon boot, turn off all incoming interrupts from

    the Warp1260
 arch/m68k/amiga/config.c       | 9 +++++++++
 include/uapi/linux/zorro_ids.h | 3 +++
 2 files changed, 12 insertions(+)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/1 m68k: amiga: config: upon boot, turn off all incoming interrupts from the Warp1260

---
 arch/m68k/amiga/config.c       | 9 +++++++++
 include/uapi/linux/zorro_ids.h | 3 +++
 2 files changed, 12 insertions(+)
arch/m68k/amiga/config.c +9 -0
index 3137b45750df..8bbf7372a5fe 100644
@@ -180,6 +180,15 @@ int __init amiga_parse_bootinfo(const struct bi_record *record)
 			dev->slotsize = be16_to_cpu(cd->cd_SlotSize);
 			dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);
 			dev->boardsize = be32_to_cpu(cd->cd_BoardSize);
+
+			/* CS-LAB Warp 1260 workaround */
+			if (be16_to_cpu(dev->rom.er_Manufacturer) == ZORRO_MANUF(ZORRO_PROD_CSLAB_WARP_1260) &&
+			    dev->rom.er_Product == ZORRO_PROD(ZORRO_PROD_CSLAB_WARP_1260)) {
+
+				/* turn off all interrupts */
+				uint32_t *int_reg = (uint32_t *)(dev->boardaddr + 0x1000);
+				*int_reg = 0x0FFF;
+			}
 		} else
 			pr_warn("amiga_parse_bootinfo: too many AutoConfig devices\n");
 #endif /* CONFIG_ZORRO */
include/uapi/linux/zorro_ids.h +3 -0
index 6e574d7b7d79..393f2ee9c042 100644
@@ -449,6 +449,9 @@
 #define  ZORRO_PROD_VMC_ISDN_BLASTER_Z2				ZORRO_ID(VMC, 0x01, 0)
 #define  ZORRO_PROD_VMC_HYPERCOM_4				ZORRO_ID(VMC, 0x02, 0)
 
+#define ZORRO_MANUF_CSLAB					0x1400
+#define  ZORRO_PROD_CSLAB_WARP_1260				ZORRO_ID(CSLAB, 0x65, 0)
+
 #define ZORRO_MANUF_INFORMATION					0x157C
 #define  ZORRO_PROD_INFORMATION_ISDN_ENGINE_I			ZORRO_ID(INFORMATION, 0x64, 0)
 
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 1/1] m68k: amiga: config: upon boot, turn off all incoming interrupts from the Warp1260

Hi Paolo,

Quoted 1 line · Paolo Pisati

Thanks for your patch!

arch/m68k/amiga/config.c int __init amiga_parse_bootinfo(const struct bi_record *record) · line 186

Quoted 10 lines
arch/m68k/amiga/config.c +4 -0
@@ -180,6 +180,15 @@ int __init amiga_parse_bootinfo(const struct bi_record *record)
                        dev->slotsize = be16_to_cpu(cd->cd_SlotSize);
                        dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);
                        dev->boardsize = be32_to_cpu(cd->cd_BoardSize);
+
+                       /* CS-LAB Warp 1260 workaround */
+                       if (be16_to_cpu(dev->rom.er_Manufacturer) == ZORRO_MANUF(ZORRO_PROD_CSLAB_WARP_1260) &&
+                           dev->rom.er_Product == ZORRO_PROD(ZORRO_PROD_CSLAB_WARP_1260)) {

Probably we want a pr_info() here, so we know the workaround is applied. This also helps debugging if the workaround ever causes an issue.

arch/m68k/amiga/config.c int __init amiga_parse_bootinfo(const struct bi_record *record) · line 190

Quoted 4 lines
arch/m68k/amiga/config.c +4 -0
+
+                               /* turn off all interrupts */
+                               uint32_t *int_reg = (uint32_t *)(dev->boardaddr + 0x1000);
+                               *int_reg = 0x0FFF;

This can be combined:

    *(uint32_t *)(dev->boardaddr + 0x1000) = 0x0FFF;
Quoted 9 lines
arch/m68k/amiga/config.c +1 -0
+                       }
                } else
                        pr_warn("amiga_parse_bootinfo: too many AutoConfig devices\n");
 #endif /* CONFIG_ZORRO */
include/uapi/linux/zorro_ids.h +0 -0
index 6e574d7b7d79..393f2ee9c042 100644

include/uapi/linux/zorro_ids.h line 456

Quoted 8 lines
include/uapi/linux/zorro_ids.h +3 -0
@@ -449,6 +449,9 @@
 #define  ZORRO_PROD_VMC_ISDN_BLASTER_Z2                                ZORRO_ID(VMC, 0x01, 0)
 #define  ZORRO_PROD_VMC_HYPERCOM_4                             ZORRO_ID(VMC, 0x02, 0)
 
+#define ZORRO_MANUF_CSLAB                                      0x1400
+#define  ZORRO_PROD_CSLAB_WARP_1260                            ZORRO_ID(CSLAB, 0x65, 0)
+
 #define ZORRO_MANUF_INFORMATION                                        0x157C
 #define  ZORRO_PROD_INFORMATION_ISDN_ENGINE_I                  ZORRO_ID(INFORMATION, 0x64, 0)

This board does not seem to be in zorro.ids yet.

Adrian: Which repo is the official one?
https://github.com/glaubitz/zorroutils
https://github.com/glaubitz/zorroutils-debian

Looks like Debian no longer has a zorroutils package...

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
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
#3 lore raw
In reply to Paolo Pisati

Paolo,

just a style comment: For a single patch, --compose is  not necessary. Please place the below patch description in the commit message of your patch.

You left the commit message itself empty (aside from your Signed-off-by:). As a result, your patch would go in without any message (unless there's something in b4 that treats single patch submissions with introductory message special).

The commit message usually contains a description of the bug you are fixing. In your case that would be:

Amiga 1200 boot crashes in local_irq_enable() (or auto_irq_enable()) with an interrupt storm. The Warp1260 board interrupts appear to still be active at boot time.

Then a description of what your patch does (which you have below).

You also want a

and

above your Signed-off-by: tag

Cheers,

    Michael

Quoted 14 lines · Paolo Pisati

The CS-Lab people told me where to find the interrupt ctrl register (and its layout), so here is a patch that turn off all incoming interrupts during config.c::amiga_parse_bootinfo().

With this patch applied, Linux finally boots on my Amiga 1200 + Warp 1260 board.

Paolo Pisati (1):
m68k: amiga: config: upon boot, turn off all incoming interrupts from

     the Warp1260
  arch/m68k/amiga/config.c       | 9 +++++++++
  include/uapi/linux/zorro_ids.h | 3 +++
  2 files changed, 12 insertions(+)