From patchwork Tue Mar 20 02:42:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 132108 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp312511ljb; Mon, 19 Mar 2018 19:42:31 -0700 (PDT) X-Google-Smtp-Source: AG47ELtkHs6fgnQZJSCvT5wr/PIYy7F8pBpQ2eihbHIqS5koyCKEfzDjCdNQx8WEl07HWg3POCWb X-Received: by 2002:a17:902:67cd:: with SMTP id g13-v6mr11146526pln.171.1521513751512; Mon, 19 Mar 2018 19:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521513751; cv=none; d=google.com; s=arc-20160816; b=ivtNy+vjVOHXYxc0/l/Zdv17s5LH9sNWM2miOWZYtw0xuaZ1hsyY4C2t6pjEs+9dAC I9T/4eVJ4Ip0wcweB7j58qQ7J9o4jnrfQQWBNBkg4QFbQSy+i0XPy6KrG2fFi6L29jjl PaILKmO0VPB+AC6niTiG98y3XuTM26be30xo0Njc2r78Q+8aPY2zKQ1rcyXWAZHVyRTV +NnrXJLK/RGNh4poutCrYhL4bXl03J1kRDYCq/FHuVpMxq+xq6wLmYXq1xdNcs0+xBjg 0485zJvs/F3e3jIaY1ITfhUula42xq1gF+iFRs80cDVIYb6mV7WL/Gz1QpSWkejVecnU 7tLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=f34YVHnjb86QVH7C+9BLR26ByaeqzMsixaPND6ybbwQ=; b=zconOTmQPsNjVrLprNjpYanxMbkgscvKrX9waoQFIOpO7uIRsxPDDjNFWEB98Rob6i WV3Q03Nx2NLqPf8tWFepMgJ2QtrYXaQ852BGmp/JROxR1OTVgeMwsWkPL6cBlyEWRTMX QJSNSizLIZPLCczFiHPxjCHj5TnYgHeIbTbtT4OkjF7BFwi09Ov4cfBCZ7gmfQDHHwkF NMa/IKz9P43VVW+AZ/rpDFnzvszALw5bs0MMKKazLVjgnba6E3/mIkaWgZwIStvgt8o+ QqnOPdak6lVUPuZXHxS/+Ulz7mszQc2P0qqL+P6qQmfQzl77q1y+5c4LvF0GPg8Bu+/X Pd5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Vj4axvdb; spf=pass (google.com: best guess record for domain of linux-spi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-spi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9si457612pgp.800.2018.03.19.19.42.31; Mon, 19 Mar 2018 19:42:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-spi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Vj4axvdb; spf=pass (google.com: best guess record for domain of linux-spi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-spi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751064AbeCTCm3 (ORCPT + 1 other); Mon, 19 Mar 2018 22:42:29 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:43890 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968AbeCTCm2 (ORCPT ); Mon, 19 Mar 2018 22:42:28 -0400 Received: by mail-pl0-f67.google.com with SMTP id f23-v6so109829plr.10 for ; Mon, 19 Mar 2018 19:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=mvaczSUD27BCOMINe9A3n3oV7xxXYJeoOs85TORQ6KE=; b=Vj4axvdbCqB/qbV4hrsCCOi1Qo/yYYJ5DlA6q2B+bLOgrx7hYclyxvozLxwrifdyUx XeAPSma9RHyu90Rds6dP6MK40ioqgWcCmGAloUO0x8tk3926S6hb9Ko4woc/SHVzT9iJ Nu/vuewQeaKWehGlxhM/IDCnvKL/N4R8LLGEk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mvaczSUD27BCOMINe9A3n3oV7xxXYJeoOs85TORQ6KE=; b=I9VUNzOwP7vpOzCGpfCMW44eWMIC5nVX6MFhsOOoWhHyH58jOk977f4/SzBTjBAa9D k42KtGuRooWnH49VBZHBmMxxYnyZBUyqSgAxGhm5fLr5R350DXDJax4LJ0n1VClw44ib wDbVpxW0HoIvoh2Mh0QkPxmB1M2rv+qyVSoxH9EdlJdHd64hbCusA4o/9HcuNwspagv2 L5vI9U4ZPMDiCPVZl/R9CqorXeuVsel0a9hWRbp2p3q/dVz0AK3atS8ExSINnH/ev1nN fU8KD+UTI72IrFH7n1G0XrPs0Zb2Q8Gr3ueVC+HBGwq1VMMy8Vh8zPKFImKc+ZEOCDBk IekA== X-Gm-Message-State: AElRT7HAUAzkHrMlVDb84ybs+s4tPOzW01XcEdGvXIeLFY0GJ5ct8iNf 34RGoWN7QX538hT0vAzY7zk006q+lXk= X-Received: by 2002:a17:902:9a8f:: with SMTP id w15-v6mr585615plp.103.1521513747841; Mon, 19 Mar 2018 19:42:27 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id x5sm570678pgq.84.2018.03.19.19.42.24 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Mar 2018 19:42:27 -0700 (PDT) From: Baolin Wang To: broonie@kernel.org Cc: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, erick.chen@spreadtrum.com, baolin.wang@linaro.org Subject: [PATCH 1/2] spi: sprd: Simplify the transfer function Date: Tue, 20 Mar 2018 10:42:13 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org We can move the hardware spinlock protection into the ADI read/write functions to simplify the sprd_adi_transfer_one() function. Moreover this optimization can also help to access PMIC without considering the hardware spinlock using sprd_adi_read/write() functions. Signed-off-by: Baolin Wang --- drivers/spi/spi-sprd-adi.c | 64 ++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 29 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index eb82b94..b89b09d 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -123,7 +123,17 @@ static int sprd_adi_fifo_is_full(struct sprd_adi *sadi) static int sprd_adi_read(struct sprd_adi *sadi, u32 reg_paddr, u32 *read_val) { int read_timeout = ADI_READ_TIMEOUT; + unsigned long flags; u32 val, rd_addr; + int ret; + + ret = hwspin_lock_timeout_irqsave(sadi->hwlock, + ADI_HWSPINLOCK_TIMEOUT, + &flags); + if (ret) { + dev_err(sadi->dev, "get the hw lock failed\n"); + return ret; + } /* * Set the physical register address need to read into RD_CMD register, @@ -147,7 +157,8 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg_paddr, u32 *read_val) if (read_timeout == 0) { dev_err(sadi->dev, "ADI read timeout\n"); - return -EBUSY; + ret = -EBUSY; + goto out; } /* @@ -161,21 +172,35 @@ static int sprd_adi_read(struct sprd_adi *sadi, u32 reg_paddr, u32 *read_val) if (rd_addr != (reg_paddr & REG_ADDR_LOW_MASK)) { dev_err(sadi->dev, "read error, reg addr = 0x%x, val = 0x%x\n", reg_paddr, val); - return -EIO; + ret = -EIO; + goto out; } *read_val = val & RD_VALUE_MASK; - return 0; + +out: + hwspin_unlock_irqrestore(sadi->hwlock, &flags); + return ret; } -static int sprd_adi_write(struct sprd_adi *sadi, unsigned long reg, u32 val) +static int sprd_adi_write(struct sprd_adi *sadi, u32 reg_paddr, u32 val) { + unsigned long reg = sprd_adi_to_vaddr(sadi, reg_paddr); u32 timeout = ADI_FIFO_DRAIN_TIMEOUT; + unsigned long flags; int ret; + ret = hwspin_lock_timeout_irqsave(sadi->hwlock, + ADI_HWSPINLOCK_TIMEOUT, + &flags); + if (ret) { + dev_err(sadi->dev, "get the hw lock failed\n"); + return ret; + } + ret = sprd_adi_drain_fifo(sadi); if (ret < 0) - return ret; + goto out; /* * we should wait for write fifo is empty before writing data to PMIC @@ -192,10 +217,12 @@ static int sprd_adi_write(struct sprd_adi *sadi, unsigned long reg, u32 val) if (timeout == 0) { dev_err(sadi->dev, "write fifo is full\n"); - return -EBUSY; + ret = -EBUSY; } - return 0; +out: + hwspin_unlock_irqrestore(sadi->hwlock, &flags); + return ret; } static int sprd_adi_transfer_one(struct spi_controller *ctlr, @@ -203,7 +230,6 @@ static int sprd_adi_transfer_one(struct spi_controller *ctlr, struct spi_transfer *t) { struct sprd_adi *sadi = spi_controller_get_devdata(ctlr); - unsigned long flags, virt_reg; u32 phy_reg, val; int ret; @@ -214,16 +240,7 @@ static int sprd_adi_transfer_one(struct spi_controller *ctlr, if (ret) return ret; - ret = hwspin_lock_timeout_irqsave(sadi->hwlock, - ADI_HWSPINLOCK_TIMEOUT, - &flags); - if (ret) { - dev_err(sadi->dev, "get the hw lock failed\n"); - return ret; - } - ret = sprd_adi_read(sadi, phy_reg, &val); - hwspin_unlock_irqrestore(sadi->hwlock, &flags); if (ret) return ret; @@ -241,19 +258,8 @@ static int sprd_adi_transfer_one(struct spi_controller *ctlr, if (ret) return ret; - virt_reg = sprd_adi_to_vaddr(sadi, phy_reg); val = *p; - - ret = hwspin_lock_timeout_irqsave(sadi->hwlock, - ADI_HWSPINLOCK_TIMEOUT, - &flags); - if (ret) { - dev_err(sadi->dev, "get the hw lock failed\n"); - return ret; - } - - ret = sprd_adi_write(sadi, virt_reg, val); - hwspin_unlock_irqrestore(sadi->hwlock, &flags); + ret = sprd_adi_write(sadi, phy_reg, val); if (ret) return ret; } else {