Skip to content

Commit ea2abe2

Browse files
committed
zorro: Fix address space collision message with RAM expansion boards
When booting Linux on an Amiga with BigRAMPlus Zorro expansion board: zorro: Address space collision on device Zorro device 12128600 (Individual Computers) [??? 0x50000000-] This happens because the address space occupied by the BigRAMPlus Zorro device is already in use, as it is part of system RAM. Hence the message is harmless. Zorro memory expansion boards have the ERTF_MEMLIST flag set, which tells AmigaOS to link the board's RAM into the free memory list. While we could skip registering the board resource if this flag is set, that may cause issues with Zorro II RAM excluded in a memfile. Hence fix the issue by just ignoring the error if ERTF_MEMLIST is set. Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/20200713072429.6182-1-geert@linux-m68k.org
1 parent 3b0950a commit ea2abe2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/zorro/zorro.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
181181
z->resource.name = z->name;
182182
r = zorro_find_parent_resource(pdev, z);
183183
error = request_resource(r, &z->resource);
184-
if (error)
184+
if (error && !(z->rom.er_Type & ERTF_MEMLIST))
185185
dev_err(&bus->dev,
186186
"Address space collision on device %s %pR\n",
187187
z->name, &z->resource);

0 commit comments

Comments
 (0)