[PATCH 0/2] mtd: m25p80: restore the addressing mode when stop using the flash

[PATCH 0/2] mtd: m25p80: restore the addressing mode when stop using the flash

[Zhiqiang Hou]

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

To be compatible with legacy device, reset the addressing mode
to the default mode. Such as Freescale eSPI boot, it copies the
images from SPI flash without firing a reset signal previously,
so the reboot command will fail without reseting the addressing
mode of SPI flash.

Hou Zhiqiang (2):
  mtd: spi-nor: add a API to restore the addressing mode
  mtd: m25p80: restore the addressing mode when stop using the flash

 drivers/mtd/devices/m25p80.c  | 8 ++++++++
 drivers/mtd/spi-nor/spi-nor.c | 8 ++++++++
 include/linux/mtd/spi-nor.h   | 1 +
 3 files changed, 17 insertions(+)

-- 
2.14.1

[PATCH 1/2] mtd: spi-nor: add a API to restore the addressing mode

[Zhiqiang Hou]

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

It's better to restore the addressing mode of the SPI flash
whenever remove the driver or reboot the system.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 8 ++++++++
 include/linux/mtd/spi-nor.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index bc266f70a15b..801cbe99b059 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2713,6 +2713,14 @@ static void spi_nor_resume(struct mtd_info *mtd)
 		dev_err(dev, "resume() failed\n");
 }
 
