spi: spi-fsl-qspi: Reduce devm_ioremap size to 4 times AHB buffer size
Subsystems (2)
PATCH 1/1 spi: spi-fsl-qspi: Reduce devm_ioremap size to 4 times AHB buffer size
Reduce devm_ioremap size to (4 * AHB_BUFER_SIZE) rather than mapping complete QSPI-Memmory as driver is now independent of flash size. Flash of any size can be accessed.
Issue was reported on platform where devm_ioremap failure is observed with size > 256M.
Error log on LS1021ATWR :
fsl-quadspi 1550000.spi: ioremap failed for resource [mem 0x40000000-0x7fffffff] fsl-quadspi 1550000.spi: Freescale QuadSPI probe failed
fsl-quadspi: probe of 1550000.spi failed with error -12
This change was also suggested previously:
https://patchwork.kernel.org/patch/10508753/#22166385
--- drivers/spi/spi-fsl-qspi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/spi/spi-fsl-qspi.c +7 -3
@@ -859,14 +859,15 @@ static int fsl_qspi_probe(struct platform_device *pdev) res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"QuadSPI-memory" ); - q->ahb_addr =devm_ioremap_resource (dev, res); + q->memmap_phy = res->start; +/* Since there are 4 CS max MAP required is 4 time ahb_buf_size */ + q->ahb_addr =devm_ioremap (dev, q->memmap_phy, + (q->devtype_data->ahb_buf_size *4 ));if (IS_ERR (q->ahb_addr)) { ret =PTR_ERR (q->ahb_addr); goto err_put_ctrl; } - q->memmap_phy = res->start; -/* find the clocks */ q->clk_en =devm_clk_get (dev,"qspi_en" );if (IS_ERR (q->clk_en)) {
@@ -939,6 +940,9 @@ static int fsl_qspi_remove(struct platform_device *pdev)mutex_destroy (&q->lock); +if (q->ahb_addr) +devm_iounmap (q->dev, q->ahb_addr); +return 0 ; }
Signature · 1 line
2.7.4
Hi Ashish,
Quoted 11 lines · Ashish Kumar
Reduce
devm_ioremapsize to (4 *AHB_BUFER_SIZE) rather than mapping complete QSPI-Memmory as driver is now independent of flash size. Flash of any size can be accessed.Issue was reported on platform where
devm_ioremapfailure is observed with size > 256M.
Error log on LS1021ATWR :
fsl-quadspi 1550000.spi: ioremap failed for resource [mem 0x40000000-0x7fffffff] fsl-quadspi 1550000.spi: Freescale QuadSPI probe failed
fsl-quadspi: probe of 1550000.spi failed with error -12
Quoted 2 lines
This change was also suggested previously:
https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.kernel.org%2Fpatch%2F10508753%2F%2322166385&data=02%7C01%7Cfrieder.schrempf%40kontron.de%7Cba26817e759b460819a708d7e1e0d083%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637226228543132272&sdata=z7wekDTg%2FN7CZUy7ikM%2BVHOKT95YbDJ0cr2JE62Wgzw%3D&reserved=0
So if you want you could add a "Suggested-by" tag referring to Boris.
Quoted 12 lines
Signed-off-by Kuldeep Singh <[email protected]>Signed-off-by Ashish Kumar <[email protected]>--- drivers/spi/spi-fsl-qspi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/spi/spi-fsl-qspi.c +0
-0
drivers/spi/spi-fsl-qspi.c static int fsl_qspi_probe(struct platform_device *pdev) · line 863
Quoted 6 lines
drivers/spi/spi-fsl-qspi.c +2
-1@@ -859,14 +859,15 @@ static int fsl_qspi_probe(struct platform_device *pdev) res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"QuadSPI-memory" ); - q->ahb_addr =devm_ioremap_resource (dev, res); + q->memmap_phy = res->start; +/* Since there are 4 CS max MAP required is 4 time ahb_buf_size */
/* Since there are 4 cs, map size required is 4 times ahb_buf_size */
Quoted 13 lines
drivers/spi/spi-fsl-qspi.c +2
-2+ q->ahb_addr =devm_ioremap (dev, q->memmap_phy, + (q->devtype_data->ahb_buf_size *4 ));if (IS_ERR (q->ahb_addr)) { ret =PTR_ERR (q->ahb_addr); goto err_put_ctrl; } - q->memmap_phy = res->start; -/* find the clocks */ q->clk_en =devm_clk_get (dev,"qspi_en" );if (IS_ERR (q->clk_en)) {
drivers/spi/spi-fsl-qspi.c static int fsl_qspi_remove(struct platform_device *pdev) · line 944
Quoted 5 lines
drivers/spi/spi-fsl-qspi.c +2
-0@@ -939,6 +940,9 @@ static int fsl_qspi_remove(struct platform_device *pdev)mutex_destroy (&q->lock); +if (q->ahb_addr) +devm_iounmap (q->dev, q->ahb_addr);
You don't need to unmap explicitly. Using devm_*(), lifetime of the resource is already tied to the device.
Thanks,
Frieder
Quoted 5 lines
drivers/spi/spi-fsl-qspi.c +1
-0+return 0 ; }
Hi Frieder,
Quoted 33 lines
-----Original Message-----
From: Schrempf Frieder <[email protected]>
Sent: Thursday, April 16, 2020 3:06 PM
To: Ashish Kumar <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; Kuldeep Singh <[email protected]>
Subject: [EXT] Re: [PATCH] spi: spi-fsl-qspi: Reducedevm_ioremapsize to 4 times AHB buffer sizeCaution: EXT Email
Hi Ashish,
Quoted 8 lines · Ashish Kumar
Reduce
devm_ioremapsize to (4 *AHB_BUFER_SIZE) rather than mapping complete QSPI-Memmory as driver is now independent of flash size. Flash of any size can be accessed.Issue was reported on platform where
devm_ioremapfailure is observed with size > 256M.
Error log on LS1021ATWR :
fsl-quadspi 1550000.spi: ioremap failed for resource [mem 0x40000000-
0x7fffffff]Quoted 6 lines
fsl-quadspi 1550000.spi: Freescale QuadSPI probe failed
fsl-quadspi: probe of 1550000.spi failed with error -12This change was also suggested previously:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.kernel.org%2Fpatch%2F10508753%2F%2322166385&data=02%7C 01%7Ca
Quoted 1 line
Quoted 8 lines
shish.kumar%40nxp.com%7C7e4a6913030f4f5a4a0408d7e1e9a342%7C686ea 1d3bc2
Quoted 1 line
b4c6fa92cd99c5c301635%7C0%7C0%7C637226265903575933&sdata=JDb k0rA2L
Quoted 1 line
5EwAah8S3srd5u26bOxaD1MVR3voUKFxyI%3D&reserved=0
So if you want you could add a "Suggested-by" tag referring to Boris.
Sure, I will add in next version.
Quoted 39 lines
Quoted 13 lines
Signed-off-by Kuldeep Singh <[email protected]>Signed-off-by Ashish Kumar <[email protected]>--- drivers/spi/spi-fsl-qspi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/spi/spi-fsl-qspi.c +0
-0drivers/spi/spi-fsl-qspi.c static int fsl_qspi_probe(struct platform_device · line 865
Quoted 8 lines
drivers/spi/spi-fsl-qspi.c +3
-1@@ -859,14 +859,15 @@ static int fsl_qspi_probe(struct platform_device *pdev) res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"QuadSPI-memory" ); - q->ahb_addr =devm_ioremap_resource (dev, res); + q->memmap_phy = res->start; +/* Since there are 4 CS max MAP required is 4 time ahb_buf_size +*/ /* Since there are 4 cs, map size required is 4 times
ahb_buf_size*/Quoted 15 lines
drivers/spi/spi-fsl-qspi.c +2
-2+ q->ahb_addr =devm_ioremap (dev, q->memmap_phy, + (q->devtype_data->ahb_buf_size *4 ));if (IS_ERR (q->ahb_addr)) { ret =PTR_ERR (q->ahb_addr); goto err_put_ctrl; } - q->memmap_phy = res->start; -/* find the clocks */ q->clk_en =devm_clk_get (dev,"qspi_en" );if (IS_ERR (q->clk_en)) {@@ -939,6 +940,9 @@ static int fsl_qspi_remove(struct platform_device *pdev)
Quoted 7 lines
drivers/spi/spi-fsl-qspi.c static int fsl_qspi_remove(struct platform_device *pdev) · line 944
Quoted 4 lines
drivers/spi/spi-fsl-qspi.c +2
-0mutex_destroy (&q->lock); +if (q->ahb_addr) +devm_iounmap (q->dev, q->ahb_addr);You don't need to unmap explicitly. Using devm_*(), lifetime of the resource is already tied to the device.
Thanks. I will remove this.
Regards
Ashish
Quoted 9 lines
Thanks,
FriederQuoted 5 lines
drivers/spi/spi-fsl-qspi.c +1
-0+return 0 ; }