From patchwork Thu Aug 25 04:50:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298647 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 5064960757 for ; Thu, 25 Aug 2016 04:55:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 395B3291C7 for ; Thu, 25 Aug 2016 04:55:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A7D0291C8; Thu, 25 Aug 2016 04:55:04 +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 B13B5291C0 for ; Thu, 25 Aug 2016 04:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756057AbcHYEyp (ORCPT ); Thu, 25 Aug 2016 00:54:45 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34077 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754698AbcHYExc (ORCPT ); Thu, 25 Aug 2016 00:53:32 -0400 Received: by mail-wm0-f67.google.com with SMTP id q128so5639074wma.1 for ; Wed, 24 Aug 2016 21:53:31 -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=zJn9kNysTOS2gX4gWytKRDAacWm5EzRP8+5cPBghTjw=; b=kiyqMd9Gv23puQFKb87a6BEI0qoATzKVniQCQobNX/4LMmWI3N8u4Wq6PzDxJbVauL 9xer8F6YMDPIfD2FLDyt39MhE9O6bG1C64sBl3vAh+YiOYH/Nh+BQ/Ne2Zu/Z/XCPJF2 7Pql5Y4ofqoMPsQQ29HaAzrVuyNOMiHXECOrNBBMkF1DLL8tlc/vnJVtT5mhIgSXMZt+ pgZDfhvjo/ztFEpLVVMVpQRxWlU6+OJeOIdYSVYB3ZdZ1u3Ubmy4MmMx74LDjIOKxz+5 6PLYmXvIR4l84aSRKpb/FonpZ49p4p1nZbTFEk3RkHQerXY2hY4I7dPO1qMBVuXs+6D+ eIVg== 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=zJn9kNysTOS2gX4gWytKRDAacWm5EzRP8+5cPBghTjw=; b=jHrfWniKRF4TXMhpGclelDmLvp8o5fFE+ymv0N0ttbKvQw/GQn5WUMKfeIGAEzo4qR fKqdlsL9E9IvQlZeQ1XwAx3E2GHsKlW8VrGXN1PPbS0d+g7rgm62PPRCQ+Uh5E99l/gS ohbTs4qGCMfJp1QYjcN7+zneJgupajAscBc651oukZREPQY6/llVfFOm4K6CXDhvoXu0 ve7CGBtvPywR9M4Zn1kjbj9HGzF2fNl3JLISC66nnoHx3G0ELTU/43kQosjhKLY1/P9m 31DQI0jKlF1ev8pw2qMJ84ZihAFxLrDG9gBAlkvOmW0JvAzV+C8d108NIfGqMLC+0WvP RQSw== X-Gm-Message-State: AEkoouts4QAcJvSGCrSn3o2Ib3JYhxKq4N9EON+4+IB1XhloRnvN5XVeWAA2jBa1qQ4hEA== X-Received: by 10.194.42.202 with SMTP id q10mr5353004wjl.190.1472100810775; Wed, 24 Aug 2016 21:53:30 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:dd82:2805:e44f:720e? (p200300625F439500DD822805E44F720E.dip0.t-ipconnect.de. [2003:62:5f43:9500:dd82:2805:e44f:720e]) by smtp.googlemail.com with ESMTPSA id i1sm13141877wjf.12.2016.08.24.21.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:30 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 18/23] spi: fsl-espi: factor out initial message checking To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Thu, 25 Aug 2016 06:50:45 +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 --- 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 8d5bebc..d398caf 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -97,6 +97,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); @@ -223,11 +247,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))); @@ -254,20 +273,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;