+void spi_nor_restore_addr_mode(struct spi_nor *nor)
+{
+	if ((nor->addr_width == 4) &&
+	    (JEDEC_MFR(nor->info) != SNOR_MFR_SPANSION) &&
+	    !(nor->info->flags & SPI_NOR_4B_OPCODES))
+		set_4byte(nor, nor->info, 0);
+}
+
 int spi_nor_scan(struct spi_nor *nor, const char *name,
 		 const struct spi_nor_hwcaps *hwcaps)
 {
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index d0c66a0975cf..fe9357da2049 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -398,5 +398,6 @@ struct spi_nor_hwcaps {
  */
 int spi_nor_scan(struct spi_nor *nor, const char *name,
 		 const struct spi_nor_hwcaps *hwcaps);
+void spi_nor_restore_addr_mode(struct spi_nor *nor);
 
 #endif
-- 
2.14.1

[PATCH 2/2] mtd: m25p80: restore the addressing mode when stop using the flash

[Zhiqiang Hou]

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Add .shutdown function to restore the addressing mode in reboot
process, and add the same operation to the .remove function.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 drivers/mtd/devices/m25p80.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index dbe6a1de2bb8..867bd2d5a267 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -307,10 +307,17 @@ static int m25p_remove(struct spi_device *spi)
 {
 	struct m25p	*flash = spi_get_drvdata(spi);
 
+	spi_nor_restore_addr_mode(&flash->spi_nor);
 	/* Clean up MTD stuff. */
 	return mtd_device_unregister(&flash->spi_nor.mtd);
 }
 
+static void m25p_shutdown(struct spi_device *spi)
+{
+	struct m25p *flash = spi_get_drvdata(spi);
+
+	spi_nor_restore_addr_mode(&flash->spi_nor);
+}
 /*
  * Do NOT add to this array without reading the following:
  *
@@ -386,6 +393,7 @@ static struct spi_driver m25p80_driver = {
 	.id_table	= m25p_ids,
 	.probe	= m25p_probe,
 	.remove	= m25p_remove,
+	.shutdown	= m25p_shutdown,
 
 	/* REVISIT: many of these chips have deep power-down modes, which
 	 * should clearly be entered on suspend() to minimize power use.
-- 
2.14.1

Re: [PATCH 1/2] mtd: spi-nor: add a API to restore the addressing mode

[Cyrille Pitchen]

Hi Hou,

Le 24/11/2017 à 11:08, Zhiqiang Hou a écrit :
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> It's better to restore the addressing mode of the SPI flash
> whenever remove the driver or reboot the system.
> 
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  drivers/mtd/spi-nor/spi-nor.c | 8 ++++++++
>  include/linux/mtd/spi-nor.h   | 1 +
>  2 files changed, 9 insertions(+)
> 
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index bc266f70a15b..801cbe99b059 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -2713,6 +2713,14 @@ static void spi_nor_resume(struct mtd_info *mtd)
>  		dev_err(dev, "resume() failed\n");
>  }
>  
> +void spi_nor_restore_addr_mode(struct spi_nor *nor)
> +{
> +	if ((nor->addr_width == 4) &&
> +	    (JEDEC_MFR(nor->info) != SNOR_MFR_SPANSION) &&
> +	    !(nor->info->flags & SPI_NOR_4B_OPCODES))
> +		set_4byte(nor, nor->info, 0);
> +}
+ EXPORT_SYMBOL_GPL(spi_nor_restore_addr_mode);

Like for spi_nor_scan(), you would need to export the symbol for modules.

> +
>  int spi_nor_scan(struct spi_nor *nor, const char *name,
>  		 const struct spi_nor_hwcaps *hwcaps)
>  {
> diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
> index d0c66a0975cf..fe9357da2049 100644
> --- a/include/linux/mtd/spi-nor.h
> +++ b/include/linux/mtd/spi-nor.h
> @@ -398,5 +398,6 @@ struct spi_nor_hwcaps {
>   */
>  int spi_nor_scan(struct spi_nor *nor, const char *name,
>  		 const struct spi_nor_hwcaps *hwcaps);
> +void spi_nor_restore_addr_mode(struct spi_nor *nor);
>
Please add the relevant kernel doc.

Best regards,

Cyrille

>  #endif
> 

Re: [PATCH 2/2] mtd: m25p80: restore the addressing mode when stop using the flash

[Cyrille Pitchen]

Hi Hou,

Le 24/11/2017 à 11:08, Zhiqiang Hou a écrit :
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> Add .shutdown function to restore the addressing mode in reboot
> process, and add the same operation to the .remove function.
> 
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
>  drivers/mtd/devices/m25p80.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
> index dbe6a1de2bb8..867bd2d5a267 100644
> --- a/drivers/mtd/devices/m25p80.c
> +++ b/drivers/mtd/devices/m25p80.c
> @@ -307,10 +307,17 @@ static int m25p_remove(struct spi_device *spi)
>  {
>  	struct m25p	*flash = spi_get_drvdata(spi);
>  
> +	spi_nor_restore_addr_mode(&flash->spi_nor);

maybe add a new line here.

Otherwise, this looks good :)

Best regards,

Cyrille

>  	/* Clean up MTD stuff. */
>  	return mtd_device_unregister(&flash->spi_nor.mtd);
>  }
>  
> +static void m25p_shutdown(struct spi_device *spi)
> +{
> +	struct m25p *flash = spi_get_drvdata(spi);
> +
> +	spi_nor_restore_addr_mode(&flash->spi_nor);
> +}
>  /*
>   * Do NOT add to this array without reading the following:
>   *
> @@ -386,6 +393,7 @@ static struct spi_driver m25p80_driver = {
>  	.id_table	= m25p_ids,
>  	.probe	= m25p_probe,
>  	.remove	= m25p_remove,
> +	.shutdown	= m25p_shutdown,
>  
>  	/* REVISIT: many of these chips have deep power-down modes, which
>  	 * should clearly be entered on suspend() to minimize power use.
> 

RE: [PATCH 1/2] mtd: spi-nor: add a API to restore the addressing mode

[Z.q. Hou]

Hi Cyrille,

Thanks a lot for your comments!

> -----Original Message-----
> From: Cyrille Pitchen [mailto:cyrille.pitchen@wedev4u.fr]
> Sent: 2017年12月1日 16:53
> To: Z.q. Hou <zhiqiang.hou@nxp.com>; linux-mtd@lists.infradead.org;
> linux-kernel@vger.kernel.org; computersforpeace@gmail.com;
> dwmw2@infradead.org; boris.brezillon@free-electrons.com;
> marek.vasut@gmail.com; richard@nod.at
> Subject: Re: [PATCH 1/2] mtd: spi-nor: add a API to restore the addressing
> mode
> 
> Hi Hou,
> 
> Le 24/11/2017 à 11:08, Zhiqiang Hou a écrit :
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > It's better to restore the addressing mode of the SPI flash whenever
> > remove the driver or reboot the system.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  drivers/mtd/spi-nor/spi-nor.c | 8 ++++++++
> >  include/linux/mtd/spi-nor.h   | 1 +
> >  2 files changed, 9 insertions(+)
> >
> > diff --git a/drivers/mtd/spi-nor/spi-nor.c
> > b/drivers/mtd/spi-nor/spi-nor.c index bc266f70a15b..801cbe99b059
> > 100644
> > --- a/drivers/mtd/spi-nor/spi-nor.c
> > +++ b/drivers/mtd/spi-nor/spi-nor.c
> > @@ -2713,6 +2713,14 @@ static void spi_nor_resume(struct mtd_info
> *mtd)
> >  		dev_err(dev, "resume() failed\n");
> >  }
> >
> > +void spi_nor_restore_addr_mode(struct spi_nor *nor) {
> > +	if ((nor->addr_width == 4) &&
> > +	    (JEDEC_MFR(nor->info) != SNOR_MFR_SPANSION) &&
> > +	    !(nor->info->flags & SPI_NOR_4B_OPCODES))
> > +		set_4byte(nor, nor->info, 0);
> > +}
> + EXPORT_SYMBOL_GPL(spi_nor_restore_addr_mode);
> 
> Like for spi_nor_scan(), you would need to export the symbol for modules.

Yes, I will add this in next version.

> 
> > +
> >  int spi_nor_scan(struct spi_nor *nor, const char *name,
> >  		 const struct spi_nor_hwcaps *hwcaps)  { diff --git
> > a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index
> > d0c66a0975cf..fe9357da2049 100644
> > --- a/include/linux/mtd/spi-nor.h
> > +++ b/include/linux/mtd/spi-nor.h
> > @@ -398,5 +398,6 @@ struct spi_nor_hwcaps {
> >   */
> >  int spi_nor_scan(struct spi_nor *nor, const char *name,
> >  		 const struct spi_nor_hwcaps *hwcaps);
> > +void spi_nor_restore_addr_mode(struct spi_nor *nor);
> >
> Please add the relevant kernel doc.

Yes, will add comments for this API in next version.

> 
> Best regards,
> 
> Cyrille
> 
> >  #endif
> >

Thanks,
Zhiqiang

RE: [PATCH 1/2] mtd: spi-nor: add a API to restore the addressing mode

[Z.q. Hou]

Hi Cyrille,

Thanks a lot for your comments!

> -----Original Message-----
> From: Cyrille Pitchen [mailto:cyrille.pitchen@wedev4u.fr]
> Sent: 2017年12月1日 16:53
> To: Z.q. Hou <zhiqiang.hou@nxp.com>; linux-mtd@lists.infradead.org;
> linux-kernel@vger.kernel.org; computersforpeace@gmail.com;
> dwmw2@infradead.org; boris.brezillon@free-electrons.com;
> marek.vasut@gmail.com; richard@nod.at
> Subject: Re: [PATCH 1/2] mtd: spi-nor: add a API to restore the addressing
> mode
> 
> Hi Hou,
> 
> Le 24/11/2017 à 11:08, Zhiqiang Hou a écrit :
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > It's better to restore the addressing mode of the SPI flash whenever
> > remove the driver or reboot the system.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  drivers/mtd/spi-nor/spi-nor.c | 8 ++++++++
> >  include/linux/mtd/spi-nor.h   | 1 +
> >  2 files changed, 9 insertions(+)
> >
> > diff --git a/drivers/mtd/spi-nor/spi-nor.c
> > b/drivers/mtd/spi-nor/spi-nor.c index bc266f70a15b..801cbe99b059
> > 100644
> > --- a/drivers/mtd/spi-nor/spi-nor.c
> > +++ b/drivers/mtd/spi-nor/spi-nor.c
> > @@ -2713,6 +2713,14 @@ static void spi_nor_resume(struct mtd_info
> *mtd)
> >  		dev_err(dev, "resume() failed\n");
> >  }
> >
> > +void spi_nor_restore_addr_mode(struct spi_nor *nor) {
> > +	if ((nor->addr_width == 4) &&
> > +	    (JEDEC_MFR(nor->info) != SNOR_MFR_SPANSION) &&
> > +	    !(nor->info->flags & SPI_NOR_4B_OPCODES))
> > +		set_4byte(nor, nor->info, 0);
> > +}
> + EXPORT_SYMBOL_GPL(spi_nor_restore_addr_mode);
> 
> Like for spi_nor_scan(), you would need to export the symbol for modules.

