Commit a7f4d00a authored Sep 22, 2011 by Geert Uytterhoeven Committed by Linus Torvalds Sep 22, 2011

zorro: Defer device_register() until all devices have been identified



As the Amiga Zorro II address space is limited to 8.5 MiB and Zorro
devices can contain only one BAR, several Amiga Zorro II expansion
boards (mainly graphics cards) contain multiple Zorro devices: a small
one for the control registers and one (or more) for the graphics memory.

The conversion of cirrusfb to the new driver framework introduced a
regression: the driver contains a zorro_driver for the first Zorro
device, and uses the (old) zorro_find_device() call to find the second
Zorro device.

However, as the Zorro core calls device_register() as soon as a Zorro
device is identified, it may not have identified the second Zorro device
belonging to the same physical Zorro expansion card.  Hence cirrusfb
could no longer find the second part of the Picasso II graphics card,
causing a NULL pointer dereference.

Defer the registration of Zorro devices with the driver framework until
all Zorro devices have been identified to fix this.

Note that the alternative solution (modifying cirrusfb to register a
zorro_driver for all Zorro devices belonging to a graphics card, instead
of only for the first one, and adding a synchronization mechanism to
defer initialization until all have been found), is not an option, as on
some cards one device may be optional (e.g.  the second bank of 2 MiB of
graphics memory on the Picasso IV in Zorro II mode).

Reported-by: Ingo Jürgensmann <ij@2011.bluespice.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent fae3f6f2

drivers/zorro/zorro.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -148,10 +148,10 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
		}
		platform_set_drvdata(pdev, bus);

		/* Register all devices */
		pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n",
		zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");

		/* First identify all devices ... */
		for (i = 0; i < zorro_num_autocon; i++) {
		z = &zorro_autocon[i];
		z->id = (z->rom.er_Manufacturer<<16) \| (z->rom.er_Product<<8);
		@@ -172,6 +172,11 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
		dev_set_name(&z->dev, "%02x", i);
		z->dev.parent = &bus->dev;
		z->dev.bus = &zorro_bus_type;
		}

		/* ... then register them */
		for (i = 0; i < zorro_num_autocon; i++) {
		z = &zorro_autocon[i];
		error = device_register(&z->dev);
		if (error) {
		dev_err(&bus->dev, "Error registering device %s\n",

Admin message