From patchwork Sun Aug 7 19:48:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9266545 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 999E360754 for ; Sun, 7 Aug 2016 19:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A587279E0 for ; Sun, 7 Aug 2016 19:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F39E25D99; Sun, 7 Aug 2016 19:49:44 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 3568C25D99 for ; Sun, 7 Aug 2016 19:49:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751976AbcHGTtn (ORCPT ); Sun, 7 Aug 2016 15:49:43 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36687 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbcHGTtn (ORCPT ); Sun, 7 Aug 2016 15:49:43 -0400 Received: by mail-wm0-f67.google.com with SMTP id x83so11953037wma.3 for ; Sun, 07 Aug 2016 12:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=TYB4FfjfP9dEpKOUdTmN+VdTKkxFEfUsHZsFQRg7i6U=; b=flsQS6KVFIGs86Pzj+E5SymYlC2GDhDgsCGBrbym6OpVk6xX72NCPsXHacoslMHzlR o/NWDJSejPZC/HRMBLIOydAS9kvHwU3PFwRg4Q3vpnU+w6wwqPFeMlEIGbfvDsLKJSK0 Jh/fKoopZAJMGSeeBZixaryf3KMKAC9AHX1am2JOIV69qjwTuKh4xDqbTIbH3dVs9ItK wRnQRDqZncfEkdJzo4ysfNwwytMjk+O7+1BdwZYM+g57+wtFB0jIJ8i4AMvOxv1X3a+l WABZeiGRGZueHjSuAk82CB4Lp9xlZaJrCSbOb5com09YeuwT7dpa0K13S/6JkC+b3z1D 3bvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=TYB4FfjfP9dEpKOUdTmN+VdTKkxFEfUsHZsFQRg7i6U=; b=jt0w9jgJCtu3g7duKy3DckyUTqwh82G+EeBCiLREi1Y2D6u7DkIJmqFHtBMEtgMdJj eZJnsCGC0YXkEZiJyhbcgPT4T23zF3768R10ugpfkeed8/q1WFkUNo8eKNIf8qml//FS yp1fHAKECEuppvDwAGLEO9KNv2CQnoazVjdzUitCwxDurhgY+FWnV+HGWEQxLEcIJGMT nhXKt96/HApQ/ta7CY0dgI/GQgOIwAWYQPAW57c/aquwDZvK9VeF4N0KyWCGeCwjkraS l6c9C4QiDs4i9mmM+SaUKlwZ1UfqcUfGYAqY/ZpLs+V/yj1yFUn55ONgd2UU2FG+t/1c J0vg== X-Gm-Message-State: AEkoouuJ20pae2s6vUUibOQCYKAr/VR8rmOFjZ0pfUkFKzw8V+kA+S61VsHO8Nvx8RrSzA== X-Received: by 10.194.57.244 with SMTP id l20mr80035455wjq.1.1470599381944; Sun, 07 Aug 2016 12:49:41 -0700 (PDT) Received: from ?IPv6:2003:62:5f01:4400:19c4:bee6:ba17:e190? (p200300625F01440019C4BEE6BA17E190.dip0.t-ipconnect.de. [2003:62:5f01:4400:19c4:bee6:ba17:e190]) by smtp.googlemail.com with ESMTPSA id i66sm19972596wmg.9.2016.08.07.12.49.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Aug 2016 12:49:41 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 2/3] mtd: m25p80: consider max message size in m25p80_read To: Mark Brown , Brian Norris Cc: "linux-spi@vger.kernel.org" , MTD Maling List Message-ID: Date: Sun, 7 Aug 2016 21:48:37 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 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 If the spi_master has the max_message_size_flag set, the maximum amount of data that can be read is the message size limit minus length of the read command. Signed-off-by: Heiner Kallweit --- drivers/mtd/devices/m25p80.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 9cf7fcd..2925038 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -133,6 +133,7 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, struct spi_transfer t[2]; struct spi_message m; unsigned int dummy = nor->read_dummy; + size_t max_read_len; ssize_t ret; /* convert the dummy cycles to the number of bytes */ @@ -170,9 +171,13 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, t[0].len = m25p_cmdsz(nor) + dummy; spi_message_add_tail(&t[0], &m); + max_read_len = spi_max_transfer_size(spi); + if (spi->master->max_message_size_flag) + max_read_len -= t[0].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 = min(len, max_read_len); spi_message_add_tail(&t[1], &m); ret = spi_sync(spi, &m);