-
Notifications
You must be signed in to change notification settings - Fork 53.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
IDE: Fix platform device registration in Swarm IDE driver (v2)
The Swarm IDE driver uses a release method which is defined in the driver itself thus potentially oopsable. The simple fix would be to just leak the device but this patch goes the full length and moves the entire handling of the platform device in the platform code and retains only the platform driver code in drivers/ide/mips/swarm.c. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: "Maciej W. Rozycki" <macro@linux-mips.org> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> [bart: remove no longer needed BLK_DEV_IDE_SWARM from ide/Kconfig] Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
- Loading branch information
1 parent
22e05b4
commit 2fef357
Showing
5 changed files
with
83 additions
and
203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o | ||
obj-y := platform.o setup.o rtc_xicor1241.o \ | ||
rtc_m41t81.o | ||
|
||
obj-$(CONFIG_I2C_BOARDINFO) += swarm-i2c.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
#include <linux/err.h> | ||
#include <linux/kernel.h> | ||
#include <linux/init.h> | ||
#include <linux/io.h> | ||
#include <linux/platform_device.h> | ||
#include <linux/ata_platform.h> | ||
|
||
#include <asm/sibyte/board.h> | ||
#include <asm/sibyte/sb1250_genbus.h> | ||
#include <asm/sibyte/sb1250_regs.h> | ||
|
||
#define DRV_NAME "pata-swarm" | ||
|
||
#define SWARM_IDE_SHIFT 5 | ||
#define SWARM_IDE_BASE 0x1f0 | ||
#define SWARM_IDE_CTRL 0x3f6 | ||
|
||
static struct resource swarm_pata_resource[] = { | ||
{ | ||
.name = "Swarm GenBus IDE", | ||
.flags = IORESOURCE_MEM, | ||
}, { | ||
.name = "Swarm GenBus IDE", | ||
.flags = IORESOURCE_MEM, | ||
}, { | ||
.name = "Swarm GenBus IDE", | ||
.flags = IORESOURCE_IRQ, | ||
.start = K_INT_GB_IDE, | ||
.end = K_INT_GB_IDE, | ||
}, | ||
}; | ||
|
||
static struct pata_platform_info pata_platform_data = { | ||
.ioport_shift = SWARM_IDE_SHIFT, | ||
}; | ||
|
||
static struct platform_device swarm_pata_device = { | ||
.name = "pata_platform", | ||
.id = -1, | ||
.resource = swarm_pata_resource, | ||
.num_resources = ARRAY_SIZE(swarm_pata_resource), | ||
.dev = { | ||
.platform_data = &pata_platform_data, | ||
.coherent_dma_mask = ~0, /* grumble */ | ||
}, | ||
}; | ||
|
||
static int __init swarm_pata_init(void) | ||
{ | ||
u8 __iomem *base; | ||
phys_t offset, size; | ||
struct resource *r; | ||
|
||
if (!SIBYTE_HAVE_IDE) | ||
return -ENODEV; | ||
|
||
base = ioremap(A_IO_EXT_BASE, 0x800); | ||
offset = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_START_ADDR, IDE_CS)); | ||
size = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_MULT_SIZE, IDE_CS)); | ||
iounmap(base); | ||
|
||
offset = G_IO_START_ADDR(offset) << S_IO_ADDRBASE; | ||
size = (G_IO_MULT_SIZE(size) + 1) << S_IO_REGSIZE; | ||
if (offset < A_PHYS_GENBUS || offset >= A_PHYS_GENBUS_END) { | ||
pr_info(DRV_NAME ": PATA interface at GenBus disabled\n"); | ||
|
||
return -EBUSY; | ||
} | ||
|
||
pr_info(DRV_NAME ": PATA interface at GenBus slot %i\n", IDE_CS); | ||
|
||
r = swarm_pata_resource; | ||
r[0].start = offset + (SWARM_IDE_BASE << SWARM_IDE_SHIFT); | ||
r[0].end = offset + ((SWARM_IDE_BASE + 8) << SWARM_IDE_SHIFT) - 1; | ||
r[1].start = offset + (SWARM_IDE_CTRL << SWARM_IDE_SHIFT); | ||
r[1].end = offset + ((SWARM_IDE_CTRL + 1) << SWARM_IDE_SHIFT) - 1; | ||
|
||
return platform_device_register(&swarm_pata_device); | ||
} | ||
|
||
device_initcall(swarm_pata_init); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o | ||
obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o | ||
|
||
EXTRA_CFLAGS := -Idrivers/ide |
This file was deleted.
Oops, something went wrong.