[PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Marek Vasut]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: David Woodhouse <david.woodhouse@intel.com>
---
 drivers/mtd/devices/m25p80.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index b4dbcef..d8d4672 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -671,6 +671,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "s25sl032a",  INFO(0x010215,      0,  64 * 1024,  64, 0) },
 	{ "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, SECT_4K) },
 	{ "s25sl064a",  INFO(0x010216,      0,  64 * 1024, 128, 0) },
+	{ "s25sl064p",  INFO(0x010216, 0x4d00,  64 * 1024, 128, SECT_4K) },
 	{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
 	{ "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, 0) },
 	{ "s25fl512s",  INFO(0x010220, 0x4d00, 256 * 1024, 256, 0) },
-- 
1.7.10

[PATCH 2/3] mtd: m25p80: Fix the Spansion chip detection

[Marek Vasut]

Due to the implementation of the following loop at the end
of jedec_probe():

776         for (tmp = 0; tmp < ARRAY_SIZE(m25p_ids) - 1; tmp++) {
777                 info = (void *)m25p_ids[tmp].driver_data;
778                 if (info->jedec_id == jedec) {
779                         if (info->ext_id != 0 && info->ext_id != ext_jedec)
780                                 continue;
781                         return &m25p_ids[tmp];
782                 }
783         }

In particular line 779 in the above numbering, the chips with ext_id != 0 must
be ordered first in the list of chips (m25p_ids[]).

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: David Woodhouse <david.woodhouse@intel.com>
---
 drivers/mtd/devices/m25p80.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index d8d4672..28e841d 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -665,12 +665,7 @@ static const struct spi_device_id m25p_ids[] = {
 	/* Spansion -- single (large) sector size only, at least
 	 * for the chips listed here (without boot sectors).
 	 */
-	{ "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
-	{ "s25sl008a",  INFO(0x010213,      0,  64 * 1024,  16, 0) },
-	{ "s25sl016a",  INFO(0x010214,      0,  64 * 1024,  32, 0) },
-	{ "s25sl032a",  INFO(0x010215,      0,  64 * 1024,  64, 0) },
 	{ "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, SECT_4K) },
-	{ "s25sl064a",  INFO(0x010216,      0,  64 * 1024, 128, 0) },
 	{ "s25sl064p",  INFO(0x010216, 0x4d00,  64 * 1024, 128, SECT_4K) },
 	{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
 	{ "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, 0) },
@@ -680,6 +675,11 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
 	{ "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, 0) },
 	{ "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, 0) },
+	{ "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
+	{ "s25sl008a",  INFO(0x010213,      0,  64 * 1024,  16, 0) },
+	{ "s25sl016a",  INFO(0x010214,      0,  64 * 1024,  32, 0) },
+	{ "s25sl032a",  INFO(0x010215,      0,  64 * 1024,  64, 0) },
+	{ "s25sl064a",  INFO(0x010216,      0,  64 * 1024, 128, 0) },
 	{ "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) },
 	{ "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },
 
-- 
1.7.10

[PATCH 3/3] [RFC] mtd: m25p80: Make fast read configurable via DT

[Marek Vasut]

Add DT property "m25p,fast-read" that signalises the particular
chip supports "fast read" opcode.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: David Woodhouse <david.woodhouse@intel.com>
---
 drivers/mtd/devices/m25p80.c |   32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

NOTE: I'm not sure where to document this property, as m25p80 is
      a simple DT device. Any hints please?

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 28e841d..08019b8 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -73,14 +73,6 @@
 #define	MAX_READY_WAIT_JIFFIES	(40 * HZ)	/* M25P16 specs 40s max chip erase */
 #define	MAX_CMD_SIZE		5
 
-#ifdef CONFIG_M25PXX_USE_FAST_READ
-#define OPCODE_READ 	OPCODE_FAST_READ
-#define FAST_READ_DUMMY_BYTE 1
-#else
-#define OPCODE_READ 	OPCODE_NORM_READ
-#define FAST_READ_DUMMY_BYTE 0
-#endif
-
 #define JEDEC_MFR(_jedec_id)	((_jedec_id) >> 16)
 
 /****************************************************************************/
@@ -93,6 +85,7 @@ struct m25p {
 	u16			addr_width;
 	u8			erase_opcode;
 	u8			*command;
+	bool			fast_read;
 };
 
 static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
@@ -342,6 +335,7 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
 	struct m25p *flash = mtd_to_m25p(mtd);
 	struct spi_transfer t[2];
 	struct spi_message m;
+	uint8_t opcode;
 
 	pr_debug("%s: %s from 0x%08x, len %zd\n", dev_name(&flash->spi->dev),
 			__func__, (u32)from, len);
@@ -354,7 +348,7 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
 	 * Should add 1 byte DUMMY_BYTE.
 	 */
 	t[0].tx_buf = flash->command;
-	t[0].len = m25p_cmdsz(flash) + FAST_READ_DUMMY_BYTE;
+	t[0].len = m25p_cmdsz(flash) + (flash->fast_read ? 1 : 0);
 	spi_message_add_tail(&t[0], &m);
 
 	t[1].rx_buf = buf;
@@ -376,12 +370,14 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
 	 */
 
 	/* Set up the write data buffer. */
-	flash->command[0] = OPCODE_READ;
+	opcode = flash->fast_read ? OPCODE_FAST_READ : OPCODE_NORM_READ;
+	flash->command[0] = opcode;
 	m25p_addr2cmd(flash, from, flash->command);
 
 	spi_sync(flash->spi, &m);
 
-	*retlen = m.actual_length - m25p_cmdsz(flash) - FAST_READ_DUMMY_BYTE;
+	*retlen = m.actual_length - m25p_cmdsz(flash) -
+			(flash->fast_read ? 1 : 0);
 
 	mutex_unlock(&flash->lock);
 
@@ -803,9 +799,10 @@ static int __devinit m25p_probe(struct spi_device *spi)
 	struct flash_info		*info;
 	unsigned			i;
 	struct mtd_part_parser_data	ppdata;
+	struct device_node		*np = spi->dev.of_node;
 
 #ifdef CONFIG_MTD_OF_PARTS
-	if (!of_device_is_available(spi->dev.of_node))
+	if (!of_device_is_available(np))
 		return -ENODEV;
 #endif
 
@@ -857,7 +854,8 @@ static int __devinit m25p_probe(struct spi_device *spi)
 	flash = kzalloc(sizeof *flash, GFP_KERNEL);
 	if (!flash)
 		return -ENOMEM;
-	flash->command = kmalloc(MAX_CMD_SIZE + FAST_READ_DUMMY_BYTE, GFP_KERNEL);
+	flash->command = kmalloc(MAX_CMD_SIZE + (flash->fast_read ? 1 : 0),
+					GFP_KERNEL);
 	if (!flash->command) {
 		kfree(flash);
 		return -ENOMEM;
@@ -914,6 +912,14 @@ static int __devinit m25p_probe(struct spi_device *spi)
 	flash->page_size = info->page_size;
 	flash->mtd.writebufsize = flash->page_size;
 
+	flash->fast_read = false;
+	if (np && of_find_property(np, "m25p,fast-read", NULL))
+		flash->fast_read = true;
+
+#ifdef CONFIG_M25PXX_USE_FAST_READ
+	flash->fast_read = true;
+#endif
+
 	if (info->addr_width)
 		flash->addr_width = info->addr_width;
 	else {
-- 
1.7.10

Re: [PATCH 3/3] [RFC] mtd: m25p80: Make fast read configurable via DT

[Stefan Roese]

Hi Marek,

On Friday 06 July 2012 08:10:27 Marek Vasut wrote:
> @@ -914,6 +912,14 @@ static int __devinit m25p_probe(struct spi_device
> *spi) flash->page_size = info->page_size;
>  	flash->mtd.writebufsize = flash->page_size;
> 
> +	flash->fast_read = false;
> +	if (np && of_find_property(np, "m25p,fast-read", NULL))
> +		flash->fast_read = true;
> +
> +#ifdef CONFIG_M25PXX_USE_FAST_READ
> +	flash->fast_read = true;
> +#endif
> +

Better use of_property_read_bool() instead of of_find_property() here.

Thanks,
Stefan

Re: [PATCH 3/3] [RFC] mtd: m25p80: Make fast read configurable via DT

[Marek Vasut]

Dear Marek Vasut,

> Add DT property "m25p,fast-read" that signalises the particular
> chip supports "fast read" opcode.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> Cc: David Woodhouse <david.woodhouse@intel.com>
> ---
>  drivers/mtd/devices/m25p80.c |   32 +++++++++++++++++++-------------
>  1 file changed, 19 insertions(+), 13 deletions(-)
> 
> NOTE: I'm not sure where to document this property, as m25p80 is
>       a simple DT device. Any hints please?
> 
   ^--- bump?

Best regards,
Marek Vasut

Re: [PATCH 3/3] [RFC] mtd: m25p80: Make fast read configurable via DT

[Mike Frysinger]

On Mon, Jul 9, 2012 at 10:13 AM, Marek Vasut <marex@denx.de> wrote:
> > Add DT property "m25p,fast-read" that signalises the particular
> > chip supports "fast read" opcode.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> > Cc: David Woodhouse <david.woodhouse@intel.com>
> > ---
> >  drivers/mtd/devices/m25p80.c |   32 +++++++++++++++++++-------------
> >  1 file changed, 19 insertions(+), 13 deletions(-)
> >
> > NOTE: I'm not sure where to document this property, as m25p80 is
> >       a simple DT device. Any hints please?
> >
>    ^--- bump?

did you see Stefan's suggestion ?
-mike

Re: [PATCH 3/3] [RFC] mtd: m25p80: Make fast read configurable via DT

[Marek Vasut]

Dear Mike Frysinger,

> On Mon, Jul 9, 2012 at 10:13 AM, Marek Vasut <marex@denx.de> wrote:
> > > Add DT property "m25p,fast-read" that signalises the particular
> > > chip supports "fast read" opcode.
> > > 
> > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> > > Cc: David Woodhouse <david.woodhouse@intel.com>
> > > ---
> > > 
> > >  drivers/mtd/devices/m25p80.c |   32 +++++++++++++++++++-------------
> > >  1 file changed, 19 insertions(+), 13 deletions(-)
> > > 
> > > NOTE: I'm not sure where to document this property, as m25p80 is
> > > 
> > >       a simple DT device. Any hints please?
> >    
> >    ^--- bump?
> 
> did you see Stefan's suggestion ?
> -mike

The one which wasn't about documentation but usage of different OF function? 
Yes.

Best regards,
Marek Vasut

Re: [PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Artem Bityutskiy]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

On Fri, 2012-07-06 at 08:10 +0200, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> Cc: David Woodhouse <david.woodhouse@intel.com>

Pushed 1/3 and 2/3 to l2-mtd.git, thanks!

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Artem Bityutskiy]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

On Wed, 2012-07-18 at 18:08 +0200, Marek Vasut wrote:
> Dear Artem Bityutskiy,
> 
> > On Fri, 2012-07-06 at 08:10 +0200, Marek Vasut wrote:
> > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> > > Cc: David Woodhouse <david.woodhouse@intel.com>
> > 
> > Pushed 1/3 and 2/3 to l2-mtd.git, thanks!
> 
> Thanks, Artem. Could you please suggest where to document the property added in 
> 3/3 please?

I do not know. Surely there is a DT mailing list and DT experts - I'd
ask there/them.

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Marek Vasut]

Dear Artem Bityutskiy,

> On Fri, 2012-07-06 at 08:10 +0200, Marek Vasut wrote:
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> > Cc: David Woodhouse <david.woodhouse@intel.com>
> 
> Pushed 1/3 and 2/3 to l2-mtd.git, thanks!

Thanks, Artem. Could you please suggest where to document the property added in 
3/3 please?

Best regards,
Marek Vasut

Re: [PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Artem Bityutskiy]

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

On Wed, 2012-07-18 at 18:08 +0200, Marek Vasut wrote:
> Dear Artem Bityutskiy,
> 
> > On Fri, 2012-07-06 at 08:10 +0200, Marek Vasut wrote:
> > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> > > Cc: David Woodhouse <david.woodhouse@intel.com>
> > 
> > Pushed 1/3 and 2/3 to l2-mtd.git, thanks!
> 
> Thanks, Artem. Could you please suggest where to document the property added in 
> 3/3 please?

Rob Herring responded to me last time, let's try to ask him. Rob, the
question is here:

http://lists.infradead.org/pipermail/linux-mtd/2012-July/042752.html

"NOTE: I'm not sure where to document this property, as m25p80 is
      a simple DT device. Any hints please?"

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Rob Herring]

On 07/18/2012 11:13 AM, Artem Bityutskiy wrote:
> On Wed, 2012-07-18 at 18:08 +0200, Marek Vasut wrote:
>> Dear Artem Bityutskiy,
>>
>>> On Fri, 2012-07-06 at 08:10 +0200, Marek Vasut wrote:
>>>> Signed-off-by: Marek Vasut <marex@denx.de>
>>>> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
>>>> Cc: David Woodhouse <david.woodhouse@intel.com>
>>>
>>> Pushed 1/3 and 2/3 to l2-mtd.git, thanks!
>>
>> Thanks, Artem. Could you please suggest where to document the property added in 
>> 3/3 please?
> 
> Rob Herring responded to me last time, let's try to ask him. Rob, the
> question is here:
> 
> http://lists.infradead.org/pipermail/linux-mtd/2012-July/042752.html
> 
> "NOTE: I'm not sure where to document this property, as m25p80 is
>       a simple DT device. Any hints please?"

Looks like "spansion,m25p80" needs to be documented under
Documentation/devicetree/bindings/mtd, and then this new property
documented with it. The only in tree user right now is here:

arch/powerpc/boot/dts/p2020rdb-pc.dtsi

Rob

Re: [PATCH 1/3] mtd: m25p80: add support for Spansion s25sl064p chip

[Marek Vasut]

Dear Rob Herring,

> On 07/18/2012 11:13 AM, Artem Bityutskiy wrote:
> > On Wed, 2012-07-18 at 18:08 +0200, Marek Vasut wrote:
> >> Dear Artem Bityutskiy,
> >> 
> >>> On Fri, 2012-07-06 at 08:10 +0200, Marek Vasut wrote:
> >>>> Signed-off-by: Marek Vasut <marex@denx.de>
> >>>> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> >>>> Cc: David Woodhouse <david.woodhouse@intel.com>
> >>> 
> >>> Pushed 1/3 and 2/3 to l2-mtd.git, thanks!
> >> 
> >> Thanks, Artem. Could you please suggest where to document the property
> >> added in 3/3 please?
> > 
> > Rob Herring responded to me last time, let's try to ask him. Rob, the
> > question is here:
> > 
> > http://lists.infradead.org/pipermail/linux-mtd/2012-July/042752.html
> > 
> > "NOTE: I'm not sure where to document this property, as m25p80 is
> > 
> >       a simple DT device. Any hints please?"
> 
> Looks like "spansion,m25p80" needs to be documented under
> Documentation/devicetree/bindings/mtd, and then this new property
> documented with it. The only in tree user right now is here:
> 
> arch/powerpc/boot/dts/p2020rdb-pc.dtsi

Roger that, Rob! Will submit a new version of the patch ASAP.

Thanks!

Best regards,
Marek Vasut