Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (36 commits)
  ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
  scc_pata: kill unused variables
  sgiioc4: kill duplicate ioremap()
  sgiioc4: kill useless address checks
  delkin_cb: add PM support
  ide: remove broken hpt34x driver
  ide-floppy: remove idefloppy_floppy_t typedef
  sgiioc4: remove maskproc() method
  hpt366: cleanup maskproc() method
  ide: mask interrupt in ide_config_drive_speed()
  hpt366: fix compile warning
  ide: remove unused macros from <asm-parisc/ide.h>
  ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>
  ide: remove dead <asm-arm/arch-sa1100/ide.h>
  ide: fix support for IDE PCI controllers using MMIO on frv
  ide-cd: remove stale comment
  ide-cd: small drive type print fix
  ide-cd: debug log enhancements
  ide: add generic ATA/ATAPI disk driver
  ide: allow device drivers to specify per-device type /proc settings
  ...

1 files changed, 62 insertions, 320 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 3853bde8eedc..223750c1b5a6 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -14,9 +14,6 @@
  * This is the IDE/ATA disk driver, as evolved from hd.c and ide.c.
  */
 
-#define IDEDISK_VERSION "1.18"
-
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
@@ -39,46 +36,8 @@
 #include <asm/io.h>
 #include <asm/div64.h>
 
-#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
-#define IDE_DISK_MINORS         (1 << PARTN_BITS)
-#else
-#define IDE_DISK_MINORS         0
-#endif
-
 #include "ide-disk.h"
 
-static DEFINE_MUTEX(idedisk_ref_mutex);
-
-#define to_ide_disk(obj) container_of(obj, struct ide_disk_obj, kref)
-
-static void ide_disk_release(struct kref *);
-
-static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)
-{
-        struct ide_disk_obj *idkp = NULL;
-
-        mutex_lock(&idedisk_ref_mutex);
-        idkp = ide_disk_g(disk);
-        if (idkp) {
-                if (ide_device_get(idkp->drive))
-                        idkp = NULL;
-                else
-                        kref_get(&idkp->kref);
-        }
-        mutex_unlock(&idedisk_ref_mutex);
-        return idkp;
-}
-
-static void ide_disk_put(struct ide_disk_obj *idkp)
-{
-        ide_drive_t *drive = idkp->drive;
-
-        mutex_lock(&idedisk_ref_mutex);
-        kref_put(&idkp->kref, ide_disk_release);
-        ide_device_put(drive);
-        mutex_unlock(&idedisk_ref_mutex);
-}
-
 static const u8 ide_rw_cmds[] = {
         ATA_CMD_READ_MULTI,
         ATA_CMD_WRITE_MULTI,
@@ -374,7 +333,7 @@ static void idedisk_check_hpa(ide_drive_t *drive)
         }
 }
 
-static void init_idedisk_capacity(ide_drive_t *drive)
+static int ide_disk_get_capacity(ide_drive_t *drive)
 {
         u16 *id = drive->id;
         int lba;
@@ -403,11 +362,28 @@ static void init_idedisk_capacity(ide_drive_t *drive)
                 if (ata_id_hpa_enabled(id))
                         idedisk_check_hpa(drive);
         }
-}
 
-sector_t ide_disk_capacity(ide_drive_t *drive)
-{
-        return drive->capacity64;
+        /* limit drive capacity to 137GB if LBA48 cannot be used */
+        if ((drive->dev_flags & IDE_DFLAG_LBA48) == 0 &&
+            drive->capacity64 > 1ULL << 28) {
+                printk(KERN_WARNING "%s: cannot use LBA48 - full capacity "
+                       "%llu sectors (%llu MB)\n",
+                       drive->name, (unsigned long long)drive->capacity64,
+                       sectors_to_MB(drive->capacity64));
+                drive->capacity64 = 1ULL << 28;
+        }
+
+        if ((drive->hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) &&
+            (drive->dev_flags & IDE_DFLAG_LBA48)) {
+                if (drive->capacity64 > 1ULL << 28) {
+                        printk(KERN_INFO "%s: cannot use LBA48 DMA - PIO mode"
+                                         " will be used for accessing sectors "
+                                         "> %u\n", drive->name, 1 << 28);
+                } else
+                        drive->dev_flags &= ~IDE_DFLAG_LBA48;
+        }
+
+        return 0;
 }
 
 static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
