Skip to contentSkip to conversation

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

PATCH Superseded Paolo Pisati 2 participants 2 messages Jun 1, 2024 m68k architecture

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

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

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): CS-Lab told me where to find the interrupt register (and its layout) so here's patch that turns off all incoming interrupts during config.c::amiga_parse_bootinfo().

---
Changes since v2:
-moved changelog history below tags

Changes since v1:
-addressed all comments from Geert and Michael

---
 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..fa74452600c1 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 */
+				pr_info("Warp 1260 card detected: applying interrupt storm workaround");
+				*(uint32_t *)(dev->boardaddr + 0x1000) = 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
#1 lore raw

Hi Paolo,

Quoted 5 lines · Paolo Pisati

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): CS-Lab told me where to find the interrupt register (and its layout) so here's patch that turns off all incoming interrupts during config.c::amiga_parse_bootinfo().

It's not really necessary for a patch to include its history of creation in the long description. Rather, the long description should just explain in detail what the patch does and why it's necessary.

Thus:

Quoted 4 lines

On an Amiga 1200 with equipped Warp1260 accelerator, an interrupt storm coming from the accelerator board causes the machine to crash in local_irq_enable() or auto_irq_enable(). Disabling interrupts for the Warp1260 in amiga_parse_bootinfo() fixes the problem.

I would also rephrase the subject as follows to avoid the comma:

Turn off all incoming interrupts from the Warp1260 during boot

Adrian

Signature · 4 lines
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913