From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Lukas Wunner <lukas@wunner.de>
Cc: Mark Brown <broonie@kernel.org>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
linux-spi@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>
Subject: Re: [PATCH 1/3] spi: dw: Fix controller unregister order
Date: Mon, 25 May 2020 16:15:57 +0300 [thread overview]
Message-ID: <20200525131557.GW1634618@smile.fi.intel.com> (raw)
In-Reply-To: <3fff8cb8ae44a9893840d0688be15bb88c090a14.1590408496.git.lukas@wunner.de>
On Mon, May 25, 2020 at 02:25:01PM +0200, Lukas Wunner wrote:
> The Designware SPI driver uses devm_spi_register_controller() on bind.
> As a consequence, on unbind, __device_release_driver() first invokes
> dw_spi_remove_host() before unregistering the SPI controller via
> devres_release_all().
>
> This order is incorrect: dw_spi_remove_host() shuts down the chip,
> rendering the SPI bus inaccessible even though the SPI controller is
> still registered. When the SPI controller is subsequently unregistered,
> it unbinds all its slave devices. Because their drivers cannot access
> the SPI bus, e.g. to quiesce interrupts, the slave devices may be left
> in an improper state.
>
> As a rule, devm_spi_register_controller() must not be used if the
> ->remove() hook performs teardown steps which shall be performed after
> unregistering the controller and specifically after unbinding of slaves.
>
> Fix by reverting to the non-devm variant of spi_register_controller().
>
> An alternative approach would be to use device-managed functions for all
> steps in dw_spi_remove_host(), e.g. by calling devm_add_action_or_reset()
> on probe. However that approach would add more LoC to the driver and
> it wouldn't lend itself as well to backporting to stable.
I think it's, unregistering controller first, proper way to quiescence it,
otherwise it can be a surprise transfer started while we are in removal stage.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Fixes: 04f421e7b0b1 ("spi: dw: use managed resources")
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> Cc: stable@vger.kernel.org # v3.14+
> Cc: Baruch Siach <baruch@tkos.co.il>
> ---
> drivers/spi/spi-dw.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
> index 1edb8cdd11ee..9d6904d30104 100644
> --- a/drivers/spi/spi-dw.c
> +++ b/drivers/spi/spi-dw.c
> @@ -520,7 +520,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
> }
> }
>
> - ret = devm_spi_register_controller(dev, master);
> + ret = spi_register_controller(master);
> if (ret) {
> dev_err(&master->dev, "problem registering spi master\n");
> goto err_dma_exit;
> @@ -544,6 +544,8 @@ void dw_spi_remove_host(struct dw_spi *dws)
> {
> dw_spi_debugfs_remove(dws);
>
> + spi_unregister_controller(dws->master);
> +
> if (dws->dma_ops && dws->dma_ops->dma_exit)
> dws->dma_ops->dma_exit(dws);
>
> --
> 2.25.0
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-05-25 13:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 12:25 [PATCH 0/3] Intel SPI unbind fixes Lukas Wunner
2020-05-25 12:25 ` [PATCH 1/3] spi: dw: Fix controller unregister order Lukas Wunner
2020-05-25 13:15 ` Andy Shevchenko [this message]
2020-05-25 12:25 ` [PATCH 2/3] spi: pxa2xx: " Lukas Wunner
2020-05-25 13:21 ` Andy Shevchenko
2020-05-26 7:39 ` Lukas Wunner
2020-05-26 8:22 ` Andy Shevchenko
2020-05-27 12:09 ` Tsuchiya Yuto
2020-05-27 12:27 ` Andy Shevchenko
2020-05-27 13:14 ` Tsuchiya Yuto
2020-05-28 7:02 ` Tsuchiya Yuto
2020-05-28 8:41 ` Andy Shevchenko
2020-05-28 9:31 ` Lukas Wunner
2020-05-29 13:54 ` Tsuchiya Yuto
2020-05-25 12:25 ` [PATCH 3/3] spi: pxa2xx: Fix runtime PM ref imbalance on probe error Lukas Wunner
2020-05-25 13:12 ` Andy Shevchenko
2020-05-26 8:46 ` Jarkko Nikula
2020-05-25 13:23 ` [PATCH 0/3] Intel SPI unbind fixes Andy Shevchenko
2020-05-26 16:46 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200525131557.GW1634618@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=baruch@tkos.co.il \
--cc=broonie@kernel.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-spi@vger.kernel.org \
--cc=lukas@wunner.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).