Skip to content

Commit bae1d3a

Browse files
Wolfram SangWolfram Sang
authored andcommitted
i2c: core: remove use of in_atomic()
Commit cea443a ("i2c: Support i2c_transfer in atomic contexts") added in_atomic() to the I2C core. However, the use of in_atomic() outside of core kernel code is discouraged and was already[1] when this code was added in early 2008. The above commit was a preparation for commit b7a3670 ("i2c-pxa: Add polling transfer"). Its commit message says explicitly it was added "for cases where I2C transactions have to occur at times interrup[t]s are disabled". So, the intention was 'disabled interrupts'. This matches the use cases for atomic I2C transfers I have seen so far: very late communication (mostly to a PMIC) to powerdown or reboot the system. For those cases, interrupts are disabled then. It doesn't seem that in_atomic() adds value. After a discussion with Peter Zijlstra[2], we came up with a better set of conditionals to match the use case. The I2C core will soon gain an extra callback into bus drivers especially for atomic transfers to make them more generic. The code deciding which transfer to use (atomic/non-atomic) should mimic the behaviour which locking to use (trylock/lock). This is why we add a helper for it. [1] https://lwn.net/Articles/274695/ [2] http://patchwork.ozlabs.org/patch/1067437/ Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tested-by: Stefan Lengfeld <contact@stefanchrist.eu> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
1 parent 78cdfce commit bae1d3a

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

drivers/i2c/i2c-core-base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,7 @@ int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
19461946
* one (discarding status on the second message) or errno
19471947
* (discarding status on the first one).
19481948
*/
1949-
if (in_atomic() || irqs_disabled()) {
1949+
if (i2c_in_atomic_xfer_mode()) {
19501950
ret = i2c_trylock_bus(adap, I2C_LOCK_SEGMENT);
19511951
if (!ret)
19521952
/* I2C activity is ongoing. */

drivers/i2c/i2c-core.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ extern int __i2c_first_dynamic_bus_num;
2929

3030
int i2c_check_7bit_addr_validity_strict(unsigned short addr);
3131

32+
/*
33+
* We only allow atomic transfers for very late communication, e.g. to send
34+
* the powerdown command to a PMIC. Atomic transfers are a corner case and not
35+
* for generic use!
36+
*/
37+
static inline bool i2c_in_atomic_xfer_mode(void)
38+
{
39+
return system_state > SYSTEM_RUNNING && irqs_disabled();
40+
}
41+
3242
#ifdef CONFIG_ACPI
3343
const struct acpi_device_id *
3444
i2c_acpi_match_device(const struct acpi_device_id *matches,

0 commit comments

Comments
 (0)