120-05-v5.18-spi-spi-mem-Check-the-controller-extra-capabilities.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From c9cae7e1e5c87d0aa76b7bededa5191a0c8cf25a Mon Sep 17 00:00:00 2001
  2. From: Miquel Raynal <[email protected]>
  3. Date: Thu, 27 Jan 2022 10:17:57 +0100
  4. Subject: [PATCH 05/15] spi: spi-mem: Check the controller extra capabilities
  5. Controllers can now provide a spi-mem capabilities structure. Let's make
  6. use of it in spi_mem_controller_default_supports_op(). As we want to
  7. check for DTR operations as well as normal operations in a single
  8. helper, let's pull the necessary checks from spi_mem_dtr_supports_op()
  9. for now.
  10. However, because no controller provide these extra capabilities, this
  11. change has no effect so far.
  12. Signed-off-by: Miquel Raynal <[email protected]>
  13. Reviewed-by: Pratyush Yadav <[email protected]>
  14. Reviewed-by: Boris Brezillon <[email protected]>
  15. Reviewed-by: Tudor Ambarus <[email protected]>
  16. Link: https://lore.kernel.org/linux-mtd/[email protected]
  17. (cherry picked from commit cb7e96ee81edaa48c67d84c14df2cbe464391c37)
  18. ---
  19. drivers/spi/spi-mem.c | 17 +++++++++++++----
  20. 1 file changed, 13 insertions(+), 4 deletions(-)
  21. --- a/drivers/spi/spi-mem.c
  22. +++ b/drivers/spi/spi-mem.c
  23. @@ -173,11 +173,20 @@ EXPORT_SYMBOL_GPL(spi_mem_dtr_supports_o
  24. bool spi_mem_default_supports_op(struct spi_mem *mem,
  25. const struct spi_mem_op *op)
  26. {
  27. - if (op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr)
  28. - return false;
  29. + struct spi_controller *ctlr = mem->spi->controller;
  30. + bool op_is_dtr =
  31. + op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr;
  32. - if (op->cmd.nbytes != 1)
  33. - return false;
  34. + if (op_is_dtr) {
  35. + if (!spi_mem_controller_is_capable(ctlr, dtr))
  36. + return false;
  37. +
  38. + if (op->cmd.nbytes != 2)
  39. + return false;
  40. + } else {
  41. + if (op->cmd.nbytes != 1)
  42. + return false;
  43. + }
  44. return spi_mem_check_buswidth(mem, op);
  45. }