On Tue, Sep 10, 2019 at 10:29:17AM +0100, Jon Hunter wrote: > Commit acc8abcb2a9c ("i2c: tegra: Add suspend-resume support") added > suspend support for the Tegra I2C driver and following this change on > Tegra30 the following WARNING is seen on entering suspend ... > > WARNING: CPU: 2 PID: 689 at /dvs/git/dirty/git-master_l4t-upstream/kernel/drivers/i2c/i2c-core.h:54 __i2c_transfer+0x35c/0x70c > i2c i2c-4: Transfer while suspended > Modules linked in: brcmfmac brcmutil > CPU: 2 PID: 689 Comm: rtcwake Not tainted 5.3.0-rc7-g089cf7f6ecb2 #1 > Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) > [] (unwind_backtrace) from [] (show_stack+0x10/0x14) > [] (show_stack) from [] (dump_stack+0xb4/0xc8) > [] (dump_stack) from [] (__warn+0xe0/0xf8) > [] (__warn) from [] (warn_slowpath_fmt+0x48/0x6c) > [] (warn_slowpath_fmt) from [] (__i2c_transfer+0x35c/0x70c) > [] (__i2c_transfer) from [] (i2c_transfer+0x58/0xf4) > [] (i2c_transfer) from [] (i2c_transfer_buffer_flags+0x4c/0x70) > [] (i2c_transfer_buffer_flags) from [] (regmap_i2c_write+0x14/0x30) > [] (regmap_i2c_write) from [] (_regmap_raw_write_impl+0x35c/0x868) > [] (_regmap_raw_write_impl) from [] (_regmap_update_bits+0xe4/0xec) > [] (_regmap_update_bits) from [] (regmap_update_bits_base+0x50/0x74) > [] (regmap_update_bits_base) from [] (regulator_disable_regmap+0x44/0x54) > [] (regulator_disable_regmap) from [] (_regulator_do_disable+0xf8/0x268) > [] (_regulator_do_disable) from [] (_regulator_disable+0xf4/0x19c) > [] (_regulator_disable) from [] (regulator_disable+0x34/0x64) > [] (regulator_disable) from [] (regulator_bulk_disable+0x28/0xb4) > [] (regulator_bulk_disable) from [] (tegra_pcie_power_off+0x64/0xa8) > [] (tegra_pcie_power_off) from [] (tegra_pcie_pm_suspend+0x25c/0x3f4) > [] (tegra_pcie_pm_suspend) from [] (dpm_run_callback+0x38/0x1d4) > [] (dpm_run_callback) from [] (__device_suspend_noirq+0xc0/0x2b8) > [] (__device_suspend_noirq) from [] (dpm_noirq_suspend_devices+0x100/0x37c) > [] (dpm_noirq_suspend_devices) from [] (dpm_suspend_noirq+0x1c/0x48) > [] (dpm_suspend_noirq) from [] (suspend_devices_and_enter+0x1d0/0xa00) > [] (suspend_devices_and_enter) from [] (pm_suspend+0x220/0x74c) > [] (pm_suspend) from [] (state_store+0x6c/0xc8) > [] (state_store) from [] (kernfs_fop_write+0xe8/0x1c4) > [] (kernfs_fop_write) from [] (__vfs_write+0x2c/0x1c4) > [] (__vfs_write) from [] (vfs_write+0xa4/0x184) > [] (vfs_write) from [] (ksys_write+0x9c/0xdc) > [] (ksys_write) from [] (ret_fast_syscall+0x0/0x54) > Exception stack(0xe9f21fa8 to 0xe9f21ff0) > 1fa0: 0000006c 004b2438 00000004 004b2438 00000004 00000000 > 1fc0: 0000006c 004b2438 004b1228 00000004 00000004 00000004 0049e78c 004b1228 > 1fe0: 00000004 be9809b8 b6f0bc0b b6e96206 > > The problem is that the Tegra PCIe driver indirectly uses I2C for > controlling some regulators and the I2C driver is now being suspended > before the PCIe driver causing the PCIe suspend to fail. The Tegra PCIe > driver is suspended during the NOIRQ phase and this cannot be changed > due to other dependencies. Therefore, we also need to move the suspend > handling for the Tegra I2C driver to the NOIRQ phase as well. > > In order to move the I2C suspend handling to the NOIRQ phase we also > need to avoid calling pm_runtime_get/put() because per commit > 1e2ef05bb8cf ("PM: Limit race conditions between runtime PM and system > sleep (v2)") these cannot be called early in resume. The function > tegra_i2c_init(), called during resume, calls pm_runtime_get/put() and > so move these calls outside of tegra_i2c_init(), so this function can > be used during the NOIRQ resume phase. > > Fixes: acc8abcb2a9c ("i2c: tegra: Add suspend-resume support") > > Signed-off-by: Jon Hunter Applied to for-next, thanks!