From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Alexander Stein" <alexander.stein@ew.tq-group.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Andi Shyti" <andi.shyti@kernel.org>,
"Sasha Levin" <sashal@kernel.org>,
aisheng.dong@nxp.com, shawnguo@kernel.org,
linux-i2c@vger.kernel.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 6.9 21/28] i2c: lpi2c: Avoid calling clk_get_rate during transfer
Date: Wed, 5 Jun 2024 07:48:50 -0400 [thread overview]
Message-ID: <20240605114927.2961639-21-sashal@kernel.org> (raw)
In-Reply-To: <20240605114927.2961639-1-sashal@kernel.org>
From: Alexander Stein <alexander.stein@ew.tq-group.com>
[ Upstream commit 4268254a39484fc11ba991ae148bacbe75d9cc0a ]
Instead of repeatedly calling clk_get_rate for each transfer, lock
the clock rate and cache the value.
A deadlock has been observed while adding tlv320aic32x4 audio codec to
the system. When this clock provider adds its clock, the clk mutex is
locked already, it needs to access i2c, which in return needs the mutex
for clk_get_rate as well.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/i2c/busses/i2c-imx-lpi2c.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c
index 6d72e4e126dde..36e8f6196a87b 100644
--- a/drivers/i2c/busses/i2c-imx-lpi2c.c
+++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -99,6 +99,7 @@ struct lpi2c_imx_struct {
__u8 *rx_buf;
__u8 *tx_buf;
struct completion complete;
+ unsigned long rate_per;
unsigned int msglen;
unsigned int delivered;
unsigned int block_data;
@@ -212,9 +213,7 @@ static int lpi2c_imx_config(struct lpi2c_imx_struct *lpi2c_imx)
lpi2c_imx_set_mode(lpi2c_imx);
- clk_rate = clk_get_rate(lpi2c_imx->clks[0].clk);
- if (!clk_rate)
- return -EINVAL;
+ clk_rate = lpi2c_imx->rate_per;
if (lpi2c_imx->mode == HS || lpi2c_imx->mode == ULTRA_FAST)
filt = 0;
@@ -611,6 +610,20 @@ static int lpi2c_imx_probe(struct platform_device *pdev)
if (ret)
return ret;
+ /*
+ * Lock the parent clock rate to avoid getting parent clock upon
+ * each transfer
+ */
+ ret = devm_clk_rate_exclusive_get(&pdev->dev, lpi2c_imx->clks[0].clk);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret,
+ "can't lock I2C peripheral clock rate\n");
+
+ lpi2c_imx->rate_per = clk_get_rate(lpi2c_imx->clks[0].clk);
+ if (!lpi2c_imx->rate_per)
+ return dev_err_probe(&pdev->dev, -EINVAL,
+ "can't get I2C peripheral clock rate\n");
+
pm_runtime_set_autosuspend_delay(&pdev->dev, I2C_PM_TIMEOUT);
pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_get_noresume(&pdev->dev);
--
2.43.0
next prev parent reply other threads:[~2024-06-05 11:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 11:48 [PATCH AUTOSEL 6.9 01/28] usb: gadget: uvc: configfs: ensure guid to be valid before set Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 02/28] f2fs: fix to detect inconsistent nat entry during truncation Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 03/28] f2fs: remove clear SB_INLINECRYPT flag in default_options Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 04/28] usb: typec: ucsi_glink: rework quirks implementation Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 05/28] usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 06/28] Avoid hw_desc array overrun in dw-axi-dmac Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 07/28] usb: dwc3: pci: Don't set "linux,phy_charger_detect" property on Lenovo Yoga Tab2 1380 Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 08/28] usb: typec: ucsi_glink: drop special handling for CCI_BUSY Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 09/28] udf: udftime: prevent overflow in udf_disk_stamp_to_time() Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 10/28] PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 11/28] f2fs: don't set RO when shutting down f2fs Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 12/28] MIPS: Octeon: Add PCIe link status check Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 13/28] serial: imx: Introduce timeout when waiting on transmitter empty Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 14/28] serial: exar: adding missing CTI and Exar PCI ids Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 15/28] usb: gadget: function: Remove usage of the deprecated ida_simple_xx() API Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 16/28] usb: dwc3: core: Access XHCI address space temporarily to read port info Sasha Levin
2024-06-05 11:53 ` Johan Hovold
2024-06-19 14:33 ` Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 17/28] f2fs: fix to do sanity check on i_xattr_nid in sanity_check_inode() Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 18/28] xhci: remove XHCI_TRUST_TX_LENGTH quirk Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 19/28] tty: add the option to have a tty reject a new ldisc Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 20/28] greybus: Fix use-after-free bug in gb_interface_release due to race condition Sasha Levin
2024-06-05 11:48 ` Sasha Levin [this message]
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 22/28] cxl: Add post-reset warning if reset results in loss of previously committed HDM decoders Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 23/28] vfio/pci: Collect hot-reset devices to local buffer Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 24/28] usb: typec: qcom-pmic-typec: split HPD bridge alloc and registration Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 25/28] cpufreq: amd-pstate: fix memory leak on CPU EPP exit Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 26/28] ACPI: EC: Install address space handler at the namespace root Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 27/28] PCI: Do not wait for disconnected devices when resuming Sasha Levin
2024-06-05 11:48 ` [PATCH AUTOSEL 6.9 28/28] OPP: Fix required_opp_tables for multiple genpds using same table Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240605114927.2961639-21-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=aisheng.dong@nxp.com \
--cc=alexander.stein@ew.tq-group.com \
--cc=andi.shyti@kernel.org \
--cc=imx@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox