From: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Cyrille Pitchen <cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> Cc: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, "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] mtd: m25p80: consider max message size in m25p80_read Date: Fri, 28 Oct 2016 07:58:46 +0200 [thread overview] Message-ID: <0e38d1ed-af5c-160f-e02a-f1433c507d23@gmail.com> (raw) In-Reply-To: <e2e4ecfe-b888-f335-57f6-634f5c818252-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Consider a message size limit when calculating the maximum amount of data that can be read. The message size limit has been introduced with 4.9, so cc it to stable. Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 4.9.x --- v2: - This patch was part of a series and the other patches of the series went into 4.9. It's needed to correctly support reads > 64k on fsl-espi as first user of spi_max_message_size. See commit 02a595d5d6e4 ("spi: fsl-espi: eliminate spi nor flash read loop"). CC it to stable. --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Heiner Kallweit <hkallweit1@gmail.com> To: Cyrille Pitchen <cyrille.pitchen@atmel.com> Cc: Brian Norris <computersforpeace@gmail.com>, Mark Brown <broonie@kernel.org>, "linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>, MTD Maling List <linux-mtd@lists.infradead.org> Subject: [PATCH v2] mtd: m25p80: consider max message size in m25p80_read Date: Fri, 28 Oct 2016 07:58:46 +0200 [thread overview] Message-ID: <0e38d1ed-af5c-160f-e02a-f1433c507d23@gmail.com> (raw) In-Reply-To: <e2e4ecfe-b888-f335-57f6-634f5c818252@gmail.com> Consider a message size limit when calculating the maximum amount of data that can be read. The message size limit has been introduced with 4.9, so cc it to stable. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Cc: <stable@vger.kernel.org> # 4.9.x --- v2: - This patch was part of a series and the other patches of the series went into 4.9. It's needed to correctly support reads > 64k on fsl-espi as first user of spi_max_message_size. See commit 02a595d5d6e4 ("spi: fsl-espi: eliminate spi nor flash read loop"). CC it to stable. --- 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
next prev parent reply other threads:[~2016-10-28 5:58 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 ` [PATCH v2 1/3] spi: introduce max_message_size hook " Heiner Kallweit 2016-08-17 19:08 ` 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 ` Heiner Kallweit [this message] 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 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=0e38d1ed-af5c-160f-e02a-f1433c507d23@gmail.com \ --to=hkallweit1-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@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.