From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Peter Rosin <peda@axentia.se>, Wolfram Sang <wsa@the-dreams.de>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.9 22/34] mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT)
Date: Sat, 15 Sep 2018 01:34:39 +0000 [thread overview]
Message-ID: <20180915013422.180023-22-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180915013422.180023-1-alexander.levin@microsoft.com>
From: Peter Rosin <peda@axentia.se>
[ Upstream commit 8c8f74f327a76604a499fad8c54c15e1c0ee8051 ]
Locking the root adapter for __i2c_transfer will deadlock if the
device sits behind a mux-locked I2C mux. Switch to the finer-grained
i2c_lock_bus with the I2C_LOCK_SEGMENT flag. If the device does not
sit behind a mux-locked mux, the two locking variants are equivalent.
Signed-off-by: Peter Rosin <peda@axentia.se>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
drivers/mfd/88pm860x-i2c.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/88pm860x-i2c.c b/drivers/mfd/88pm860x-i2c.c
index 84e313107233..7b9052ea7413 100644
--- a/drivers/mfd/88pm860x-i2c.c
+++ b/drivers/mfd/88pm860x-i2c.c
@@ -146,14 +146,14 @@ int pm860x_page_reg_write(struct i2c_client *i2c, int reg,
unsigned char zero;
int ret;
- i2c_lock_adapter(i2c->adapter);
+ i2c_lock_bus(i2c->adapter, I2C_LOCK_SEGMENT);
read_device(i2c, 0xFA, 0, &zero);
read_device(i2c, 0xFB, 0, &zero);
read_device(i2c, 0xFF, 0, &zero);
ret = write_device(i2c, reg, 1, &data);
read_device(i2c, 0xFE, 0, &zero);
read_device(i2c, 0xFC, 0, &zero);
- i2c_unlock_adapter(i2c->adapter);
+ i2c_unlock_bus(i2c->adapter, I2C_LOCK_SEGMENT);
return ret;
}
EXPORT_SYMBOL(pm860x_page_reg_write);
@@ -164,14 +164,14 @@ int pm860x_page_bulk_read(struct i2c_client *i2c, int reg,
unsigned char zero = 0;
int ret;
- i2c_lock_adapter(i2c->adapter);
+ i2c_lock_bus(i2c->adapter, I2C_LOCK_SEGMENT);
read_device(i2c, 0xfa, 0, &zero);
read_device(i2c, 0xfb, 0, &zero);
read_device(i2c, 0xff, 0, &zero);
ret = read_device(i2c, reg, count, buf);
read_device(i2c, 0xFE, 0, &zero);
read_device(i2c, 0xFC, 0, &zero);
- i2c_unlock_adapter(i2c->adapter);
+ i2c_unlock_bus(i2c->adapter, I2C_LOCK_SEGMENT);
return ret;
}
EXPORT_SYMBOL(pm860x_page_bulk_read);
--
2.17.1
next prev parent reply other threads:[~2018-09-15 1:34 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-15 1:34 [PATCH AUTOSEL 4.9 01/34] binfmt_elf: Respect error return from `regset->active' Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 02/34] audit: fix use-after-free in audit_add_watch Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 04/34] mtd: rawnand: sunxi: Add an U suffix to NFC_PAGE_OP definition Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 03/34] mtdchar: fix overflows in adjustment of `count` Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 05/34] evm: Don't deadlock if a crypto algorithm is unavailable Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 06/34] PM / devfreq: use put_device() instead of kfree() Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 07/34] MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 08/34] configfs: fix registered group removal Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 10/34] ARM: hisi: handle of_iomap and fix missing of_node_put Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 09/34] efi/esrt: Only call efi_mem_reserve() for boot services memory Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 11/34] ARM: hisi: fix error handling and missing of_node_put Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 12/34] ARM: hisi: check of_iomap and fix " Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 13/34] gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 14/34] mmc: tegra: prevent HS200 on Tegra 3 Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 15/34] mmc: sdhci: do not try to use 3.3V signaling if not supported Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 16/34] drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 18/34] coresight: Handle errors in finding input/output ports Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 17/34] parport: sunbpp: fix error return code Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 19/34] coresight: tpiu: Fix disabling timeouts Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 20/34] gpio: pxa: Fix potential NULL dereference Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 21/34] gpiolib: Mark gpio_suffixes array with __maybe_unused Sasha Levin
2018-09-15 1:34 ` Sasha Levin [this message]
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 24/34] rcu: Fix grace-period hangs due to race with CPU offline Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 23/34] input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 25/34] drm/amdkfd: Fix error codes in kfd_get_process Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 27/34] ALSA: pcm: Fix snd_interval_refine first/last with open min/max Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 26/34] rtc: bq4802: add error handling for devm_ioremap Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 28/34] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 29/34] drm/panel: type promotion bug in s6e8aa0_read_mtp_id() Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 31/34] dmaengine: idma64: Support dmaengine_terminate_sync() Sasha Levin
2018-09-20 0:40 ` Vinod
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 30/34] dmaengine: hsu: " Sasha Levin
2018-09-20 0:38 ` Vinod
2018-09-24 0:55 ` Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 32/34] IB/nes: Fix a compiler warning Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 33/34] gpiolib: Respect error code of ->get_direction() Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 34/34] pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant 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=20180915013422.180023-22-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peda@axentia.se \
--cc=stable@vger.kernel.org \
--cc=wsa@the-dreams.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