@@ -508,7 +484,7 @@ static void update_ordered(ide_drive_t *drive)
                  * time we have trimmed the drive capacity if LBA48 is
                  * not available so we don't need to recheck that.
                  */
-                capacity = ide_disk_capacity(drive);
+                capacity = ide_gd_capacity(drive);
                 barrier = ata_id_flush_enabled(id) &&
                         (drive->dev_flags & IDE_DFLAG_NOFLUSH) == 0 &&
                         ((drive->dev_flags & IDE_DFLAG_LBA48) == 0 ||
@@ -616,7 +592,12 @@ ide_ext_devset_rw(wcache, wcache);
 
 ide_ext_devset_rw_sync(nowerr, nowerr);
 
-static void idedisk_setup(ide_drive_t *drive)
+static int ide_disk_check(ide_drive_t *drive, const char *s)
+{
+        return 1;
+}
+
+static void ide_disk_setup(ide_drive_t *drive)
 {
         struct ide_disk_obj *idkp = drive->driver_data;
         ide_hwif_t *hwif = drive->hwif;
@@ -652,33 +633,13 @@ static void idedisk_setup(ide_drive_t *drive)
                          drive->queue->max_sectors / 2);
 
         /* calculate drive capacity, and select LBA if possible */
-        init_idedisk_capacity(drive);
-
-        /* limit drive capacity to 137GB if LBA48 cannot be used */
-        if ((drive->dev_flags & IDE_DFLAG_LBA48) == 0 &&
-            drive->capacity64 > 1ULL << 28) {
-                printk(KERN_WARNING "%s: cannot use LBA48 - full capacity "
-                       "%llu sectors (%llu MB)\n",
-                       drive->name, (unsigned long long)drive->capacity64,
-                       sectors_to_MB(drive->capacity64));
-                drive->capacity64 = 1ULL << 28;
-        }
-
-        if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) &&
-            (drive->dev_flags & IDE_DFLAG_LBA48)) {
-                if (drive->capacity64 > 1ULL << 28) {
-                        printk(KERN_INFO "%s: cannot use LBA48 DMA - PIO mode"
-                                         " will be used for accessing sectors "
-                                         "> %u\n", drive->name, 1 << 28);
-                } else
-                        drive->dev_flags &= ~IDE_DFLAG_LBA48;
-        }
+        ide_disk_get_capacity(drive);
 
         /*
          * if possible, give fdisk access to more of the drive,
          * by correcting bios_cyls:
          */
