Re: [PATCH 3/3] mtd: add SMEM parser for QCOM platforms
On Fri, Aug 14, 2015 at 10:48:17PM -0700, Bjorn Andersson wrote:
> On Fri 14 Aug 17:46 PDT 2015, Mathieu Olivari wrote:
>
> > On QCOM platforms using MTD devices storage (such as IPQ806x), SMEM is
> > used to store partition layout. This new parser can now be used to read
> > SMEM and use it to register an MTD layout according to its content.
> >
>
> Nice to see another user of the smem code :)
>
> > diff --git a/drivers/mtd/qcom_smem_part.c b/drivers/mtd/qcom_smem_part.c
> [..]
> > +
> > +/* Processor/host identifier for the application processor */
> > +#define SMEM_HOST_APPS 0
>
> This makes me wonder if there will ever be an apps partition. I would
> have picked QCOM_SMEM_HOST_ANY, but I don't know what future platforms
> might hold for us.
>
>
> And as a side note, I think I will propose that we rename that define
> QCOM_SMEM_GLOBAL.
OK; I'll rename it in QCOM_SMEM_GLOBAL then to be in sync.
>
> > +
> > +/* SMEM items index */
> > +#define SMEM_AARM_PARTITION_TABLE 9
> > +#define SMEM_BOOT_FLASH_TYPE 421
> > +#define SMEM_BOOT_FLASH_BLOCK_SIZE 424
> > +
> > +/* SMEM Flash types */
> > +#define SMEM_FLASH_NAND2
> > +#define SMEM_FLASH_SPI 6
> > +
> > +#define SMEM_PART_NAME_SZ 16
> > +#define SMEM_PARTS_MAX 32
> > +
> > +struct smem_partition {
> > + char name[SMEM_PART_NAME_SZ];
> > + __le32 start;
> > + __le32 size;
> > + __le32 attr;
> > +};
> > +
> > +struct smem_partition_table {
> > + u8 magic[8];
> > + __le32 version;
> > + __le32 len;
> > + struct smem_partition parts[SMEM_PARTS_MAX];
> > +};
> > +
> > +/* SMEM Magic values in partition table */
> > +static const u8 SMEM_PTABLE_MAGIC[] = {
> > + 0xaa, 0x73, 0xee, 0x55,
> > + 0xdb, 0xbd, 0x5e, 0xe3,
> > +};
> > +
> > +static int qcom_smem_get_flash_blksz(u64 **smem_blksz)
>
> Instead of passing pointers around I think you should just make this
> function return < 0 for errors and >= 0 for the requested data. You can
> probably still have it as an int, as the current values are well below
> the size of the int.
Good point. Thanks. I'll report it.
>
> > +{
> > + int ret;
> > + size_t size;
> > +
> > + ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE,
> > + (void **) smem_blksz, &size);
> > +
> > + if (ret < 0) {
> > + pr_err("Unable to read flash blksz from SMEM\n");
> > + return -ENOENT;
> > + }
> > +
> > + if (size != sizeof(**smem_blksz)) {
> > + pr_err("Invalid flash blksz size in SMEM\n");
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int qcom_smem_get_flash_type(u64 **smem_flash_type)
>
> Same as above.
OK.
>
> > +{
> > + int ret;
> > + size_t size;
> > +
> > + ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE,
> > + (void **) smem_flash_type, &size);
> > +
> > + if (ret < 0) {
> > + pr_err("Unable to read flash type from SMEM\n");
> > + return -ENOENT;
> > + }
> > +
> > + if (size != sizeof(**smem_flash_type)) {
> > + pr_err("Invalid flash type size in SMEM\n");
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int qcom_smem_get_flash_partitions(struct smem_partition_table
> > **pparts)
> > +{
> > + int ret;
> > + size_t size;
> > +
> > + ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE,
> > + (void **) pparts, &size);
> > +
>
> If you don't care about the size just pass NULL as the last argument.
OK.
>
> > + if (ret < 0) {
> > + pr_err("Unable to read partition table from SMEM\n");
> > + return -ENOENT;
> > + }
>
> I think it would be cleaner if you had this function check the magic and
> version and then return the partition pointer. That is:
>
> static smem_partition *qcom_smem_get_flash_partitions(size_t *count)
>
>
> And make *count = le32_to_cpu(table->len); so you don't have to care
> about that below.
>
> (And use NULL or ERR_PTR for the error paths)
Same; good idea. I'll make the mod.
>
> > +
> > + return 0;
> > +}
> > +
> > +static int of_dev_node_match(struct device *dev, void *data)
> > +{
> > + return dev->of_node == data;
> > +}
> > +
> > +static bool is_spi_device(struct device_node *np)
> > +{
> > + struct device *dev;
> > +
> > + dev = bus_find_device(&spi_bus_type, NULL, np, of_dev_node_match);
> > + if (!dev)
> > + return false;
> > +
> > + put_device(dev);
> > + return true;
> > +}
> > +
> > +static int parse_qcom_smem_partitions(struct mtd_info *master,
> > + struct mtd_partition **pparts,
> > + struct mtd_part_parser_data *data)
> > +{
> > + struct smem_partition_table *smem_parts;
> > + u64 *smem_flash_type, *smem_blksz;
> > + struct mtd_partition *mtd_parts;
> > + struct device_node *of
Re: [PATCH 3/3] mtd: add SMEM parser for QCOM platforms
On Fri 14 Aug 17:46 PDT 2015, Mathieu Olivari wrote:
> On QCOM platforms using MTD devices storage (such as IPQ806x), SMEM is
> used to store partition layout. This new parser can now be used to read
> SMEM and use it to register an MTD layout according to its content.
>
Nice to see another user of the smem code :)
> diff --git a/drivers/mtd/qcom_smem_part.c b/drivers/mtd/qcom_smem_part.c
[..]
> +
> +/* Processor/host identifier for the application processor */
> +#define SMEM_HOST_APPS 0
This makes me wonder if there will ever be an apps partition. I would
have picked QCOM_SMEM_HOST_ANY, but I don't know what future platforms
might hold for us.
And as a side note, I think I will propose that we rename that define
QCOM_SMEM_GLOBAL.
> +
> +/* SMEM items index */
> +#define SMEM_AARM_PARTITION_TABLE9
> +#define SMEM_BOOT_FLASH_TYPE 421
> +#define SMEM_BOOT_FLASH_BLOCK_SIZE 424
> +
> +/* SMEM Flash types */
> +#define SMEM_FLASH_NAND 2
> +#define SMEM_FLASH_SPI 6
> +
> +#define SMEM_PART_NAME_SZ16
> +#define SMEM_PARTS_MAX 32
> +
> +struct smem_partition {
> + char name[SMEM_PART_NAME_SZ];
> + __le32 start;
> + __le32 size;
> + __le32 attr;
> +};
> +
> +struct smem_partition_table {
> + u8 magic[8];
> + __le32 version;
> + __le32 len;
> + struct smem_partition parts[SMEM_PARTS_MAX];
> +};
> +
> +/* SMEM Magic values in partition table */
> +static const u8 SMEM_PTABLE_MAGIC[] = {
> + 0xaa, 0x73, 0xee, 0x55,
> + 0xdb, 0xbd, 0x5e, 0xe3,
> +};
> +
> +static int qcom_smem_get_flash_blksz(u64 **smem_blksz)
Instead of passing pointers around I think you should just make this
function return < 0 for errors and >= 0 for the requested data. You can
probably still have it as an int, as the current values are well below
the size of the int.
> +{
> + int ret;
> + size_t size;
> +
> + ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE,
> + (void **) smem_blksz, &size);
> +
> + if (ret < 0) {
> + pr_err("Unable to read flash blksz from SMEM\n");
> + return -ENOENT;
> + }
> +
> + if (size != sizeof(**smem_blksz)) {
> + pr_err("Invalid flash blksz size in SMEM\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int qcom_smem_get_flash_type(u64 **smem_flash_type)
Same as above.
> +{
> + int ret;
> + size_t size;
> +
> + ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE,
> + (void **) smem_flash_type, &size);
> +
> + if (ret < 0) {
> + pr_err("Unable to read flash type from SMEM\n");
> + return -ENOENT;
> + }
> +
> + if (size != sizeof(**smem_flash_type)) {
> + pr_err("Invalid flash type size in SMEM\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int qcom_smem_get_flash_partitions(struct smem_partition_table
> **pparts)
> +{
> + int ret;
> + size_t size;
> +
> + ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE,
> + (void **) pparts, &size);
> +
If you don't care about the size just pass NULL as the last argument.
> + if (ret < 0) {
> + pr_err("Unable to read partition table from SMEM\n");
> + return -ENOENT;
> + }
I think it would be cleaner if you had this function check the magic and
version and then return the partition pointer. That is:
static smem_partition *qcom_smem_get_flash_partitions(size_t *count)
And make *count = le32_to_cpu(table->len); so you don't have to care
about that below.
(And use NULL or ERR_PTR for the error paths)
> +
> + return 0;
> +}
> +
> +static int of_dev_node_match(struct device *dev, void *data)
> +{
> + return dev->of_node == data;
> +}
> +
> +static bool is_spi_device(struct device_node *np)
> +{
> + struct device *dev;
> +
> + dev = bus_find_device(&spi_bus_type, NULL, np, of_dev_node_match);
> + if (!dev)
> + return false;
> +
> + put_device(dev);
> + return true;
> +}
> +
> +static int parse_qcom_smem_partitions(struct mtd_info *master,
> + struct mtd_partition **pparts,
> + struct mtd_part_parser_data *data)
> +{
> + struct smem_partition_table *smem_parts;
> + u64 *smem_flash_type, *smem_blksz;
> + struct mtd_partition *mtd_parts;
> + struct device_node *of_node = data->of_node;
> + int i, ret;
> +
> + /*
> + * SMEM will only store the partition table of the boot device.
> + * If this is not the boot device, do not return any partition.
> + */
I guess this is the result of below checks, but it's not describing
what's actually done here. I think it should say "only parse
partitions on the specified memory type" or something like that.
[PATCH 3/3] mtd: add SMEM parser for QCOM platforms
On QCOM platforms using MTD devices storage (such as IPQ806x), SMEM is
used to store partition layout. This new parser can now be used to read
SMEM and use it to register an MTD layout according to its content.
Signed-off-by: Mathieu Olivari
---
drivers/mtd/Kconfig | 7 ++
drivers/mtd/Makefile | 1 +
drivers/mtd/qcom_smem_part.c | 231 +++
3 files changed, 239 insertions(+)
create mode 100644 drivers/mtd/qcom_smem_part.c
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index a03ad29..debc887 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -155,6 +155,13 @@ config MTD_BCM47XX_PARTS
This provides partitions parser for devices based on BCM47xx
boards.
+config MTD_QCOM_SMEM_PARTS
+ tristate "QCOM SMEM partitioning support"
+ depends on QCOM_SMEM
+ help
+ This provides partitions parser for QCOM devices using SMEM
+ such as IPQ806x.
+
comment "User Modules And Translation Layers"
#
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 99bb9a1..b3c7de4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_AR7_PARTS)+= ar7part.o
obj-$(CONFIG_MTD_BCM63XX_PARTS)+= bcm63xxpart.o
obj-$(CONFIG_MTD_BCM47XX_PARTS)+= bcm47xxpart.o
+obj-$(CONFIG_MTD_QCOM_SMEM_PARTS) += qcom_smem_part.o
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o
diff --git a/drivers/mtd/qcom_smem_part.c b/drivers/mtd/qcom_smem_part.c
new file mode 100644
index 000..20fef5c
--- /dev/null
+++ b/drivers/mtd/qcom_smem_part.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+/* Processor/host identifier for the application processor */
+#define SMEM_HOST_APPS 0
+
+/* SMEM items index */
+#define SMEM_AARM_PARTITION_TABLE 9
+#define SMEM_BOOT_FLASH_TYPE 421
+#define SMEM_BOOT_FLASH_BLOCK_SIZE 424
+
+/* SMEM Flash types */
+#define SMEM_FLASH_NAND2
+#define SMEM_FLASH_SPI 6
+
+#define SMEM_PART_NAME_SZ 16
+#define SMEM_PARTS_MAX 32
+
+struct smem_partition {
+ char name[SMEM_PART_NAME_SZ];
+ __le32 start;
+ __le32 size;
+ __le32 attr;
+};
+
+struct smem_partition_table {
+ u8 magic[8];
+ __le32 version;
+ __le32 len;
+ struct smem_partition parts[SMEM_PARTS_MAX];
+};
+
+/* SMEM Magic values in partition table */
+static const u8 SMEM_PTABLE_MAGIC[] = {
+ 0xaa, 0x73, 0xee, 0x55,
+ 0xdb, 0xbd, 0x5e, 0xe3,
+};
+
+static int qcom_smem_get_flash_blksz(u64 **smem_blksz)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE,
+ (void **) smem_blksz, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read flash blksz from SMEM\n");
+ return -ENOENT;
+ }
+
+ if (size != sizeof(**smem_blksz)) {
+ pr_err("Invalid flash blksz size in SMEM\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int qcom_smem_get_flash_type(u64 **smem_flash_type)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE,
+ (void **) smem_flash_type, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read flash type from SMEM\n");
+ return -ENOENT;
+ }
+
+ if (size != sizeof(**smem_flash_type)) {
+ pr_err("Invalid flash type size in SMEM\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int qcom_smem_get_flash_partitions(struct smem_partition_table **pparts)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE,
+ (void **) pparts, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read partition table from SMEM\n");
+ return -ENOENT;
+ }
+
+ return 0;
+}
+
+static int of_dev_node_match(struct device *dev, void *data)
+{
+ return dev->of_node == data;
+}
+
+static bool is_spi_device(struct device_node *np)
+{
+ struct device *dev;
+
+ dev = bus_find
Re: [PATCH 3/3] mtd: add SMEM parser for QCOM platforms
On Thu, Aug 13, 2015 at 05:38:02PM -0700, Stephen Boyd wrote:
> On 08/13/2015 02:33 PM, Mathieu Olivari wrote:
> >diff --git a/drivers/mtd/qcom_smem_part.c b/drivers/mtd/qcom_smem_part.c
> >new file mode 100644
> >index 000..6cbf610
> >--- /dev/null
> >+++ b/drivers/mtd/qcom_smem_part.c
> >
> >+#define SMEM_PARTS_MAX 32
> >+
> >+struct smem_partition {
> >+char name[SMEM_PART_NAME_SZ];
> >+uint32_t start;
> >+uint32_t size;
> >+uint32_t attr;
>
> Is this little endian? __le32? I think so.
Yes. I'll make the change.
>
> >+};
> >+
> >+struct smem_partition_table {
> >+uint32_t magic[2];
> >+uint32_t version;
> >+uint32_t len;
>
> Same for these being little endian. And if so, please make magic into a byte
> array of size 8 and then do a memcmp with another static byte array.
Done.
>
> >+struct smem_partition parts[SMEM_PARTS_MAX];
> >+};
> >+
> >+static int qcom_smem_get_flash_blksz(uint64_t **smem_blksz)
>
> I don't know, but I prefer u64 because it's short and sweet. But I'm not the
> maintainer here.
Agreed.
>
> >+{
> >+int ret;
> >+size_t size;
> >+
> >+ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE,
> >+(void **) smem_blksz, &size);
>
> Is the cast necessary?
Compiler will issue a warning if it's not there.
>
> >+
> >+if (ret < 0) {
> >+pr_err("Unable to read flash blksz from SMEM\n");
> >+return -ENOENT;
> >+}
> >+
> >+if (size != sizeof(**smem_blksz)) {
> >+pr_err("Invalid flash blksz size in SMEM\n");
> >+return -EINVAL;
> >+}
> >+
> >+return 0;
> >+}
> >+
> >+static int qcom_smem_get_flash_type(uint64_t **smem_flash_type)
> >+{
> >+int ret;
> >+size_t size;
> >+
> >+ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE,
> >+(void **) smem_flash_type, &size);
> >+
> >+if (ret < 0) {
> >+pr_err("Unable to read flash type from SMEM\n");
> >+return -ENOENT;
> >+}
> >+
> >+if (size != sizeof(**smem_flash_type)) {
> >+pr_err("Invalid flash type size in SMEM\n");
> >+return -EINVAL;
> >+}
> >+
> >+return 0;
> >+}
> >+
> >+static int qcom_smem_get_flash_partitions(struct smem_partition_table
> >**pparts)
> >+{
> >+int ret;
> >+size_t size;
> >+
> >+ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE,
> >+(void **) pparts, &size);
> >+
> >+if (ret < 0) {
> >+pr_err("Unable to read partition table from SMEM\n");
> >+return -ENOENT;
> >+}
> >+
> >+return 0;
> >+}
> >+
> >+static int of_dev_node_match(struct device *dev, void *data)
> >+{
> >+return dev->of_node == data;
> >+}
> >+
> >+static bool is_spi_device(struct device_node *np)
> >+{
> >+struct device *dev;
> >+
> >+dev = bus_find_device(&spi_bus_type, NULL, np, of_dev_node_match);
>
> I'm pretty sure this holds a reference to the device that needs to be
> released with put_device().
You're right. I'll add the corresponding put_device().
>
> >+return dev ? true : false;
> >+}
> >+
> >+static int parse_qcom_smem_partitions(struct mtd_info *master,
> >+ struct mtd_partition **pparts,
> >+ struct mtd_part_parser_data *data)
> >+{
> >+struct smem_partition_table *smem_parts;
> >+uint64_t *smem_flash_type, *smem_blksz;
> >+struct mtd_partition *mtd_parts;
> >+struct device_node *of_node = data->of_node;
> >+int i, ret;
> >+
> >+/*
> >+ * SMEM will only store the partition table of the boot device.
> >+ * If this is not the boot device, do not return any partition.
> >+ */
> >+ret = qcom_smem_get_flash_type(&smem_flash_type);
> >+if (ret < 0)
> >+return ret;
> >+
> >+if ((*smem_flash_type == SMEM_FLASH_NAND && !mtd_type_is_nand(master))
> >+|| (*smem_flash_type == SMEM_FLASH_SPI && !is_spi_device(of_node)))
> >+return 0;
> >+
> >+/*
> >+ * Just for sanity purpose, make sure the block size in SMEM matches the
> >+ * block size of the MTD device
> >+ */
> >+ret = qcom_smem_get_flash_blksz(&smem_blksz);
> >+if (ret < 0)
> >+return ret;
> >+
> >+if (*smem_blksz != master->erasesize) {
> >+pr_err("SMEM block size differs from MTD block size\n");
> >+return -EINVAL;
> >+}
> >+
> >+/* Get partition pointer from SMEM */
> >+ret = qcom_smem_get_flash_partitions(&smem_parts);
> >+if (ret < 0)
> >+return ret;
> >+
> >+if (smem_parts->magic[0] != SMEM_PTABLE_MAGIC_1 ||
> >+smem_parts->magic[1] != SMEM_PTABLE_MAGIC_2) {
> >+pr_err("SMEM partition magic invalid\n");
> >+return -EINVAL;
> >+}
> >+
> >+/* Allocate and populate the mtd structures */
> >+mtd_parts = kcalloc(smem_parts->len, sizeof(struct mtd_par
Re: [PATCH 3/3] mtd: add SMEM parser for QCOM platforms
On 08/13/2015 02:33 PM, Mathieu Olivari wrote:
diff --git a/drivers/mtd/qcom_smem_part.c b/drivers/mtd/qcom_smem_part.c
new file mode 100644
index 000..6cbf610
--- /dev/null
+++ b/drivers/mtd/qcom_smem_part.c
+#define SMEM_PARTS_MAX 32
+
+struct smem_partition {
+ char name[SMEM_PART_NAME_SZ];
+ uint32_t start;
+ uint32_t size;
+ uint32_t attr;
Is this little endian? __le32? I think so.
+};
+
+struct smem_partition_table {
+ uint32_t magic[2];
+ uint32_t version;
+ uint32_t len;
Same for these being little endian. And if so, please make magic into a
byte array of size 8 and then do a memcmp with another static byte array.
+ struct smem_partition parts[SMEM_PARTS_MAX];
+};
+
+static int qcom_smem_get_flash_blksz(uint64_t **smem_blksz)
I don't know, but I prefer u64 because it's short and sweet. But I'm not
the maintainer here.
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE,
+ (void **) smem_blksz, &size);
Is the cast necessary?
+
+ if (ret < 0) {
+ pr_err("Unable to read flash blksz from SMEM\n");
+ return -ENOENT;
+ }
+
+ if (size != sizeof(**smem_blksz)) {
+ pr_err("Invalid flash blksz size in SMEM\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int qcom_smem_get_flash_type(uint64_t **smem_flash_type)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE,
+ (void **) smem_flash_type, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read flash type from SMEM\n");
+ return -ENOENT;
+ }
+
+ if (size != sizeof(**smem_flash_type)) {
+ pr_err("Invalid flash type size in SMEM\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int qcom_smem_get_flash_partitions(struct smem_partition_table **pparts)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE,
+ (void **) pparts, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read partition table from SMEM\n");
+ return -ENOENT;
+ }
+
+ return 0;
+}
+
+static int of_dev_node_match(struct device *dev, void *data)
+{
+ return dev->of_node == data;
+}
+
+static bool is_spi_device(struct device_node *np)
+{
+ struct device *dev;
+
+ dev = bus_find_device(&spi_bus_type, NULL, np, of_dev_node_match);
I'm pretty sure this holds a reference to the device that needs to be
released with put_device().
+ return dev ? true : false;
+}
+
+static int parse_qcom_smem_partitions(struct mtd_info *master,
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+{
+ struct smem_partition_table *smem_parts;
+ uint64_t *smem_flash_type, *smem_blksz;
+ struct mtd_partition *mtd_parts;
+ struct device_node *of_node = data->of_node;
+ int i, ret;
+
+ /*
+* SMEM will only store the partition table of the boot device.
+* If this is not the boot device, do not return any partition.
+*/
+ ret = qcom_smem_get_flash_type(&smem_flash_type);
+ if (ret < 0)
+ return ret;
+
+ if ((*smem_flash_type == SMEM_FLASH_NAND && !mtd_type_is_nand(master))
+ || (*smem_flash_type == SMEM_FLASH_SPI && !is_spi_device(of_node)))
+ return 0;
+
+ /*
+* Just for sanity purpose, make sure the block size in SMEM matches the
+* block size of the MTD device
+*/
+ ret = qcom_smem_get_flash_blksz(&smem_blksz);
+ if (ret < 0)
+ return ret;
+
+ if (*smem_blksz != master->erasesize) {
+ pr_err("SMEM block size differs from MTD block size\n");
+ return -EINVAL;
+ }
+
+ /* Get partition pointer from SMEM */
+ ret = qcom_smem_get_flash_partitions(&smem_parts);
+ if (ret < 0)
+ return ret;
+
+ if (smem_parts->magic[0] != SMEM_PTABLE_MAGIC_1 ||
+ smem_parts->magic[1] != SMEM_PTABLE_MAGIC_2) {
+ pr_err("SMEM partition magic invalid\n");
+ return -EINVAL;
+ }
+
+ /* Allocate and populate the mtd structures */
+ mtd_parts = kcalloc(smem_parts->len, sizeof(struct mtd_partition),
sizeof(*mtd_parts)?
+ GFP_KERNEL);
+ if (mtd_parts == NULL)
if (!mtd_parts) is more kernel style.
+ return -ENOMEM;
+
+ for (i = 0; i < smem_parts->len; i++) {
+ struct smem_partition *part = &smem_parts->parts[i];
+
+ mtd_parts[i].name = part->name;
+ mtd_parts[i].size = part->size * (*sm
[PATCH 3/3] mtd: add SMEM parser for QCOM platforms
On QCOM platforms using MTD devices storage (such as IPQ806x), SMEM is
used to store partition layout. This new parser can now be used to read
SMEM and use it to register an MTD layout according to its content.
Signed-off-by: Mathieu Olivari
---
drivers/mtd/Kconfig | 7 ++
drivers/mtd/Makefile | 1 +
drivers/mtd/qcom_smem_part.c | 224 +++
3 files changed, 232 insertions(+)
create mode 100644 drivers/mtd/qcom_smem_part.c
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index a03ad29..debc887 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -155,6 +155,13 @@ config MTD_BCM47XX_PARTS
This provides partitions parser for devices based on BCM47xx
boards.
+config MTD_QCOM_SMEM_PARTS
+ tristate "QCOM SMEM partitioning support"
+ depends on QCOM_SMEM
+ help
+ This provides partitions parser for QCOM devices using SMEM
+ such as IPQ806x.
+
comment "User Modules And Translation Layers"
#
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 99bb9a1..b3c7de4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_AR7_PARTS)+= ar7part.o
obj-$(CONFIG_MTD_BCM63XX_PARTS)+= bcm63xxpart.o
obj-$(CONFIG_MTD_BCM47XX_PARTS)+= bcm47xxpart.o
+obj-$(CONFIG_MTD_QCOM_SMEM_PARTS) += qcom_smem_part.o
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o
diff --git a/drivers/mtd/qcom_smem_part.c b/drivers/mtd/qcom_smem_part.c
new file mode 100644
index 000..6cbf610
--- /dev/null
+++ b/drivers/mtd/qcom_smem_part.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+/* Processor/host identifier for the application processor */
+#define SMEM_HOST_APPS 0
+
+/* SMEM items index */
+#define SMEM_AARM_PARTITION_TABLE 9
+#define SMEM_BOOT_FLASH_TYPE 421
+#define SMEM_BOOT_FLASH_BLOCK_SIZE 424
+
+/* SMEM Magic values in partition table */
+#define SMEM_PTABLE_MAGIC_10x55ee73aa
+#define SMEM_PTABLE_MAGIC_20xe35ebddb
+
+/* SMEM Flash types */
+#define SMEM_FLASH_NAND2
+#define SMEM_FLASH_SPI 6
+
+#define SMEM_PART_NAME_SZ 16
+#define SMEM_PARTS_MAX 32
+
+struct smem_partition {
+ char name[SMEM_PART_NAME_SZ];
+ uint32_t start;
+ uint32_t size;
+ uint32_t attr;
+};
+
+struct smem_partition_table {
+ uint32_t magic[2];
+ uint32_t version;
+ uint32_t len;
+ struct smem_partition parts[SMEM_PARTS_MAX];
+};
+
+static int qcom_smem_get_flash_blksz(uint64_t **smem_blksz)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE,
+ (void **) smem_blksz, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read flash blksz from SMEM\n");
+ return -ENOENT;
+ }
+
+ if (size != sizeof(**smem_blksz)) {
+ pr_err("Invalid flash blksz size in SMEM\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int qcom_smem_get_flash_type(uint64_t **smem_flash_type)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE,
+ (void **) smem_flash_type, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read flash type from SMEM\n");
+ return -ENOENT;
+ }
+
+ if (size != sizeof(**smem_flash_type)) {
+ pr_err("Invalid flash type size in SMEM\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int qcom_smem_get_flash_partitions(struct smem_partition_table **pparts)
+{
+ int ret;
+ size_t size;
+
+ ret = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE,
+ (void **) pparts, &size);
+
+ if (ret < 0) {
+ pr_err("Unable to read partition table from SMEM\n");
+ return -ENOENT;
+ }
+
+ return 0;
+}
+
+static int of_dev_node_match(struct device *dev, void *data)
+{
+ return dev->of_node == data;
+}
+
+static bool is_spi_device(struct device_node *np)
+{
+ struct device *dev;
+
+
