From: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: "linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, MTD Maling List <linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> Subject: [PATCH v2 1/3] spi: introduce max_message_size hook in spi_master Date: Wed, 17 Aug 2016 21:08:01 +0200 [thread overview] Message-ID: <69c4ce26-7b41-222e-07b2-92818cedd05f@gmail.com> (raw) In-Reply-To: <20160816164204.GV9347-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> Recently a maximum transfer size was was introduced in struct spi_master. However there are also spi controllers with a maximum message size, e.g. fsl-espi has a max message size of 64KB. Introduce a hook max_message_size to deal with such limitations. Also make sure that spi_max_transfer_size doesn't return greater values than spi_max_message_size, even if hook max_transfer_size is not set. Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- v2: - replace the flag with a hook that allows to define a message size limit independednt of a potential transfer size limit --- include/linux/spi/spi.h | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 072cb2a..f2d3960 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -312,6 +312,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) * @flags: other constraints relevant to this driver * @max_transfer_size: function that returns the max transfer size for * a &spi_device; may be %NULL, so the default %SIZE_MAX will be used. + * @max_message_size: function that returns the max message size for + * a &spi_device; may be %NULL, so the default %SIZE_MAX will be used. * @io_mutex: mutex for physical bus access * @bus_lock_spinlock: spinlock for SPI bus locking * @bus_lock_mutex: mutex for exclusion of multiple callers @@ -442,10 +444,11 @@ struct spi_master { #define SPI_MASTER_MUST_TX BIT(4) /* requires tx */ /* - * on some hardware transfer size may be constrained + * on some hardware transfer / message size may be constrained * the limit may depend on device transfer settings */ size_t (*max_transfer_size)(struct spi_device *spi); + size_t (*max_message_size)(struct spi_device *spi); /* I/O mutex */ struct mutex io_mutex; @@ -905,12 +908,26 @@ extern int spi_async_locked(struct spi_device *spi, struct spi_message *message); static inline size_t -spi_max_transfer_size(struct spi_device *spi) +spi_max_message_size(struct spi_device *spi) { struct spi_master *master = spi->master; - if (!master->max_transfer_size) + if (!master->max_message_size) return SIZE_MAX; - return master->max_transfer_size(spi); + return master->max_message_size(spi); +} + +static inline size_t +spi_max_transfer_size(struct spi_device *spi) +{ + struct spi_master *master = spi->master; + size_t tr_max = SIZE_MAX; + size_t msg_max = spi_max_message_size(spi); + + if (master->max_transfer_size) + tr_max = master->max_transfer_size(spi); + + /* transfer size limit must not be greater than messsage size limit */ + return min(tr_max, msg_max); } /*---------------------------------------------------------------------------*/ -- 2.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Heiner Kallweit <hkallweit1@gmail.com> To: Mark Brown <broonie@kernel.org>, Brian Norris <computersforpeace@gmail.com> Cc: "linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>, MTD Maling List <linux-mtd@lists.infradead.org> Subject: [PATCH v2 1/3] spi: introduce max_message_size hook in spi_master Date: Wed, 17 Aug 2016 21:08:01 +0200 [thread overview] Message-ID: <69c4ce26-7b41-222e-07b2-92818cedd05f@gmail.com> (raw) In-Reply-To: <20160816164204.GV9347@sirena.org.uk> Recently a maximum transfer size was was introduced in struct spi_master. However there are also spi controllers with a maximum message size, e.g. fsl-espi has a max message size of 64KB. Introduce a hook max_message_size to deal with such limitations. Also make sure that spi_max_transfer_size doesn't return greater values than spi_max_message_size, even if hook max_transfer_size is not set. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - replace the flag with a hook that allows to define a message size limit independednt of a potential transfer size limit --- include/linux/spi/spi.h | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 072cb2a..f2d3960 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -312,6 +312,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) * @flags: other constraints relevant to this driver * @max_transfer_size: function that returns the max transfer size for * a &spi_device; may be %NULL, so the default %SIZE_MAX will be used. + * @max_message_size: function that returns the max message size for + * a &spi_device; may be %NULL, so the default %SIZE_MAX will be used. * @io_mutex: mutex for physical bus access * @bus_lock_spinlock: spinlock for SPI bus locking * @bus_lock_mutex: mutex for exclusion of multiple callers @@ -442,10 +444,11 @@ struct spi_master { #define SPI_MASTER_MUST_TX BIT(4) /* requires tx */ /* - * on some hardware transfer size may be constrained + * on some hardware transfer / message size may be constrained * the limit may depend on device transfer settings */ size_t (*max_transfer_size)(struct spi_device *spi); + size_t (*max_message_size)(struct spi_device *spi); /* I/O mutex */ struct mutex io_mutex; @@ -905,12 +908,26 @@ extern int spi_async_locked(struct spi_device *spi, struct spi_message *message); static inline size_t -spi_max_transfer_size(struct spi_device *spi) +spi_max_message_size(struct spi_device *spi) { struct spi_master *master = spi->master; - if (!master->max_transfer_size) + if (!master->max_message_size) return SIZE_MAX; - return master->max_transfer_size(spi); + return master->max_message_size(spi); +} + +static inline size_t +spi_max_transfer_size(struct spi_device *spi) +{ + struct spi_master *master = spi->master; + size_t tr_max = SIZE_MAX; + size_t msg_max = spi_max_message_size(spi); + + if (master->max_transfer_size) + tr_max = master->max_transfer_size(spi); + + /* transfer size limit must not be greater than messsage size limit */ + return min(tr_max, msg_max); } /*---------------------------------------------------------------------------*/ -- 2.9.2
next prev parent reply other threads:[~2016-08-17 19:08 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-07 19:47 [PATCH 1/3] spi: introduce max message size flag in spi_master Heiner Kallweit 2016-08-07 19:47 ` Heiner Kallweit [not found] ` <6c95366c-7fcc-ef4c-033a-f9f6e152a669-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-08-16 16:42 ` Mark Brown 2016-08-16 16:42 ` Mark Brown [not found] ` <20160816164204.GV9347-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2016-08-17 18:51 ` Heiner Kallweit 2016-08-17 18:51 ` Heiner Kallweit 2016-08-17 19:08 ` Heiner Kallweit [this message] 2016-08-17 19:08 ` [PATCH v2 1/3] spi: introduce max_message_size hook " Heiner Kallweit [not found] ` <69c4ce26-7b41-222e-07b2-92818cedd05f-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-08-18 10:17 ` Mark Brown 2016-08-18 10:17 ` Mark Brown 2016-08-18 10:17 ` Applied "spi: introduce max_message_size hook in spi_master" to the spi tree Mark Brown 2016-08-18 10:17 ` Mark Brown 2016-08-17 19:09 ` [PATCH v2 2/3] mtd: m25p80: consider max message size in m25p80_read Heiner Kallweit 2016-08-17 19:09 ` Heiner Kallweit [not found] ` <b65240ff-7e28-5ecb-0670-abfca871246b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-09-16 19:13 ` Heiner Kallweit 2016-09-16 19:13 ` Heiner Kallweit [not found] ` <a5aad691-fb3b-39a5-943e-43068df74c44-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-10-27 21:23 ` [PATCH RESEND] " Heiner Kallweit 2016-10-27 21:23 ` Heiner Kallweit [not found] ` <e2e4ecfe-b888-f335-57f6-634f5c818252-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-10-28 5:48 ` Heiner Kallweit 2016-10-28 5:48 ` Heiner Kallweit 2016-10-28 5:58 ` [PATCH v2] " Heiner Kallweit 2016-10-28 5:58 ` Heiner Kallweit [not found] ` <0e38d1ed-af5c-160f-e02a-f1433c507d23-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-10-29 17:59 ` Marek Vasut 2016-10-29 17:59 ` Marek Vasut [not found] ` <6f1aed1e-9467-aa94-56cb-5e9435b21ae4-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-10-29 18:09 ` Mark Brown 2016-10-29 18:09 ` Mark Brown 2016-11-29 6:29 ` Heiner Kallweit 2016-11-29 6:29 ` Heiner Kallweit 2016-12-23 15:15 ` [PATCH v2 2/3] " Cyrille Pitchen 2016-12-23 15:15 ` Cyrille Pitchen 2016-12-23 15:33 ` Cyrille Pitchen 2016-12-23 15:33 ` Cyrille Pitchen [not found] ` <2e31fbe7-bbc7-8fed-ccbf-dd9ae4d220e1-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> 2016-12-23 18:53 ` Marek Vasut 2016-12-23 18:53 ` Marek Vasut [not found] ` <e7513817-c6d1-948d-19ff-617debfa1399-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-12-23 21:04 ` Michal Suchanek 2016-12-23 21:04 ` Michal Suchanek [not found] ` <CAOMqctTaPoMR=_dEF_j-WU178_i2tOp2sTfZJSDWWkohVxZn8A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2016-12-24 10:20 ` Marek Vasut 2016-12-24 10:20 ` Marek Vasut [not found] ` <1bd5f31a-a32e-12ce-10af-1a17955f5ab6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-12-24 23:47 ` Heiner Kallweit 2016-12-24 23:47 ` Heiner Kallweit 2016-08-17 19:11 ` [PATCH v2 3/3] spi: fsl-espi: eliminate spi nor flash read loop Heiner Kallweit 2016-08-17 19:11 ` Heiner Kallweit [not found] ` <b66e4ae5-3528-5141-e1fe-90c19ffcb7ac-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-08-18 10:17 ` Applied "spi: fsl-espi: eliminate spi nor flash read loop" to the spi tree Mark Brown 2016-08-18 10:17 ` Mark Brown 2016-10-13 18:50 ` [PATCH v2 RESEND 2/3] mtd: m25p80: consider max message size in m25p80_read Heiner Kallweit 2016-10-13 18:50 ` Heiner Kallweit
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=69c4ce26-7b41-222e-07b2-92818cedd05f@gmail.com \ --to=hkallweit1-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.