Patched in Tegra support.

1 files changed, 56 insertions, 48 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 9a289d7c84b..d3834710b95 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/kmod.h>
 #include <linux/kobj_map.h>
+#include <linux/buffer_head.h>
 #include <linux/mutex.h>
 #include <linux/idr.h>
 #include <linux/log2.h>
@@ -35,7 +36,6 @@ static DEFINE_IDR(ext_devt_idr);
 
 static struct device_type disk_type;
 
-static void disk_alloc_events(struct gendisk *disk);
 static void disk_add_events(struct gendisk *disk);
 static void disk_del_events(struct gendisk *disk);
 static void disk_release_events(struct gendisk *disk);
@@ -154,7 +154,7 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter)
                 part = rcu_dereference(ptbl->part[piter->idx]);
                 if (!part)
                         continue;
-                if (!part_nr_sects_read(part) &&
+                if (!part->nr_sects &&
                     !(piter->flags & DISK_PITER_INCL_EMPTY) &&
                     !(piter->flags & DISK_PITER_INCL_EMPTY_PART0 &&
                       piter->idx == 0))
@@ -191,7 +191,7 @@ EXPORT_SYMBOL_GPL(disk_part_iter_exit);
 static inline int sector_in_part(struct hd_struct *part, sector_t sector)
 {
         return part->start_sect <= sector &&
-                sector < part->start_sect + part_nr_sects_read(part);
+                sector < part->start_sect + part->nr_sects;
 }
 
 /**
@@ -507,7 +507,7 @@ static int exact_lock(dev_t devt, void *data)
         return 0;
 }
 
-static void register_disk(struct gendisk *disk)
+void register_disk(struct gendisk *disk)
 {
         struct device *ddev = disk_to_dev(disk);
         struct block_device *bdev;
@@ -536,7 +536,7 @@ static void register_disk(struct gendisk *disk)
         disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
 
         /* No minors to use for partitions */
-        if (!disk_part_scan_enabled(disk))
+        if (!disk_partitionable(disk))
                 goto exit;
 
         /* No such device (e.g., media were just removed) */
@@ -602,8 +602,6 @@ void add_disk(struct gendisk *disk)
         disk->major = MAJOR(devt);
         disk->first_minor = MINOR(devt);
 
-        disk_alloc_events(disk);
-
         /* Register BDI before referencing it from bdev */
         bdi = &disk->queue->backing_dev_info;
         bdi_register_dev(bdi, disk_devt(disk));
@@ -617,7 +615,7 @@ void add_disk(struct gendisk *disk)
          * Take an extra ref on queue which will be put on disk_release()
          * so that it sticks around as long as @disk is there.
          */
-        WARN_ON_ONCE(!blk_get_queue(disk->queue));
+        WARN_ON_ONCE(blk_get_queue(disk->queue));
 
         retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,
                                    "bdi");
@@ -743,6 +741,7 @@ void __init printk_all_partitions(void)
                 struct hd_struct *part;
                 char name_buf[BDEVNAME_SIZE];
                 char devt_buf[BDEVT_SIZE];