-        capacity = ide_disk_capacity(drive);
+        capacity = ide_gd_capacity(drive);
 
         if ((drive->dev_flags & IDE_DFLAG_FORCED_GEOM) == 0) {
                 if (ata_id_lba48_enabled(drive->id)) {
@@ -718,9 +679,17 @@ static void idedisk_setup(ide_drive_t *drive)
                 drive->dev_flags |= IDE_DFLAG_WCACHE;
 
         set_wcache(drive, 1);
+
+        if ((drive->dev_flags & IDE_DFLAG_LBA) == 0 &&
+            (drive->head == 0 || drive->head > 16)) {
+                printk(KERN_ERR "%s: invalid geometry: %d physical heads?\n",
+                        drive->name, drive->head);
+                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
+        } else
+                drive->dev_flags |= IDE_DFLAG_ATTACH;
 }
 
-static void ide_cacheflush_p(ide_drive_t *drive)
+static void ide_disk_flush(ide_drive_t *drive)
 {
         if (ata_id_flush_enabled(drive->id) == 0 ||
             (drive->dev_flags & IDE_DFLAG_WCACHE) == 0)
@@ -730,267 +699,40 @@ static void ide_cacheflush_p(ide_drive_t *drive)
                 printk(KERN_INFO "%s: wcache flush failed!\n", drive->name);
 }
 
-static void ide_disk_remove(ide_drive_t *drive)
-{
-        struct ide_disk_obj *idkp = drive->driver_data;
-        struct gendisk *g = idkp->disk;
-
-        ide_proc_unregister_driver(drive, idkp->driver);
-
-        del_gendisk(g);
-
-        ide_cacheflush_p(drive);
-
-        ide_disk_put(idkp);
-}
-
-static void ide_disk_release(struct kref *kref)
-{
-        struct ide_disk_obj *idkp = to_ide_disk(kref);
-        ide_drive_t *drive = idkp->drive;
-        struct gendisk *g = idkp->disk;
-
-        drive->driver_data = NULL;
-        g->private_data = NULL;
-        put_disk(g);
-        kfree(idkp);
-}
-
-static int ide_disk_probe(ide_drive_t *drive);
-
-/*
- * On HPA drives the capacity needs to be
- * reinitilized on resume otherwise the disk
- * can not be used and a hard reset is required
- */
-static void ide_disk_resume(ide_drive_t *drive)
+static int ide_disk_init_media(ide_drive_t *drive, struct gendisk *disk)
 {
-        if (ata_id_hpa_enabled(drive->id))
-                init_idedisk_capacity(drive);
-}
-
-static void ide_device_shutdown(ide_drive_t *drive)
-{
-#ifdef  CONFIG_ALPHA
-        /* On Alpha, halt(8) doesn't actually turn the machine off,
-           it puts you into the sort of firmware monitor. Typically,
-           it's used to boot another kernel image, so it's not much
-           different from reboot(8). Therefore, we don't need to
-           spin down the disk in this case, especially since Alpha
-           firmware doesn't handle disks in standby mode properly.
-           On the other hand, it's reasonably safe to turn the power
-           off when the shutdown process reaches the firmware prompt,
-           as the firmware initialization takes rather long time -
-           at least 10 seconds, which should be sufficient for
-           the disk to expire its write cache. */
-        if (system_state != SYSTEM_POWER_OFF) {
-#else
-        if (system_state == SYSTEM_RESTART) {
-#endif
-                ide_cacheflush_p(drive);
-                return;
-        }
-
-        printk(KERN_INFO "Shutdown: %s\n", drive->name);
-
-        drive->gendev.bus->suspend(&drive->gendev, PMSG_SUSPEND);
+        return 0;
 }
 
-static ide_driver_t idedisk_driver = {
-        .gen_driver = {
-                .owner          = THIS_MODULE,
-                .name           = "ide-disk",
-                .bus            = &ide_bus_type,
-        },
-        .probe                  = ide_disk_probe,
-        .remove                 = ide_disk_remove,
-        .resume                 = ide_disk_resume,
-        .shutdown               = ide_device_shutdown,
-        .version                = IDEDISK_VERSION,
-        .do_request             = ide_do_rw_disk,
-        .end_request            = ide_end_request,
-        .error                  = __ide_error,
-#ifdef CONFIG_IDE_PROC_FS
-        .proc                   = ide_disk_proc,
-        .settings               = ide_disk_settings,
-#endif
-};
-
-static int idedisk_set_doorlock(ide_drive_t *drive, int on)
+static int ide_disk_set_doorlock(ide_drive_t *drive, struct gendisk *disk,
+                                 int on)
 {
         ide_task_t task;
+        int ret;
+
+        if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0)
+                return 0;
 
         memset(&task, 0, sizeof(task));
         task.tf.command = on ? ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK;
         task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
 
-        return ide_no_data_taskfile(drive, &task);
-}
-
-static int idedisk_open(struct inode *inode, struct file *filp)
-{
-        struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct ide_disk_obj *idkp;
-        ide_drive_t *drive;
-
-        idkp = ide_disk_get(disk);
-        if (idkp == NULL)
-                return -ENXIO;
-
-        drive = idkp->drive;
-
-        idkp->openers++;
-
-        if ((drive->dev_flags & IDE_DFLAG_REMOVABLE) && idkp->openers == 1) {
-                check_disk_change(inode->i_bdev);
-                /*
-                 * Ignore the return code from door_lock,
-                 * since the open() has already succeeded,
-                 * and the door_lock is irrelevant at this point.
-                 */
-                if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) &&
-                    idedisk_set_doorlock(drive, 1))
-                        drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
-        }
-        return 0;
-}
-
-static int idedisk_release(struct inode *inode, struct file *filp)
-{
-        struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct ide_disk_obj *idkp = ide_disk_g(disk);
-        ide_drive_t *drive = idkp->drive;
-
-        if (idkp->openers == 1)
-                ide_cacheflush_p(drive);
-
-        if ((drive->dev_flags & IDE_DFLAG_REMOVABLE) && idkp->openers == 1) {
-                if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) &&
-                    idedisk_set_doorlock(drive, 0))
-                        drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
-        }
+        ret = ide_no_data_taskfile(drive, &task);
 
-        idkp->openers--;
+        if (ret)
+                drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
 
