Patchwork mtd: m25p80: Modify the name of mtd_info

login
register
mail settings
Submitter Zhiqiang Hou
Date March 21, 2014, 11:16 a.m.
Message ID <1395400578-5637-1-git-send-email-B48286@freescale.com>
Download mbox | patch
Permalink /patch/332577/
State Not Applicable
Headers show

Comments

Zhiqiang Hou - March 21, 2014, 11:16 a.m.
To specify spi flash layouts by "mtdparts=..." in cmdline, we must
give mtd_info a fixed name,because the cmdlinepart's parser will
match the name of mtd_info given in cmdline.
Now, if use DT, the mtd_info's name will be spi->dev->name. It
consists of spi_master->bus_num, and the spi_master->bus_num maybe
dynamically fetched. So, in this case, replace the component bus_num
with thei physical address of spi master.

Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
---
 drivers/mtd/devices/m25p80.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
Scott Wood - March 21, 2014, 5:34 p.m.
On Fri, 2014-03-21 at 19:16 +0800, Hou Zhiqiang wrote:
> @@ -1009,8 +1012,17 @@ static int m25p_probe(struct spi_device *spi)
>  
>  	if (data && data->name)
>  		flash->mtd.name = data->name;
> -	else
> -		flash->mtd.name = dev_name(&spi->dev);
> +	else{

Whitespace

> +		ret = of_address_to_resource(mnp, 0, &res);
> +		if (ret) {
> +			dev_err(&spi->dev, "failed to get spi master resource\n");
> +			return ret;
> +		}
> +		flash->mtd.name = kasprintf(GFP_KERNEL, "spi%x.%d",
> +				(unsigned)res.start, spi->chip_select);

Don't use "unsigned" by itself.  Don't cast physical addresses to
"unsigned int" -- use "unsigned long long".

-Scott
Brian Norris - April 16, 2014, 6:48 a.m.
On Fri, Mar 21, 2014 at 07:16:18PM +0800, Hou Zhiqiang wrote:
> To specify spi flash layouts by "mtdparts=..." in cmdline, we must
> give mtd_info a fixed name,because the cmdlinepart's parser will
> match the name of mtd_info given in cmdline.
> Now, if use DT, the mtd_info's name will be spi->dev->name. It
> consists of spi_master->bus_num, and the spi_master->bus_num maybe
> dynamically fetched. So, in this case, replace the component bus_num
> with thei physical address of spi master.
> 
> Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
> ---
>  drivers/mtd/devices/m25p80.c | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
> index 7eda71d..64450a2 100644
> --- a/drivers/mtd/devices/m25p80.c
> +++ b/drivers/mtd/devices/m25p80.c
> @@ -30,6 +30,7 @@
>  #include <linux/mtd/cfi.h>
>  #include <linux/mtd/mtd.h>
>  #include <linux/mtd/partitions.h>
> +#include <linux/of_address.h>
>  #include <linux/of_platform.h>
>  
>  #include <linux/spi/spi.h>
> @@ -934,9 +935,11 @@ static int m25p_probe(struct spi_device *spi)
>  	struct flash_platform_data	*data;
>  	struct m25p			*flash;
>  	struct flash_info		*info;
> -	unsigned			i;
> +	unsigned			i, ret;
>  	struct mtd_part_parser_data	ppdata;
>  	struct device_node *np = spi->dev.of_node;
> +	struct resource res;
> +	struct device_node *mnp = spi->master->dev.of_node;
>  
>  	/* Platform data helps sort out which chip type we have, as
>  	 * well as how this board partitions it.  If we don't have
> @@ -1009,8 +1012,17 @@ static int m25p_probe(struct spi_device *spi)
>  
>  	if (data && data->name)
>  		flash->mtd.name = data->name;
> -	else
> -		flash->mtd.name = dev_name(&spi->dev);
> +	else{
> +		ret = of_address_to_resource(mnp, 0, &res);

You're making a lot assumptions about the SPI master/device
relationship -- that the master has a device-node; that the first
resource of the master is its physical address (this is not guaranteed
by DT semantics). Please do not do this.

> +		if (ret) {
> +			dev_err(&spi->dev, "failed to get spi master resource\n");
> +			return ret;

This is wrong. It breaks all !CONFIG_OF cases which didn't specify a
name via platform data.

> +		}
> +		flash->mtd.name = kasprintf(GFP_KERNEL, "spi%x.%d",
> +				(unsigned)res.start, spi->chip_select);
> +		if (!flash->mtd.name)
> +			return -ENOMEM;
> +	}
>  
>  	flash->mtd.type = MTD_NORFLASH;
>  	flash->mtd.writesize = 1;

Brian
Zhiqiang Hou - April 21, 2014, 10:21 a.m.
> -----Original Message-----
> From: Brian Norris [mailto:computersforpeace@gmail.com]
> Sent: Wednesday, April 16, 2014 2:48 PM
> To: Hou Zhiqiang-B48286
> Cc: linux-mtd@lists.infradead.org; linuxppc-dev@ozlabs.org; Wood Scott-
> B07421; Hu Mingkai-B21284; dwmw2@infradead.org
> Subject: Re: [PATCH] mtd: m25p80: Modify the name of mtd_info
> 
> On Fri, Mar 21, 2014 at 07:16:18PM +0800, Hou Zhiqiang wrote:
> > To specify spi flash layouts by "mtdparts=..." in cmdline, we must
> > give mtd_info a fixed name,because the cmdlinepart's parser will match
> > the name of mtd_info given in cmdline.
> > Now, if use DT, the mtd_info's name will be spi->dev->name. It
> > consists of spi_master->bus_num, and the spi_master->bus_num maybe
> > dynamically fetched. So, in this case, replace the component bus_num
> > with thei physical address of spi master.
> >
> > Signed-off-by: Hou Zhiqiang <B48286@freescale.com>
> > ---
> >  drivers/mtd/devices/m25p80.c | 18 +++++++++++++++---
> >  1 file changed, 15 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/mtd/devices/m25p80.c
> > b/drivers/mtd/devices/m25p80.c index 7eda71d..64450a2 100644
> > --- a/drivers/mtd/devices/m25p80.c
> > +++ b/drivers/mtd/devices/m25p80.c
> > @@ -30,6 +30,7 @@
> >  #include <linux/mtd/cfi.h>
> >  #include <linux/mtd/mtd.h>
> >  #include <linux/mtd/partitions.h>
> > +#include <linux/of_address.h>
> >  #include <linux/of_platform.h>
> >
> >  #include <linux/spi/spi.h>
> > @@ -934,9 +935,11 @@ static int m25p_probe(struct spi_device *spi)
> >  	struct flash_platform_data	*data;
> >  	struct m25p			*flash;
> >  	struct flash_info		*info;
> > -	unsigned			i;
> > +	unsigned			i, ret;
> >  	struct mtd_part_parser_data	ppdata;
> >  	struct device_node *np = spi->dev.of_node;
> > +	struct resource res;
> > +	struct device_node *mnp = spi->master->dev.of_node;
> >
> >  	/* Platform data helps sort out which chip type we have, as
> >  	 * well as how this board partitions it.  If we don't have @@
> > -1009,8 +1012,17 @@ static int m25p_probe(struct spi_device *spi)
> >
> >  	if (data && data->name)
> >  		flash->mtd.name = data->name;
> > -	else
> > -		flash->mtd.name = dev_name(&spi->dev);
> > +	else{
> > +		ret = of_address_to_resource(mnp, 0, &res);
> 
> You're making a lot assumptions about the SPI master/device relationship
> -- that the master has a device-node; that the first resource of the
> master is its physical address (this is not guaranteed by DT semantics).
> Please do not do this.

Thank you for your tips, but I think it is right to get the physical address
of master using the API of_address_to_resource, because of_address_to_resource
just parse address-resource from device tree.

> 
> > +		if (ret) {
> > +			dev_err(&spi->dev, "failed to get spi master
> resource\n");
> > +			return ret;
> 
> This is wrong. It breaks all !CONFIG_OF cases which didn't specify a name
> via platform data.
> 

I will resend a patch to fix it.

> > +		}
> > +		flash->mtd.name = kasprintf(GFP_KERNEL, "spi%x.%d",
> > +				(unsigned)res.start, spi->chip_select);
> > +		if (!flash->mtd.name)
> > +			return -ENOMEM;
> > +	}
> >
> >  	flash->mtd.type = MTD_NORFLASH;
> >  	flash->mtd.writesize = 1;
> 
> Brian
> 

Thanks,
Zhiqiang

Patch

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7eda71d..64450a2 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -30,6 +30,7 @@ 
 #include <linux/mtd/cfi.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 
 #include <linux/spi/spi.h>
@@ -934,9 +935,11 @@  static int m25p_probe(struct spi_device *spi)
 	struct flash_platform_data	*data;
 	struct m25p			*flash;
 	struct flash_info		*info;
-	unsigned			i;
+	unsigned			i, ret;
 	struct mtd_part_parser_data	ppdata;
 	struct device_node *np = spi->dev.of_node;
+	struct resource res;
+	struct device_node *mnp = spi->master->dev.of_node;
 
 	/* Platform data helps sort out which chip type we have, as
 	 * well as how this board partitions it.  If we don't have
@@ -1009,8 +1012,17 @@  static int m25p_probe(struct spi_device *spi)
 
 	if (data && data->name)
 		flash->mtd.name = data->name;
-	else
-		flash->mtd.name = dev_name(&spi->dev);
+	else{
+		ret = of_address_to_resource(mnp, 0, &res);
+		if (ret) {
+			dev_err(&spi->dev, "failed to get spi master resource\n");
+			return ret;
+		}
+		flash->mtd.name = kasprintf(GFP_KERNEL, "spi%x.%d",
+				(unsigned)res.start, spi->chip_select);
+		if (!flash->mtd.name)
+			return -ENOMEM;
+	}
 
 	flash->mtd.type = MTD_NORFLASH;
 	flash->mtd.writesize = 1;