From patchwork Thu Jun 3 05:25:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 12296281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17DB7C47096 for ; Thu, 3 Jun 2021 05:28:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6177613DA for ; Thu, 3 Jun 2021 05:28:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6177613DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=alliedtelesis.co.nz Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Pxx1hukR68RrmxX+Fi+BCuhK7mbonhy2sORu4MVZ/Jo=; b=faFIOER6f5fJRo e+LTB/CKi/RoTsGmyWDKEAzW4uG3c72cR7Cm3ZUMrIL4hzw2szA+NJjuZih4gMCmoxYHUd5YESYbD hGxQtpnPHw6mx1if3S0Pdd+Go0FZcY9bGcys+C5McWRfpqQjRYNGA2v+GHGY/NwFCkfY27iaCJzZD 7VF7LZZ9B21qZeZ8kRlYftxAfx3kq4zpqLr5pkP9CBCHO1bZdFF14uTJJm5DieavtmZxvLXm44py1 VFfvsohFQ5hhaO9GbZNY/uFxeZ5kaNJ40d9eSqepSvtulUIJ0LJkLD6Yd0MOU79JjaiUUpBjnMBsS A2uTrm5eOD3INAVitcBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lofrP-007Bd3-5C; Thu, 03 Jun 2021 05:25:39 +0000 Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lofrK-007Bbq-3g for linux-arm-kernel@lists.infradead.org; Thu, 03 Jun 2021 05:25:36 +0000 Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 5E500806B6; Thu, 3 Jun 2021 17:25:20 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1622697920; bh=x6haR024OvYHKI8eySrrs/NAdfpgdjcvs9Ke2ox1u4E=; h=From:To:Cc:Subject:Date; b=BpMfdZ/7K8LRIPwGzxQ+I+jyh3BMQZ85qhTs+DanVswo7WgmvT7pt+Epsv+MsKCWE nDZiv6xqCF2z4o4FsYJob4nSkmgA6ffxXmAyOi7vpMKTLoq5m1PCIj5IhwlYNzUeE8 ncwWHOvp5lTAPZwknZNERSo+hKT+T4Xclt2pDRdtczKidIlDE751zF2GtXzaINE1uu aiCZwyv6zirRKd02tD+fSGnzFutyVj9DmPxpIkl0b7S4actT/bzxp+0LS2AZwSeyAI AlWfnU/NaZNkEy3ErZqFayKhM4851a4Iih4Ob+BTR2uL00kziR8K+6mrY+l0qWJvO+ qAKuz57PjZIHw== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8, 2, 6, 11305) id ; Thu, 03 Jun 2021 17:25:20 +1200 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.20]) by pat.atlnz.lc (Postfix) with ESMTP id 298C813ECA5; Thu, 3 Jun 2021 17:25:20 +1200 (NZST) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 229AD283A55; Thu, 3 Jun 2021 17:25:20 +1200 (NZST) From: Chris Packham To: wsa@kernel.org, rjui@broadcom.com, sbranden@broadcom.com, bcm-kernel-feedback-list@broadcom.com Cc: linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Richard Laing , Chris Packham Subject: [PATCH v3] i2c: bcm-iproc: Add i2c recovery support Date: Thu, 3 Jun 2021 17:25:15 +1200 Message-Id: <20210603052515.11178-1-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-SEG-SpamProfiler-Analysis: v=2.3 cv=WOcBoUkR c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=r6YtysWOX24A:10 a=p0chULUzsp4gKrt3FYkA:9 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210602_222534_500782_7C1B2C7F X-CRM114-Status: GOOD ( 20.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Richard Laing The bcm-iproc controller can put the SDA/SCL lines into bit-bang mode, make use of this to support i2c bus recovery. Signed-off-by: Richard Laing Signed-off-by: Chris Packham Acked-by: Ray Jui --- Richard did most of the work on this. I'm just cleaning it up to get it upstream. Changes in v3: - drop const from bcm_iproc_recovery_info due to build error from the kernel test bot Changes in v2: - Incorporate feedback from Ray Jui - Move bcm_iproc_i2c_resume so it can be re-used to return the i2c bus to normal operation at the correct speed after a recovery. - Add iproc_i2c_lockup_recover() helper to only trigger recovery if sda is actually stuck - Use usleep_range() instead of udelay() - Cosmetic changes to register bit definitions drivers/i2c/busses/i2c-bcm-iproc.c | 176 +++++++++++++++++++++++++---- 1 file changed, 151 insertions(+), 25 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index cceaf69279a9..fdbb98a848e3 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -25,6 +25,7 @@ #define CFG_OFFSET 0x00 #define CFG_RESET_SHIFT 31 #define CFG_EN_SHIFT 30 +#define CFG_BIT_BANG_SHIFT 29 #define CFG_SLAVE_ADDR_0_SHIFT 28 #define CFG_M_RETRY_CNT_SHIFT 16 #define CFG_M_RETRY_CNT_MASK 0x0f @@ -66,6 +67,12 @@ #define S_FIFO_RX_THLD_SHIFT 8 #define S_FIFO_RX_THLD_MASK 0x3f +#define M_BB_CTRL_OFFSET 0x14 +#define M_BB_SMBCLK_IN_SHIFT 31 +#define M_BB_SMBCLK_OUT_EN_SHIFT 30 +#define M_BB_SMBDAT_IN_SHIFT 29 +#define M_BB_SMBDAT_OUT_EN_SHIFT 28 + #define M_CMD_OFFSET 0x30 #define M_CMD_START_BUSY_SHIFT 31 #define M_CMD_STATUS_SHIFT 25 @@ -713,6 +720,147 @@ static void bcm_iproc_i2c_enable_disable(struct bcm_iproc_i2c_dev *iproc_i2c, iproc_i2c_wr_reg(iproc_i2c, CFG_OFFSET, val); } +static int bcm_iproc_i2c_resume(struct device *dev) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = dev_get_drvdata(dev); + int ret; + u32 val; + + /* + * Power domain could have been shut off completely in system deep + * sleep, so re-initialize the block here + */ + ret = bcm_iproc_i2c_init(iproc_i2c); + if (ret) + return ret; + + /* configure to the desired bus speed */ + val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET); + val &= ~BIT(TIM_CFG_MODE_400_SHIFT); + val |= (iproc_i2c->bus_speed == I2C_MAX_FAST_MODE_FREQ) << TIM_CFG_MODE_400_SHIFT; + iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val); + + bcm_iproc_i2c_enable_disable(iproc_i2c, true); + + return 0; +} + +static void bcm_iproc_i2c_prepare_recovery(struct i2c_adapter *adap) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(adap); + u32 tmp; + + dev_dbg(iproc_i2c->device, "Prepare recovery\n"); + + /* Disable interrupts */ + writel(0, iproc_i2c->base + IE_OFFSET); + readl(iproc_i2c->base + IE_OFFSET); + synchronize_irq(iproc_i2c->irq); + + /* Place controller in reset */ + tmp = readl(iproc_i2c->base + CFG_OFFSET); + tmp |= BIT(CFG_RESET_SHIFT); + writel(tmp, iproc_i2c->base + CFG_OFFSET); + usleep_range(100, 200); + + /* Switch to bit-bang mode */ + tmp = readl(iproc_i2c->base + CFG_OFFSET); + tmp |= BIT(CFG_BIT_BANG_SHIFT); + writel(tmp, iproc_i2c->base + CFG_OFFSET); + usleep_range(100, 200); +} + +static void bcm_iproc_i2c_unprepare_recovery(struct i2c_adapter *adap) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(adap); + u32 tmp; + + /* Switch to normal mode */ + tmp = readl(iproc_i2c->base + CFG_OFFSET); + tmp &= ~BIT(CFG_BIT_BANG_SHIFT); + writel(tmp, iproc_i2c->base + CFG_OFFSET); + usleep_range(100, 200); + + bcm_iproc_i2c_resume(iproc_i2c->device); + + dev_dbg(iproc_i2c->device, "Recovery complete\n"); +} + +static int bcm_iproc_i2c_get_scl(struct i2c_adapter *adap) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(adap); + u32 tmp; + + tmp = readl(iproc_i2c->base + M_BB_CTRL_OFFSET); + + return !!(tmp & BIT(M_BB_SMBCLK_IN_SHIFT)); +} + +static void bcm_iproc_i2c_set_scl(struct i2c_adapter *adap, int val) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(adap); + u32 tmp; + + tmp = readl(iproc_i2c->base + M_BB_CTRL_OFFSET); + if (val) + tmp |= BIT(M_BB_SMBCLK_OUT_EN_SHIFT); + else + tmp &= ~BIT(M_BB_SMBCLK_OUT_EN_SHIFT); + + writel(tmp, iproc_i2c->base + M_BB_CTRL_OFFSET); +} + +static void bcm_iproc_i2c_set_sda(struct i2c_adapter *adap, int val) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(adap); + u32 tmp; + + tmp = readl(iproc_i2c->base + M_BB_CTRL_OFFSET); + if (val) + tmp |= BIT(M_BB_SMBDAT_OUT_EN_SHIFT); + else + tmp &= ~BIT(M_BB_SMBDAT_OUT_EN_SHIFT); + + writel(tmp, iproc_i2c->base + M_BB_CTRL_OFFSET); +} + +static int bcm_iproc_i2c_get_sda(struct i2c_adapter *adap) +{ + struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(adap); + u32 tmp; + + tmp = readl(iproc_i2c->base + M_BB_CTRL_OFFSET); + + return !!(tmp & BIT(M_BB_SMBDAT_IN_SHIFT)); +} + +/* Check if bus lockup occurred, and invoke recovery if so. */ +static void iproc_i2c_lockup_recover(struct bcm_iproc_i2c_dev *iproc_i2c) +{ + /* + * assume bus lockup if SDA line is low; + * note that there is no need to switch to + * bit-bang mode for this check. + */ + if (!bcm_iproc_i2c_get_sda(&iproc_i2c->adapter)) { + /* locked up - invoke i2c bus recovery. */ + int ret = i2c_recover_bus(&iproc_i2c->adapter); + + if (ret) + dev_err(iproc_i2c->device, "bus recovery: error %d\n", ret); + } +} + +static struct i2c_bus_recovery_info bcm_iproc_recovery_info = { + .recover_bus = i2c_generic_scl_recovery, + .prepare_recovery = bcm_iproc_i2c_prepare_recovery, + .unprepare_recovery = bcm_iproc_i2c_unprepare_recovery, + .set_scl = bcm_iproc_i2c_set_scl, + .get_scl = bcm_iproc_i2c_get_scl, + .set_sda = bcm_iproc_i2c_set_sda, + .get_sda = bcm_iproc_i2c_get_sda, +}; + static int bcm_iproc_i2c_check_status(struct bcm_iproc_i2c_dev *iproc_i2c, struct i2c_msg *msg) { @@ -806,6 +954,7 @@ static int bcm_iproc_i2c_xfer_wait(struct bcm_iproc_i2c_dev *iproc_i2c, /* flush both TX/RX FIFOs */ val = BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, val); + iproc_i2c_lockup_recover(iproc_i2c); return -ETIMEDOUT; } @@ -814,6 +963,7 @@ static int bcm_iproc_i2c_xfer_wait(struct bcm_iproc_i2c_dev *iproc_i2c, /* flush both TX/RX FIFOs */ val = BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, val); + iproc_i2c_lockup_recover(iproc_i2c); return ret; } @@ -1111,6 +1261,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) of_node_full_name(iproc_i2c->device->of_node)); adap->algo = &bcm_iproc_algo; adap->quirks = &bcm_iproc_i2c_quirks; + adap->bus_recovery_info = &bcm_iproc_recovery_info; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; @@ -1159,31 +1310,6 @@ static int bcm_iproc_i2c_suspend(struct device *dev) return 0; } -static int bcm_iproc_i2c_resume(struct device *dev) -{ - struct bcm_iproc_i2c_dev *iproc_i2c = dev_get_drvdata(dev); - int ret; - u32 val; - - /* - * Power domain could have been shut off completely in system deep - * sleep, so re-initialize the block here - */ - ret = bcm_iproc_i2c_init(iproc_i2c); - if (ret) - return ret; - - /* configure to the desired bus speed */ - val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET); - val &= ~BIT(TIM_CFG_MODE_400_SHIFT); - val |= (iproc_i2c->bus_speed == I2C_MAX_FAST_MODE_FREQ) << TIM_CFG_MODE_400_SHIFT; - iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val); - - bcm_iproc_i2c_enable_disable(iproc_i2c, true); - - return 0; -} - static const struct dev_pm_ops bcm_iproc_i2c_pm_ops = { .suspend_late = &bcm_iproc_i2c_suspend, .resume_early = &bcm_iproc_i2c_resume