+                u8 uuid[PARTITION_META_INFO_UUIDLTH * 2 + 1];
 
                 /*
                  * Don't show empty devices or things that have been
@@ -761,11 +760,14 @@ void __init printk_all_partitions(void)
                 while ((part = disk_part_iter_next(&piter))) {
                         bool is_part0 = part == &disk->part0;
 
+                        uuid[0] = 0;
+                        if (part->info)
+                                part_unpack_uuid(part->info->uuid, uuid);
+
                         printk("%s%s %10llu %s %s", is_part0 ? "" : "  ",
                                bdevt_str(part_devt(part), devt_buf),
-                               (unsigned long long)part_nr_sects_read(part) >> 1
-                               , disk_name(disk, part->partno, name_buf),
-                               part->info ? part->info->uuid : "");
+                               (unsigned long long)part->nr_sects >> 1,
+                               disk_name(disk, part->partno, name_buf), uuid);
                         if (is_part0) {
                                 if (disk->driverfs_dev != NULL &&
                                     disk->driverfs_dev->driver != NULL)
@@ -829,7 +831,7 @@ static void disk_seqf_stop(struct seq_file *seqf, void *v)
 
 static void *show_partition_start(struct seq_file *seqf, loff_t *pos)
 {
-        void *p;
+        static void *p;
 
         p = disk_seqf_start(seqf, pos);
         if (!IS_ERR_OR_NULL(p) && !*pos)
@@ -845,7 +847,7 @@ static int show_partition(struct seq_file *seqf, void *v)
         char buf[BDEVNAME_SIZE];
 
         /* Don't show non-partitionable removeable devices or empty devices */
-        if (!get_capacity(sgp) || (!disk_max_parts(sgp) &&
+        if (!get_capacity(sgp) || (!disk_partitionable(sgp) &&
                                    (sgp->flags & GENHD_FL_REMOVABLE)))
                 return 0;
         if (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)
@@ -856,7 +858,7 @@ static int show_partition(struct seq_file *seqf, void *v)
         while ((part = disk_part_iter_next(&piter)))
                 seq_printf(seqf, "%4d  %7d %10llu %s\n",
                            MAJOR(part_devt(part)), MINOR(part_devt(part)),
-                           (unsigned long long)part_nr_sects_read(part) >> 1,
+                           (unsigned long long)part->nr_sects >> 1,
                            disk_name(sgp, part->partno, buf));
         disk_part_iter_exit(&piter);
 
@@ -1103,11 +1105,27 @@ static void disk_release(struct device *dev)
                 blk_put_queue(disk->queue);
         kfree(disk);
 }
+
+static int disk_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct gendisk *disk = dev_to_disk(dev);
+        struct disk_part_iter piter;
+        struct hd_struct *part;
+        int cnt = 0;
+
+        disk_part_iter_init(&piter, disk, 0);
+        while((part = disk_part_iter_next(&piter)))
+                cnt++;
+        disk_part_iter_exit(&piter);
+        add_uevent_var(env, "NPARTS=%u", cnt);
+        return 0;
+}
+
 struct class block_class = {
         .name           = "block",
 };
 
-static char *block_devnode(struct device *dev, umode_t *mode)
+static char *block_devnode(struct device *dev, mode_t *mode)
 {
         struct gendisk *disk = dev_to_disk(dev);
 
@@ -1121,6 +1139,7 @@ static struct device_type disk_type = {
         .groups         = disk_attr_groups,
         .release        = disk_release,
         .devnode        = block_devnode,
+        .uevent         = disk_uevent,
 };
 
 #ifdef CONFIG_PROC_FS
@@ -1239,7 +1258,7 @@ EXPORT_SYMBOL(blk_lookup_devt);
 
 struct gendisk *alloc_disk(int minors)
 {
-        return alloc_disk_node(minors, NUMA_NO_NODE);
+        return alloc_disk_node(minors, -1);
 }
 EXPORT_SYMBOL(alloc_disk);
 
@@ -1262,16 +1281,6 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
                 }
                 disk->part_tbl->part[0] = &disk->part0;
 
-                /*
-                 * set_capacity() and get_capacity() currently don't use
-                 * seqcounter to read/update the part0->nr_sects. Still init
-                 * the counter as we can read the sectors in IO submission
-                 * patch using seqence counters.
-                 *
-                 * TODO: Ideally set_capacity() and get_capacity() should be
-                 * converted to make use of bd_mutex and sequence counters.
-                 */
-                seqcount_init(&disk->part0.nr_sects_seq);
                 hd_ref_init(&disk->part0);
 
                 disk->minors = minors;
