From patchwork Fri Jul 8 19:32:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asmaa Mnebhi X-Patchwork-Id: 1654371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lfk2V1rLKz9s2R for ; Sat, 9 Jul 2022 05:32:48 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o9tiK-0005Ur-D0; Fri, 08 Jul 2022 19:32:32 +0000 Received: from mail-il-dmz.mellanox.com ([193.47.165.129] helo=mellanox.co.il) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o9tiG-0005UN-7Q for kernel-team@lists.ubuntu.com; Fri, 08 Jul 2022 19:32:28 +0000 Received: from Internal Mail-Server by MTLPINE1 (envelope-from asmaa@mellanox.com) with SMTP; 8 Jul 2022 22:32:24 +0300 Received: from bu-vnc02.mtbu.labs.mlnx (bu-vnc02.mtbu.labs.mlnx [10.15.2.65]) by mtbu-labmailer.labs.mlnx (8.14.4/8.14.4) with ESMTP id 268JWMts005588; Fri, 8 Jul 2022 15:32:22 -0400 Received: (from asmaa@localhost) by bu-vnc02.mtbu.labs.mlnx (8.14.7/8.13.8/Submit) id 268JWMlR022975; Fri, 8 Jul 2022 15:32:22 -0400 From: Asmaa Mnebhi To: kernel-team@lists.ubuntu.com Subject: [SRU][F:linux-bluefield][PATCH v1 1/1] UBUNTU: SAUCE: i2c-mlxbf.c: support lock mechanism Date: Fri, 8 Jul 2022 15:32:17 -0400 Message-Id: <20220708193217.22920-2-asmaa@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20220708193217.22920-1-asmaa@nvidia.com> References: <20220708193217.22920-1-asmaa@nvidia.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: asmaa@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Buglink: https://bugs.launchpad.net/bugs/1981105 Support the I2C lock mechanism, otherwise there could be unexpected behavior when an i2c bus is accessed by several entities like the linux driver, ATF driver and UEFI driver. Replace ioremap_cache with ioremap since it is deprecated in later kernels. Signed-off-by: Asmaa Mnebhi --- drivers/i2c/busses/i2c-mlxbf.c | 40 +++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c index 0ac9e70244a7..7ce289d4efa8 100644 --- a/drivers/i2c/busses/i2c-mlxbf.c +++ b/drivers/i2c/busses/i2c-mlxbf.c @@ -340,7 +340,8 @@ enum { * Timeout is given in microsends. Note also that timeout handling is not * exact. */ -#define SMBUS_TIMEOUT (300 * 1000) /* 300ms */ +#define SMBUS_TIMEOUT (300 * 1000) /* 300ms */ +#define SMBUS_LOCK_POLL_TIMEOUT (300 * 1000) /* 300ms */ /* Encapsulates timing parameters */ struct mlx_i2c_timings { @@ -573,6 +574,25 @@ static bool mlx_smbus_master_wait_for_idle(struct mlx_i2c_priv *priv) return false; } +/* + * wait for the lock to be released before acquiring it. + */ +static bool mlx_smbus_master_lock(struct mlx_i2c_priv *priv) +{ + if (mlx_smbus_poll(priv->smbus->io, SMBUS_MASTER_GW, + 1 << MASTER_LOCK_BIT_OFF, true, + SMBUS_LOCK_POLL_TIMEOUT)) + return true; + + return false; +} + +static void mlx_smbus_master_unlock(struct mlx_i2c_priv *priv) +{ + /* Clear the gw to clear the lock */ + writel(0, priv->smbus->io + SMBUS_MASTER_GW); +} + /* * Poll SMBus master status and return transaction status, * i.e. whether succeeded or failed. I2C and SMBus fault codes @@ -704,7 +724,7 @@ static int mlx_smbus_enable(struct mlx_i2c_priv *priv, u8 slave, /* Clear status bits */ smbus_write(priv->smbus->io, SMBUS_MASTER_STATUS, 0x0); /* Set the cause data */ - smbus_write(priv->smbus->io, I2C_CAUSE_OR_CLEAR_BITS, ~0x0); + smbus_write(priv->mst_cause->io, I2C_CAUSE_OR_CLEAR_BITS, ~0x0); /* Zero PEC byte */ smbus_write(priv->smbus->io, SMBUS_MASTER_PEC, 0x0); /* Zero byte count */ @@ -748,6 +768,10 @@ static int mlx_smbus_start_transaction(struct mlx_i2c_priv *priv, if (WARN_ON(!mlx_smbus_master_wait_for_idle(priv))) return -EBUSY; + /* Try to acquire the smbus gw lock */ + if (WARN_ON(!mlx_smbus_master_lock(priv))) + return -EBUSY; + /* Set first byte */ data_desc[data_idx++] = addr; @@ -802,8 +826,10 @@ static int mlx_smbus_start_transaction(struct mlx_i2c_priv *priv, if (write_en) { ret = mlx_smbus_enable(priv, slave, write_len, block_en, pec_en, 0); - if (ret != 0) + if (ret) { + mlx_smbus_master_unlock(priv); return ret; + } } if (read_en) { @@ -830,6 +856,8 @@ static int mlx_smbus_start_transaction(struct mlx_i2c_priv *priv, SMBUS_MASTER_FSM_PS_STATE_MASK); } + mlx_smbus_master_unlock(priv); + return ret; } @@ -1396,7 +1424,7 @@ static int mlx_i2c_get_gpio(struct platform_device *pdev, if (!devm_request_mem_region(dev, params->start, size, params->name)) return -EFAULT; - gpio_res->io = devm_ioremap_nocache(dev, params->start, size); + gpio_res->io = devm_ioremap(dev, params->start, size); if (IS_ERR(gpio_res->io)) { devm_release_mem_region(dev, params->start, size); return PTR_ERR(gpio_res->io); @@ -1460,7 +1488,7 @@ static int mlx_i2c_get_corepll(struct platform_device *pdev, if (!devm_request_mem_region(dev, params->start, size, params->name)) return -EFAULT; - corepll_res->io = devm_ioremap_nocache(dev, params->start, size); + corepll_res->io = devm_ioremap(dev, params->start, size); if (IS_ERR(corepll_res->io)) { devm_release_mem_region(dev, params->start, size); return PTR_ERR(corepll_res->io); @@ -1813,7 +1841,7 @@ static int mlx_i2c_init_coalesce(struct platform_device *pdev, if (!request_mem_region(params->start, size, params->name)) return -EFAULT; - coalesce_res->io = ioremap_nocache(params->start, size); + coalesce_res->io = ioremap(params->start, size); if (IS_ERR(coalesce_res->io)) { release_mem_region(params->start, size); return PTR_ERR(coalesce_res->io);