From patchwork Thu Oct 27 21:23:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9400469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 06507600BA for ; Thu, 27 Oct 2016 21:24:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E15462A3A4 for ; Thu, 27 Oct 2016 21:24:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5A0F2A3A8; Thu, 27 Oct 2016 21:24:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C40F2A3A4 for ; Thu, 27 Oct 2016 21:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965092AbcJ0VYW (ORCPT ); Thu, 27 Oct 2016 17:24:22 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35340 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964938AbcJ0VYT (ORCPT ); Thu, 27 Oct 2016 17:24:19 -0400 Received: by mail-wm0-f67.google.com with SMTP id b80so4540333wme.2 for ; Thu, 27 Oct 2016 14:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:references:cc:to:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=aO/ZZCNFQoKPK+TnJcDDCd/oH7gnBfqKB1VsVMRB6gA=; b=mY0hBiHJsA8H/IWsoDOFkBJ/2ymik25+G5ThoVqxPDh82wcTDfCABobVvfkZKv44bW K/tu4YeGs9XNZagESERNKYgpAEcBK0EwxRErma0mACSL6nP4JSoWdsis03qWrEWhGN/D WxcpSiwimINcfTZpxyETNBKORlFZwSqDqp6umWvF4I/Rn+DuGJkMRbysmKqVNFaqsMwt V/RTl7f/wQuWBWHbDQ4hvdFULnkISGQ+xAYhdMW5JGUYGDM34DnA8LgnAzR321WpVd0p RCnBAn/RNDnfG+fEseLyCs7jo0pIAeVCl3daDmnWm62c+za3NkGiJsLFKwyy8JcwAUK0 4WuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:references:cc:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=aO/ZZCNFQoKPK+TnJcDDCd/oH7gnBfqKB1VsVMRB6gA=; b=dyME5xJKrcRz9RmoreC7ttcTBxApzCtsyVhLn/Gt7Lo7GbV0WHfLSaiMcecHVki4gX apwIfQebDqF4dFGSDeZRxKNPPyXq+R7YMqRYAaJzGNtp8vu9mX9UTo3nxm9VSCG3qI+s KAgDtZ3JkOh80CAhQSO9tHw7MkvV4LFD7r2bG0gLVQQs6AderpIlgSjh6xUdTDerfI9N KHwehW3uUeEYm39C0KJ75SoXSZ+IQYPu880pYTOqjv8hq5vwwupXmt5vU9UOZsLsRTKy TToYepU6M0QmROc4YDx6oSxNKsh7V49Iy/DW76naLFCtXSyzZib7X9QS4Rw5j68/YeGY ATUQ== X-Gm-Message-State: ABUngvc37GjvqXraTompM85iTAmKqQ1RgFIaOmiQg5zyM8Jmn50kttniud/B8XN45zJu+g== X-Received: by 10.194.189.83 with SMTP id gg19mr8626510wjc.165.1477603457967; Thu, 27 Oct 2016 14:24:17 -0700 (PDT) Received: from ?IPv6:2003:62:5f6e:ba00:49f8:f47b:2191:41c4? (p200300625F6EBA0049F8F47B219141C4.dip0.t-ipconnect.de. [2003:62:5f6e:ba00:49f8:f47b:2191:41c4]) by smtp.googlemail.com with ESMTPSA id o62sm5338564wmg.12.2016.10.27.14.24.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 14:24:17 -0700 (PDT) Subject: [PATCH RESEND] mtd: m25p80: consider max message size in m25p80_read References: <6c95366c-7fcc-ef4c-033a-f9f6e152a669@gmail.com> <20160816164204.GV9347@sirena.org.uk> Cc: Brian Norris , Mark Brown , "linux-spi@vger.kernel.org" , MTD Maling List To: Cyrille Pitchen From: Heiner Kallweit Message-ID: Date: Thu, 27 Oct 2016 23:23:58 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 This patch was part of a series and is 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") --- 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);