| Message ID | 20201110214736.25718-1-eajames@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ee4ad5d06509b3aea79b6a77bebd09ef891bed8d |
| Headers | show |
| Series | spi: fsi: Fix transfer returning without finalizing message | expand |
On Tue, 10 Nov 2020 at 21:47, Eddie James <eajames@linux.ibm.com> wrote: > > In the case that the SPI mux isn't set, the transfer_one_message > function returns without finalizing the message. This means that > the transfer never completes, resulting in hung tasks and an > eventual kernel panic. Fix it by finalizing the transfer in this > case. > > Fixes: 9211a441e606 ("spi: fsi: Check mux status before transfers") > Signed-off-by: Eddie James <eajames@linux.ibm.com> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/spi/spi-fsi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-fsi.c b/drivers/spi/spi-fsi.c > index 8a440c7078ef..3920cd3286d8 100644 > --- a/drivers/spi/spi-fsi.c > +++ b/drivers/spi/spi-fsi.c > @@ -477,7 +477,7 @@ static int fsi_spi_transfer_one_message(struct spi_controller *ctlr, > > rc = fsi_spi_check_mux(ctx->fsi, ctx->dev); > if (rc) > - return rc; > + goto error; > > list_for_each_entry(transfer, &mesg->transfers, transfer_list) { > struct fsi_spi_sequence seq; > -- > 2.26.2 >
On Tue, 10 Nov 2020 15:47:36 -0600, Eddie James wrote: > In the case that the SPI mux isn't set, the transfer_one_message > function returns without finalizing the message. This means that > the transfer never completes, resulting in hung tasks and an > eventual kernel panic. Fix it by finalizing the transfer in this > case. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: fsi: Fix transfer returning without finalizing message commit: ee4ad5d06509b3aea79b6a77bebd09ef891bed8d 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
diff --git a/drivers/spi/spi-fsi.c b/drivers/spi/spi-fsi.c index 8a440c7078ef..3920cd3286d8 100644 --- a/drivers/spi/spi-fsi.c +++ b/drivers/spi/spi-fsi.c @@ -477,7 +477,7 @@ static int fsi_spi_transfer_one_message(struct spi_controller *ctlr, rc = fsi_spi_check_mux(ctx->fsi, ctx->dev); if (rc) - return rc; + goto error; list_for_each_entry(transfer, &mesg->transfers, transfer_list) { struct fsi_spi_sequence seq;
In the case that the SPI mux isn't set, the transfer_one_message function returns without finalizing the message. This means that the transfer never completes, resulting in hung tasks and an eventual kernel panic. Fix it by finalizing the transfer in this case. Fixes: 9211a441e606 ("spi: fsi: Check mux status before transfers") Signed-off-by: Eddie James <eajames@linux.ibm.com> --- drivers/spi/spi-fsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)