#endif
EXPORT_SYMBOL(noautodma);
-EXPORT_SYMBOL(ide_bus_type);
/*
* This is declared extern in ide.h, for access by other IDE modules:
#endif
}
+extern void ide_arm_init(void);
+
/*
* init_ide_data() sets reasonable default values into all fields
* of all instances of the hwifs and drives, but only on the first call.
ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
#endif
}
-
-/* OBSOLETE: still needed on arm26 and arm */
-#ifdef CONFIG_ARM
- /* Add default hw interfaces */
+#ifdef CONFIG_IDE_ARM
initializing = 1;
- ide_init_default_hwifs();
+ ide_arm_init();
initializing = 0;
#endif
}
return -EBUSY;
}
-EXPORT_SYMBOL(ide_hwif_request_regions);
-
/**
* ide_hwif_release_regions - free IDE resources
*
release_region(hwif->io_ports[i], 1);
}
-EXPORT_SYMBOL(ide_hwif_release_regions);
+/* restore hwif to a sane state */
+static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
+{
+ hwif->hwgroup = tmp_hwif->hwgroup;
+
+ hwif->gendev.parent = tmp_hwif->gendev.parent;
+
+ hwif->proc = tmp_hwif->proc;
+
+ hwif->major = tmp_hwif->major;
+ hwif->straight8 = tmp_hwif->straight8;
+ hwif->bus_state = tmp_hwif->bus_state;
+
+ hwif->atapi_dma = tmp_hwif->atapi_dma;
+ hwif->ultra_mask = tmp_hwif->ultra_mask;
+ hwif->mwdma_mask = tmp_hwif->mwdma_mask;
+ hwif->swdma_mask = tmp_hwif->swdma_mask;
+
+ hwif->chipset = tmp_hwif->chipset;
+ hwif->hold = tmp_hwif->hold;
+
+#ifdef CONFIG_BLK_DEV_IDEPCI
+ hwif->pci_dev = tmp_hwif->pci_dev;
+ hwif->cds = tmp_hwif->cds;
+#endif
+
+ hwif->identify = tmp_hwif->identify;
+ hwif->tuneproc = tmp_hwif->tuneproc;
+ hwif->speedproc = tmp_hwif->speedproc;
+ hwif->selectproc = tmp_hwif->selectproc;
+ hwif->reset_poll = tmp_hwif->reset_poll;
+ hwif->pre_reset = tmp_hwif->pre_reset;
+ hwif->resetproc = tmp_hwif->resetproc;
+ hwif->intrproc = tmp_hwif->intrproc;
+ hwif->maskproc = tmp_hwif->maskproc;
+ hwif->quirkproc = tmp_hwif->quirkproc;
+ hwif->busproc = tmp_hwif->busproc;
+
+ hwif->ata_input_data = tmp_hwif->ata_input_data;
+ hwif->ata_output_data = tmp_hwif->ata_output_data;
+ hwif->atapi_input_bytes = tmp_hwif->atapi_input_bytes;
+ hwif->atapi_output_bytes = tmp_hwif->atapi_output_bytes;
+
+ hwif->ide_dma_read = tmp_hwif->ide_dma_read;
+ hwif->ide_dma_write = tmp_hwif->ide_dma_write;
+ hwif->ide_dma_begin = tmp_hwif->ide_dma_begin;
+ hwif->ide_dma_end = tmp_hwif->ide_dma_end;
+ hwif->ide_dma_check = tmp_hwif->ide_dma_check;
+ hwif->ide_dma_on = tmp_hwif->ide_dma_on;
+ hwif->ide_dma_off_quietly = tmp_hwif->ide_dma_off_quietly;
+ hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq;
+ hwif->ide_dma_host_on = tmp_hwif->ide_dma_host_on;
+ hwif->ide_dma_host_off = tmp_hwif->ide_dma_host_off;
+ hwif->ide_dma_verbose = tmp_hwif->ide_dma_verbose;
+ hwif->ide_dma_lostirq = tmp_hwif->ide_dma_lostirq;
+ hwif->ide_dma_timeout = tmp_hwif->ide_dma_timeout;
+
+ hwif->OUTB = tmp_hwif->OUTB;
+ hwif->OUTBSYNC = tmp_hwif->OUTBSYNC;
+ hwif->OUTW = tmp_hwif->OUTW;
+ hwif->OUTL = tmp_hwif->OUTL;
+ hwif->OUTSW = tmp_hwif->OUTSW;
+ hwif->OUTSL = tmp_hwif->OUTSL;
+
+ hwif->INB = tmp_hwif->INB;
+ hwif->INW = tmp_hwif->INW;
+ hwif->INL = tmp_hwif->INL;
+ hwif->INSW = tmp_hwif->INSW;
+ hwif->INSL = tmp_hwif->INSL;
+
+ hwif->mmio = tmp_hwif->mmio;
+ hwif->rqsize = tmp_hwif->rqsize;
+ hwif->no_lba48 = tmp_hwif->no_lba48;
+
+#ifndef CONFIG_BLK_DEV_IDECS
+ hwif->irq = tmp_hwif->irq;
+#endif
+
+ hwif->dma_base = tmp_hwif->dma_base;
+ hwif->dma_master = tmp_hwif->dma_master;
+ hwif->dma_command = tmp_hwif->dma_command;
+ hwif->dma_vendor1 = tmp_hwif->dma_vendor1;
+ hwif->dma_status = tmp_hwif->dma_status;
+ hwif->dma_vendor3 = tmp_hwif->dma_vendor3;
+ hwif->dma_prdtable = tmp_hwif->dma_prdtable;
+
+ hwif->dma_extra = tmp_hwif->dma_extra;
+ hwif->config_data = tmp_hwif->config_data;
+ hwif->select_data = tmp_hwif->select_data;
+ hwif->autodma = tmp_hwif->autodma;
+ hwif->udma_four = tmp_hwif->udma_four;
+ hwif->no_dsc = tmp_hwif->no_dsc;
+
+ hwif->hwif_data = tmp_hwif->hwif_data;
+}
/**
* ide_unregister - free an ide interface
* Unregister restores the hwif structures to the default state.
* This is raving bonkers.
*/
-
-void ide_unregister (unsigned int index)
+
+void ide_unregister(unsigned int index)
{
ide_drive_t *drive;
- ide_hwif_t *hwif, *g;
+ ide_hwif_t *hwif, *g, *tmp_hwif;
ide_hwgroup_t *hwgroup;
int irq_count = 0, unit, i;
- ide_hwif_t old_hwif;
- if (index >= MAX_HWIFS)
- BUG();
-
+ BUG_ON(index >= MAX_HWIFS);
+
+ tmp_hwif = kmalloc(sizeof(*tmp_hwif), GFP_KERNEL|__GFP_NOFAIL);
+ if (!tmp_hwif) {
+ printk(KERN_ERR "%s: unable to allocate memory\n", __FUNCTION__);
+ return;
+ }
+
BUG_ON(in_interrupt());
BUG_ON(irqs_disabled());
down(&ide_cfg_sem);
drive->dead = 1;
}
hwif->present = 0;
-
+
spin_unlock_irq(&ide_lock);
for (unit = 0; unit < MAX_DRIVES; ++unit) {
continue;
DRIVER(drive)->cleanup(drive);
}
-
+
#ifdef CONFIG_PROC_FS
destroy_proc_ide_drives(hwif);
#endif
hwif->dma_prdtable = 0;
}
- old_hwif = *hwif;
+ /* copy original settings */
+ *tmp_hwif = *hwif;
- init_hwif_data(hwif, index); /* restore hwif data to pristine status */
+ /* restore hwif data to pristine status */
+ init_hwif_data(hwif, index);
init_hwif_default(hwif, index);
- hwif->hwgroup = old_hwif.hwgroup;
-
- hwif->gendev.parent = old_hwif.gendev.parent;
-
- hwif->proc = old_hwif.proc;
-
- hwif->major = old_hwif.major;
-// hwif->index = old_hwif.index;
-// hwif->channel = old_hwif.channel;
- hwif->straight8 = old_hwif.straight8;
- hwif->bus_state = old_hwif.bus_state;
-
- hwif->atapi_dma = old_hwif.atapi_dma;
- hwif->ultra_mask = old_hwif.ultra_mask;
- hwif->mwdma_mask = old_hwif.mwdma_mask;
- hwif->swdma_mask = old_hwif.swdma_mask;
+ ide_hwif_restore(hwif, tmp_hwif);
- hwif->chipset = old_hwif.chipset;
- hwif->hold = old_hwif.hold;
-
-#ifdef CONFIG_BLK_DEV_IDEPCI
- hwif->pci_dev = old_hwif.pci_dev;
- hwif->cds = old_hwif.cds;
-#endif /* CONFIG_BLK_DEV_IDEPCI */
-
-#if 0
- hwif->hwifops = old_hwif.hwifops;
-#else
- hwif->identify = old_hwif.identify;
- hwif->tuneproc = old_hwif.tuneproc;
- hwif->speedproc = old_hwif.speedproc;
- hwif->selectproc = old_hwif.selectproc;
- hwif->reset_poll = old_hwif.reset_poll;
- hwif->pre_reset = old_hwif.pre_reset;
- hwif->resetproc = old_hwif.resetproc;
- hwif->intrproc = old_hwif.intrproc;
- hwif->maskproc = old_hwif.maskproc;
- hwif->quirkproc = old_hwif.quirkproc;
- hwif->busproc = old_hwif.busproc;
-#endif
-
-#if 0
- hwif->pioops = old_hwif.pioops;
-#else
- hwif->ata_input_data = old_hwif.ata_input_data;
- hwif->ata_output_data = old_hwif.ata_output_data;
- hwif->atapi_input_bytes = old_hwif.atapi_input_bytes;
- hwif->atapi_output_bytes = old_hwif.atapi_output_bytes;
-#endif
-
-#if 0
- hwif->dmaops = old_hwif.dmaops;
-#else
- hwif->ide_dma_read = old_hwif.ide_dma_read;
- hwif->ide_dma_write = old_hwif.ide_dma_write;
- hwif->ide_dma_begin = old_hwif.ide_dma_begin;
- hwif->ide_dma_end = old_hwif.ide_dma_end;
- hwif->ide_dma_check = old_hwif.ide_dma_check;
- hwif->ide_dma_on = old_hwif.ide_dma_on;
- hwif->ide_dma_off_quietly = old_hwif.ide_dma_off_quietly;
- hwif->ide_dma_test_irq = old_hwif.ide_dma_test_irq;
- hwif->ide_dma_host_on = old_hwif.ide_dma_host_on;
- hwif->ide_dma_host_off = old_hwif.ide_dma_host_off;
- hwif->ide_dma_verbose = old_hwif.ide_dma_verbose;
- hwif->ide_dma_lostirq = old_hwif.ide_dma_lostirq;
- hwif->ide_dma_timeout = old_hwif.ide_dma_timeout;
-#endif
-
-#if 0
- hwif->iops = old_hwif.iops;
-#else
- hwif->OUTB = old_hwif.OUTB;
- hwif->OUTBSYNC = old_hwif.OUTBSYNC;
- hwif->OUTW = old_hwif.OUTW;
- hwif->OUTL = old_hwif.OUTL;
- hwif->OUTSW = old_hwif.OUTSW;
- hwif->OUTSL = old_hwif.OUTSL;
-
- hwif->INB = old_hwif.INB;
- hwif->INW = old_hwif.INW;
- hwif->INL = old_hwif.INL;
- hwif->INSW = old_hwif.INSW;
- hwif->INSL = old_hwif.INSL;
-#endif
-
- hwif->mmio = old_hwif.mmio;
- hwif->rqsize = old_hwif.rqsize;
- hwif->no_lba48 = old_hwif.no_lba48;
-#ifndef CONFIG_BLK_DEV_IDECS
- hwif->irq = old_hwif.irq;
-#endif /* CONFIG_BLK_DEV_IDECS */
-
- hwif->dma_base = old_hwif.dma_base;
- hwif->dma_master = old_hwif.dma_master;
- hwif->dma_command = old_hwif.dma_command;
- hwif->dma_vendor1 = old_hwif.dma_vendor1;
- hwif->dma_status = old_hwif.dma_status;
- hwif->dma_vendor3 = old_hwif.dma_vendor3;
- hwif->dma_prdtable = old_hwif.dma_prdtable;
-
- hwif->dma_extra = old_hwif.dma_extra;
- hwif->config_data = old_hwif.config_data;
- hwif->select_data = old_hwif.select_data;
- hwif->autodma = old_hwif.autodma;
- hwif->udma_four = old_hwif.udma_four;
- hwif->no_dsc = old_hwif.no_dsc;
-
- hwif->hwif_data = old_hwif.hwif_data;
abort:
spin_unlock_irq(&ide_lock);
up(&ide_cfg_sem);
+
+ kfree(tmp_hwif);
}
EXPORT_SYMBOL(ide_unregister);
*/
}
-EXPORT_SYMBOL(ide_setup_ports);
-
/*
* Register an IDE interface, specifying exactly the registers etc
* Set init=1 iff calling before probes have taken place.
*/
DECLARE_MUTEX(ide_setting_sem);
-EXPORT_SYMBOL(ide_setting_sem);
/**
* ide_add_setting - add an ide setting option
kfree(setting);
}
-/**
- * ide_remove_setting - remove an ide setting option
- * @drive: drive to use
- * @name: setting name
- *
- * Removes the setting named from the device if it is present.
- * The function takes the settings_lock to protect against
- * parallel changes. This function must not be called from IRQ
- * context.
- */
-
-void ide_remove_setting (ide_drive_t *drive, char *name)
-{
- down(&ide_setting_sem);
- __ide_remove_setting(drive, name);
- up(&ide_setting_sem);
-}
-
-EXPORT_SYMBOL(ide_remove_setting);
-
/**
* ide_find_setting_by_ioctl - find a drive specific ioctl
* @drive: drive to scan
return 0;
}
-EXPORT_SYMBOL(ide_write_setting);
-
static int set_io_32bit(ide_drive_t *drive, int arg)
{
drive->io_32bit = arg;
ide_add_setting(drive, "ide-scsi", SETTING_RW, -1, HDIO_SET_IDE_SCSI, TYPE_BYTE, 0, 1, 1, 1, &drive->scsi, ide_atapi_to_scsi);
}
-/*
- * Delay for *at least* 50ms. As we don't know how much time is left
- * until the next tick occurs, we wait an extra tick to be safe.
- * This is used only during the probing/polling for drives at boot time.
- *
- * However, its usefullness may be needed in other places, thus we export it now.
- * The future may change this to a millisecond setable delay.
- */
-void ide_delay_50ms (void)
-{
-#ifndef CONFIG_BLK_DEV_IDECS
- mdelay(50);
-#else
- __set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1+HZ/20);
-#endif /* CONFIG_BLK_DEV_IDECS */
-}
-
-EXPORT_SYMBOL(ide_delay_50ms);
-
int system_bus_clock (void)
{
return((int) ((!system_bus_speed) ? ide_system_bus_speed() : system_bus_speed ));
return 1;
}
-EXPORT_SYMBOL(ide_replace_subdriver);
-
int ata_attach(ide_drive_t *drive)
{
struct list_head *p;
return 1;
}
-EXPORT_SYMBOL(ata_attach);
-
static int generic_ide_suspend(struct device *dev, u32 state)
{
ide_drive_t *drive = dev->driver_data;
ide_drive_t *drive = bdev->bd_disk->private_data;
ide_settings_t *setting;
int err = 0;
+ void __user *p = (void __user *)arg;
down(&ide_setting_sem);
if ((setting = ide_find_setting_by_ioctl(drive, cmd)) != NULL) {
if (cmd == setting->read_ioctl) {
err = ide_read_setting(drive, setting);
up(&ide_setting_sem);
- return err >= 0 ? put_user(err, (long *) arg) : err;
+ return err >= 0 ? put_user(err, (long __user *)arg) : err;
} else {
if (bdev != bdev->bd_contains)
err = -EINVAL;
switch (cmd) {
case HDIO_GETGEO:
{
- struct hd_geometry *loc = (struct hd_geometry *) arg;
- u16 bios_cyl = drive->bios_cyl; /* truncate */
- if (!loc || (drive->media != ide_disk && drive->media != ide_floppy)) return -EINVAL;
- if (put_user(drive->bios_head, (u8 *) &loc->heads)) return -EFAULT;
- if (put_user(drive->bios_sect, (u8 *) &loc->sectors)) return -EFAULT;
- if (put_user(bios_cyl, (u16 *) &loc->cylinders)) return -EFAULT;
- if (put_user((unsigned)get_start_sect(bdev),
- (unsigned long *) &loc->start)) return -EFAULT;
+ struct hd_geometry geom;
+ if (!p || (drive->media != ide_disk && drive->media != ide_floppy)) return -EINVAL;
+ geom.heads = drive->bios_head;
+ geom.sectors = drive->bios_sect;
+ geom.cylinders = (u16)drive->bios_cyl; /* truncate */
+ geom.start = get_start_sect(bdev);
+ if (copy_to_user(p, &geom, sizeof(struct hd_geometry)))
+ return -EFAULT;
return 0;
}
return -EINVAL;
if (drive->id_read == 0)
return -ENOMSG;
- if (copy_to_user((char *)arg, (char *)drive->id, (cmd == HDIO_GET_IDENTITY) ? sizeof(*drive->id) : 142))
+ if (copy_to_user(p, drive->id, (cmd == HDIO_GET_IDENTITY) ? sizeof(*drive->id) : 142))
return -EFAULT;
return 0;
drive->nice0 << IDE_NICE_0 |
drive->nice1 << IDE_NICE_1 |
drive->nice2 << IDE_NICE_2,
- (long *) arg);
+ (long __user *) arg);
#ifdef CONFIG_IDE_TASK_IOCTL
case HDIO_DRIVE_TASKFILE:
hw_regs_t hw;
int args[3];
if (!capable(CAP_SYS_RAWIO)) return -EACCES;
- if (copy_from_user(args, (void *)arg, 3 * sizeof(int)))
+ if (copy_from_user(args, p, 3 * sizeof(int)))
return -EFAULT;
memset(&hw, 0, sizeof(hw));
ide_init_hwif_ports(&hw, (unsigned long) args[0],
case CDROMEJECT:
case CDROMCLOSETRAY:
- return scsi_cmd_ioctl(bdev->bd_disk, cmd, arg);
+ return scsi_cmd_ioctl(bdev->bd_disk, cmd, p);
case HDIO_GET_BUSSTATE:
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
- if (put_user(HWIF(drive)->bus_state, (long *)arg))
+ if (put_user(HWIF(drive)->bus_state, (long __user *)arg))
return -EFAULT;
return 0;
if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) {
const char *hd_words[] = {
"none", "noprobe", "nowerr", "cdrom", "serialize",
- "autotune", "noautotune", "minus8", "swapdata", "bswap",
+ "autotune", "noautotune", "stroke", "swapdata", "bswap",
"minus11", "remap", "remap63", "scsi", NULL };
unit = s[2] - 'a';
hw = unit / MAX_DRIVES;
case -7: /* "noautotune" */
drive->autotune = IDE_TUNE_NOAUTO;
goto done;
+ case -8: /* stroke */
+ drive->stroke = 1;
+ goto done;
case -9: /* "swapdata" */
case -10: /* "bswap" */
drive->bswap = 1;
return 1;
}
+extern void pnpide_init(void);
+extern void h8300_ide_init(void);
+
/*
* probe_for_hwifs() finds/initializes "known" IDE interfaces
*/
pmac_ide_probe();
}
#endif /* CONFIG_BLK_DEV_IDE_PMAC */
-#ifdef CONFIG_BLK_DEV_IDE_SWARM
- {
- extern void swarm_ide_probe(void);
- swarm_ide_probe();
- }
-#endif /* CONFIG_BLK_DEV_IDE_SWARM */
#ifdef CONFIG_BLK_DEV_GAYLE
{
extern void gayle_init(void);
buddha_init();
}
#endif /* CONFIG_BLK_DEV_BUDDHA */
-#if defined(CONFIG_BLK_DEV_IDEPNP) && defined(CONFIG_PNP)
- {
- extern void pnpide_init(int enable);
- pnpide_init(1);
- }
-#endif /* CONFIG_BLK_DEV_IDEPNP */
+#ifdef CONFIG_BLK_DEV_IDEPNP
+ pnpide_init();
+#endif
+#ifdef CONFIG_H8300
+ h8300_ide_init();
+#endif
}
/*
up(&ide_setting_sem);
return 1;
}
-#if defined(CONFIG_BLK_DEV_IDEPNP) && defined(CONFIG_PNP) && defined(MODULE)
- pnpide_init(0);
-#endif /* CONFIG_BLK_DEV_IDEPNP */
#ifdef CONFIG_PROC_FS
ide_remove_proc_entries(drive->proc, DRIVER(drive)->proc);
ide_remove_proc_entries(drive->proc, generic_subdriver_entries);
git://git.onelab.eu / linux-2.6.git / blobdiff