From patchwork Wed Sep 7 20:53:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9319917 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 DE98C607D3 for ; Wed, 7 Sep 2016 20:56:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE9E72942A for ; Wed, 7 Sep 2016 20:56:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C398D2942B; Wed, 7 Sep 2016 20:56:16 +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 5248129427 for ; Wed, 7 Sep 2016 20:56:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757321AbcIGUzx (ORCPT ); Wed, 7 Sep 2016 16:55:53 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33566 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757138AbcIGUzu (ORCPT ); Wed, 7 Sep 2016 16:55:50 -0400 Received: by mail-wm0-f67.google.com with SMTP id b187so852614wme.0 for ; Wed, 07 Sep 2016 13:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=Iq+7bnXWuC0gG3dLjRHYsnm58zyqC5sGhZDw2WDRIQE=; b=eepeBzmjmCaU/xfvfDCb3gr62EejGwFiBlKMJlrMKO3mrGyYLdtUJyh7jpalSCuZhB bTA85wE7U7THmmvHEc4VjAmjt0tYBL/tu8Ckmwrauw1zDJ5zeoJxc6NWQhW+s/8tSn2Z JjW8mOYX6jrxapbz9vx0zCG/ceAwObgdBsU6yFeHSoKhAr8sR1Lh+j0uL+X8F7k4bexo uTrH6DqAPbvluSrRPdH5E/v4uQZQnHQHJy8ZRYWKJheWzST2raPc65t0GVmviCWwpYoA LIccWy5vdS8a9mt77ekOiWI+TALpKSzuG7VxikcKsdHLDYhp5xDcjKrP+2om7bPoGlEk yUoQ== 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:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=Iq+7bnXWuC0gG3dLjRHYsnm58zyqC5sGhZDw2WDRIQE=; b=dk/9Oc5Mj4phY+1H8jjZqnQWWgJWbZ2VxDeVysSa4KiUi1OqQU2WVsxpGhLoRPf/AN 7/rpUK38sOsGHyKzcJUXNse5cxLKHZfUlzbwwMf/i0015888M8cTA2cYCjcGYrI+3rlD jli8W/lBm++yn60ePSLrC1jFh3jcXzShJGcNuhzRA6EHLCeleQW95PVAv1MICS6sCZxV MfqlXIAZRBnz65nBByl1b2LtGUkWb/Fj8tQgXK65jgbbD/qD/X7OmW8v2qukWmaTUcYp mvqAvifhbiGtgWjnSXkTo/LNLZSu1Sa1zS+31n6bLPhA8V+1o9Lz1M+oyJDvgzf6x/iG MIdg== X-Gm-Message-State: AE9vXwNRsdr9LUT4cvPsnPq89hZZIi6e3YgNbjWdNn+/DF/bUrnHfiY/GQt9c0B6E4Ilwg== X-Received: by 10.28.142.83 with SMTP id q80mr827762wmd.92.1473281749095; Wed, 07 Sep 2016 13:55:49 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:6565:4488:ad4:60db? (p200300625F439500656544880AD460DB.dip0.t-ipconnect.de. [2003:62:5f43:9500:6565:4488:ad4:60db]) by smtp.googlemail.com with ESMTPSA id bk7sm37220882wjc.36.2016.09.07.13.55.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Sep 2016 13:55:48 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v3 11/15] spi: fsl-espi: factor out initial message checking To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <1df813fd-e444-c8fd-0ca4-ccf7b879ebbc@gmail.com> Date: Wed, 7 Sep 2016 22:53:38 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.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 Checking the message is currently done at diffrent places in the driver. Factor it out to fsl_espi_check_message. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - new numbering --- drivers/spi/spi-fsl-espi.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 534dc14..a32bc3a 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -98,6 +98,30 @@ static unsigned int fsl_espi_copy_to_buf(struct spi_message *m, return tx_only; } +static int fsl_espi_check_message(struct spi_message *m) +{ + struct mpc8xxx_spi *mspi = spi_master_get_devdata(m->spi->master); + struct spi_transfer *t, *first; + + if (m->frame_length > SPCOM_TRANLEN_MAX) { + dev_err(mspi->dev, "message too long, size is %u bytes\n", + m->frame_length); + return -EMSGSIZE; + } + + first = list_first_entry(&m->transfers, struct spi_transfer, + transfer_list); + list_for_each_entry(t, &m->transfers, transfer_list) { + if (first->bits_per_word != t->bits_per_word || + first->speed_hz != t->speed_hz) { + dev_err(mspi->dev, "bits_per_word/speed_hz should be the same for all transfers\n"); + return -EINVAL; + } + } + + return 0; +} + static void fsl_espi_change_mode(struct spi_device *spi) { struct mpc8xxx_spi *mspi = spi_master_get_devdata(spi->master); @@ -222,11 +246,6 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) reinit_completion(&mpc8xxx_spi->done); /* Set SPCOM[CS] and SPCOM[TRANLEN] field */ - if (t->len > SPCOM_TRANLEN_MAX) { - dev_err(mpc8xxx_spi->dev, "Transaction length (%d)" - " beyond the SPCOM[TRANLEN] field\n", t->len); - return -EINVAL; - } mpc8xxx_spi_write_reg(®_base->command, (SPCOM_CS(spi->chip_select) | SPCOM_TRANLEN(t->len - 1))); @@ -253,20 +272,12 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) static int fsl_espi_do_trans(struct spi_message *m, struct spi_transfer *trans) { struct spi_device *spi = m->spi; - struct mpc8xxx_spi *mspi = spi_master_get_devdata(spi->master); struct spi_transfer *t, *first; int ret = 0; first = list_first_entry(&m->transfers, struct spi_transfer, transfer_list); list_for_each_entry(t, &m->transfers, transfer_list) { - if ((first->bits_per_word != t->bits_per_word) || - (first->speed_hz != t->speed_hz)) { - dev_err(mspi->dev, - "bits_per_word/speed_hz should be same for the same SPI transfer\n"); - return -EINVAL; - } - trans->speed_hz = t->speed_hz; trans->bits_per_word = t->bits_per_word; trans->delay_usecs = max(first->delay_usecs, t->delay_usecs); @@ -313,6 +324,10 @@ static int fsl_espi_do_one_msg(struct spi_master *master, struct spi_transfer *t, trans = {}; int ret; + ret = fsl_espi_check_message(m); + if (ret) + goto out; + list_for_each_entry(t, &m->transfers, transfer_list) { if (t->rx_buf) rx_buf = t->rx_buf; @@ -325,7 +340,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master, ret = fsl_espi_trans(m, &trans, rx_buf); m->actual_length = ret ? 0 : trans.len; - +out: if (m->status == -EINPROGRESS) m->status = ret;