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 2/3] mtd: m25p80: consider max message size in m25p80_read
Date: Wed, 17 Aug 2016 21:09:48 +0200 [thread overview]
Message-ID: <b65240ff-7e28-5ecb-0670-abfca871246b@gmail.com> (raw)
In-Reply-To: <20160816164204.GV9347-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
Consider a message size limit when calculating the maximum amount
of data that can be read.
Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
v2:
- use the new function spi_max_message_size
---
drivers/mtd/devices/m25p80.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 9cf7fcd..16a7df2 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -172,7 +172,8 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
t[1].rx_buf = buf;
t[1].rx_nbits = m25p80_rx_nbits(nor);
- t[1].len = min(len, spi_max_transfer_size(spi));
+ t[1].len = min3(len, spi_max_transfer_size(spi),
+ spi_max_message_size(spi) - t[0].len);
spi_message_add_tail(&t[1], &m);
ret = spi_sync(spi, &m);
--
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
next prev parent reply other threads:[~2016-08-17 19:09 UTC|newest]
Thread overview: 23+ 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
[not found] ` <6c95366c-7fcc-ef4c-033a-f9f6e152a669-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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 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 ` Applied "spi: introduce max_message_size hook in spi_master" to the spi tree Mark Brown
2016-08-17 19:09 ` Heiner Kallweit [this message]
[not found] ` <b65240ff-7e28-5ecb-0670-abfca871246b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-16 19:13 ` [PATCH v2 2/3] mtd: m25p80: consider max message size in m25p80_read Heiner Kallweit
[not found] ` <a5aad691-fb3b-39a5-943e-43068df74c44-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-27 21:23 ` [PATCH RESEND] " Heiner Kallweit
[not found] ` <e2e4ecfe-b888-f335-57f6-634f5c818252-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-28 5:48 ` Heiner Kallweit
2016-10-28 5:58 ` [PATCH v2] " Heiner Kallweit
[not found] ` <0e38d1ed-af5c-160f-e02a-f1433c507d23-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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-11-29 6:29 ` Heiner Kallweit
2016-12-23 15:15 ` [PATCH v2 2/3] " 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
[not found] ` <e7513817-c6d1-948d-19ff-617debfa1399-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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
[not found] ` <1bd5f31a-a32e-12ce-10af-1a17955f5ab6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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
[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-10-13 18:50 ` [PATCH v2 RESEND 2/3] mtd: m25p80: consider max message size in m25p80_read 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=b65240ff-7e28-5ecb-0670-abfca871246b@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: 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).