From patchwork Wed Apr 30 17:44:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4095411 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8C0ABFF02 for ; Wed, 30 Apr 2014 17:46:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F08DB20172 for ; Wed, 30 Apr 2014 17:46:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1308200ED for ; Wed, 30 Apr 2014 17:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933870AbaD3RqI (ORCPT ); Wed, 30 Apr 2014 13:46:08 -0400 Received: from mail-vc0-f201.google.com ([209.85.220.201]:53640 "EHLO mail-vc0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759271AbaD3Rof (ORCPT ); Wed, 30 Apr 2014 13:44:35 -0400 Received: by mail-vc0-f201.google.com with SMTP id ij19so300387vcb.0 for ; Wed, 30 Apr 2014 10:44:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ncdg3QJ2eUKZ5C9BiG9k/2jNWUaviPX3jtsTRHj3pys=; b=hXYwcwJzxmn5/N6LNNcVWaN7P6psj3KacUzl1trpjPiS4gsi/Johzv+VnE04+ienDH eSu5Iur6g/vB/Zw8iDTBI5KLIYm+FVBbT8/0Ui5zIRjucljz3J00DcOkuwQbg02E7oc4 0ymw3WJuIa72+3yTHPZs8hrSZdXM+SVpa+3pio6xVrY4p9zJN3337yPsd0R0VNSeP+1U FygsLztc/zae8rqN4apsUmDfBpbdGcFKrCoaHcY3PJLZVVe3BOo9mbKbJBtQzU4znuAK PXJv3yITb+pNeLA4mEvnNBqAMZGYnY7MJkj4tW1e7ISpKkTj6FOPRChemjVnCTbKaDIu fdOg== X-Gm-Message-State: ALoCoQm0cnsbCSTT2+iKW5cSbokp7iRg47qOE2MPnaryJlAZmkTKQZwoQMLLb7Mb/xkuUi0i5YfJuKHiwNEpI8DHDwXmzn6uKpczaYOF9V5ht1XpO9ngNEtljdA6Nn5WbUT6+RPqzx5bMUeLJWjDKfLnrKl8a3Jcu6xAmqmhvtOU1yeelrcq6eg0Mjemu66YxQrXmBRjsljRLGg3+tZRV8jHRfKrzMyupw== X-Received: by 10.58.188.4 with SMTP id fw4mr3361288vec.9.1398879874785; Wed, 30 Apr 2014 10:44:34 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id x22si3078285yhd.5.2014.04.30.10.44.34 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Apr 2014 10:44:34 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 7D33531C25A; Wed, 30 Apr 2014 10:44:34 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 303B680BF1; Wed, 30 Apr 2014 10:44:34 -0700 (PDT) From: Doug Anderson To: lee.jones@linaro.org, swarren@nvidia.com, wsa@the-dreams.de Cc: abrestic@chromium.org, dgreid@chromium.org, olof@lixom.net, sjg@chromium.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, Doug Anderson , sameo@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/7] mfd: cros_ec: spi: Add mutex to cros_ec_spi Date: Wed, 30 Apr 2014 10:44:05 -0700 Message-Id: <1398879850-9111-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.9.1.423.g4596e3a In-Reply-To: <1398879850-9111-1-git-send-email-dianders@chromium.org> References: <1398879850-9111-1-git-send-email-dianders@chromium.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The main transfer function for cros_ec_spi can be called by more than one client at a time. Make sure that those clients don't stomp on each other by locking the bus for the duration of the transfer function. Signed-off-by: Doug Anderson Acked-by: Lee Jones Reviewed-by: Simon Glass Tested-by: Andrew Bresticker Tested-by: Stephen Warren --- Changes in v3: None Changes in v2: None drivers/mfd/cros_ec_spi.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c index c185eb6..a2a605d 100644 --- a/drivers/mfd/cros_ec_spi.c +++ b/drivers/mfd/cros_ec_spi.c @@ -65,11 +65,13 @@ * if no record * @end_of_msg_delay: used to set the delay_usecs on the spi_transfer that * is sent when we want to turn off CS at the end of a transaction. + * @lock: mutex to ensure only one user of cros_ec_command_spi_xfer at a time */ struct cros_ec_spi { struct spi_device *spi; s64 last_transfer_ns; unsigned int end_of_msg_delay; + struct mutex lock; }; static void debug_packet(struct device *dev, const char *name, u8 *ptr, @@ -208,6 +210,13 @@ static int cros_ec_command_spi_xfer(struct cros_ec_device *ec_dev, int ret = 0, final_ret; struct timespec ts; + /* + * We have the shared ec_dev buffer plus we do lots of separate spi_sync + * calls, so we need to make sure only one person is using this at a + * time. + */ + mutex_lock(&ec_spi->lock); + len = cros_ec_prepare_tx(ec_dev, ec_msg); dev_dbg(ec_dev->dev, "prepared, len=%d\n", len); @@ -260,7 +269,7 @@ static int cros_ec_command_spi_xfer(struct cros_ec_device *ec_dev, ret = final_ret; if (ret < 0) { dev_err(ec_dev->dev, "spi transfer failed: %d\n", ret); - return ret; + goto exit; } /* check response error code */ @@ -269,14 +278,16 @@ static int cros_ec_command_spi_xfer(struct cros_ec_device *ec_dev, dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n", ec_msg->cmd, ptr[0]); debug_packet(ec_dev->dev, "in_err", ptr, len); - return -EINVAL; + ret = -EINVAL; + goto exit; } len = ptr[1]; sum = ptr[0] + ptr[1]; if (len > ec_msg->in_len) { dev_err(ec_dev->dev, "packet too long (%d bytes, expected %d)", len, ec_msg->in_len); - return -ENOSPC; + ret = -ENOSPC; + goto exit; } /* copy response packet payload and compute checksum */ @@ -293,10 +304,14 @@ static int cros_ec_command_spi_xfer(struct cros_ec_device *ec_dev, dev_err(ec_dev->dev, "bad packet checksum, expected %02x, got %02x\n", sum, ptr[len + 2]); - return -EBADMSG; + ret = -EBADMSG; + goto exit; } - return 0; + ret = 0; +exit: + mutex_unlock(&ec_spi->lock); + return ret; } static void cros_ec_spi_dt_probe(struct cros_ec_spi *ec_spi, struct device *dev) @@ -327,6 +342,7 @@ static int cros_ec_spi_probe(struct spi_device *spi) if (ec_spi == NULL) return -ENOMEM; ec_spi->spi = spi; + mutex_init(&ec_spi->lock); ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL); if (!ec_dev) return -ENOMEM;