Yes, I will add this in next version.

> 
> > +
> >  int spi_nor_scan(struct spi_nor *nor, const char *name,
> >  		 const struct spi_nor_hwcaps *hwcaps)  { diff --git
> > a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index
> > d0c66a0975cf..fe9357da2049 100644
> > --- a/include/linux/mtd/spi-nor.h
> > +++ b/include/linux/mtd/spi-nor.h
> > @@ -398,5 +398,6 @@ struct spi_nor_hwcaps {
> >   */
> >  int spi_nor_scan(struct spi_nor *nor, const char *name,
> >  		 const struct spi_nor_hwcaps *hwcaps);
> > +void spi_nor_restore_addr_mode(struct spi_nor *nor);
> >
> Please add the relevant kernel doc.

Yes, will add comments for this API in next version.

> 
> Best regards,
> 
> Cyrille
> 
> >  #endif
> >

Thanks,
Zhiqiang

RE: [PATCH 2/2] mtd: m25p80: restore the addressing mode when stop using the flash

[Z.q. Hou]

Hi Cyrille,

Thanks for your comments!

> -----Original Message-----
> From: Cyrille Pitchen [mailto:cyrille.pitchen@wedev4u.fr]
> Sent: 2017年12月1日 16:58
> To: Z.q. Hou <zhiqiang.hou@nxp.com>; linux-mtd@lists.infradead.org;
> linux-kernel@vger.kernel.org; computersforpeace@gmail.com;
> dwmw2@infradead.org; boris.brezillon@free-electrons.com;
> marek.vasut@gmail.com; richard@nod.at
> Subject: Re: [PATCH 2/2] mtd: m25p80: restore the addressing mode when
> stop using the flash
> 
> Hi Hou,
> 
> Le 24/11/2017 à 11:08, Zhiqiang Hou a écrit :
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > Add .shutdown function to restore the addressing mode in reboot
> > process, and add the same operation to the .remove function.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  drivers/mtd/devices/m25p80.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/mtd/devices/m25p80.c
> > b/drivers/mtd/devices/m25p80.c index dbe6a1de2bb8..867bd2d5a267
> 100644
> > --- a/drivers/mtd/devices/m25p80.c
> > +++ b/drivers/mtd/devices/m25p80.c
> > @@ -307,10 +307,17 @@ static int m25p_remove(struct spi_device *spi)
> > {
> >  	struct m25p	*flash = spi_get_drvdata(spi);
> >
> > +	spi_nor_restore_addr_mode(&flash->spi_nor);
> 
> maybe add a new line here.
> 
> Otherwise, this looks good :)

Yes, will add in next version, thanks a lot for the suggestion!


Thanks,
Zhiqiang

RE: [PATCH 2/2] mtd: m25p80: restore the addressing mode when stop using the flash

[Z.q. Hou]

Hi Cyrille,

Thanks for your comments!

> -----Original Message-----
> From: Cyrille Pitchen [mailto:cyrille.pitchen@wedev4u.fr]
> Sent: 2017年12月1日 16:58
> To: Z.q. Hou <zhiqiang.hou@nxp.com>; linux-mtd@lists.infradead.org;
> linux-kernel@vger.kernel.org; computersforpeace@gmail.com;
> dwmw2@infradead.org; boris.brezillon@free-electrons.com;
> marek.vasut@gmail.com; richard@nod.at
> Subject: Re: [PATCH 2/2] mtd: m25p80: restore the addressing mode when
> stop using the flash
> 
> Hi Hou,
> 
> Le 24/11/2017 à 11:08, Zhiqiang Hou a écrit :
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > Add .shutdown function to restore the addressing mode in reboot
> > process, and add the same operation to the .remove function.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> >  drivers/mtd/devices/m25p80.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/mtd/devices/m25p80.c
> > b/drivers/mtd/devices/m25p80.c index dbe6a1de2bb8..867bd2d5a267
> 100644
> > --- a/drivers/mtd/devices/m25p80.c
> > +++ b/drivers/mtd/devices/m25p80.c
> > @@ -307,10 +307,17 @@ static int m25p_remove(struct spi_device *spi)
> > {
> >  	struct m25p	*flash = spi_get_drvdata(spi);
> >
> > +	spi_nor_restore_addr_mode(&flash->spi_nor);
> 
> maybe add a new line here.
> 
> Otherwise, this looks good :)

Yes, will add in next version, thanks a lot for the suggestion!


Thanks,
Zhiqiang