-        ide_disk_put(idkp);
-
-        return 0;
-}
-
-static int idedisk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-{
-        struct ide_disk_obj *idkp = ide_disk_g(bdev->bd_disk);
-        ide_drive_t *drive = idkp->drive;
-
-        geo->heads = drive->bios_head;
-        geo->sectors = drive->bios_sect;
-        geo->cylinders = (u16)drive->bios_cyl; /* truncate */
-        return 0;
+        return ret;
 }
 
-static int idedisk_media_changed(struct gendisk *disk)
-{
-        struct ide_disk_obj *idkp = ide_disk_g(disk);
-        ide_drive_t *drive = idkp->drive;
-
-        /* do not scan partitions twice if this is a removable device */
-        if (drive->dev_flags & IDE_DFLAG_ATTACH) {
-                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
-                return 0;
-        }
-
-        /* if removable, always assume it was changed */
-        return !!(drive->dev_flags & IDE_DFLAG_REMOVABLE);
-}
-
-static int idedisk_revalidate_disk(struct gendisk *disk)
-{
-        struct ide_disk_obj *idkp = ide_disk_g(disk);
-        set_capacity(disk, ide_disk_capacity(idkp->drive));
-        return 0;
-}
-
-static struct block_device_operations idedisk_ops = {
-        .owner                  = THIS_MODULE,
-        .open                   = idedisk_open,
-        .release                = idedisk_release,
-        .ioctl                  = ide_disk_ioctl,
-        .getgeo                 = idedisk_getgeo,
-        .media_changed          = idedisk_media_changed,
-        .revalidate_disk        = idedisk_revalidate_disk
+const struct ide_disk_ops ide_ata_disk_ops = {
+        .check          = ide_disk_check,
+        .get_capacity   = ide_disk_get_capacity,
+        .setup          = ide_disk_setup,
+        .flush          = ide_disk_flush,
+        .init_media     = ide_disk_init_media,
+        .set_doorlock   = ide_disk_set_doorlock,
+        .do_request     = ide_do_rw_disk,
+        .end_request    = ide_end_request,
+        .ioctl          = ide_disk_ioctl,
 };
-
-MODULE_DESCRIPTION("ATA DISK Driver");
-
-static int ide_disk_probe(ide_drive_t *drive)
-{
-        struct ide_disk_obj *idkp;
-        struct gendisk *g;
-
-        /* strstr("foo", "") is non-NULL */
-        if (!strstr("ide-disk", drive->driver_req))
-                goto failed;
-
-        if (drive->media != ide_disk)
-                goto failed;
-
-        idkp = kzalloc(sizeof(*idkp), GFP_KERNEL);
-        if (!idkp)
-                goto failed;
-
-        g = alloc_disk_node(IDE_DISK_MINORS, hwif_to_node(drive->hwif));
-        if (!g)
-                goto out_free_idkp;
-
-        ide_init_disk(g, drive);
-
-        kref_init(&idkp->kref);
-
-        idkp->drive = drive;
-        idkp->driver = &idedisk_driver;
-        idkp->disk = g;
-
-        g->private_data = &idkp->driver;
-
-        drive->driver_data = idkp;
-
-        idedisk_setup(drive);
-        if ((drive->dev_flags & IDE_DFLAG_LBA) == 0 &&
-            (drive->head == 0 || drive->head > 16)) {
-                printk(KERN_ERR "%s: INVALID GEOMETRY: %d PHYSICAL HEADS?\n",
-                        drive->name, drive->head);
-                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
-        } else
-                drive->dev_flags |= IDE_DFLAG_ATTACH;
-
-        g->minors = IDE_DISK_MINORS;
-        g->driverfs_dev = &drive->gendev;
-        g->flags |= GENHD_FL_EXT_DEVT;
-        if (drive->dev_flags & IDE_DFLAG_REMOVABLE)
-                g->flags = GENHD_FL_REMOVABLE;
-        set_capacity(g, ide_disk_capacity(drive));
-        g->fops = &idedisk_ops;
-        add_disk(g);
-        return 0;
-
-out_free_idkp:
-        kfree(idkp);
-failed:
-        return -ENODEV;
-}
-
-static void __exit idedisk_exit(void)
-{
-        driver_unregister(&idedisk_driver.gen_driver);
-}
-
-static int __init idedisk_init(void)
-{
-        return driver_register(&idedisk_driver.gen_driver);
-}
-
-MODULE_ALIAS("ide:*m-disk*");
-MODULE_ALIAS("ide-disk");
-module_init(idedisk_init);
-module_exit(idedisk_exit);
-MODULE_LICENSE("GPL");