* [PATCH 0/2] spi: atmel-quadspi: fix resume call @ 2019-06-28 15:30 Tudor.Ambarus 2019-06-28 15:30 ` [PATCH 1/2] spi: atmel-quadspi: void return type for atmel_qspi_init() Tudor.Ambarus 2019-06-28 15:30 ` [PATCH 2/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus 0 siblings, 2 replies; 5+ messages in thread From: Tudor.Ambarus @ 2019-06-28 15:30 UTC (permalink / raw) To: broonie, mdeneen Cc: alexandre.belloni, Tudor.Ambarus, linux-spi, Ludovic.Desroches, Claudiu.Beznea, linux-arm-kernel From: Tudor Ambarus <tudor.ambarus@microchip.com> When waking up from the Suspend-to-RAM state, the following error was seen: m25p80 spi2.0: flash operation timed out The flash remained in an undefined state, returning 0xFFs. Fix it by setting the Serial Clock Baud Rate, as it was set before the conversion to SPIMEM. Tested with sama5d2_xplained and mx25l25673g spi-nor in Backup + Self-Refresh and Suspend modes. Tudor Ambarus (2): spi: atmel-quadspi: void return type for atmel_qspi_init() spi: atmel-quadspi: fix resume call drivers/spi/atmel-quadspi.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) -- 2.9.5 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] spi: atmel-quadspi: void return type for atmel_qspi_init() 2019-06-28 15:30 [PATCH 0/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus @ 2019-06-28 15:30 ` Tudor.Ambarus 2019-07-02 13:04 ` Applied "spi: atmel-quadspi: void return type for atmel_qspi_init()" to the spi tree Mark Brown 2019-06-28 15:30 ` [PATCH 2/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus 1 sibling, 1 reply; 5+ messages in thread From: Tudor.Ambarus @ 2019-06-28 15:30 UTC (permalink / raw) To: broonie, mdeneen Cc: alexandre.belloni, Tudor.Ambarus, linux-spi, Ludovic.Desroches, Claudiu.Beznea, linux-arm-kernel From: Tudor Ambarus <tudor.ambarus@microchip.com> commit 2d30ac5ed633 ("mtd: spi-nor: atmel-quadspi: Use spi-mem interface for atmel-quadspi driver") removed the error path from atmel_qspi_init(), but not changed the function's return type. Set void return type for atmel_qspi_init(). Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- drivers/spi/atmel-quadspi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 9f24d5f0b431..32eb7447c31a 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -405,7 +405,7 @@ static int atmel_qspi_setup(struct spi_device *spi) return 0; } -static int atmel_qspi_init(struct atmel_qspi *aq) +static void atmel_qspi_init(struct atmel_qspi *aq) { /* Reset the QSPI controller */ writel_relaxed(QSPI_CR_SWRST, aq->regs + QSPI_CR); @@ -416,8 +416,6 @@ static int atmel_qspi_init(struct atmel_qspi *aq) /* Enable the QSPI controller */ writel_relaxed(QSPI_CR_QSPIEN, aq->regs + QSPI_CR); - - return 0; } static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id) @@ -536,9 +534,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) if (err) goto disable_qspick; - err = atmel_qspi_init(aq); - if (err) - goto disable_qspick; + atmel_qspi_init(aq); err = spi_register_controller(ctrl); if (err) @@ -587,7 +583,8 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) clk_prepare_enable(aq->pclk); clk_prepare_enable(aq->qspick); - return atmel_qspi_init(aq); + atmel_qspi_init(aq); + return 0; } static SIMPLE_DEV_PM_OPS(atmel_qspi_pm_ops, atmel_qspi_suspend, -- 2.9.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "spi: atmel-quadspi: void return type for atmel_qspi_init()" to the spi tree 2019-06-28 15:30 ` [PATCH 1/2] spi: atmel-quadspi: void return type for atmel_qspi_init() Tudor.Ambarus @ 2019-07-02 13:04 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2019-07-02 13:04 UTC (permalink / raw) To: Tudor Ambarus Cc: alexandre.belloni, Tudor.Ambarus, mdeneen, linux-spi, Ludovic.Desroches, Mark Brown, Claudiu.Beznea, linux-arm-kernel The patch spi: atmel-quadspi: void return type for atmel_qspi_init() has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.3 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 5b74e9a306267be3b371b309faef8626b18e6423 Mon Sep 17 00:00:00 2001 From: Tudor Ambarus <tudor.ambarus@microchip.com> Date: Fri, 28 Jun 2019 15:30:32 +0000 Subject: [PATCH] spi: atmel-quadspi: void return type for atmel_qspi_init() commit 2d30ac5ed633 ("mtd: spi-nor: atmel-quadspi: Use spi-mem interface for atmel-quadspi driver") removed the error path from atmel_qspi_init(), but not changed the function's return type. Set void return type for atmel_qspi_init(). Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/atmel-quadspi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 9f24d5f0b431..32eb7447c31a 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -405,7 +405,7 @@ static int atmel_qspi_setup(struct spi_device *spi) return 0; } -static int atmel_qspi_init(struct atmel_qspi *aq) +static void atmel_qspi_init(struct atmel_qspi *aq) { /* Reset the QSPI controller */ writel_relaxed(QSPI_CR_SWRST, aq->regs + QSPI_CR); @@ -416,8 +416,6 @@ static int atmel_qspi_init(struct atmel_qspi *aq) /* Enable the QSPI controller */ writel_relaxed(QSPI_CR_QSPIEN, aq->regs + QSPI_CR); - - return 0; } static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id) @@ -536,9 +534,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) if (err) goto disable_qspick; - err = atmel_qspi_init(aq); - if (err) - goto disable_qspick; + atmel_qspi_init(aq); err = spi_register_controller(ctrl); if (err) @@ -587,7 +583,8 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) clk_prepare_enable(aq->pclk); clk_prepare_enable(aq->qspick); - return atmel_qspi_init(aq); + atmel_qspi_init(aq); + return 0; } static SIMPLE_DEV_PM_OPS(atmel_qspi_pm_ops, atmel_qspi_suspend, -- 2.20.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] spi: atmel-quadspi: fix resume call 2019-06-28 15:30 [PATCH 0/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus 2019-06-28 15:30 ` [PATCH 1/2] spi: atmel-quadspi: void return type for atmel_qspi_init() Tudor.Ambarus @ 2019-06-28 15:30 ` Tudor.Ambarus 2019-07-02 13:04 ` Applied "spi: atmel-quadspi: fix resume call" to the spi tree Mark Brown 1 sibling, 1 reply; 5+ messages in thread From: Tudor.Ambarus @ 2019-06-28 15:30 UTC (permalink / raw) To: broonie, mdeneen Cc: alexandre.belloni, Tudor.Ambarus, linux-spi, Ludovic.Desroches, Claudiu.Beznea, linux-arm-kernel From: Tudor Ambarus <tudor.ambarus@microchip.com> When waking up from the Suspend-to-RAM state, the following error was seen: m25p80 spi2.0: flash operation timed out The flash remained in an undefined state, returning 0xFFs. Fix it by setting the Serial Clock Baud Rate, as it was set before the conversion to SPIMEM. Tested with sama5d2_xplained and mx25l25673g spi-nor in Backup + Self-Refresh and Suspend modes. Fixes: 0e6aae08e9ae ("spi: Add QuadSPI driver for Atmel SAMA5D2") Reported-by: Mark Deneen <mdeneen@gmail.com> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- drivers/spi/atmel-quadspi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 32eb7447c31a..6a7d7b553d95 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -151,6 +151,7 @@ struct atmel_qspi { const struct atmel_qspi_caps *caps; u32 pending; u32 mr; + u32 scr; struct completion cmd_completion; }; @@ -382,7 +383,7 @@ static int atmel_qspi_setup(struct spi_device *spi) struct spi_controller *ctrl = spi->master; struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); unsigned long src_rate; - u32 scr, scbr; + u32 scbr; if (ctrl->busy) return -EBUSY; @@ -399,8 +400,8 @@ static int atmel_qspi_setup(struct spi_device *spi) if (scbr > 0) scbr--; - scr = QSPI_SCR_SCBR(scbr); - writel_relaxed(scr, aq->regs + QSPI_SCR); + aq->scr = QSPI_SCR_SCBR(scbr); + writel_relaxed(aq->scr, aq->regs + QSPI_SCR); return 0; } @@ -584,6 +585,9 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) clk_prepare_enable(aq->qspick); atmel_qspi_init(aq); + + writel_relaxed(aq->scr, aq->regs + QSPI_SCR); + return 0; } -- 2.9.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "spi: atmel-quadspi: fix resume call" to the spi tree 2019-06-28 15:30 ` [PATCH 2/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus @ 2019-07-02 13:04 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2019-07-02 13:04 UTC (permalink / raw) To: Tudor Ambarus Cc: alexandre.belloni, Tudor.Ambarus, mdeneen, linux-spi, Ludovic.Desroches, Mark Brown, Claudiu.Beznea, linux-arm-kernel The patch spi: atmel-quadspi: fix resume call has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.3 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 0db3a61b4b3ceaea68b748ee63cc88f110757b7f Mon Sep 17 00:00:00 2001 From: Tudor Ambarus <tudor.ambarus@microchip.com> Date: Fri, 28 Jun 2019 15:30:34 +0000 Subject: [PATCH] spi: atmel-quadspi: fix resume call When waking up from the Suspend-to-RAM state, the following error was seen: m25p80 spi2.0: flash operation timed out The flash remained in an undefined state, returning 0xFFs. Fix it by setting the Serial Clock Baud Rate, as it was set before the conversion to SPIMEM. Tested with sama5d2_xplained and mx25l25673g spi-nor in Backup + Self-Refresh and Suspend modes. Fixes: 0e6aae08e9ae ("spi: Add QuadSPI driver for Atmel SAMA5D2") Reported-by: Mark Deneen <mdeneen@gmail.com> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/atmel-quadspi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 32eb7447c31a..6a7d7b553d95 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -151,6 +151,7 @@ struct atmel_qspi { const struct atmel_qspi_caps *caps; u32 pending; u32 mr; + u32 scr; struct completion cmd_completion; }; @@ -382,7 +383,7 @@ static int atmel_qspi_setup(struct spi_device *spi) struct spi_controller *ctrl = spi->master; struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); unsigned long src_rate; - u32 scr, scbr; + u32 scbr; if (ctrl->busy) return -EBUSY; @@ -399,8 +400,8 @@ static int atmel_qspi_setup(struct spi_device *spi) if (scbr > 0) scbr--; - scr = QSPI_SCR_SCBR(scbr); - writel_relaxed(scr, aq->regs + QSPI_SCR); + aq->scr = QSPI_SCR_SCBR(scbr); + writel_relaxed(aq->scr, aq->regs + QSPI_SCR); return 0; } @@ -584,6 +585,9 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev) clk_prepare_enable(aq->qspick); atmel_qspi_init(aq); + + writel_relaxed(aq->scr, aq->regs + QSPI_SCR); + return 0; } -- 2.20.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-02 13:04 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-28 15:30 [PATCH 0/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus 2019-06-28 15:30 ` [PATCH 1/2] spi: atmel-quadspi: void return type for atmel_qspi_init() Tudor.Ambarus 2019-07-02 13:04 ` Applied "spi: atmel-quadspi: void return type for atmel_qspi_init()" to the spi tree Mark Brown 2019-06-28 15:30 ` [PATCH 2/2] spi: atmel-quadspi: fix resume call Tudor.Ambarus 2019-07-02 13:04 ` Applied "spi: atmel-quadspi: fix resume call" to the spi tree Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).