* [PATCH v2 01/15] mtd: maps: physmap: Add SPDX header
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
@ 2018-10-19 7:48 ` Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 02/15] mtd: maps: physmap: Rename ->map and ->mtd into ->maps and ->mtds Boris Brezillon
` (15 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:48 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Add an SPDX header matching the MODULE_LICENSE("GPL") definition.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index cc2adbbcd60f..19ec105cbb2d 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Normal mappings of chips in physical memory
*
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 02/15] mtd: maps: physmap: Rename ->map and ->mtd into ->maps and ->mtds
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 01/15] mtd: maps: physmap: Add SPDX header Boris Brezillon
@ 2018-10-19 7:48 ` Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 03/15] mtd: maps: physmap: Use platform_get_resource() to retrieve iomem resources Boris Brezillon
` (14 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:48 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
The ->map and ->mtd fields are actually arrays of map and mtd objects.
Rename those fields into ->maps and ->mtds to make it obvious.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 55 +++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 19ec105cbb2d..4010afee4a33 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -25,9 +25,9 @@
#define MAX_RESOURCES 4
struct physmap_flash_info {
- struct mtd_info *mtd[MAX_RESOURCES];
+ struct mtd_info *mtds[MAX_RESOURCES];
struct mtd_info *cmtd;
- struct map_info map[MAX_RESOURCES];
+ struct map_info maps[MAX_RESOURCES];
spinlock_t vpp_lock;
int vpp_refcnt;
};
@@ -46,13 +46,13 @@ static int physmap_flash_remove(struct platform_device *dev)
if (info->cmtd) {
mtd_device_unregister(info->cmtd);
- if (info->cmtd != info->mtd[0])
+ if (info->cmtd != info->mtds[0])
mtd_concat_destroy(info->cmtd);
}
for (i = 0; i < MAX_RESOURCES; i++) {
- if (info->mtd[i] != NULL)
- map_destroy(info->mtd[i]);
+ if (info->mtds[i] != NULL)
+ map_destroy(info->mtds[i]);
}
if (physmap_data->exit)
@@ -136,48 +136,49 @@ static int physmap_flash_probe(struct platform_device *dev)
goto err_out;
}
- info->map[i].name = dev_name(&dev->dev);
- info->map[i].phys = dev->resource[i].start;
- info->map[i].size = resource_size(&dev->resource[i]);
- info->map[i].bankwidth = physmap_data->width;
- info->map[i].set_vpp = physmap_set_vpp;
- info->map[i].pfow_base = physmap_data->pfow_base;
- info->map[i].map_priv_1 = (unsigned long)dev;
-
- info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys,
- info->map[i].size);
- if (info->map[i].virt == NULL) {
+ info->maps[i].name = dev_name(&dev->dev);
+ info->maps[i].phys = dev->resource[i].start;
+ info->maps[i].size = resource_size(&dev->resource[i]);
+ info->maps[i].bankwidth = physmap_data->width;
+ info->maps[i].set_vpp = physmap_set_vpp;
+ info->maps[i].pfow_base = physmap_data->pfow_base;
+ info->maps[i].map_priv_1 = (unsigned long)dev;
+
+ info->maps[i].virt = devm_ioremap(&dev->dev,
+ info->maps[i].phys,
+ info->maps[i].size);
+ if (info->maps[i].virt == NULL) {
dev_err(&dev->dev, "Failed to ioremap flash region\n");
err = -EIO;
goto err_out;
}
- simple_map_init(&info->map[i]);
+ simple_map_init(&info->maps[i]);
probe_type = rom_probe_types;
if (physmap_data->probe_type == NULL) {
- for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)
- info->mtd[i] = do_map_probe(*probe_type, &info->map[i]);
+ for (; info->mtds[i] == NULL && *probe_type != NULL; probe_type++)
+ info->mtds[i] = do_map_probe(*probe_type, &info->maps[i]);
} else
- info->mtd[i] = do_map_probe(physmap_data->probe_type, &info->map[i]);
+ info->mtds[i] = do_map_probe(physmap_data->probe_type, &info->maps[i]);
- if (info->mtd[i] == NULL) {
+ if (info->mtds[i] == NULL) {
dev_err(&dev->dev, "map_probe failed\n");
err = -ENXIO;
goto err_out;
} else {
devices_found++;
}
- info->mtd[i]->dev.parent = &dev->dev;
+ info->mtds[i]->dev.parent = &dev->dev;
}
if (devices_found == 1) {
- info->cmtd = info->mtd[0];
+ info->cmtd = info->mtds[0];
} else if (devices_found > 1) {
/*
* We detected multiple devices. Concatenate them together.
*/
- info->cmtd = mtd_concat_create(info->mtd, devices_found, dev_name(&dev->dev));
+ info->cmtd = mtd_concat_create(info->mtds, devices_found, dev_name(&dev->dev));
if (info->cmtd == NULL)
err = -ENXIO;
}
@@ -203,9 +204,9 @@ static void physmap_flash_shutdown(struct platform_device *dev)
struct physmap_flash_info *info = platform_get_drvdata(dev);
int i;
- for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
- if (mtd_suspend(info->mtd[i]) == 0)
- mtd_resume(info->mtd[i]);
+ for (i = 0; i < MAX_RESOURCES && info->mtds[i]; i++)
+ if (mtd_suspend(info->mtds[i]) == 0)
+ mtd_resume(info->mtds[i]);
}
#else
#define physmap_flash_shutdown NULL
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 03/15] mtd: maps: physmap: Use platform_get_resource() to retrieve iomem resources
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 01/15] mtd: maps: physmap: Add SPDX header Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 02/15] mtd: maps: physmap: Rename ->map and ->mtd into ->maps and ->mtds Boris Brezillon
@ 2018-10-19 7:48 ` Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 04/15] mtd: maps: physmap: Use dev_notice() and a %pR specifier Boris Brezillon
` (13 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:48 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Stop manipulating the dev->resource array directly and use the
platform_get_resource() helper instead.
While at it, fix the loop check so that we never overflow the info->maps
and info->mtds array even if the number of resources attached to the
platform dev is higher than MAX_RESOURCES.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
- Fix the platform_get_resource() ret code check
---
drivers/mtd/maps/physmap.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 4010afee4a33..a097f0cf519a 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -122,23 +122,28 @@ static int physmap_flash_probe(struct platform_device *dev)
platform_set_drvdata(dev, info);
- for (i = 0; i < dev->num_resources; i++) {
+ for (i = 0; i < MAX_RESOURCES; i++) {
+ struct resource *res;
+
+ res = platform_get_resource(dev, IORESOURCE_MEM, i);
+ if (!res)
+ break;
+
printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",
- (unsigned long long)resource_size(&dev->resource[i]),
- (unsigned long long)dev->resource[i].start);
+ (unsigned long long)resource_size(res),
+ (unsigned long long)res->start);
- if (!devm_request_mem_region(&dev->dev,
- dev->resource[i].start,
- resource_size(&dev->resource[i]),
- dev_name(&dev->dev))) {
+ if (!devm_request_mem_region(&dev->dev, res->start,
+ resource_size(res),
+ dev_name(&dev->dev))) {
dev_err(&dev->dev, "Could not reserve memory region\n");
err = -ENOMEM;
goto err_out;
}
info->maps[i].name = dev_name(&dev->dev);
- info->maps[i].phys = dev->resource[i].start;
- info->maps[i].size = resource_size(&dev->resource[i]);
+ info->maps[i].phys = res->start;
+ info->maps[i].size = resource_size(res);
info->maps[i].bankwidth = physmap_data->width;
info->maps[i].set_vpp = physmap_set_vpp;
info->maps[i].pfow_base = physmap_data->pfow_base;
@@ -172,9 +177,11 @@ static int physmap_flash_probe(struct platform_device *dev)
info->mtds[i]->dev.parent = &dev->dev;
}
- if (devices_found == 1) {
+ if (!devices_found) {
+ err = -ENODEV;
+ } else if (devices_found == 1) {
info->cmtd = info->mtds[0];
- } else if (devices_found > 1) {
+ } else {
/*
* We detected multiple devices. Concatenate them together.
*/
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 04/15] mtd: maps: physmap: Use dev_notice() and a %pR specifier
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (2 preceding siblings ...)
2018-10-19 7:48 ` [PATCH v2 03/15] mtd: maps: physmap: Use platform_get_resource() to retrieve iomem resources Boris Brezillon
@ 2018-10-19 7:48 ` Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 05/15] mtd: maps: physmap: Use devm_ioremap_resource() Boris Brezillon
` (12 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:48 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Replace printk(KERN_NOTICE) by dev_notice() use the %pR specifier to
print the iomem resource.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index a097f0cf519a..b98072a67d74 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -129,9 +129,8 @@ static int physmap_flash_probe(struct platform_device *dev)
if (!res)
break;
- printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",
- (unsigned long long)resource_size(res),
- (unsigned long long)res->start);
+ dev_notice(&dev->dev, "physmap platform flash device: %pR\n",
+ res);
if (!devm_request_mem_region(&dev->dev, res->start,
resource_size(res),
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 05/15] mtd: maps: physmap: Use devm_ioremap_resource()
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (3 preceding siblings ...)
2018-10-19 7:48 ` [PATCH v2 04/15] mtd: maps: physmap: Use dev_notice() and a %pR specifier Boris Brezillon
@ 2018-10-19 7:48 ` Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 06/15] mtd: maps: physmap: Remove the MAX_RESOURCES limitation Boris Brezillon
` (11 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:48 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Use devm_ioremap_resource() to replace the devm_request_mem_region() +
devm_ioremap() combination.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index b98072a67d74..1d0f6f034a03 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -129,17 +129,15 @@ static int physmap_flash_probe(struct platform_device *dev)
if (!res)
break;
- dev_notice(&dev->dev, "physmap platform flash device: %pR\n",
- res);
-
- if (!devm_request_mem_region(&dev->dev, res->start,
- resource_size(res),
- dev_name(&dev->dev))) {
- dev_err(&dev->dev, "Could not reserve memory region\n");
- err = -ENOMEM;
+ info->maps[i].virt = devm_ioremap_resource(&dev->dev, res);
+ if (IS_ERR(info->maps[i].virt)) {
+ err = PTR_ERR(info->maps[i].virt);
goto err_out;
}
+ dev_notice(&dev->dev, "physmap platform flash device: %pR\n",
+ res);
+
info->maps[i].name = dev_name(&dev->dev);
info->maps[i].phys = res->start;
info->maps[i].size = resource_size(res);
@@ -148,15 +146,6 @@ static int physmap_flash_probe(struct platform_device *dev)
info->maps[i].pfow_base = physmap_data->pfow_base;
info->maps[i].map_priv_1 = (unsigned long)dev;
- info->maps[i].virt = devm_ioremap(&dev->dev,
- info->maps[i].phys,
- info->maps[i].size);
- if (info->maps[i].virt == NULL) {
- dev_err(&dev->dev, "Failed to ioremap flash region\n");
- err = -EIO;
- goto err_out;
- }
-
simple_map_init(&info->maps[i]);
probe_type = rom_probe_types;
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 06/15] mtd: maps: physmap: Remove the MAX_RESOURCES limitation
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (4 preceding siblings ...)
2018-10-19 7:48 ` [PATCH v2 05/15] mtd: maps: physmap: Use devm_ioremap_resource() Boris Brezillon
@ 2018-10-19 7:48 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 07/15] mtd: maps: physmap: Check mtd_device_{parse_register, unregister}() ret code Boris Brezillon
` (10 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:48 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Remove the MAX_RESOURCES limitation by dynamically allocating the
->mtds[] and ->maps[] at probe time based on the number of iomem
resources attached to the platform device.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 44 +++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 1d0f6f034a03..86679d149a49 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -22,12 +22,11 @@
#include <linux/mtd/concat.h>
#include <linux/io.h>
-#define MAX_RESOURCES 4
-
struct physmap_flash_info {
- struct mtd_info *mtds[MAX_RESOURCES];
+ unsigned int nmaps;
+ struct mtd_info **mtds;
struct mtd_info *cmtd;
- struct map_info maps[MAX_RESOURCES];
+ struct map_info *maps;
spinlock_t vpp_lock;
int vpp_refcnt;
};
@@ -50,7 +49,7 @@ static int physmap_flash_remove(struct platform_device *dev)
mtd_concat_destroy(info->cmtd);
}
- for (i = 0; i < MAX_RESOURCES; i++) {
+ for (i = 0; i < info->nmaps; i++) {
if (info->mtds[i] != NULL)
map_destroy(info->mtds[i]);
}
@@ -101,7 +100,6 @@ static int physmap_flash_probe(struct platform_device *dev)
const char * const *part_types;
int err = 0;
int i;
- int devices_found = 0;
physmap_data = dev_get_platdata(&dev->dev);
if (physmap_data == NULL)
@@ -114,6 +112,24 @@ static int physmap_flash_probe(struct platform_device *dev)
goto err_out;
}
+ while (platform_get_resource(dev, IORESOURCE_MEM, info->nmaps))
+ info->nmaps++;
+
+ if (!info->nmaps)
+ return -ENODEV;
+
+ info->maps = devm_kzalloc(&dev->dev,
+ sizeof(*info->maps) * info->nmaps,
+ GFP_KERNEL);
+ if (!info->maps)
+ return -ENOMEM;
+
+ info->mtds = devm_kzalloc(&dev->dev,
+ sizeof(*info->mtds) * info->nmaps,
+ GFP_KERNEL);
+ if (!info->mtds)
+ return -ENOMEM;
+
if (physmap_data->init) {
err = physmap_data->init(dev);
if (err)
@@ -122,13 +138,10 @@ static int physmap_flash_probe(struct platform_device *dev)
platform_set_drvdata(dev, info);
- for (i = 0; i < MAX_RESOURCES; i++) {
+ for (i = 0; i < info->nmaps; i++) {
struct resource *res;
res = platform_get_resource(dev, IORESOURCE_MEM, i);
- if (!res)
- break;
-
info->maps[i].virt = devm_ioremap_resource(&dev->dev, res);
if (IS_ERR(info->maps[i].virt)) {
err = PTR_ERR(info->maps[i].virt);
@@ -159,21 +172,18 @@ static int physmap_flash_probe(struct platform_device *dev)
dev_err(&dev->dev, "map_probe failed\n");
err = -ENXIO;
goto err_out;
- } else {
- devices_found++;
}
info->mtds[i]->dev.parent = &dev->dev;
}
- if (!devices_found) {
- err = -ENODEV;
- } else if (devices_found == 1) {
+ if (info->nmaps == 1) {
info->cmtd = info->mtds[0];
} else {
/*
* We detected multiple devices. Concatenate them together.
*/
- info->cmtd = mtd_concat_create(info->mtds, devices_found, dev_name(&dev->dev));
+ info->cmtd = mtd_concat_create(info->mtds, info->nmaps,
+ dev_name(&dev->dev));
if (info->cmtd == NULL)
err = -ENXIO;
}
@@ -199,7 +209,7 @@ static void physmap_flash_shutdown(struct platform_device *dev)
struct physmap_flash_info *info = platform_get_drvdata(dev);
int i;
- for (i = 0; i < MAX_RESOURCES && info->mtds[i]; i++)
+ for (i = 0; i < info->nmaps && info->mtds[i]; i++)
if (mtd_suspend(info->mtds[i]) == 0)
mtd_resume(info->mtds[i]);
}
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 07/15] mtd: maps: physmap: Check mtd_device_{parse_register, unregister}() ret code
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (5 preceding siblings ...)
2018-10-19 7:48 ` [PATCH v2 06/15] mtd: maps: physmap: Remove the MAX_RESOURCES limitation Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 08/15] mtd: maps: physmap: Return -ENOMEM directly when info allocation fails Boris Brezillon
` (9 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
mtd_device_parse_register() and mtd_device_unregister() can fail,
check their return code and propagate the error to the upper layer
if needed.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 86679d149a49..9b34223c4635 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -35,7 +35,7 @@ static int physmap_flash_remove(struct platform_device *dev)
{
struct physmap_flash_info *info;
struct physmap_flash_data *physmap_data;
- int i;
+ int i, err;
info = platform_get_drvdata(dev);
if (info == NULL)
@@ -44,7 +44,10 @@ static int physmap_flash_remove(struct platform_device *dev)
physmap_data = dev_get_platdata(&dev->dev);
if (info->cmtd) {
- mtd_device_unregister(info->cmtd);
+ err = mtd_device_unregister(info->cmtd);
+ if (err)
+ return err;
+
if (info->cmtd != info->mtds[0])
mtd_concat_destroy(info->cmtd);
}
@@ -194,8 +197,12 @@ static int physmap_flash_probe(struct platform_device *dev)
part_types = physmap_data->part_probe_types ? : part_probe_types;
- mtd_device_parse_register(info->cmtd, part_types, NULL,
- physmap_data->parts, physmap_data->nr_parts);
+ err = mtd_device_parse_register(info->cmtd, part_types, NULL,
+ physmap_data->parts,
+ physmap_data->nr_parts);
+ if (err)
+ goto err_out;
+
return 0;
err_out:
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 08/15] mtd: maps: physmap: Return -ENOMEM directly when info allocation fails
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (6 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 07/15] mtd: maps: physmap: Check mtd_device_{parse_register, unregister}() ret code Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 09/15] mtd: maps: physmap: Fix coding style issues reported by checkpatch Boris Brezillon
` (8 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
There's no point going to the err_out path since no resources have
been allocated yet, just return -ENOMEM directly.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 9b34223c4635..7d30f3524d35 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -110,10 +110,8 @@ static int physmap_flash_probe(struct platform_device *dev)
info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info),
GFP_KERNEL);
- if (info == NULL) {
- err = -ENOMEM;
- goto err_out;
- }
+ if (!info)
+ return -ENOMEM;
while (platform_get_resource(dev, IORESOURCE_MEM, info->nmaps))
info->nmaps++;
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 09/15] mtd: maps: physmap: Fix coding style issues reported by checkpatch
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (7 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 08/15] mtd: maps: physmap: Return -ENOMEM directly when info allocation fails Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 10/15] mtd: maps: Prepare merging of physmap and physmap_of Boris Brezillon
` (7 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Fix the following coding style issues:
- != NULL and == NULL test replaced by ! (or nothing)
- split over 80 chars lines
- add missing braces in multi-line if() {} else {} statements
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 7d30f3524d35..e27051bc5dc6 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -38,7 +38,7 @@ static int physmap_flash_remove(struct platform_device *dev)
int i, err;
info = platform_get_drvdata(dev);
- if (info == NULL)
+ if (!info)
return 0;
physmap_data = dev_get_platdata(&dev->dev);
@@ -53,7 +53,7 @@ static int physmap_flash_remove(struct platform_device *dev)
}
for (i = 0; i < info->nmaps; i++) {
- if (info->mtds[i] != NULL)
+ if (info->mtds[i])
map_destroy(info->mtds[i]);
}
@@ -90,10 +90,12 @@ static void physmap_set_vpp(struct map_info *map, int state)
}
static const char * const rom_probe_types[] = {
- "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL };
+ "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL
+};
static const char * const part_probe_types[] = {
- "cmdlinepart", "RedBoot", "afs", NULL };
+ "cmdlinepart", "RedBoot", "afs", NULL
+};
static int physmap_flash_probe(struct platform_device *dev)
{
@@ -105,11 +107,10 @@ static int physmap_flash_probe(struct platform_device *dev)
int i;
physmap_data = dev_get_platdata(&dev->dev);
- if (physmap_data == NULL)
+ if (!physmap_data)
return -ENODEV;
- info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info),
- GFP_KERNEL);
+ info = devm_kzalloc(&dev->dev, sizeof(*info), GFP_KERNEL);
if (!info)
return -ENOMEM;
@@ -163,13 +164,16 @@ static int physmap_flash_probe(struct platform_device *dev)
simple_map_init(&info->maps[i]);
probe_type = rom_probe_types;
- if (physmap_data->probe_type == NULL) {
- for (; info->mtds[i] == NULL && *probe_type != NULL; probe_type++)
- info->mtds[i] = do_map_probe(*probe_type, &info->maps[i]);
- } else
- info->mtds[i] = do_map_probe(physmap_data->probe_type, &info->maps[i]);
+ if (!physmap_data->probe_type) {
+ for (; !info->mtds[i] && *probe_type; probe_type++)
+ info->mtds[i] = do_map_probe(*probe_type,
+ &info->maps[i]);
+ } else {
+ info->mtds[i] = do_map_probe(physmap_data->probe_type,
+ &info->maps[i]);
+ }
- if (info->mtds[i] == NULL) {
+ if (!info->mtds[i]) {
dev_err(&dev->dev, "map_probe failed\n");
err = -ENXIO;
goto err_out;
@@ -185,7 +189,7 @@ static int physmap_flash_probe(struct platform_device *dev)
*/
info->cmtd = mtd_concat_create(info->mtds, info->nmaps,
dev_name(&dev->dev));
- if (info->cmtd == NULL)
+ if (!info->cmtd)
err = -ENXIO;
}
if (err)
@@ -231,7 +235,6 @@ static struct platform_driver physmap_flash_driver = {
},
};
-
#ifdef CONFIG_MTD_PHYSMAP_COMPAT
static struct physmap_flash_data physmap_flash_data = {
.width = CONFIG_MTD_PHYSMAP_BANKWIDTH,
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 10/15] mtd: maps: Prepare merging of physmap and physmap_of
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (8 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 09/15] mtd: maps: physmap: Fix coding style issues reported by checkpatch Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Boris Brezillon
` (6 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
We want to merge the physmap and physmap_of driver, but before we can
do that we must prepare things to create physmap.o out of several .c
files. Rename physmap.c into physmap-core.c and add a new Makefile
rule to create physmap.o (right now it only contains physmap-core.o).
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/Makefile | 2 ++
drivers/mtd/maps/{physmap.c => physmap-core.c} | 0
2 files changed, 2 insertions(+)
rename drivers/mtd/maps/{physmap.c => physmap-core.c} (100%)
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 51acf1fec19b..2574909edffd 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -17,6 +17,8 @@ obj-$(CONFIG_MTD_ICHXROM) += ichxrom.o
obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o
+physmap-objs-y += physmap-core.o
+physmap-objs := $(physmap-objs-y)
obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
physmap_of-objs-y += physmap_of_core.o
physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap-core.c
similarity index 100%
rename from drivers/mtd/maps/physmap.c
rename to drivers/mtd/maps/physmap-core.c
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 11/15] mtd: maps: Merge physmap_of.c into physmap-core.c
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (9 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 10/15] mtd: maps: Prepare merging of physmap and physmap_of Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2019-04-02 23:44 ` [v2,11/15] " Chris Packham
2018-10-19 7:49 ` [PATCH v2 12/15] mtd: maps: Rename physmap_of_{versatile, gemini} into physmap-{versatile, gemini} Boris Brezillon
` (5 subsequent siblings)
16 siblings, 1 reply; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
There's no real reason to have two separate driver for the DT and pdata
case. Just do what we do everywhere else and handle DT and pdata
parsing in the same driver.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
- Fix 2 checks (reported by Ricardo)
---
drivers/mtd/maps/Kconfig | 4 +-
drivers/mtd/maps/Makefile | 7 +-
drivers/mtd/maps/physmap-core.c | 261 +++++++++++++++++++++++---
drivers/mtd/maps/physmap_of_core.c | 368 -------------------------------------
4 files changed, 240 insertions(+), 400 deletions(-)
delete mode 100644 drivers/mtd/maps/physmap_of_core.c
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index afb36bff13a7..5bffebacce86 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -66,8 +66,8 @@ config MTD_PHYSMAP_BANKWIDTH
used internally by the CFI drivers.
config MTD_PHYSMAP_OF
- tristate "Memory device in physical memory map based on OF description"
- depends on OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_RAM)
+ bool "Memory device in physical memory map based on OF description"
+ depends on OF && MTD_PHYSMAP
help
This provides a 'mapping' driver which allows the NOR Flash, ROM
and RAM driver code to communicate with chips which are mapped
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 2574909edffd..ad32b185a120 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -18,13 +18,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o
physmap-objs-y += physmap-core.o
+physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
+physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o
physmap-objs := $(physmap-objs-y)
obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
-physmap_of-objs-y += physmap_of_core.o
-physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
-physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o
-physmap_of-objs := $(physmap_of-objs-y)
-obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o
obj-$(CONFIG_MTD_PISMO) += pismo.o
obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index e27051bc5dc6..07af8368d173 100644
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -6,6 +6,13 @@
* Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
*
* 031022 - [jsun] add run-time configure and partition setup
+ *
+ * Device tree support:
+ * Copyright (C) 2006 MontaVista Software Inc.
+ * Author: Vitaly Wool <vwool@ru.mvista.com>
+ *
+ * Revised to handle newer style flash binding by:
+ * Copyright (C) 2007 David Gibson, IBM Corporation.
*/
#include <linux/module.h>
@@ -20,7 +27,12 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/concat.h>
+#include <linux/mtd/cfi_endian.h>
#include <linux/io.h>
+#include <linux/of_device.h>
+
+#include "physmap_of_gemini.h"
+#include "physmap_of_versatile.h"
struct physmap_flash_info {
unsigned int nmaps;
@@ -29,6 +41,10 @@ struct physmap_flash_info {
struct map_info *maps;
spinlock_t vpp_lock;
int vpp_refcnt;
+ const char *probe_type;
+ const char * const *part_types;
+ unsigned int nparts;
+ const struct mtd_partition *parts;
};
static int physmap_flash_remove(struct platform_device *dev)
@@ -41,8 +57,6 @@ static int physmap_flash_remove(struct platform_device *dev)
if (!info)
return 0;
- physmap_data = dev_get_platdata(&dev->dev);
-
if (info->cmtd) {
err = mtd_device_unregister(info->cmtd);
if (err)
@@ -57,7 +71,8 @@ static int physmap_flash_remove(struct platform_device *dev)
map_destroy(info->mtds[i]);
}
- if (physmap_data->exit)
+ physmap_data = dev_get_platdata(&dev->dev);
+ if (physmap_data && physmap_data->exit)
physmap_data->exit(dev);
return 0;
@@ -89,6 +104,172 @@ static void physmap_set_vpp(struct map_info *map, int state)
spin_unlock_irqrestore(&info->vpp_lock, flags);
}
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP_OF)
+static const struct of_device_id of_flash_match[] = {
+ {
+ .compatible = "cfi-flash",
+ .data = "cfi_probe",
+ },
+ {
+ /*
+ * FIXME: JEDEC chips can't be safely and reliably
+ * probed, although the mtd code gets it right in
+ * practice most of the time. We should use the
+ * vendor and device ids specified by the binding to
+ * bypass the heuristic probe code, but the mtd layer
+ * provides, at present, no interface for doing so
+ * :(.
+ */
+ .compatible = "jedec-flash",
+ .data = "jedec_probe",
+ },
+ {
+ .compatible = "mtd-ram",
+ .data = "map_ram",
+ },
+ {
+ .compatible = "mtd-rom",
+ .data = "map_rom",
+ },
+ {
+ .type = "rom",
+ .compatible = "direct-mapped"
+ },
+ { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_flash_match);
+
+static const char * const of_default_part_probes[] = {
+ "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL
+};
+
+static const char * const *of_get_part_probes(struct platform_device *dev)
+{
+ struct device_node *dp = dev->dev.of_node;
+ const char **res;
+ int count;
+
+ count = of_property_count_strings(dp, "linux,part-probe");
+ if (count < 0)
+ return of_default_part_probes;
+
+ res = devm_kcalloc(&dev->dev, count + 1, sizeof(*res), GFP_KERNEL);
+ if (!res)
+ return NULL;
+
+ count = of_property_read_string_array(dp, "linux,part-probe", res,
+ count);
+ if (count < 0)
+ return NULL;
+
+ return res;
+}
+
+static const char *of_select_probe_type(struct platform_device *dev)
+{
+ struct device_node *dp = dev->dev.of_node;
+ const struct of_device_id *match;
+ const char *probe_type;
+
+ match = of_match_device(of_flash_match, &dev->dev);
+ probe_type = match->data;
+ if (probe_type)
+ return probe_type;
+
+ dev_warn(&dev->dev,
+ "Device tree uses obsolete \"direct-mapped\" flash binding\n");
+
+ of_property_read_string(dp, "probe-type", &probe_type);
+ if (!probe_type)
+ return NULL;
+
+ if (!strcmp(probe_type, "CFI")) {
+ probe_type = "cfi_probe";
+ } else if (!strcmp(probe_type, "JEDEC")) {
+ probe_type = "jedec_probe";
+ } else if (!strcmp(probe_type, "ROM")) {
+ probe_type = "map_rom";
+ } else {
+ dev_warn(&dev->dev,
+ "obsolete_probe: don't know probe type '%s', mapping as rom\n",
+ probe_type);
+ probe_type = "map_rom";
+ }
+
+ return probe_type;
+}
+
+static int physmap_flash_of_init(struct platform_device *dev)
+{
+ struct physmap_flash_info *info = platform_get_drvdata(dev);
+ struct device_node *dp = dev->dev.of_node;
+ const char *mtd_name = NULL;
+ int err, swap = 0;
+ bool map_indirect;
+ unsigned int i;
+ u32 bankwidth;
+
+ if (!dp)
+ return -EINVAL;
+
+ info->probe_type = of_select_probe_type(dev);
+
+ info->part_types = of_get_part_probes(dev);
+ if (!info->part_types)
+ return -ENOMEM;
+
+ of_property_read_string(dp, "linux,mtd-name", &mtd_name);
+
+ map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access");
+
+ err = of_property_read_u32(dp, "bank-width", &bankwidth);
+ if (err) {
+ dev_err(&dev->dev, "Can't get bank width from device tree\n");
+ return err;
+ }
+
+ if (of_property_read_bool(dp, "big-endian"))
+ swap = CFI_BIG_ENDIAN;
+ else if (of_property_read_bool(dp, "little-endian"))
+ swap = CFI_LITTLE_ENDIAN;
+
+ for (i = 0; i < info->nmaps; i++) {
+ info->maps[i].name = mtd_name;
+ info->maps[i].swap = swap;
+ info->maps[i].bankwidth = bankwidth;
+ info->maps[i].device_node = dp;
+
+ err = of_flash_probe_gemini(dev, dp, &info->maps[i]);
+ if (err)
+ return err;
+
+ err = of_flash_probe_versatile(dev, dp, &info->maps[i]);
+ if (err)
+ return err;
+
+ /*
+ * On some platforms (e.g. MPC5200) a direct 1:1 mapping
+ * may cause problems with JFFS2 usage, as the local bus (LPB)
+ * doesn't support unaligned accesses as implemented in the
+ * JFFS2 code via memcpy(). By setting NO_XIP, the
+ * flash will not be exposed directly to the MTD users
+ * (e.g. JFFS2) any more.
+ */
+ if (map_indirect)
+ info->maps[i].phys = NO_XIP;
+ }
+
+ return 0;
+}
+#else /* IS_ENABLED(CONFIG_MTD_PHYSMAP_OF) */
+#define of_flash_match NULL
+
+static int physmap_flash_of_init(struct platform_device *dev)
+{
+ return -ENOTSUPP;
+}
+#endif /* IS_ENABLED(CONFIG_MTD_PHYSMAP_OF) */
+
static const char * const rom_probe_types[] = {
"cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL
};
@@ -97,18 +278,46 @@ static const char * const part_probe_types[] = {
"cmdlinepart", "RedBoot", "afs", NULL
};
-static int physmap_flash_probe(struct platform_device *dev)
+static int physmap_flash_pdata_init(struct platform_device *dev)
{
+ struct physmap_flash_info *info = platform_get_drvdata(dev);
struct physmap_flash_data *physmap_data;
+ unsigned int i;
+ int err;
+
+ physmap_data = dev_get_platdata(&dev->dev);
+ if (!physmap_data)
+ return -EINVAL;
+
+ info->probe_type = physmap_data->probe_type;
+ info->part_types = physmap_data->part_probe_types ? : part_probe_types;
+ info->parts = physmap_data->parts;
+ info->nparts = physmap_data->nr_parts;
+
+ if (physmap_data->init) {
+ err = physmap_data->init(dev);
+ if (err)
+ return err;
+ }
+
+ for (i = 0; i < info->nmaps; i++) {
+ info->maps[i].bankwidth = physmap_data->width;
+ info->maps[i].pfow_base = physmap_data->pfow_base;
+ info->maps[i].set_vpp = physmap_set_vpp;
+ }
+
+ return 0;
+}
+
+static int physmap_flash_probe(struct platform_device *dev)
+{
struct physmap_flash_info *info;
const char * const *probe_type;
- const char * const *part_types;
int err = 0;
int i;
- physmap_data = dev_get_platdata(&dev->dev);
- if (!physmap_data)
- return -ENODEV;
+ if (!dev->dev.of_node && !dev_get_platdata(&dev->dev))
+ return -EINVAL;
info = devm_kzalloc(&dev->dev, sizeof(*info), GFP_KERNEL);
if (!info)
@@ -132,14 +341,16 @@ static int physmap_flash_probe(struct platform_device *dev)
if (!info->mtds)
return -ENOMEM;
- if (physmap_data->init) {
- err = physmap_data->init(dev);
- if (err)
- goto err_out;
- }
-
platform_set_drvdata(dev, info);
+ if (dev->dev.of_node)
+ err = physmap_flash_of_init(dev);
+ else
+ err = physmap_flash_pdata_init(dev);
+
+ if (err)
+ return err;
+
for (i = 0; i < info->nmaps; i++) {
struct resource *res;
@@ -154,22 +365,22 @@ static int physmap_flash_probe(struct platform_device *dev)
res);
info->maps[i].name = dev_name(&dev->dev);
- info->maps[i].phys = res->start;
+
+ if (!info->maps[i].phys)
+ info->maps[i].phys = res->start;
+
info->maps[i].size = resource_size(res);
- info->maps[i].bankwidth = physmap_data->width;
- info->maps[i].set_vpp = physmap_set_vpp;
- info->maps[i].pfow_base = physmap_data->pfow_base;
info->maps[i].map_priv_1 = (unsigned long)dev;
simple_map_init(&info->maps[i]);
probe_type = rom_probe_types;
- if (!physmap_data->probe_type) {
+ if (!info->probe_type) {
for (; !info->mtds[i] && *probe_type; probe_type++)
info->mtds[i] = do_map_probe(*probe_type,
&info->maps[i]);
} else {
- info->mtds[i] = do_map_probe(physmap_data->probe_type,
+ info->mtds[i] = do_map_probe(info->probe_type,
&info->maps[i]);
}
@@ -197,11 +408,9 @@ static int physmap_flash_probe(struct platform_device *dev)
spin_lock_init(&info->vpp_lock);
- part_types = physmap_data->part_probe_types ? : part_probe_types;
-
- err = mtd_device_parse_register(info->cmtd, part_types, NULL,
- physmap_data->parts,
- physmap_data->nr_parts);
+ mtd_set_of_node(info->cmtd, dev->dev.of_node);
+ err = mtd_device_parse_register(info->cmtd, info->part_types, NULL,
+ info->parts, info->nparts);
if (err)
goto err_out;
@@ -232,6 +441,7 @@ static struct platform_driver physmap_flash_driver = {
.shutdown = physmap_flash_shutdown,
.driver = {
.name = "physmap-flash",
+ .of_match_table = of_flash_match,
},
};
@@ -286,6 +496,7 @@ module_exit(physmap_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
+MODULE_AUTHOR("Vitaly Wool <vwool@ru.mvista.com>");
MODULE_DESCRIPTION("Generic configurable MTD map driver");
/* legacy platform drivers can't hotplug or coldplg */
diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c
deleted file mode 100644
index ece605d78c21..000000000000
--- a/drivers/mtd/maps/physmap_of_core.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Flash mappings described by the OF (or flattened) device tree
- *
- * Copyright (C) 2006 MontaVista Software Inc.
- * Author: Vitaly Wool <vwool@ru.mvista.com>
- *
- * Revised to handle newer style flash binding by:
- * Copyright (C) 2007 David Gibson, IBM Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/concat.h>
-#include <linux/mtd/cfi_endian.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/slab.h>
-#include "physmap_of_gemini.h"
-#include "physmap_of_versatile.h"
-
-struct of_flash_list {
- struct mtd_info *mtd;
- struct map_info map;
-};
-
-struct of_flash {
- struct mtd_info *cmtd;
- int list_size; /* number of elements in of_flash_list */
- struct of_flash_list list[0];
-};
-
-static int of_flash_remove(struct platform_device *dev)
-{
- struct of_flash *info;
- int i;
-
- info = dev_get_drvdata(&dev->dev);
- if (!info)
- return 0;
- dev_set_drvdata(&dev->dev, NULL);
-
- if (info->cmtd) {
- mtd_device_unregister(info->cmtd);
- if (info->cmtd != info->list[0].mtd)
- mtd_concat_destroy(info->cmtd);
- }
-
- for (i = 0; i < info->list_size; i++)
- if (info->list[i].mtd)
- map_destroy(info->list[i].mtd);
-
- return 0;
-}
-
-static const char * const rom_probe_types[] = {
- "cfi_probe", "jedec_probe", "map_rom" };
-
-/* Helper function to handle probing of the obsolete "direct-mapped"
- * compatible binding, which has an extra "probe-type" property
- * describing the type of flash probe necessary. */
-static struct mtd_info *obsolete_probe(struct platform_device *dev,
- struct map_info *map)
-{
- struct device_node *dp = dev->dev.of_node;
- const char *of_probe;
- struct mtd_info *mtd;
- int i;
-
- dev_warn(&dev->dev, "Device tree uses obsolete \"direct-mapped\" "
- "flash binding\n");
-
- of_probe = of_get_property(dp, "probe-type", NULL);
- if (!of_probe) {
- for (i = 0; i < ARRAY_SIZE(rom_probe_types); i++) {
- mtd = do_map_probe(rom_probe_types[i], map);
- if (mtd)
- return mtd;
- }
- return NULL;
- } else if (strcmp(of_probe, "CFI") == 0) {
- return do_map_probe("cfi_probe", map);
- } else if (strcmp(of_probe, "JEDEC") == 0) {
- return do_map_probe("jedec_probe", map);
- } else {
- if (strcmp(of_probe, "ROM") != 0)
- dev_warn(&dev->dev, "obsolete_probe: don't know probe "
- "type '%s', mapping as rom\n", of_probe);
- return do_map_probe("map_rom", map);
- }
-}
-
-/* When partitions are set we look for a linux,part-probe property which
- specifies the list of partition probers to use. If none is given then the
- default is use. These take precedence over other device tree
- information. */
-static const char * const part_probe_types_def[] = {
- "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL };
-
-static const char * const *of_get_probes(struct device_node *dp)
-{
- const char **res;
- int count;
-
- count = of_property_count_strings(dp, "linux,part-probe");
- if (count < 0)
- return part_probe_types_def;
-
- res = kcalloc(count + 1, sizeof(*res), GFP_KERNEL);
- if (!res)
- return NULL;
-
- count = of_property_read_string_array(dp, "linux,part-probe", res,
- count);
- if (count < 0)
- return NULL;
-
- return res;
-}
-
-static void of_free_probes(const char * const *probes)
-{
- if (probes != part_probe_types_def)
- kfree(probes);
-}
-
-static const struct of_device_id of_flash_match[];
-static int of_flash_probe(struct platform_device *dev)
-{
- const char * const *part_probe_types;
- const struct of_device_id *match;
- struct device_node *dp = dev->dev.of_node;
- struct resource res;
- struct of_flash *info;
- const char *probe_type;
- const __be32 *width;
- int err;
- int i;
- int count;
- const __be32 *p;
- int reg_tuple_size;
- struct mtd_info **mtd_list = NULL;
- resource_size_t res_size;
- bool map_indirect;
- const char *mtd_name = NULL;
-
- match = of_match_device(of_flash_match, &dev->dev);
- if (!match)
- return -EINVAL;
- probe_type = match->data;
-
- reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32);
-
- of_property_read_string(dp, "linux,mtd-name", &mtd_name);
-
- /*
- * Get number of "reg" tuples. Scan for MTD devices on area's
- * described by each "reg" region. This makes it possible (including
- * the concat support) to support the Intel P30 48F4400 chips which
- * consists internally of 2 non-identical NOR chips on one die.
- */
- p = of_get_property(dp, "reg", &count);
- if (!p || count % reg_tuple_size != 0) {
- dev_err(&dev->dev, "Malformed reg property on %pOF\n",
- dev->dev.of_node);
- err = -EINVAL;
- goto err_flash_remove;
- }
- count /= reg_tuple_size;
-
- map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access");
-
- err = -ENOMEM;
- info = devm_kzalloc(&dev->dev,
- sizeof(struct of_flash) +
- sizeof(struct of_flash_list) * count, GFP_KERNEL);
- if (!info)
- goto err_flash_remove;
-
- dev_set_drvdata(&dev->dev, info);
-
- mtd_list = kcalloc(count, sizeof(*mtd_list), GFP_KERNEL);
- if (!mtd_list)
- goto err_flash_remove;
-
- for (i = 0; i < count; i++) {
- err = -ENXIO;
- if (of_address_to_resource(dp, i, &res)) {
- /*
- * Continue with next register tuple if this
- * one is not mappable
- */
- continue;
- }
-
- dev_dbg(&dev->dev, "of_flash device: %pR\n", &res);
-
- err = -EBUSY;
- res_size = resource_size(&res);
- info->list[i].map.virt = devm_ioremap_resource(&dev->dev, &res);
- if (IS_ERR(info->list[i].map.virt)) {
- err = PTR_ERR(info->list[i].map.virt);
- goto err_out;
- }
-
- err = -ENXIO;
- width = of_get_property(dp, "bank-width", NULL);
- if (!width) {
- dev_err(&dev->dev, "Can't get bank width from device"
- " tree\n");
- goto err_out;
- }
-
- info->list[i].map.name = mtd_name ?: dev_name(&dev->dev);
- info->list[i].map.phys = res.start;
- info->list[i].map.size = res_size;
- info->list[i].map.bankwidth = be32_to_cpup(width);
- info->list[i].map.device_node = dp;
-
- if (of_property_read_bool(dp, "big-endian"))
- info->list[i].map.swap = CFI_BIG_ENDIAN;
- else if (of_property_read_bool(dp, "little-endian"))
- info->list[i].map.swap = CFI_LITTLE_ENDIAN;
-
- err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
- if (err)
- goto err_out;
- err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
- if (err)
- goto err_out;
-
- simple_map_init(&info->list[i].map);
-
- /*
- * On some platforms (e.g. MPC5200) a direct 1:1 mapping
- * may cause problems with JFFS2 usage, as the local bus (LPB)
- * doesn't support unaligned accesses as implemented in the
- * JFFS2 code via memcpy(). By setting NO_XIP, the
- * flash will not be exposed directly to the MTD users
- * (e.g. JFFS2) any more.
- */
- if (map_indirect)
- info->list[i].map.phys = NO_XIP;
-
- if (probe_type) {
- info->list[i].mtd = do_map_probe(probe_type,
- &info->list[i].map);
- } else {
- info->list[i].mtd = obsolete_probe(dev,
- &info->list[i].map);
- }
-
- /* Fall back to mapping region as ROM */
- if (!info->list[i].mtd) {
- dev_warn(&dev->dev,
- "do_map_probe() failed for type %s\n",
- probe_type);
-
- info->list[i].mtd = do_map_probe("map_rom",
- &info->list[i].map);
- }
- mtd_list[i] = info->list[i].mtd;
-
- err = -ENXIO;
- if (!info->list[i].mtd) {
- dev_err(&dev->dev, "do_map_probe() failed\n");
- goto err_out;
- } else {
- info->list_size++;
- }
- info->list[i].mtd->dev.parent = &dev->dev;
- }
-
- err = 0;
- info->cmtd = NULL;
- if (info->list_size == 1) {
- info->cmtd = info->list[0].mtd;
- } else if (info->list_size > 1) {
- /*
- * We detected multiple devices. Concatenate them together.
- */
- info->cmtd = mtd_concat_create(mtd_list, info->list_size,
- dev_name(&dev->dev));
- }
- if (info->cmtd == NULL)
- err = -ENXIO;
-
- if (err)
- goto err_out;
-
- info->cmtd->dev.parent = &dev->dev;
- mtd_set_of_node(info->cmtd, dp);
- part_probe_types = of_get_probes(dp);
- if (!part_probe_types) {
- err = -ENOMEM;
- goto err_out;
- }
- mtd_device_parse_register(info->cmtd, part_probe_types, NULL,
- NULL, 0);
- of_free_probes(part_probe_types);
-
- kfree(mtd_list);
-
- return 0;
-
-err_out:
- kfree(mtd_list);
-err_flash_remove:
- of_flash_remove(dev);
-
- return err;
-}
-
-static const struct of_device_id of_flash_match[] = {
- {
- .compatible = "cfi-flash",
- .data = (void *)"cfi_probe",
- },
- {
- /* FIXME: JEDEC chips can't be safely and reliably
- * probed, although the mtd code gets it right in
- * practice most of the time. We should use the
- * vendor and device ids specified by the binding to
- * bypass the heuristic probe code, but the mtd layer
- * provides, at present, no interface for doing so
- * :(. */
- .compatible = "jedec-flash",
- .data = (void *)"jedec_probe",
- },
- {
- .compatible = "mtd-ram",
- .data = (void *)"map_ram",
- },
- {
- .compatible = "mtd-rom",
- .data = (void *)"map_rom",
- },
- {
- .type = "rom",
- .compatible = "direct-mapped"
- },
- { },
-};
-MODULE_DEVICE_TABLE(of, of_flash_match);
-
-static struct platform_driver of_flash_driver = {
- .driver = {
- .name = "of-flash",
- .of_match_table = of_flash_match,
- },
- .probe = of_flash_probe,
- .remove = of_flash_remove,
-};
-
-module_platform_driver(of_flash_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Vitaly Wool <vwool@ru.mvista.com>");
-MODULE_DESCRIPTION("Device tree based MTD map driver");
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [v2,11/15] mtd: maps: Merge physmap_of.c into physmap-core.c
2018-10-19 7:49 ` [PATCH v2 11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Boris Brezillon
@ 2019-04-02 23:44 ` Chris Packham
2019-04-03 2:02 ` [PATCH] mtd: maps: Allow MTD_PHYSMAP with MTD_RAM Chris Packham
2019-05-01 18:02 ` [v2,11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Li Yang
0 siblings, 2 replies; 24+ messages in thread
From: Chris Packham @ 2019-04-02 23:44 UTC (permalink / raw)
To: Boris Brezillon, David Woodhouse, Brian Norris, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Mark Rutland, devicetree, Pawel Moll, Ian Campbell,
Linus Walleij, miquel.raynal, Rob Herring, Kumar Gala,
Ricardo Ribalda Delgado
Hi Boris,
I've just come across the commit from this patch.
On 19/10/18 8:49 PM, Boris Brezillon wrote:
> There's no real reason to have two separate driver for the DT and pdata
> case. Just do what we do everywhere else and handle DT and pdata
> parsing in the same driver.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
> Changes in v2:
> - Add Ricardo's R-b
> - Fix 2 checks (reported by Ricardo)
> ---
> drivers/mtd/maps/Kconfig | 4 +-
> drivers/mtd/maps/Makefile | 7 +-
> drivers/mtd/maps/physmap-core.c | 261 +++++++++++++++++++++++---
> drivers/mtd/maps/physmap_of_core.c | 368 -------------------------------------
> 4 files changed, 240 insertions(+), 400 deletions(-)
> delete mode 100644 drivers/mtd/maps/physmap_of_core.c
>
> diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
> index afb36bff13a7..5bffebacce86 100644
> --- a/drivers/mtd/maps/Kconfig
> +++ b/drivers/mtd/maps/Kconfig
> @@ -66,8 +66,8 @@ config MTD_PHYSMAP_BANKWIDTH
> used internally by the CFI drivers.
>
> config MTD_PHYSMAP_OF
> - tristate "Memory device in physical memory map based on OF description"
> - depends on OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_RAM)
> + bool "Memory device in physical memory map based on OF description"
> + depends on OF && MTD_PHYSMAP
Previously we could select MTD_PHYSMAP_OF if MTD_RAM was defined. After
this change we can't select this because MTD_PHYSMAP does not have
MTD_RAM as dependency.
I'm just in the process of porting the latest kernel to a platform with
parallel SRAM and NAND via a dedicated controller. I haven't got to a
point where the platform is booting but I suspect I'll loose my SRAM.
> help
> This provides a 'mapping' driver which allows the NOR Flash, ROM
> and RAM driver code to communicate with chips which are mapped
> diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
> index 2574909edffd..ad32b185a120 100644
> --- a/drivers/mtd/maps/Makefile
> +++ b/drivers/mtd/maps/Makefile
> @@ -18,13 +18,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
> obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
> obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o
> physmap-objs-y += physmap-core.o
> +physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
> +physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o
> physmap-objs := $(physmap-objs-y)
> obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
> -physmap_of-objs-y += physmap_of_core.o
> -physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
> -physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o
> -physmap_of-objs := $(physmap_of-objs-y)
> -obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o
> obj-$(CONFIG_MTD_PISMO) += pismo.o
> obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o
> obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
> diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
> index e27051bc5dc6..07af8368d173 100644
> --- a/drivers/mtd/maps/physmap-core.c
> +++ b/drivers/mtd/maps/physmap-core.c
> @@ -6,6 +6,13 @@
> * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
> *
> * 031022 - [jsun] add run-time configure and partition setup
> + *
> + * Device tree support:
> + * Copyright (C) 2006 MontaVista Software Inc.
> + * Author: Vitaly Wool <vwool@ru.mvista.com>
> + *
> + * Revised to handle newer style flash binding by:
> + * Copyright (C) 2007 David Gibson, IBM Corporation.
> */
>
> #include <linux/module.h>
> @@ -20,7 +27,12 @@
> #include <linux/mtd/partitions.h>
> #include <linux/mtd/physmap.h>
> #include <linux/mtd/concat.h>
> +#include <linux/mtd/cfi_endian.h>
> #include <linux/io.h>
> +#include <linux/of_device.h>
> +
> +#include "physmap_of_gemini.h"
> +#include "physmap_of_versatile.h"
>
> struct physmap_flash_info {
> unsigned int nmaps;
> @@ -29,6 +41,10 @@ struct physmap_flash_info {
> struct map_info *maps;
> spinlock_t vpp_lock;
> int vpp_refcnt;
> + const char *probe_type;
> + const char * const *part_types;
> + unsigned int nparts;
> + const struct mtd_partition *parts;
> };
>
> static int physmap_flash_remove(struct platform_device *dev)
> @@ -41,8 +57,6 @@ static int physmap_flash_remove(struct platform_device *dev)
> if (!info)
> return 0;
>
> - physmap_data = dev_get_platdata(&dev->dev);
> -
> if (info->cmtd) {
> err = mtd_device_unregister(info->cmtd);
> if (err)
> @@ -57,7 +71,8 @@ static int physmap_flash_remove(struct platform_device *dev)
> map_destroy(info->mtds[i]);
> }
>
> - if (physmap_data->exit)
> + physmap_data = dev_get_platdata(&dev->dev);
> + if (physmap_data && physmap_data->exit)
> physmap_data->exit(dev);
>
> return 0;
> @@ -89,6 +104,172 @@ static void physmap_set_vpp(struct map_info *map, int state)
> spin_unlock_irqrestore(&info->vpp_lock, flags);
> }
>
> +#if IS_ENABLED(CONFIG_MTD_PHYSMAP_OF)
> +static const struct of_device_id of_flash_match[] = {
> + {
> + .compatible = "cfi-flash",
> + .data = "cfi_probe",
> + },
> + {
> + /*
> + * FIXME: JEDEC chips can't be safely and reliably
> + * probed, although the mtd code gets it right in
> + * practice most of the time. We should use the
> + * vendor and device ids specified by the binding to
> + * bypass the heuristic probe code, but the mtd layer
> + * provides, at present, no interface for doing so
> + * :(.
> + */
> + .compatible = "jedec-flash",
> + .data = "jedec_probe",
> + },
> + {
> + .compatible = "mtd-ram",
> + .data = "map_ram",
> + },
> + {
> + .compatible = "mtd-rom",
> + .data = "map_rom",
> + },
> + {
> + .type = "rom",
> + .compatible = "direct-mapped"
> + },
> + { /* sentinel */ },
> +};
> +MODULE_DEVICE_TABLE(of, of_flash_match);
> +
> +static const char * const of_default_part_probes[] = {
> + "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL
> +};
> +
> +static const char * const *of_get_part_probes(struct platform_device *dev)
> +{
> + struct device_node *dp = dev->dev.of_node;
> + const char **res;
> + int count;
> +
> + count = of_property_count_strings(dp, "linux,part-probe");
> + if (count < 0)
> + return of_default_part_probes;
> +
> + res = devm_kcalloc(&dev->dev, count + 1, sizeof(*res), GFP_KERNEL);
> + if (!res)
> + return NULL;
> +
> + count = of_property_read_string_array(dp, "linux,part-probe", res,
> + count);
> + if (count < 0)
> + return NULL;
> +
> + return res;
> +}
> +
> +static const char *of_select_probe_type(struct platform_device *dev)
> +{
> + struct device_node *dp = dev->dev.of_node;
> + const struct of_device_id *match;
> + const char *probe_type;
> +
> + match = of_match_device(of_flash_match, &dev->dev);
> + probe_type = match->data;
> + if (probe_type)
> + return probe_type;
> +
> + dev_warn(&dev->dev,
> + "Device tree uses obsolete \"direct-mapped\" flash binding\n");
> +
> + of_property_read_string(dp, "probe-type", &probe_type);
> + if (!probe_type)
> + return NULL;
> +
> + if (!strcmp(probe_type, "CFI")) {
> + probe_type = "cfi_probe";
> + } else if (!strcmp(probe_type, "JEDEC")) {
> + probe_type = "jedec_probe";
> + } else if (!strcmp(probe_type, "ROM")) {
> + probe_type = "map_rom";
> + } else {
> + dev_warn(&dev->dev,
> + "obsolete_probe: don't know probe type '%s', mapping as rom\n",
> + probe_type);
> + probe_type = "map_rom";
> + }
> +
> + return probe_type;
> +}
> +
> +static int physmap_flash_of_init(struct platform_device *dev)
> +{
> + struct physmap_flash_info *info = platform_get_drvdata(dev);
> + struct device_node *dp = dev->dev.of_node;
> + const char *mtd_name = NULL;
> + int err, swap = 0;
> + bool map_indirect;
> + unsigned int i;
> + u32 bankwidth;
> +
> + if (!dp)
> + return -EINVAL;
> +
> + info->probe_type = of_select_probe_type(dev);
> +
> + info->part_types = of_get_part_probes(dev);
> + if (!info->part_types)
> + return -ENOMEM;
> +
> + of_property_read_string(dp, "linux,mtd-name", &mtd_name);
> +
> + map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access");
> +
> + err = of_property_read_u32(dp, "bank-width", &bankwidth);
> + if (err) {
> + dev_err(&dev->dev, "Can't get bank width from device tree\n");
> + return err;
> + }
> +
> + if (of_property_read_bool(dp, "big-endian"))
> + swap = CFI_BIG_ENDIAN;
> + else if (of_property_read_bool(dp, "little-endian"))
> + swap = CFI_LITTLE_ENDIAN;
> +
> + for (i = 0; i < info->nmaps; i++) {
> + info->maps[i].name = mtd_name;
> + info->maps[i].swap = swap;
> + info->maps[i].bankwidth = bankwidth;
> + info->maps[i].device_node = dp;
> +
> + err = of_flash_probe_gemini(dev, dp, &info->maps[i]);
> + if (err)
> + return err;
> +
> + err = of_flash_probe_versatile(dev, dp, &info->maps[i]);
> + if (err)
> + return err;
> +
> + /*
> + * On some platforms (e.g. MPC5200) a direct 1:1 mapping
> + * may cause problems with JFFS2 usage, as the local bus (LPB)
> + * doesn't support unaligned accesses as implemented in the
> + * JFFS2 code via memcpy(). By setting NO_XIP, the
> + * flash will not be exposed directly to the MTD users
> + * (e.g. JFFS2) any more.
> + */
> + if (map_indirect)
> + info->maps[i].phys = NO_XIP;
> + }
> +
> + return 0;
> +}
> +#else /* IS_ENABLED(CONFIG_MTD_PHYSMAP_OF) */
> +#define of_flash_match NULL
> +
> +static int physmap_flash_of_init(struct platform_device *dev)
> +{
> + return -ENOTSUPP;
> +}
> +#endif /* IS_ENABLED(CONFIG_MTD_PHYSMAP_OF) */
> +
> static const char * const rom_probe_types[] = {
> "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL
> };
> @@ -97,18 +278,46 @@ static const char * const part_probe_types[] = {
> "cmdlinepart", "RedBoot", "afs", NULL
> };
>
> -static int physmap_flash_probe(struct platform_device *dev)
> +static int physmap_flash_pdata_init(struct platform_device *dev)
> {
> + struct physmap_flash_info *info = platform_get_drvdata(dev);
> struct physmap_flash_data *physmap_data;
> + unsigned int i;
> + int err;
> +
> + physmap_data = dev_get_platdata(&dev->dev);
> + if (!physmap_data)
> + return -EINVAL;
> +
> + info->probe_type = physmap_data->probe_type;
> + info->part_types = physmap_data->part_probe_types ? : part_probe_types;
> + info->parts = physmap_data->parts;
> + info->nparts = physmap_data->nr_parts;
> +
> + if (physmap_data->init) {
> + err = physmap_data->init(dev);
> + if (err)
> + return err;
> + }
> +
> + for (i = 0; i < info->nmaps; i++) {
> + info->maps[i].bankwidth = physmap_data->width;
> + info->maps[i].pfow_base = physmap_data->pfow_base;
> + info->maps[i].set_vpp = physmap_set_vpp;
> + }
> +
> + return 0;
> +}
> +
> +static int physmap_flash_probe(struct platform_device *dev)
> +{
> struct physmap_flash_info *info;
> const char * const *probe_type;
> - const char * const *part_types;
> int err = 0;
> int i;
>
> - physmap_data = dev_get_platdata(&dev->dev);
> - if (!physmap_data)
> - return -ENODEV;
> + if (!dev->dev.of_node && !dev_get_platdata(&dev->dev))
> + return -EINVAL;
>
> info = devm_kzalloc(&dev->dev, sizeof(*info), GFP_KERNEL);
> if (!info)
> @@ -132,14 +341,16 @@ static int physmap_flash_probe(struct platform_device *dev)
> if (!info->mtds)
> return -ENOMEM;
>
> - if (physmap_data->init) {
> - err = physmap_data->init(dev);
> - if (err)
> - goto err_out;
> - }
> -
> platform_set_drvdata(dev, info);
>
> + if (dev->dev.of_node)
> + err = physmap_flash_of_init(dev);
> + else
> + err = physmap_flash_pdata_init(dev);
> +
> + if (err)
> + return err;
> +
> for (i = 0; i < info->nmaps; i++) {
> struct resource *res;
>
> @@ -154,22 +365,22 @@ static int physmap_flash_probe(struct platform_device *dev)
> res);
>
> info->maps[i].name = dev_name(&dev->dev);
> - info->maps[i].phys = res->start;
> +
> + if (!info->maps[i].phys)
> + info->maps[i].phys = res->start;
> +
> info->maps[i].size = resource_size(res);
> - info->maps[i].bankwidth = physmap_data->width;
> - info->maps[i].set_vpp = physmap_set_vpp;
> - info->maps[i].pfow_base = physmap_data->pfow_base;
> info->maps[i].map_priv_1 = (unsigned long)dev;
>
> simple_map_init(&info->maps[i]);
>
> probe_type = rom_probe_types;
> - if (!physmap_data->probe_type) {
> + if (!info->probe_type) {
> for (; !info->mtds[i] && *probe_type; probe_type++)
> info->mtds[i] = do_map_probe(*probe_type,
> &info->maps[i]);
> } else {
> - info->mtds[i] = do_map_probe(physmap_data->probe_type,
> + info->mtds[i] = do_map_probe(info->probe_type,
> &info->maps[i]);
> }
>
> @@ -197,11 +408,9 @@ static int physmap_flash_probe(struct platform_device *dev)
>
> spin_lock_init(&info->vpp_lock);
>
> - part_types = physmap_data->part_probe_types ? : part_probe_types;
> -
> - err = mtd_device_parse_register(info->cmtd, part_types, NULL,
> - physmap_data->parts,
> - physmap_data->nr_parts);
> + mtd_set_of_node(info->cmtd, dev->dev.of_node);
> + err = mtd_device_parse_register(info->cmtd, info->part_types, NULL,
> + info->parts, info->nparts);
> if (err)
> goto err_out;
>
> @@ -232,6 +441,7 @@ static struct platform_driver physmap_flash_driver = {
> .shutdown = physmap_flash_shutdown,
> .driver = {
> .name = "physmap-flash",
> + .of_match_table = of_flash_match,
> },
> };
>
> @@ -286,6 +496,7 @@ module_exit(physmap_exit);
>
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
> +MODULE_AUTHOR("Vitaly Wool <vwool@ru.mvista.com>");
> MODULE_DESCRIPTION("Generic configurable MTD map driver");
>
> /* legacy platform drivers can't hotplug or coldplg */
> diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c
> deleted file mode 100644
> index ece605d78c21..000000000000
> --- a/drivers/mtd/maps/physmap_of_core.c
> +++ /dev/null
> @@ -1,368 +0,0 @@
> -/*
> - * Flash mappings described by the OF (or flattened) device tree
> - *
> - * Copyright (C) 2006 MontaVista Software Inc.
> - * Author: Vitaly Wool <vwool@ru.mvista.com>
> - *
> - * Revised to handle newer style flash binding by:
> - * Copyright (C) 2007 David Gibson, IBM Corporation.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the
> - * Free Software Foundation; either version 2 of the License, or (at your
> - * option) any later version.
> - */
> -
> -#include <linux/module.h>
> -#include <linux/types.h>
> -#include <linux/device.h>
> -#include <linux/mtd/mtd.h>
> -#include <linux/mtd/map.h>
> -#include <linux/mtd/partitions.h>
> -#include <linux/mtd/concat.h>
> -#include <linux/mtd/cfi_endian.h>
> -#include <linux/of.h>
> -#include <linux/of_address.h>
> -#include <linux/of_platform.h>
> -#include <linux/slab.h>
> -#include "physmap_of_gemini.h"
> -#include "physmap_of_versatile.h"
> -
> -struct of_flash_list {
> - struct mtd_info *mtd;
> - struct map_info map;
> -};
> -
> -struct of_flash {
> - struct mtd_info *cmtd;
> - int list_size; /* number of elements in of_flash_list */
> - struct of_flash_list list[0];
> -};
> -
> -static int of_flash_remove(struct platform_device *dev)
> -{
> - struct of_flash *info;
> - int i;
> -
> - info = dev_get_drvdata(&dev->dev);
> - if (!info)
> - return 0;
> - dev_set_drvdata(&dev->dev, NULL);
> -
> - if (info->cmtd) {
> - mtd_device_unregister(info->cmtd);
> - if (info->cmtd != info->list[0].mtd)
> - mtd_concat_destroy(info->cmtd);
> - }
> -
> - for (i = 0; i < info->list_size; i++)
> - if (info->list[i].mtd)
> - map_destroy(info->list[i].mtd);
> -
> - return 0;
> -}
> -
> -static const char * const rom_probe_types[] = {
> - "cfi_probe", "jedec_probe", "map_rom" };
> -
> -/* Helper function to handle probing of the obsolete "direct-mapped"
> - * compatible binding, which has an extra "probe-type" property
> - * describing the type of flash probe necessary. */
> -static struct mtd_info *obsolete_probe(struct platform_device *dev,
> - struct map_info *map)
> -{
> - struct device_node *dp = dev->dev.of_node;
> - const char *of_probe;
> - struct mtd_info *mtd;
> - int i;
> -
> - dev_warn(&dev->dev, "Device tree uses obsolete \"direct-mapped\" "
> - "flash binding\n");
> -
> - of_probe = of_get_property(dp, "probe-type", NULL);
> - if (!of_probe) {
> - for (i = 0; i < ARRAY_SIZE(rom_probe_types); i++) {
> - mtd = do_map_probe(rom_probe_types[i], map);
> - if (mtd)
> - return mtd;
> - }
> - return NULL;
> - } else if (strcmp(of_probe, "CFI") == 0) {
> - return do_map_probe("cfi_probe", map);
> - } else if (strcmp(of_probe, "JEDEC") == 0) {
> - return do_map_probe("jedec_probe", map);
> - } else {
> - if (strcmp(of_probe, "ROM") != 0)
> - dev_warn(&dev->dev, "obsolete_probe: don't know probe "
> - "type '%s', mapping as rom\n", of_probe);
> - return do_map_probe("map_rom", map);
> - }
> -}
> -
> -/* When partitions are set we look for a linux,part-probe property which
> - specifies the list of partition probers to use. If none is given then the
> - default is use. These take precedence over other device tree
> - information. */
> -static const char * const part_probe_types_def[] = {
> - "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL };
> -
> -static const char * const *of_get_probes(struct device_node *dp)
> -{
> - const char **res;
> - int count;
> -
> - count = of_property_count_strings(dp, "linux,part-probe");
> - if (count < 0)
> - return part_probe_types_def;
> -
> - res = kcalloc(count + 1, sizeof(*res), GFP_KERNEL);
> - if (!res)
> - return NULL;
> -
> - count = of_property_read_string_array(dp, "linux,part-probe", res,
> - count);
> - if (count < 0)
> - return NULL;
> -
> - return res;
> -}
> -
> -static void of_free_probes(const char * const *probes)
> -{
> - if (probes != part_probe_types_def)
> - kfree(probes);
> -}
> -
> -static const struct of_device_id of_flash_match[];
> -static int of_flash_probe(struct platform_device *dev)
> -{
> - const char * const *part_probe_types;
> - const struct of_device_id *match;
> - struct device_node *dp = dev->dev.of_node;
> - struct resource res;
> - struct of_flash *info;
> - const char *probe_type;
> - const __be32 *width;
> - int err;
> - int i;
> - int count;
> - const __be32 *p;
> - int reg_tuple_size;
> - struct mtd_info **mtd_list = NULL;
> - resource_size_t res_size;
> - bool map_indirect;
> - const char *mtd_name = NULL;
> -
> - match = of_match_device(of_flash_match, &dev->dev);
> - if (!match)
> - return -EINVAL;
> - probe_type = match->data;
> -
> - reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32);
> -
> - of_property_read_string(dp, "linux,mtd-name", &mtd_name);
> -
> - /*
> - * Get number of "reg" tuples. Scan for MTD devices on area's
> - * described by each "reg" region. This makes it possible (including
> - * the concat support) to support the Intel P30 48F4400 chips which
> - * consists internally of 2 non-identical NOR chips on one die.
> - */
> - p = of_get_property(dp, "reg", &count);
> - if (!p || count % reg_tuple_size != 0) {
> - dev_err(&dev->dev, "Malformed reg property on %pOF\n",
> - dev->dev.of_node);
> - err = -EINVAL;
> - goto err_flash_remove;
> - }
> - count /= reg_tuple_size;
> -
> - map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access");
> -
> - err = -ENOMEM;
> - info = devm_kzalloc(&dev->dev,
> - sizeof(struct of_flash) +
> - sizeof(struct of_flash_list) * count, GFP_KERNEL);
> - if (!info)
> - goto err_flash_remove;
> -
> - dev_set_drvdata(&dev->dev, info);
> -
> - mtd_list = kcalloc(count, sizeof(*mtd_list), GFP_KERNEL);
> - if (!mtd_list)
> - goto err_flash_remove;
> -
> - for (i = 0; i < count; i++) {
> - err = -ENXIO;
> - if (of_address_to_resource(dp, i, &res)) {
> - /*
> - * Continue with next register tuple if this
> - * one is not mappable
> - */
> - continue;
> - }
> -
> - dev_dbg(&dev->dev, "of_flash device: %pR\n", &res);
> -
> - err = -EBUSY;
> - res_size = resource_size(&res);
> - info->list[i].map.virt = devm_ioremap_resource(&dev->dev, &res);
> - if (IS_ERR(info->list[i].map.virt)) {
> - err = PTR_ERR(info->list[i].map.virt);
> - goto err_out;
> - }
> -
> - err = -ENXIO;
> - width = of_get_property(dp, "bank-width", NULL);
> - if (!width) {
> - dev_err(&dev->dev, "Can't get bank width from device"
> - " tree\n");
> - goto err_out;
> - }
> -
> - info->list[i].map.name = mtd_name ?: dev_name(&dev->dev);
> - info->list[i].map.phys = res.start;
> - info->list[i].map.size = res_size;
> - info->list[i].map.bankwidth = be32_to_cpup(width);
> - info->list[i].map.device_node = dp;
> -
> - if (of_property_read_bool(dp, "big-endian"))
> - info->list[i].map.swap = CFI_BIG_ENDIAN;
> - else if (of_property_read_bool(dp, "little-endian"))
> - info->list[i].map.swap = CFI_LITTLE_ENDIAN;
> -
> - err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
> - if (err)
> - goto err_out;
> - err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
> - if (err)
> - goto err_out;
> -
> - simple_map_init(&info->list[i].map);
> -
> - /*
> - * On some platforms (e.g. MPC5200) a direct 1:1 mapping
> - * may cause problems with JFFS2 usage, as the local bus (LPB)
> - * doesn't support unaligned accesses as implemented in the
> - * JFFS2 code via memcpy(). By setting NO_XIP, the
> - * flash will not be exposed directly to the MTD users
> - * (e.g. JFFS2) any more.
> - */
> - if (map_indirect)
> - info->list[i].map.phys = NO_XIP;
> -
> - if (probe_type) {
> - info->list[i].mtd = do_map_probe(probe_type,
> - &info->list[i].map);
> - } else {
> - info->list[i].mtd = obsolete_probe(dev,
> - &info->list[i].map);
> - }
> -
> - /* Fall back to mapping region as ROM */
> - if (!info->list[i].mtd) {
> - dev_warn(&dev->dev,
> - "do_map_probe() failed for type %s\n",
> - probe_type);
> -
> - info->list[i].mtd = do_map_probe("map_rom",
> - &info->list[i].map);
> - }
> - mtd_list[i] = info->list[i].mtd;
> -
> - err = -ENXIO;
> - if (!info->list[i].mtd) {
> - dev_err(&dev->dev, "do_map_probe() failed\n");
> - goto err_out;
> - } else {
> - info->list_size++;
> - }
> - info->list[i].mtd->dev.parent = &dev->dev;
> - }
> -
> - err = 0;
> - info->cmtd = NULL;
> - if (info->list_size == 1) {
> - info->cmtd = info->list[0].mtd;
> - } else if (info->list_size > 1) {
> - /*
> - * We detected multiple devices. Concatenate them together.
> - */
> - info->cmtd = mtd_concat_create(mtd_list, info->list_size,
> - dev_name(&dev->dev));
> - }
> - if (info->cmtd == NULL)
> - err = -ENXIO;
> -
> - if (err)
> - goto err_out;
> -
> - info->cmtd->dev.parent = &dev->dev;
> - mtd_set_of_node(info->cmtd, dp);
> - part_probe_types = of_get_probes(dp);
> - if (!part_probe_types) {
> - err = -ENOMEM;
> - goto err_out;
> - }
> - mtd_device_parse_register(info->cmtd, part_probe_types, NULL,
> - NULL, 0);
> - of_free_probes(part_probe_types);
> -
> - kfree(mtd_list);
> -
> - return 0;
> -
> -err_out:
> - kfree(mtd_list);
> -err_flash_remove:
> - of_flash_remove(dev);
> -
> - return err;
> -}
> -
> -static const struct of_device_id of_flash_match[] = {
> - {
> - .compatible = "cfi-flash",
> - .data = (void *)"cfi_probe",
> - },
> - {
> - /* FIXME: JEDEC chips can't be safely and reliably
> - * probed, although the mtd code gets it right in
> - * practice most of the time. We should use the
> - * vendor and device ids specified by the binding to
> - * bypass the heuristic probe code, but the mtd layer
> - * provides, at present, no interface for doing so
> - * :(. */
> - .compatible = "jedec-flash",
> - .data = (void *)"jedec_probe",
> - },
> - {
> - .compatible = "mtd-ram",
> - .data = (void *)"map_ram",
> - },
> - {
> - .compatible = "mtd-rom",
> - .data = (void *)"map_rom",
> - },
> - {
> - .type = "rom",
> - .compatible = "direct-mapped"
> - },
> - { },
> -};
> -MODULE_DEVICE_TABLE(of, of_flash_match);
> -
> -static struct platform_driver of_flash_driver = {
> - .driver = {
> - .name = "of-flash",
> - .of_match_table = of_flash_match,
> - },
> - .probe = of_flash_probe,
> - .remove = of_flash_remove,
> -};
> -
> -module_platform_driver(of_flash_driver);
> -
> -MODULE_LICENSE("GPL");
> -MODULE_AUTHOR("Vitaly Wool <vwool@ru.mvista.com>");
> -MODULE_DESCRIPTION("Device tree based MTD map driver");
>
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH] mtd: maps: Allow MTD_PHYSMAP with MTD_RAM
2019-04-02 23:44 ` [v2,11/15] " Chris Packham
@ 2019-04-03 2:02 ` Chris Packham
2019-05-01 18:02 ` [v2,11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Li Yang
1 sibling, 0 replies; 24+ messages in thread
From: Chris Packham @ 2019-04-03 2:02 UTC (permalink / raw)
To: dwmw2, computersforpeace, bbrezillon, marek.vasut, richard
Cc: Hamish Martin, Chris Packham, linux-mtd, linux-kernel, stable
When the physmap_of_core.c code was merged into physmap-core.c the
ability to use MTD_PHYSMAP_OF with only MTD_RAM selected was lost.
Restore this by adding MTD_RAM to the dependencies of MTD_PHYSMAP.
Fixes: commit 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c")
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
---
drivers/mtd/maps/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index e0cf869c8544..544ed1931843 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -10,7 +10,7 @@ config MTD_COMPLEX_MAPPINGS
config MTD_PHYSMAP
tristate "Flash device in physical memory map"
- depends on MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_LPDDR
+ depends on MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_RAM || MTD_LPDDR
help
This provides a 'mapping' driver which allows the NOR Flash and
ROM driver code to communicate with chips which are mapped
--
2.21.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [v2,11/15] mtd: maps: Merge physmap_of.c into physmap-core.c
2019-04-02 23:44 ` [v2,11/15] " Chris Packham
2019-04-03 2:02 ` [PATCH] mtd: maps: Allow MTD_PHYSMAP with MTD_RAM Chris Packham
@ 2019-05-01 18:02 ` Li Yang
1 sibling, 0 replies; 24+ messages in thread
From: Li Yang @ 2019-05-01 18:02 UTC (permalink / raw)
To: Chris Packham
Cc: Mark Rutland, devicetree, Pawel Moll, Boris Brezillon,
miquel.raynal, Richard Weinberger, Linus Walleij, Ian Campbell,
Marek Vasut, Rob Herring, linux-mtd, Kumar Gala,
Ricardo Ribalda Delgado, Brian Norris, David Woodhouse
On Tue, Apr 2, 2019 at 6:46 PM Chris Packham
<Chris.Packham@alliedtelesis.co.nz> wrote:
>
> Hi Boris,
>
> I've just come across the commit from this patch.
>
> On 19/10/18 8:49 PM, Boris Brezillon wrote:
> > There's no real reason to have two separate driver for the DT and pdata
> > case. Just do what we do everywhere else and handle DT and pdata
> > parsing in the same driver.
> >
> > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> > Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> > ---
> > Changes in v2:
> > - Add Ricardo's R-b
> > - Fix 2 checks (reported by Ricardo)
> > ---
> > drivers/mtd/maps/Kconfig | 4 +-
> > drivers/mtd/maps/Makefile | 7 +-
> > drivers/mtd/maps/physmap-core.c | 261 +++++++++++++++++++++++---
> > drivers/mtd/maps/physmap_of_core.c | 368 -------------------------------------
> > 4 files changed, 240 insertions(+), 400 deletions(-)
> > delete mode 100644 drivers/mtd/maps/physmap_of_core.c
> >
> > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
> > index afb36bff13a7..5bffebacce86 100644
> > --- a/drivers/mtd/maps/Kconfig
> > +++ b/drivers/mtd/maps/Kconfig
> > @@ -66,8 +66,8 @@ config MTD_PHYSMAP_BANKWIDTH
> > used internally by the CFI drivers.
> >
> > config MTD_PHYSMAP_OF
> > - tristate "Memory device in physical memory map based on OF description"
> > - depends on OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_RAM)
> > + bool "Memory device in physical memory map based on OF description"
> > + depends on OF && MTD_PHYSMAP
>
> Previously we could select MTD_PHYSMAP_OF if MTD_RAM was defined. After
> this change we can't select this because MTD_PHYSMAP does not have
> MTD_RAM as dependency.
>
> I'm just in the process of porting the latest kernel to a platform with
> parallel SRAM and NAND via a dedicated controller. I haven't got to a
> point where the platform is booting but I suspect I'll loose my SRAM.
Another minor issue is that previously the MTD_PHYSMAP_OF can be
selected separately, but now it cannot be selected without the
MTD_PHYSMAP. This may break existing defconfigs. Probably it will be
better to select MTD_PHYSMAP automatically when MTD_PHYSMAP_OF is
selected?
Regards,
Leo
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v2 12/15] mtd: maps: Rename physmap_of_{versatile, gemini} into physmap-{versatile, gemini}
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (10 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property Boris Brezillon
` (4 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Now that the physmap_of driver is gone, the gemini and versative
extensions are part of the physmap driver. Rename the source files and
the config option to reflect this.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/Kconfig | 4 ++--
drivers/mtd/maps/Makefile | 4 ++--
drivers/mtd/maps/physmap-core.c | 4 ++--
drivers/mtd/maps/{physmap_of_gemini.c => physmap-gemini.c} | 2 +-
drivers/mtd/maps/{physmap_of_gemini.h => physmap-gemini.h} | 2 +-
drivers/mtd/maps/{physmap_of_versatile.c => physmap-versatile.c} | 2 +-
drivers/mtd/maps/{physmap_of_versatile.h => physmap-versatile.h} | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
rename drivers/mtd/maps/{physmap_of_gemini.c => physmap-gemini.c} (98%)
rename drivers/mtd/maps/{physmap_of_gemini.h => physmap-gemini.h} (90%)
rename drivers/mtd/maps/{physmap_of_versatile.c => physmap-versatile.c} (99%)
rename drivers/mtd/maps/{physmap_of_versatile.h => physmap-versatile.h} (90%)
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 5bffebacce86..bb0d64e3fcd6 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -74,7 +74,7 @@ config MTD_PHYSMAP_OF
physically into the CPU's memory. The mapping description here is
taken from OF device tree.
-config MTD_PHYSMAP_OF_VERSATILE
+config MTD_PHYSMAP_VERSATILE
bool "ARM Versatile OF-based physical memory map handling"
depends on MTD_PHYSMAP_OF
depends on MFD_SYSCON
@@ -84,7 +84,7 @@ config MTD_PHYSMAP_OF_VERSATILE
platforms, basically to add a VPP (write protection) callback so
the flash can be taken out of write protection.
-config MTD_PHYSMAP_OF_GEMINI
+config MTD_PHYSMAP_GEMINI
bool "Cortina Gemini OF-based physical memory map handling"
depends on MTD_PHYSMAP_OF
depends on MFD_SYSCON
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index ad32b185a120..ce737e15b7cf 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -18,8 +18,8 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o
physmap-objs-y += physmap-core.o
-physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
-physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o
+physmap-objs-$(CONFIG_MTD_PHYSMAP_VERSATILE) += physmap-versatile.o
+physmap-objs-$(CONFIG_MTD_PHYSMAP_GEMINI) += physmap-gemini.o
physmap-objs := $(physmap-objs-y)
obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
obj-$(CONFIG_MTD_PISMO) += pismo.o
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 07af8368d173..8a8af37576ff 100644
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -31,8 +31,8 @@
#include <linux/io.h>
#include <linux/of_device.h>
-#include "physmap_of_gemini.h"
-#include "physmap_of_versatile.h"
+#include "physmap-gemini.h"
+#include "physmap-versatile.h"
struct physmap_flash_info {
unsigned int nmaps;
diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap-gemini.c
similarity index 98%
rename from drivers/mtd/maps/physmap_of_gemini.c
rename to drivers/mtd/maps/physmap-gemini.c
index 9df62ca721d5..1cf128a0526d 100644
--- a/drivers/mtd/maps/physmap_of_gemini.c
+++ b/drivers/mtd/maps/physmap-gemini.c
@@ -13,7 +13,7 @@
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
#include <linux/bitops.h>
-#include "physmap_of_gemini.h"
+#include "physmap-gemini.h"
/*
* The Flash-relevant parts of the global status register
diff --git a/drivers/mtd/maps/physmap_of_gemini.h b/drivers/mtd/maps/physmap-gemini.h
similarity index 90%
rename from drivers/mtd/maps/physmap_of_gemini.h
rename to drivers/mtd/maps/physmap-gemini.h
index 60e13a689d6a..72bd04ce3fdb 100644
--- a/drivers/mtd/maps/physmap_of_gemini.h
+++ b/drivers/mtd/maps/physmap-gemini.h
@@ -2,7 +2,7 @@
#include <linux/of.h>
#include <linux/mtd/map.h>
-#ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI
+#ifdef CONFIG_MTD_PHYSMAP_GEMINI
int of_flash_probe_gemini(struct platform_device *pdev,
struct device_node *np,
struct map_info *map);
diff --git a/drivers/mtd/maps/physmap_of_versatile.c b/drivers/mtd/maps/physmap-versatile.c
similarity index 99%
rename from drivers/mtd/maps/physmap_of_versatile.c
rename to drivers/mtd/maps/physmap-versatile.c
index 03f2b6e7bc7e..0179d710bb3f 100644
--- a/drivers/mtd/maps/physmap_of_versatile.c
+++ b/drivers/mtd/maps/physmap-versatile.c
@@ -28,7 +28,7 @@
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
#include <linux/bitops.h>
-#include "physmap_of_versatile.h"
+#include "physmap-versatile.h"
static struct regmap *syscon_regmap;
diff --git a/drivers/mtd/maps/physmap_of_versatile.h b/drivers/mtd/maps/physmap-versatile.h
similarity index 90%
rename from drivers/mtd/maps/physmap_of_versatile.h
rename to drivers/mtd/maps/physmap-versatile.h
index 0302502c9462..9cf39d031f5a 100644
--- a/drivers/mtd/maps/physmap_of_versatile.h
+++ b/drivers/mtd/maps/physmap-versatile.h
@@ -2,7 +2,7 @@
#include <linux/of.h>
#include <linux/mtd/map.h>
-#ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE
+#ifdef CONFIG_MTD_PHYSMAP_VERSATILE
int of_flash_probe_versatile(struct platform_device *pdev,
struct device_node *np,
struct map_info *map);
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (11 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 12/15] mtd: maps: Rename physmap_of_{versatile, gemini} into physmap-{versatile, gemini} Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-24 18:38 ` Rob Herring
2018-10-31 10:49 ` Linus Walleij
2018-10-19 7:49 ` [PATCH v2 14/15] mtd: maps: Merge gpio-addr-flash.c into physmap-core.c Boris Brezillon
` (3 subsequent siblings)
16 siblings, 2 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Add documentation for the addr-gpios. This extension to the physmap
binding allow creating flash devices that are paged using GPIOs.
Cc: devicetree@vger.kernel.org
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
Changes in v2:
- Drop Rob's R-b (waiting for a second review)
---
Documentation/devicetree/bindings/mtd/mtd-physmap.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/mtd/mtd-physmap.txt b/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
index 232fa12e90ef..7df0dcaccb7d 100644
--- a/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
+++ b/Documentation/devicetree/bindings/mtd/mtd-physmap.txt
@@ -29,6 +29,8 @@ file systems on embedded devices.
- use-advanced-sector-protection: boolean to enable support for the
advanced sector protection (Spansion: PPB - Persistent Protection
Bits) locking.
+ - addr-gpios : (optional) List of GPIO descriptors that will be used to
+ address the MSBs address lines. The order goes from LSB to MSB.
For JEDEC compatible devices, the following additional properties
are defined:
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property
2018-10-19 7:49 ` [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property Boris Brezillon
@ 2018-10-24 18:38 ` Rob Herring
2018-10-31 10:49 ` Linus Walleij
1 sibling, 0 replies; 24+ messages in thread
From: Rob Herring @ 2018-10-24 18:38 UTC (permalink / raw)
To: Boris Brezillon
Cc: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, devicetree, Ricardo Ribalda Delgado,
Linus Walleij
On Fri, 19 Oct 2018 09:49:06 +0200, Boris Brezillon wrote:
> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>
> Add documentation for the addr-gpios. This extension to the physmap
> binding allow creating flash devices that are paged using GPIOs.
>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> Changes in v2:
> - Drop Rob's R-b (waiting for a second review)
> ---
> Documentation/devicetree/bindings/mtd/mtd-physmap.txt | 2 ++
> 1 file changed, 2 insertions(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property
2018-10-19 7:49 ` [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property Boris Brezillon
2018-10-24 18:38 ` Rob Herring
@ 2018-10-31 10:49 ` Linus Walleij
1 sibling, 0 replies; 24+ messages in thread
From: Linus Walleij @ 2018-10-31 10:49 UTC (permalink / raw)
To: Boris Brezillon
Cc: David Woodhouse, Brian Norris, Mark Vasut, Richard Weinberger,
linux-mtd, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Ricardo Ribalda Delgado
On Fri, Oct 19, 2018 at 9:49 AM Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>
> Add documentation for the addr-gpios. This extension to the physmap
> binding allow creating flash devices that are paged using GPIOs.
>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> Changes in v2:
> - Drop Rob's R-b (waiting for a second review)
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v2 14/15] mtd: maps: Merge gpio-addr-flash.c into physmap-core.c
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (12 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 15/15] mtd: maps: physmap: Invert logic on if/else branch Boris Brezillon
` (2 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
Controlling some MSB address lines using GPIOs is just a small
deviation from the generic physmap logic, and merging those two drivers
allows us to share most of the probe logic, which is a good thing.
Also, the gpio-addr-flash driver is unused since the removal of
the blackfin arch in v4.17, so we can safely remove the old driver
without risking breaking existing boards.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Tested-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b/T-b
---
drivers/mtd/maps/Kconfig | 19 ++-
drivers/mtd/maps/Makefile | 1 -
drivers/mtd/maps/gpio-addr-flash.c | 281 -------------------------------------
drivers/mtd/maps/physmap-core.c | 150 +++++++++++++++++++-
4 files changed, 157 insertions(+), 294 deletions(-)
delete mode 100644 drivers/mtd/maps/gpio-addr-flash.c
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index bb0d64e3fcd6..93b7ae32e277 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -94,6 +94,15 @@ config MTD_PHYSMAP_GEMINI
platforms, some detection and setting up parallel mode on the
external interface.
+config MTD_PHYSMAP_GPIO_ADDR
+ bool "GPIO-assisted Flash Chip Support"
+ depends on MTD_PHYSMAP
+ depends on GPIOLIB || COMPILE_TEST
+ depends on MTD_COMPLEX_MAPPINGS
+ help
+ Extend the physmap driver to allow flashes to be partially
+ physically addressed and assisted by GPIOs.
+
config MTD_PMC_MSP_EVM
tristate "CFI Flash device mapped on PMC-Sierra MSP"
depends on PMC_MSP && MTD_CFI
@@ -334,16 +343,6 @@ config MTD_PCMCIA_ANONYMOUS
If unsure, say N.
-config MTD_GPIO_ADDR
- tristate "GPIO-assisted Flash Chip Support"
- depends on GPIOLIB || COMPILE_TEST
- depends on MTD_COMPLEX_MAPPINGS
- help
- Map driver which allows flashes to be partially physically addressed
- and assisted by GPIOs.
-
- If compiled as a module, it will be called gpio-addr-flash.
-
config MTD_UCLINUX
bool "Generic uClinux RAM/ROM filesystem support"
depends on (MTD_RAM=y || MTD_ROM=y) && (!MMU || COLDFIRE)
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index ce737e15b7cf..ed1ef75244db 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -43,6 +43,5 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
obj-$(CONFIG_MTD_VMU) += vmu-flash.o
-obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o
obj-$(CONFIG_MTD_LATCH_ADDR) += latch-addr-flash.o
obj-$(CONFIG_MTD_LANTIQ) += lantiq-flash.o
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
deleted file mode 100644
index a20e85aa770e..000000000000
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * drivers/mtd/maps/gpio-addr-flash.c
- *
- * Handle the case where a flash device is mostly addressed using physical
- * line and supplemented by GPIOs. This way you can hook up say a 8MiB flash
- * to a 2MiB memory range and use the GPIOs to select a particular range.
- *
- * Copyright © 2000 Nicolas Pitre <nico@cam.org>
- * Copyright © 2005-2009 Analog Devices Inc.
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/gpio.h>
-#include <linux/gpio/consumer.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-
-#define win_mask(x) ((BIT(x)) - 1)
-
-#define DRIVER_NAME "gpio-addr-flash"
-
-/**
- * struct async_state - keep GPIO flash state
- * @mtd: MTD state for this mapping
- * @map: MTD map state for this flash
- * @gpios: Struct containing the array of GPIO descriptors
- * @gpio_values: cached GPIO values
- * @win_order: dedicated memory size (if no GPIOs)
- */
-struct async_state {
- struct mtd_info *mtd;
- struct map_info map;
- struct gpio_descs *gpios;
- unsigned int gpio_values;
- unsigned int win_order;
-};
-#define gf_map_info_to_state(mi) ((struct async_state *)(mi)->map_priv_1)
-
-/**
- * gf_set_gpios() - set GPIO address lines to access specified flash offset
- * @state: GPIO flash state
- * @ofs: desired offset to access
- *
- * Rather than call the GPIO framework every time, cache the last-programmed
- * value. This speeds up sequential accesses (which are by far the most common
- * type).
- */
-static void gf_set_gpios(struct async_state *state, unsigned long ofs)
-{
- int i;
-
- ofs >>= state->win_order;
-
- if (ofs == state->gpio_values)
- return;
-
- for (i = 0; i < state->gpios->ndescs; i++) {
- if ((ofs & BIT(i)) == (state->gpio_values & BIT(i)))
- continue;
-
- gpiod_set_value(state->gpios->desc[i], !!(ofs & BIT(i)));
- }
-
- state->gpio_values = ofs;
-}
-
-/**
- * gf_read() - read a word at the specified offset
- * @map: MTD map state
- * @ofs: desired offset to read
- */
-static map_word gf_read(struct map_info *map, unsigned long ofs)
-{
- struct async_state *state = gf_map_info_to_state(map);
- uint16_t word;
- map_word test;
-
- gf_set_gpios(state, ofs);
-
- word = readw(map->virt + (ofs & win_mask(state->win_order)));
- test.x[0] = word;
- return test;
-}
-
-/**
- * gf_copy_from() - copy a chunk of data from the flash
- * @map: MTD map state
- * @to: memory to copy to
- * @from: flash offset to copy from
- * @len: how much to copy
- *
- * The "from" region may straddle more than one window, so toggle the GPIOs for
- * each window region before reading its data.
- */
-static void gf_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
-{
- struct async_state *state = gf_map_info_to_state(map);
-
- int this_len;
-
- while (len) {
- this_len = from & win_mask(state->win_order);
- this_len = BIT(state->win_order) - this_len;
- this_len = min_t(int, len, this_len);
-
- gf_set_gpios(state, from);
- memcpy_fromio(to,
- map->virt + (from & win_mask(state->win_order)),
- this_len);
- len -= this_len;
- from += this_len;
- to += this_len;
- }
-}
-
-/**
- * gf_write() - write a word at the specified offset
- * @map: MTD map state
- * @ofs: desired offset to write
- */
-static void gf_write(struct map_info *map, map_word d1, unsigned long ofs)
-{
- struct async_state *state = gf_map_info_to_state(map);
- uint16_t d;
-
- gf_set_gpios(state, ofs);
-
- d = d1.x[0];
- writew(d, map->virt + (ofs & win_mask(state->win_order)));
-}
-
-/**
- * gf_copy_to() - copy a chunk of data to the flash
- * @map: MTD map state
- * @to: flash offset to copy to
- * @from: memory to copy from
- * @len: how much to copy
- *
- * See gf_copy_from() caveat.
- */
-static void gf_copy_to(struct map_info *map, unsigned long to,
- const void *from, ssize_t len)
-{
- struct async_state *state = gf_map_info_to_state(map);
-
- int this_len;
-
- while (len) {
- this_len = to & win_mask(state->win_order);
- this_len = BIT(state->win_order) - this_len;
- this_len = min_t(int, len, this_len);
-
- gf_set_gpios(state, to);
- memcpy_toio(map->virt + (to & win_mask(state->win_order)),
- from, len);
-
- len -= this_len;
- to += this_len;
- from += this_len;
- }
-}
-
-static const char * const part_probe_types[] = {
- "cmdlinepart", "RedBoot", NULL };
-
-/**
- * gpio_flash_probe() - setup a mapping for a GPIO assisted flash
- * @pdev: platform device
- *
- * The platform resource layout expected looks something like:
- * struct mtd_partition partitions[] = { ... };
- * struct physmap_flash_data flash_data = { ... };
- * static struct gpiod_lookup_table addr_flash_gpios = {
- * .dev_id = "gpio-addr-flash.0",
- * .table = {
- * GPIO_LOOKUP_IDX("gpio.0", 15, "addr", 0, GPIO_ACTIVE_HIGH),
- * GPIO_LOOKUP_IDX("gpio.0", 16, "addr", 1, GPIO_ACTIVE_HIGH),
- * );
- * };
- * gpiod_add_lookup_table(&addr_flash_gpios);
- *
- * struct resource flash_resource[] = {
- * {
- * .name = "cfi_probe",
- * .start = 0x20000000,
- * .end = 0x201fffff,
- * .flags = IORESOURCE_MEM,
- * },
- * };
- * struct platform_device flash_device = {
- * .name = "gpio-addr-flash",
- * .dev = { .platform_data = &flash_data, },
- * .num_resources = ARRAY_SIZE(flash_resource),
- * .resource = flash_resource,
- * ...
- * };
- */
-static int gpio_flash_probe(struct platform_device *pdev)
-{
- struct physmap_flash_data *pdata;
- struct resource *memory;
- struct async_state *state;
-
- pdata = dev_get_platdata(&pdev->dev);
- memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
- if (!memory)
- return -EINVAL;
-
- state = devm_kzalloc(&pdev->dev, sizeof(*state), GFP_KERNEL);
- if (!state)
- return -ENOMEM;
-
- state->gpios = devm_gpiod_get_array(&pdev->dev, "addr", GPIOD_OUT_LOW);
- if (IS_ERR(state->gpios))
- return PTR_ERR(state->gpios);
-
- state->win_order = get_bitmask_order(resource_size(memory)) - 1;
-
- state->map.name = DRIVER_NAME;
- state->map.read = gf_read;
- state->map.copy_from = gf_copy_from;
- state->map.write = gf_write;
- state->map.copy_to = gf_copy_to;
- state->map.bankwidth = pdata->width;
- state->map.size = BIT(state->win_order + state->gpios->ndescs);
- state->map.virt = devm_ioremap_resource(&pdev->dev, memory);
- if (IS_ERR(state->map.virt))
- return PTR_ERR(state->map.virt);
-
- state->map.phys = NO_XIP;
- state->map.map_priv_1 = (unsigned long)state;
-
- platform_set_drvdata(pdev, state);
-
- dev_notice(&pdev->dev, "probing %d-bit flash bus\n",
- state->map.bankwidth * 8);
- state->mtd = do_map_probe(memory->name, &state->map);
- if (!state->mtd)
- return -ENXIO;
- state->mtd->dev.parent = &pdev->dev;
-
- mtd_device_parse_register(state->mtd, part_probe_types, NULL,
- pdata->parts, pdata->nr_parts);
-
- return 0;
-}
-
-static int gpio_flash_remove(struct platform_device *pdev)
-{
- struct async_state *state = platform_get_drvdata(pdev);
-
- mtd_device_unregister(state->mtd);
- map_destroy(state->mtd);
- return 0;
-}
-
-static struct platform_driver gpio_flash_driver = {
- .probe = gpio_flash_probe,
- .remove = gpio_flash_remove,
- .driver = {
- .name = DRIVER_NAME,
- },
-};
-
-module_platform_driver(gpio_flash_driver);
-
-MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>");
-MODULE_DESCRIPTION("MTD map driver for flashes addressed physically and with gpios");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 8a8af37576ff..11e6239aadc7 100644
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -13,6 +13,14 @@
*
* Revised to handle newer style flash binding by:
* Copyright (C) 2007 David Gibson, IBM Corporation.
+ *
+ * GPIO address extension:
+ * Handle the case where a flash device is mostly addressed using physical
+ * line and supplemented by GPIOs. This way you can hook up say a 8MiB flash
+ * to a 2MiB memory range and use the GPIOs to select a particular range.
+ *
+ * Copyright © 2000 Nicolas Pitre <nico@cam.org>
+ * Copyright © 2005-2009 Analog Devices Inc.
*/
#include <linux/module.h>
@@ -30,6 +38,7 @@
#include <linux/mtd/cfi_endian.h>
#include <linux/io.h>
#include <linux/of_device.h>
+#include <linux/gpio/consumer.h>
#include "physmap-gemini.h"
#include "physmap-versatile.h"
@@ -45,6 +54,9 @@ struct physmap_flash_info {
const char * const *part_types;
unsigned int nparts;
const struct mtd_partition *parts;
+ struct gpio_descs *gpios;
+ unsigned int gpio_values;
+ unsigned int win_order;
};
static int physmap_flash_remove(struct platform_device *dev)
@@ -104,6 +116,119 @@ static void physmap_set_vpp(struct map_info *map, int state)
spin_unlock_irqrestore(&info->vpp_lock, flags);
}
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP_GPIO_ADDR)
+static void physmap_set_addr_gpios(struct physmap_flash_info *info,
+ unsigned long ofs)
+{
+ unsigned int i;
+
+ ofs >>= info->win_order;
+ if (info->gpio_values == ofs)
+ return;
+
+ for (i = 0; i < info->gpios->ndescs; i++) {
+ if ((BIT(i) & ofs) == (BIT(i) & info->gpio_values))
+ continue;
+
+ gpiod_set_value(info->gpios->desc[i], !!(BIT(i) & ofs));
+ }
+}
+
+#define win_mask(order) (BIT(order) - 1)
+
+static map_word physmap_addr_gpios_read(struct map_info *map,
+ unsigned long ofs)
+{
+ struct platform_device *pdev;
+ struct physmap_flash_info *info;
+ map_word mw;
+ u16 word;
+
+ pdev = (struct platform_device *)map->map_priv_1;
+ info = platform_get_drvdata(pdev);
+ physmap_set_addr_gpios(info, ofs);
+
+ word = readw(map->virt + (ofs & win_mask(info->win_order)));
+ mw.x[0] = word;
+ return mw;
+}
+
+static void physmap_addr_gpios_copy_from(struct map_info *map, void *buf,
+ unsigned long ofs, ssize_t len)
+{
+ struct platform_device *pdev;
+ struct physmap_flash_info *info;
+
+ pdev = (struct platform_device *)map->map_priv_1;
+ info = platform_get_drvdata(pdev);
+
+ while (len) {
+ unsigned int winofs = ofs & win_mask(info->win_order);
+ unsigned int chunklen = min_t(unsigned int, len,
+ BIT(info->win_order) - winofs);
+
+ physmap_set_addr_gpios(info, ofs);
+ memcpy_fromio(buf, map->virt + winofs, chunklen);
+ len -= chunklen;
+ buf += chunklen;
+ ofs += chunklen;
+ }
+}
+
+static void physmap_addr_gpios_write(struct map_info *map, map_word mw,
+ unsigned long ofs)
+{
+ struct platform_device *pdev;
+ struct physmap_flash_info *info;
+ u16 word;
+
+ pdev = (struct platform_device *)map->map_priv_1;
+ info = platform_get_drvdata(pdev);
+ physmap_set_addr_gpios(info, ofs);
+
+ word = mw.x[0];
+ writew(word, map->virt + (ofs & win_mask(info->win_order)));
+}
+
+static void physmap_addr_gpios_copy_to(struct map_info *map, unsigned long ofs,
+ const void *buf, ssize_t len)
+{
+ struct platform_device *pdev;
+ struct physmap_flash_info *info;
+
+ pdev = (struct platform_device *)map->map_priv_1;
+ info = platform_get_drvdata(pdev);
+
+ while (len) {
+ unsigned int winofs = ofs & win_mask(info->win_order);
+ unsigned int chunklen = min_t(unsigned int, len,
+ BIT(info->win_order) - winofs);
+
+ physmap_set_addr_gpios(info, ofs);
+ memcpy_toio(map->virt + winofs, buf, chunklen);
+ len -= chunklen;
+ buf += chunklen;
+ ofs += chunklen;
+ }
+}
+
+static int physmap_addr_gpios_map_init(struct map_info *map)
+{
+ map->phys = NO_XIP;
+ map->read = physmap_addr_gpios_read;
+ map->copy_from = physmap_addr_gpios_copy_from;
+ map->write = physmap_addr_gpios_write;
+ map->copy_to = physmap_addr_gpios_copy_to;
+
+ return 0;
+}
+#else
+static int physmap_addr_gpios_map_init(struct map_info *map)
+{
+ return -ENOTSUPP;
+}
+#endif
+
#if IS_ENABLED(CONFIG_MTD_PHYSMAP_OF)
static const struct of_device_id of_flash_match[] = {
{
@@ -343,6 +468,16 @@ static int physmap_flash_probe(struct platform_device *dev)
platform_set_drvdata(dev, info);
+ info->gpios = devm_gpiod_get_array_optional(&dev->dev, "addr",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(info->gpios))
+ return PTR_ERR(info->gpios);
+
+ if (info->gpios && info->nmaps > 1) {
+ dev_err(&dev->dev, "addr-gpios only supported for nmaps == 1\n");
+ return -EINVAL;
+ }
+
if (dev->dev.of_node)
err = physmap_flash_of_init(dev);
else
@@ -369,10 +504,20 @@ static int physmap_flash_probe(struct platform_device *dev)
if (!info->maps[i].phys)
info->maps[i].phys = res->start;
- info->maps[i].size = resource_size(res);
+ info->win_order = get_bitmask_order(resource_size(res)) - 1;
+ info->maps[i].size = BIT(info->win_order +
+ (info->gpios ?
+ info->gpios->ndescs : 0));
+
info->maps[i].map_priv_1 = (unsigned long)dev;
- simple_map_init(&info->maps[i]);
+ if (info->gpios) {
+ err = physmap_addr_gpios_map_init(&info->maps[i]);
+ if (err)
+ goto err_out;
+ } else {
+ simple_map_init(&info->maps[i]);
+ }
probe_type = rom_probe_types;
if (!info->probe_type) {
@@ -497,6 +642,7 @@ module_exit(physmap_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
MODULE_AUTHOR("Vitaly Wool <vwool@ru.mvista.com>");
+MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>");
MODULE_DESCRIPTION("Generic configurable MTD map driver");
/* legacy platform drivers can't hotplug or coldplg */
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v2 15/15] mtd: maps: physmap: Invert logic on if/else branch
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (13 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 14/15] mtd: maps: Merge gpio-addr-flash.c into physmap-core.c Boris Brezillon
@ 2018-10-19 7:49 ` Boris Brezillon
2018-10-22 11:45 ` [PATCH v2 00/15] mtd: maps: physmap cleanups Linus Walleij
2018-11-05 21:27 ` Boris Brezillon
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-19 7:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado, Linus Walleij
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
It is preferred to have the positive statement on an if/else. While we
are at it we replace the way we access rom_probe_types.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
Changes in v2:
- New patch
---
drivers/mtd/maps/physmap-core.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 11e6239aadc7..33b77bd9022c 100644
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -437,7 +437,6 @@ static int physmap_flash_pdata_init(struct platform_device *dev)
static int physmap_flash_probe(struct platform_device *dev)
{
struct physmap_flash_info *info;
- const char * const *probe_type;
int err = 0;
int i;
@@ -519,14 +518,18 @@ static int physmap_flash_probe(struct platform_device *dev)
simple_map_init(&info->maps[i]);
}
- probe_type = rom_probe_types;
- if (!info->probe_type) {
- for (; !info->mtds[i] && *probe_type; probe_type++)
- info->mtds[i] = do_map_probe(*probe_type,
- &info->maps[i]);
- } else {
+ if (info->probe_type) {
info->mtds[i] = do_map_probe(info->probe_type,
&info->maps[i]);
+ } else {
+ int j;
+
+ for (j = 0; ARRAY_SIZE(rom_probe_types); j++) {
+ info->mtds[i] = do_map_probe(rom_probe_types[j],
+ &info->maps[i]);
+ if (info->mtds[i])
+ break;
+ }
}
if (!info->mtds[i]) {
--
2.14.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v2 00/15] mtd: maps: physmap cleanups
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (14 preceding siblings ...)
2018-10-19 7:49 ` [PATCH v2 15/15] mtd: maps: physmap: Invert logic on if/else branch Boris Brezillon
@ 2018-10-22 11:45 ` Linus Walleij
2018-10-22 13:41 ` Boris Brezillon
2018-11-05 21:27 ` Boris Brezillon
16 siblings, 1 reply; 24+ messages in thread
From: Linus Walleij @ 2018-10-22 11:45 UTC (permalink / raw)
To: Boris Brezillon
Cc: David Woodhouse, Brian Norris, Mark Vasut, Richard Weinberger,
linux-mtd, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Ricardo Ribalda Delgado
On Fri, Oct 19, 2018 at 9:49 AM Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
> This is an attempt at merging physmap_of.c, gpio-addr-flash.c and
> physmap.c. The rational behind this decision is code sharing and
> consistency with what's done in other parts of the kernel:
>
> - physmap_of is just adding OF/DT support to the physmap logic, and we
> usually put that code in the pre-existing driver instead of creating
> a new one
>
> - gpio-addr-flash is just an extension of the physmap logic which is
> needed when the platform does not have enough native ADDR lines
> to address the whole flash. Again, I think this core belongs in the
> physmap driver
>
> Patches 1 to 9 are just cleanups, and are not really related to the
> merging of physmap_of and gpio-addr-flash into physmap.c.
>
> Patch 10 to 13 are doing the actual merging work, and patch 14 is
> documenting the addr-gpios property that has been added to support
> the gpio-addr-flash on DT platforms.
>
> Patch 15 is a cosmetic change proposed by Ricardo.
This series:
Acked-by: Linus Walleij <linus.walleij@linaro.org>
I expect to test the result when rebasing my patches for Gemini,
so hope for this to hit your devel branch after v4.20-rc1.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v2 00/15] mtd: maps: physmap cleanups
2018-10-22 11:45 ` [PATCH v2 00/15] mtd: maps: physmap cleanups Linus Walleij
@ 2018-10-22 13:41 ` Boris Brezillon
0 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-10-22 13:41 UTC (permalink / raw)
To: Linus Walleij
Cc: David Woodhouse, Brian Norris, Mark Vasut, Richard Weinberger,
linux-mtd, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Ricardo Ribalda Delgado
Hi Linus,
On Mon, 22 Oct 2018 13:45:49 +0200
Linus Walleij <linus.walleij@linaro.org> wrote:
> On Fri, Oct 19, 2018 at 9:49 AM Boris Brezillon
> <boris.brezillon@bootlin.com> wrote:
>
> > This is an attempt at merging physmap_of.c, gpio-addr-flash.c and
> > physmap.c. The rational behind this decision is code sharing and
> > consistency with what's done in other parts of the kernel:
> >
> > - physmap_of is just adding OF/DT support to the physmap logic, and we
> > usually put that code in the pre-existing driver instead of creating
> > a new one
> >
> > - gpio-addr-flash is just an extension of the physmap logic which is
> > needed when the platform does not have enough native ADDR lines
> > to address the whole flash. Again, I think this core belongs in the
> > physmap driver
> >
> > Patches 1 to 9 are just cleanups, and are not really related to the
> > merging of physmap_of and gpio-addr-flash into physmap.c.
> >
> > Patch 10 to 13 are doing the actual merging work, and patch 14 is
> > documenting the addr-gpios property that has been added to support
> > the gpio-addr-flash on DT platforms.
> >
> > Patch 15 is a cosmetic change proposed by Ricardo.
>
> This series:
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I expect to test the result when rebasing my patches for Gemini,
> so hope for this to hit your devel branch after v4.20-rc1.
>
I already have a topic branch [1] in case you want to start working on
it before 4.20-rc1.
Regards,
Boris
[1]https://github.com/bbrezillon/linux-0day/tree/mtd/physmap-cleanup
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 00/15] mtd: maps: physmap cleanups
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
` (15 preceding siblings ...)
2018-10-22 11:45 ` [PATCH v2 00/15] mtd: maps: physmap cleanups Linus Walleij
@ 2018-11-05 21:27 ` Boris Brezillon
16 siblings, 0 replies; 24+ messages in thread
From: Boris Brezillon @ 2018-11-05 21:27 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd, Linus Walleij
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, Ricardo Ribalda Delgado
On Fri, 19 Oct 2018 09:48:53 +0200
Boris Brezillon <boris.brezillon@bootlin.com> wrote:
> Hello,
>
> This is an attempt at merging physmap_of.c, gpio-addr-flash.c and
> physmap.c. The rational behind this decision is code sharing and
> consistency with what's done in other parts of the kernel:
>
> - physmap_of is just adding OF/DT support to the physmap logic, and we
> usually put that code in the pre-existing driver instead of creating
> a new one
>
> - gpio-addr-flash is just an extension of the physmap logic which is
> needed when the platform does not have enough native ADDR lines
> to address the whole flash. Again, I think this core belongs in the
> physmap driver
>
> Patches 1 to 9 are just cleanups, and are not really related to the
> merging of physmap_of and gpio-addr-flash into physmap.c.
>
> Patch 10 to 13 are doing the actual merging work, and patch 14 is
> documenting the addr-gpios property that has been added to support
> the gpio-addr-flash on DT platforms.
>
> Patch 15 is a cosmetic change proposed by Ricardo.
>
> Regards,
>
> Boris
>
> Boris Brezillon (13):
> mtd: maps: physmap: Add SPDX header
> mtd: maps: physmap: Rename ->map and ->mtd into ->maps and ->mtds
> mtd: maps: physmap: Use platform_get_resource() to retrieve iomem
> resources
> mtd: maps: physmap: Use dev_notice() and a %pR specifier
> mtd: maps: physmap: Use devm_ioremap_resource()
> mtd: maps: physmap: Remove the MAX_RESOURCES limitation
> mtd: maps: physmap: Check mtd_device_{parse_register,unregister}() ret
> code
> mtd: maps: physmap: Return -ENOMEM directly when info allocation fails
> mtd: maps: physmap: Fix coding style issues reported by checkpatch
> mtd: maps: Prepare merging of physmap and physmap_of
> mtd: maps: Merge physmap_of.c into physmap-core.c
> mtd: maps: Rename physmap_of_{versatile,gemini} into
> physmap-{versatile,gemini}
> mtd: maps: Merge gpio-addr-flash.c into physmap-core.c
>
> Ricardo Ribalda Delgado (2):
> dt-binding: mtd: physmap: Document the addr-gpios property
> mtd: maps: physmap: Invert logic on if/else branch
Queued to mtd/next.
^ permalink raw reply [flat|nested] 24+ messages in thread