target/linux/generic/pending-4.9/440-block2mtd_init.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Subject: block2mtd
   3
   4 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   5 ---
   6  drivers/mtd/devices/block2mtd.c | 30 ++++++++++++++++++++----------
   7  1 file changed, 20 insertions(+), 10 deletions(-)
   8
   9 diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
  10 index 7c887f111a7d..22135cc48879 100644
  11 --- a/drivers/mtd/devices/block2mtd.c
  12 +++ b/drivers/mtd/devices/block2mtd.c
  13 @@ -26,6 +26,7 @@
  14  #include <linux/list.h>
  15  #include <linux/init.h>
  16  #include <linux/mtd/mtd.h>
  17 +#include <linux/mtd/partitions.h>
  18  #include <linux/mutex.h>
  19  #include <linux/mount.h>
  20  #include <linux/slab.h>
  21 @@ -219,7 +220,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)
  22
  23
  24  static struct block2mtd_dev *add_device(char *devname, int erase_size,
  25 -               int timeout)
  26 +               const char *mtdname, int timeout)
  27  {
  28  #ifndef MODULE
  29         int i;
  30 @@ -227,6 +228,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,
  31         const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
  32         struct block_device *bdev = ERR_PTR(-ENODEV);
  33         struct block2mtd_dev *dev;
  34 +       struct mtd_partition *part;
  35         char *name;
  36
  37         if (!devname)
  38 @@ -283,13 +285,16 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,
  39
  40         /* Setup the MTD structure */
  41         /* make the name contain the block device in */
  42 -       name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
  43 +       if (!mtdname)
  44 +               mtdname = devname;
  45 +       name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
  46         if (!name)
  47                 goto err_destroy_mutex;
  48
  49 +       strcpy(name, mtdname);
  50         dev->mtd.name = name;
  51
  52 -       dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
  53 +       dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
  54         dev->mtd.erasesize = erase_size;
  55         dev->mtd.writesize = 1;
  56         dev->mtd.writebufsize = PAGE_SIZE;
  57 @@ -302,7 +307,11 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,
  58         dev->mtd.priv = dev;
  59         dev->mtd.owner = THIS_MODULE;
  60
  61 -       if (mtd_device_register(&dev->mtd, NULL, 0)) {
  62 +       part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
  63 +       part->name = name;
  64 +       part->offset = 0;
  65 +       part->size = dev->mtd.size;
  66 +       if (mtd_device_register(&dev->mtd, part, 1)) {
  67                 /* Device didn't get added, so free the entry */
  68                 goto err_destroy_mutex;
  69         }
  70 @@ -310,8 +319,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,
  71         list_add(&dev->list, &blkmtd_device_list);
  72         pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
  73                 dev->mtd.index,
  74 -               dev->mtd.name + strlen("block2mtd: "),
  75 -               dev->mtd.erasesize >> 10, dev->mtd.erasesize);
  76 +               mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
  77         return dev;
  78
  79  err_destroy_mutex:
  80 @@ -384,7 +392,7 @@ static int block2mtd_setup2(const char *val)
  81         /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
  82         char buf[80 + 12 + 80 + 8];
  83         char *str = buf;
  84 -       char *token[2];
  85 +       char *token[3];
  86         char *name;
  87         size_t erase_size = PAGE_SIZE;
  88         unsigned long timeout = MTD_DEFAULT_TIMEOUT;
  89 @@ -398,7 +406,7 @@ static int block2mtd_setup2(const char *val)
  90         strcpy(str, val);
  91         kill_final_newline(str);
  92
  93 -       for (i = 0; i < 2; i++)
  94 +       for (i = 0; i < 3; i++)
  95                 token[i] = strsep(&str, ",");
  96
  97         if (str) {
  98 @@ -424,8 +432,10 @@ static int block2mtd_setup2(const char *val)
  99                         return 0;
 100                 }
 101         }
 102 +       if (token[2] && (strlen(token[2]) + 1 > 80))
 103 +               pr_err("mtd device name too long\n");
 104
 105 -       add_device(name, erase_size, timeout);
 106 +       add_device(name, erase_size, token[2], timeout);
 107
 108         return 0;
 109  }
 110 @@ -459,7 +469,7 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)
 111
 112
 113  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
 114 -MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
 115 +MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
 116
 117  static int __init block2mtd_init(void)
 118  {
 119 --
 120 2.11.0
 121