@@ -1484,9 +1493,9 @@ static void __disk_unblock_events(struct gendisk *disk, bool check_now)
         intv = disk_events_poll_jiffies(disk);
         set_timer_slack(&ev->dwork.timer, intv / 4);
         if (check_now)
-                queue_delayed_work(system_freezable_wq, &ev->dwork, 0);
+                queue_delayed_work(system_nrt_wq, &ev->dwork, 0);
         else if (intv)
-                queue_delayed_work(system_freezable_wq, &ev->dwork, intv);
+                queue_delayed_work(system_nrt_wq, &ev->dwork, intv);
 out_unlock:
         spin_unlock_irqrestore(&ev->lock, flags);
 }
@@ -1528,8 +1537,10 @@ void disk_flush_events(struct gendisk *disk, unsigned int mask)
 
         spin_lock_irq(&ev->lock);
         ev->clearing |= mask;
-        if (!ev->block)
-                mod_delayed_work(system_freezable_wq, &ev->dwork, 0);
+        if (!ev->block) {
+                cancel_delayed_work(&ev->dwork);
+                queue_delayed_work(system_nrt_wq, &ev->dwork, 0);
+        }
         spin_unlock_irq(&ev->lock);
 }
 
@@ -1565,7 +1576,7 @@ unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask)
 
         /* uncondtionally schedule event check and wait for it to finish */
         disk_block_events(disk);
-        queue_delayed_work(system_freezable_wq, &ev->dwork, 0);
+        queue_delayed_work(system_nrt_wq, &ev->dwork, 0);
         flush_delayed_work(&ev->dwork);
         __disk_unblock_events(disk, false);
 
@@ -1602,7 +1613,7 @@ static void disk_events_workfn(struct work_struct *work)
 
         intv = disk_events_poll_jiffies(disk);
         if (!ev->block && intv)
-                queue_delayed_work(system_freezable_wq, &ev->dwork, intv);
+                queue_delayed_work(system_nrt_wq, &ev->dwork, intv);
 
         spin_unlock_irq(&ev->lock);
 
@@ -1740,9 +1751,9 @@ module_param_cb(events_dfl_poll_msecs, &disk_events_dfl_poll_msecs_param_ops,
                 &disk_events_dfl_poll_msecs, 0644);
 
 /*
- * disk_{alloc|add|del|release}_events - initialize and destroy disk_events.
+ * disk_{add|del|release}_events - initialize and destroy disk_events.
  */
-static void disk_alloc_events(struct gendisk *disk)
+static void disk_add_events(struct gendisk *disk)
 {
         struct disk_events *ev;
 
@@ -1755,6 +1766,16 @@ static void disk_alloc_events(struct gendisk *disk)
                 return;
         }
 
+        if (sysfs_create_files(&disk_to_dev(disk)->kobj,
+                               disk_events_attrs) < 0) {
+                pr_warn("%s: failed to create sysfs files for events\n",
+                        disk->disk_name);
+                kfree(ev);
+                return;
+        }
+
+        disk->ev = ev;
+
         INIT_LIST_HEAD(&ev->node);
         ev->disk = disk;
         spin_lock_init(&ev->lock);
@@ -1763,21 +1784,8 @@ static void disk_alloc_events(struct gendisk *disk)
         ev->poll_msecs = -1;
         INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn);
 
-        disk->ev = ev;
-}
-
-static void disk_add_events(struct gendisk *disk)
-{
-        if (!disk->ev)
-                return;
-
-        /* FIXME: error handling */
-        if (sysfs_create_files(&disk_to_dev(disk)->kobj, disk_events_attrs) < 0)
-                pr_warn("%s: failed to create sysfs files for events\n",
-                        disk->disk_name);
-
         mutex_lock(&disk_events_mutex);
-        list_add_tail(&disk->ev->node, &disk_events);
+        list_add_tail(&ev->node, &disk_events);
         mutex_unlock(&disk_events_mutex);
 
         /*