From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bkyab-00047X-L9 for linux-mtd@lists.infradead.org; Fri, 16 Sep 2016 19:14:22 +0000 Received: by mail-wm0-x242.google.com with SMTP id l132so3920222wmf.1 for ; Fri, 16 Sep 2016 12:13:58 -0700 (PDT) Subject: Re: [PATCH v2 2/3] mtd: m25p80: consider max message size in m25p80_read To: Brian Norris References: <6c95366c-7fcc-ef4c-033a-f9f6e152a669@gmail.com> <20160816164204.GV9347@sirena.org.uk> Cc: Mark Brown , "linux-spi@vger.kernel.org" , MTD Maling List From: Heiner Kallweit Message-ID: Date: Fri, 16 Sep 2016 21:13:43 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Am 17.08.2016 um 21:09 schrieb Heiner Kallweit: > Consider a message size limit when calculating the maximum amount > of data that can be read. > > Signed-off-by: Heiner Kallweit > --- > 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); > Can we still get this into 4.9 ? The other two patches of the series have been applied by Mark already and there's a dependency for messages >64k on fsl-espi.