Commit 52b1853b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Improve the detection when to run atomic transfer handlers for kernels
  with preemption disabled. This removes some false positive splats a
  number of users were seeing if their driver didn't have support for
  atomic transfers.

  Also, fix a typo in the docs while we are here"

* tag 'i2c-for-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: Fix atomic xfer check for non-preempt config
  Documentation/i2c: fix spelling error in i2c-address-translators
parents 95c8a35f a3368e11

Documentation/i2c/i2c-address-translators.rst

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ Transaction: 
 - Physical I2C transaction on bus A, slave address 0x20

 - ATR chip detects transaction on address 0x20, finds it in table,

   propagates transaction on bus B with address translated to 0x10,

   keeps clock streched on bus A waiting for reply

   keeps clock stretched on bus A waiting for reply

 - Slave X chip (on bus B) detects transaction at its own physical

   address 0x10 and replies normally

 - ATR chip stops clock stretching and forwards reply on bus A,

drivers/i2c/i2c-core.h

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * i2c-core.h - interfaces internal to the I2C framework

 */



#include <linux/kconfig.h>

#include <linux/rwsem.h>



struct i2c_devinfo {
@@ -29,7 +30,8 @@ int i2c_dev_irq_from_resources(const struct resource *resources, 
 */

static inline bool i2c_in_atomic_xfer_mode(void)

{

	return system_state > SYSTEM_RUNNING && !preemptible();

	return system_state > SYSTEM_RUNNING &&

	       (IS_ENABLED(CONFIG_PREEMPT_COUNT) ? !preemptible() : irqs_disabled());

}



static inline int __i2c_lock_bus_helper(struct i2c_adapter *adap)