| Message ID | 20161017135957.20297-2-ralf@ramses-pyramidenbau.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0af98a7e025a7263ae7e50264f6f79ed29642a7 |
| Headers | show |
On Mon, Oct 17, 2016 at 3:59 PM, Ralf Ramsauer <ralf@ramses-pyramidenbau.de> wrote: > Instantiated SPI device nodes are marked with OF_POPULATE. This was > introduced in bd6c164. On unloading, loaded device nodes will of course > be unmarked. The problem are nodes that fail during initialisation: If a > node fails, it won't be unloaded and hence not be unmarked. > > If a SPI driver module is unloaded and reloaded, it will skip nodes that > failed before. > > Skip device nodes that are already populated and mark them only in case > of success. > > Note that the same issue exists for I2C. > > Fixes: bd6c164 ("spi: Mark instantiated device nodes with OF_POPULATE") > Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Ralf, > On Oct 17, 2016, at 16:59 , Ralf Ramsauer <ralf@ramses-pyramidenbau.de> wrote: > > Instantiated SPI device nodes are marked with OF_POPULATE. This was > introduced in bd6c164. On unloading, loaded device nodes will of course > be unmarked. The problem are nodes that fail during initialisation: If a > node fails, it won't be unloaded and hence not be unmarked. > > If a SPI driver module is unloaded and reloaded, it will skip nodes that > failed before. > > Skip device nodes that are already populated and mark them only in case > of success. > > Note that the same issue exists for I2C. > > Fixes: bd6c164 ("spi: Mark instantiated device nodes with OF_POPULATE") > Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de> > --- > drivers/spi/spi.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 5787b72..838783c 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -1618,9 +1618,11 @@ static void of_register_spi_devices(struct spi_master *master) > if (of_node_test_and_set_flag(nc, OF_POPULATED)) > continue; > spi = of_register_spi_device(master, nc); > - if (IS_ERR(spi)) > + if (IS_ERR(spi)) { > dev_warn(&master->dev, "Failed to create SPI device for %s\n", > nc->full_name); > + of_node_clear_flag(nc, OF_POPULATED); > + } > } > } > #else > @@ -3131,6 +3133,7 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action, > if (IS_ERR(spi)) { > pr_err("%s: failed to create for '%s'\n", > __func__, rd->dn->full_name); > + of_node_clear_flag(rd->dn, OF_POPULATED); > return notifier_from_errno(PTR_ERR(spi)); > } > break; > -- > 2.10.1 > Thanks for this. Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 17, 2016 at 03:59:56PM +0200, Ralf Ramsauer wrote: > Instantiated SPI device nodes are marked with OF_POPULATE. This was > introduced in bd6c164. On unloading, loaded device nodes will of course Please include human readable descriptions of things like commits and issues being discussed in e-mail in your mails, this makes them much easier for humans to read especially when they have no internet access. I do frequently catch up on my mail on flights or while otherwise travelling so this is even more pressing for me than just being about making things a bit easier to read. Please also use longer hashes - the kernel repository is big enough that we do actually have a few collisons on shorter hash lengths IIRC. The standard thing is 12 characthers (you can set core.abbrev to 12 to help with this).
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 5787b72..838783c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1618,9 +1618,11 @@ static void of_register_spi_devices(struct spi_master *master) if (of_node_test_and_set_flag(nc, OF_POPULATED)) continue; spi = of_register_spi_device(master, nc); - if (IS_ERR(spi)) + if (IS_ERR(spi)) { dev_warn(&master->dev, "Failed to create SPI device for %s\n", nc->full_name); + of_node_clear_flag(nc, OF_POPULATED); + } } } #else @@ -3131,6 +3133,7 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action, if (IS_ERR(spi)) { pr_err("%s: failed to create for '%s'\n", __func__, rd->dn->full_name); + of_node_clear_flag(rd->dn, OF_POPULATED); return notifier_from_errno(PTR_ERR(spi)); } break;
Instantiated SPI device nodes are marked with OF_POPULATE. This was introduced in bd6c164. On unloading, loaded device nodes will of course be unmarked. The problem are nodes that fail during initialisation: If a node fails, it won't be unloaded and hence not be unmarked. If a SPI driver module is unloaded and reloaded, it will skip nodes that failed before. Skip device nodes that are already populated and mark them only in case of success. Note that the same issue exists for I2C. Fixes: bd6c164 ("spi: Mark instantiated device nodes with OF_POPULATE") Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de> --- drivers/spi/spi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)