[source] kernel: backport bcm47xxsflash support for reading 32 MiB flashes
LEDE Commits
lede-commits at lists.infradead.org
Thu Feb 9 00:13:37 PST 2017
rmilecki pushed a commit to source.git, branch master:
https://git.lede-project.org/76eb62e5afeac6ca5d90fb26eb34ac66df91a82e
commit 76eb62e5afeac6ca5d90fb26eb34ac66df91a82e
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Thu Feb 9 08:34:20 2017 +0100
kernel: backport bcm47xxsflash support for reading 32 MiB flashes
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
...47xxsflash-use-platform_-set-get-_drvdata.patch | 63 +++++++++++++++++
...sflash-support-reading-flash-out-of-mappi.patch | 81 ++++++++++++++++++++++
...art-fix-parsing-first-block-after-aligne.patch} | 0
...47xxsflash-use-platform_-set-get-_drvdata.patch | 63 +++++++++++++++++
...sflash-support-reading-flash-out-of-mappi.patch | 81 ++++++++++++++++++++++
5 files changed, 288 insertions(+)
diff --git a/target/linux/generic/patches-4.4/042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch b/target/linux/generic/patches-4.4/042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
new file mode 100644
index 0000000..a68eaa4
--- /dev/null
+++ b/target/linux/generic/patches-4.4/042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
@@ -0,0 +1,63 @@
+From be5e5099183301fb7920f8f6b66bd3ac1f820a97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Mon, 16 Jan 2017 17:28:18 +0100
+Subject: [PATCH] mtd: bcm47xxsflash: use platform_(set|get)_drvdata
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We have generic place & helpers for storing platform driver data so
+there is no reason for using custom priv pointer.
+
+This allows cleaning up struct bcma_sflash from unneeded fields.
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+Acked-by: Kalle Valo <kvalo at codeaurora.org>
+Acked-by: Boris Brezillon <boris.brezillon at free-electrons.com>
+Signed-off-by: Brian Norris <computersforpeace at gmail.com>
+---
+ drivers/mtd/devices/bcm47xxsflash.c | 6 +++---
+ include/linux/bcma/bcma_driver_chipcommon.h | 3 ---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+--- a/drivers/mtd/devices/bcm47xxsflash.c
++++ b/drivers/mtd/devices/bcm47xxsflash.c
+@@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(stru
+ b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL);
+ if (!b47s)
+ return -ENOMEM;
+- sflash->priv = b47s;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+@@ -334,6 +333,8 @@ static int bcm47xxsflash_bcma_probe(stru
+ b47s->size = sflash->size;
+ bcm47xxsflash_fill_mtd(b47s, &pdev->dev);
+
++ platform_set_drvdata(pdev, b47s);
++
+ err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0);
+ if (err) {
+ pr_err("Failed to register MTD device: %d\n", err);
+@@ -349,8 +350,7 @@ static int bcm47xxsflash_bcma_probe(stru
+
+ static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
+ {
+- struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
+- struct bcm47xxsflash *b47s = sflash->priv;
++ struct bcm47xxsflash *b47s = platform_get_drvdata(pdev);
+
+ mtd_device_unregister(&b47s->mtd);
+ iounmap(b47s->window);
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -591,9 +591,6 @@ struct bcma_sflash {
+ u32 blocksize;
+ u16 numblocks;
+ u32 size;
+-
+- struct mtd_info *mtd;
+- void *priv;
+ };
+ #endif
+
diff --git a/target/linux/generic/patches-4.4/042-0006-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch b/target/linux/generic/patches-4.4/042-0006-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch
new file mode 100644
index 0000000..ecdae2a
--- /dev/null
+++ b/target/linux/generic/patches-4.4/042-0006-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch
@@ -0,0 +1,81 @@
+From ccc38234fdc70120be79e7fb2df5c27ca5cd4c8a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Wed, 8 Feb 2017 23:53:44 +0100
+Subject: [PATCH] mtd: bcm47xxsflash: support reading flash out of mapping
+ window
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For reading flash content we use MMIO but it's possible to read only
+first 16 MiB this way. It's simply an arch design/limitation.
+To support flash sizes bigger than 16 MiB implement indirect access
+using ChipCommon registers.
+This has been tested using MX25L25635F.
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+Acked-by: Marek Vasut <marek.vasut at gmail.com>
+Signed-off-by: Brian Norris <computersforpeace at gmail.com>
+---
+ drivers/mtd/devices/bcm47xxsflash.c | 24 +++++++++++++++++++++---
+ drivers/mtd/devices/bcm47xxsflash.h | 3 +++
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+--- a/drivers/mtd/devices/bcm47xxsflash.c
++++ b/drivers/mtd/devices/bcm47xxsflash.c
+@@ -105,15 +105,33 @@ static int bcm47xxsflash_read(struct mtd
+ size_t *retlen, u_char *buf)
+ {
+ struct bcm47xxsflash *b47s = mtd->priv;
++ size_t orig_len = len;
+
+ /* Check address range */
+ if ((from + len) > mtd->size)
+ return -EINVAL;
+
+- memcpy_fromio(buf, b47s->window + from, len);
+- *retlen = len;
++ /* Read as much as possible using fast MMIO window */
++ if (from < BCM47XXSFLASH_WINDOW_SZ) {
++ size_t memcpy_len;
+
+- return len;
++ memcpy_len = min(len, (size_t)(BCM47XXSFLASH_WINDOW_SZ - from));
++ memcpy_fromio(buf, b47s->window + from, memcpy_len);
++ from += memcpy_len;
++ len -= memcpy_len;
++ buf += memcpy_len;
++ }
++
++ /* Use indirect access for content out of the window */
++ for (; len; len--) {
++ b47s->cc_write(b47s, BCMA_CC_FLASHADDR, from++);
++ bcm47xxsflash_cmd(b47s, OPCODE_ST_READ4B);
++ *buf++ = b47s->cc_read(b47s, BCMA_CC_FLASHDATA);
++ }
++
++ *retlen = orig_len;
++
++ return orig_len;
+ }
+
+ static int bcm47xxsflash_write_st(struct mtd_info *mtd, u32 offset, size_t len,
+--- a/drivers/mtd/devices/bcm47xxsflash.h
++++ b/drivers/mtd/devices/bcm47xxsflash.h
+@@ -3,6 +3,8 @@
+
+ #include <linux/mtd/mtd.h>
+
++#define BCM47XXSFLASH_WINDOW_SZ SZ_16M
++
+ /* Used for ST flashes only. */
+ #define OPCODE_ST_WREN 0x0006 /* Write Enable */
+ #define OPCODE_ST_WRDIS 0x0004 /* Write Disable */
+@@ -16,6 +18,7 @@
+ #define OPCODE_ST_RES 0x03ab /* Read Electronic Signature */
+ #define OPCODE_ST_CSA 0x1000 /* Keep chip select asserted */
+ #define OPCODE_ST_SSE 0x0220 /* Sub-sector Erase */
++#define OPCODE_ST_READ4B 0x6313 /* Read Data Bytes in 4Byte addressing mode */
+
+ /* Used for Atmel flashes only. */
+ #define OPCODE_AT_READ 0x07e8
diff --git a/target/linux/generic/patches-4.9/060-mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch b/target/linux/generic/patches-4.9/060-0001-mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch
similarity index 100%
rename from target/linux/generic/patches-4.9/060-mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch
rename to target/linux/generic/patches-4.9/060-0001-mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch
diff --git a/target/linux/generic/patches-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch b/target/linux/generic/patches-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
new file mode 100644
index 0000000..d975a26
--- /dev/null
+++ b/target/linux/generic/patches-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
@@ -0,0 +1,63 @@
+From be5e5099183301fb7920f8f6b66bd3ac1f820a97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Mon, 16 Jan 2017 17:28:18 +0100
+Subject: [PATCH] mtd: bcm47xxsflash: use platform_(set|get)_drvdata
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We have generic place & helpers for storing platform driver data so
+there is no reason for using custom priv pointer.
+
+This allows cleaning up struct bcma_sflash from unneeded fields.
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+Acked-by: Kalle Valo <kvalo at codeaurora.org>
+Acked-by: Boris Brezillon <boris.brezillon at free-electrons.com>
+Signed-off-by: Brian Norris <computersforpeace at gmail.com>
+---
+ drivers/mtd/devices/bcm47xxsflash.c | 6 +++---
+ include/linux/bcma/bcma_driver_chipcommon.h | 3 ---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+--- a/drivers/mtd/devices/bcm47xxsflash.c
++++ b/drivers/mtd/devices/bcm47xxsflash.c
+@@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(stru
+ b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL);
+ if (!b47s)
+ return -ENOMEM;
+- sflash->priv = b47s;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+@@ -320,6 +319,8 @@ static int bcm47xxsflash_bcma_probe(stru
+ b47s->size = sflash->size;
+ bcm47xxsflash_fill_mtd(b47s, &pdev->dev);
+
++ platform_set_drvdata(pdev, b47s);
++
+ err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0);
+ if (err) {
+ pr_err("Failed to register MTD device: %d\n", err);
+@@ -335,8 +336,7 @@ static int bcm47xxsflash_bcma_probe(stru
+
+ static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
+ {
+- struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
+- struct bcm47xxsflash *b47s = sflash->priv;
++ struct bcm47xxsflash *b47s = platform_get_drvdata(pdev);
+
+ mtd_device_unregister(&b47s->mtd);
+ iounmap(b47s->window);
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -593,9 +593,6 @@ struct bcma_sflash {
+ u32 blocksize;
+ u16 numblocks;
+ u32 size;
+-
+- struct mtd_info *mtd;
+- void *priv;
+ };
+ #endif
+
diff --git a/target/linux/generic/patches-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch b/target/linux/generic/patches-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch
new file mode 100644
index 0000000..ecdae2a
--- /dev/null
+++ b/target/linux/generic/patches-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch
@@ -0,0 +1,81 @@
+From ccc38234fdc70120be79e7fb2df5c27ca5cd4c8a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Wed, 8 Feb 2017 23:53:44 +0100
+Subject: [PATCH] mtd: bcm47xxsflash: support reading flash out of mapping
+ window
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For reading flash content we use MMIO but it's possible to read only
+first 16 MiB this way. It's simply an arch design/limitation.
+To support flash sizes bigger than 16 MiB implement indirect access
+using ChipCommon registers.
+This has been tested using MX25L25635F.
+
+Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+Acked-by: Marek Vasut <marek.vasut at gmail.com>
+Signed-off-by: Brian Norris <computersforpeace at gmail.com>
+---
+ drivers/mtd/devices/bcm47xxsflash.c | 24 +++++++++++++++++++++---
+ drivers/mtd/devices/bcm47xxsflash.h | 3 +++
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+--- a/drivers/mtd/devices/bcm47xxsflash.c
++++ b/drivers/mtd/devices/bcm47xxsflash.c
+@@ -105,15 +105,33 @@ static int bcm47xxsflash_read(struct mtd
+ size_t *retlen, u_char *buf)
+ {
+ struct bcm47xxsflash *b47s = mtd->priv;
++ size_t orig_len = len;
+
+ /* Check address range */
+ if ((from + len) > mtd->size)
+ return -EINVAL;
+
+- memcpy_fromio(buf, b47s->window + from, len);
+- *retlen = len;
++ /* Read as much as possible using fast MMIO window */
++ if (from < BCM47XXSFLASH_WINDOW_SZ) {
++ size_t memcpy_len;
+
+- return len;
++ memcpy_len = min(len, (size_t)(BCM47XXSFLASH_WINDOW_SZ - from));
++ memcpy_fromio(buf, b47s->window + from, memcpy_len);
++ from += memcpy_len;
++ len -= memcpy_len;
++ buf += memcpy_len;
++ }
++
++ /* Use indirect access for content out of the window */
++ for (; len; len--) {
++ b47s->cc_write(b47s, BCMA_CC_FLASHADDR, from++);
++ bcm47xxsflash_cmd(b47s, OPCODE_ST_READ4B);
++ *buf++ = b47s->cc_read(b47s, BCMA_CC_FLASHDATA);
++ }
++
++ *retlen = orig_len;
++
++ return orig_len;
+ }
+
+ static int bcm47xxsflash_write_st(struct mtd_info *mtd, u32 offset, size_t len,
+--- a/drivers/mtd/devices/bcm47xxsflash.h
++++ b/drivers/mtd/devices/bcm47xxsflash.h
+@@ -3,6 +3,8 @@
+
+ #include <linux/mtd/mtd.h>
+
++#define BCM47XXSFLASH_WINDOW_SZ SZ_16M
++
+ /* Used for ST flashes only. */
+ #define OPCODE_ST_WREN 0x0006 /* Write Enable */
+ #define OPCODE_ST_WRDIS 0x0004 /* Write Disable */
+@@ -16,6 +18,7 @@
+ #define OPCODE_ST_RES 0x03ab /* Read Electronic Signature */
+ #define OPCODE_ST_CSA 0x1000 /* Keep chip select asserted */
+ #define OPCODE_ST_SSE 0x0220 /* Sub-sector Erase */
++#define OPCODE_ST_READ4B 0x6313 /* Read Data Bytes in 4Byte addressing mode */
+
+ /* Used for Atmel flashes only. */
+ #define OPCODE_AT_READ 0x07e8
More information about the lede-commits
mailing list