From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa@the-dreams.de>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
rajmohan.mani@intel.com, Tomasz Figa <tfiga@chromium.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Bingbu Cao <bingbu.cao@intel.com>,
Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>,
Hyungwoo Yang <hyungwoo.yang@intel.com>,
linux-media@vger.kernel.org
Subject: [PATCH v9 2/7] i2c: Allow an ACPI driver to manage the device's power state during probe
Date: Fri, 29 Jan 2021 01:27:24 +0200 [thread overview]
Message-ID: <20210128232729.16064-2-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20200903081550.6012-1-sakari.ailus@linux.intel.com>
Enable drivers to tell ACPI that there's no need to power on a device for
probe. Drivers should still perform this by themselves if there's a need
to. In some cases powering on the device during probe is undesirable, and
this change enables a driver to choose what fits best for it.
Add a field called "flags" into struct i2c_driver for driver flags, and a
flag I2C_DRV_FL_ALLOW_LOW_POWER_PROBE to tell a driver supports probe in
low power state.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/i2c/i2c-core-acpi.c | 10 ++++++++++
drivers/i2c/i2c-core-base.c | 9 ++++++---
include/linux/i2c.h | 19 +++++++++++++++++++
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 8ceaa88dd78fb..045d344dd0cb3 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -493,6 +493,16 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
}
EXPORT_SYMBOL_GPL(i2c_acpi_new_device);
+bool i2c_acpi_allow_low_power_probe(struct device *dev)
+{
+ struct i2c_driver *driver = to_i2c_driver(dev->driver);
+ struct acpi_device *adev = ACPI_COMPANION(dev);
+
+ return driver->flags & I2C_DRV_FL_ALLOW_LOW_POWER_PROBE &&
+ adev && adev->power.flags.allow_low_power_probe;
+}
+EXPORT_SYMBOL_GPL(i2c_acpi_allow_low_power_probe);
+
#ifdef CONFIG_ACPI_I2C_OPREGION
static int acpi_gsb_i2c_read_bytes(struct i2c_client *client,
u8 cmd, u8 *data, u8 data_len)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 63ebf722a4248..87b84eee01da6 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -514,7 +514,8 @@ static int i2c_device_probe(struct device *dev)
if (status < 0)
goto err_clear_wakeup_irq;
- status = dev_pm_domain_attach(&client->dev, true);
+ status = dev_pm_domain_attach(&client->dev,
+ !i2c_acpi_allow_low_power_probe(dev));
if (status)
goto err_clear_wakeup_irq;
@@ -536,7 +537,8 @@ static int i2c_device_probe(struct device *dev)
return 0;
err_detach_pm_domain:
- dev_pm_domain_detach(&client->dev, true);
+ dev_pm_domain_detach(&client->dev,
+ !i2c_acpi_allow_low_power_probe(dev));
err_clear_wakeup_irq:
dev_pm_clear_wake_irq(&client->dev);
device_init_wakeup(&client->dev, false);
@@ -563,7 +565,8 @@ static int i2c_device_remove(struct device *dev)
dev_warn(dev, "remove failed (%pe), will be ignored\n", ERR_PTR(status));
}
- dev_pm_domain_detach(&client->dev, true);
+ dev_pm_domain_detach(&client->dev,
+ !i2c_acpi_allow_low_power_probe(dev));
dev_pm_clear_wake_irq(&client->dev);
device_init_wakeup(&client->dev, false);
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 56622658b2158..1a103c5933d2f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -11,6 +11,7 @@
#define _LINUX_I2C_H
#include <linux/acpi.h> /* for acpi_handle */
+#include <linux/bits.h>
#include <linux/mod_devicetable.h>
#include <linux/device.h> /* for struct device */
#include <linux/sched.h> /* for completion */
@@ -217,6 +218,16 @@ enum i2c_alert_protocol {
I2C_PROTOCOL_SMBUS_HOST_NOTIFY,
};
+/**
+ * enum i2c_driver_flags - Flags for an I2C device driver
+ *
+ * @I2C_DRV_FL_ALLOW_LOW_POWER_PROBE: Let the ACPI driver manage the device's
+ * power state during probe and remove
+ */
+enum i2c_driver_flags {
+ I2C_DRV_FL_ALLOW_LOW_POWER_PROBE = BIT(0),
+};
+
/**
* struct i2c_driver - represent an I2C device driver
* @class: What kind of i2c device we instantiate (for detect)
@@ -231,6 +242,7 @@ enum i2c_alert_protocol {
* @detect: Callback for device detection
* @address_list: The I2C addresses to probe (for detect)
* @clients: List of detected clients we created (for i2c-core use only)
+ * @flags: A bitmask of flags defined in &enum i2c_driver_flags
*
* The driver.owner field should be set to the module owner of this driver.
* The driver.name field should be set to the name of this driver.
@@ -289,6 +301,8 @@ struct i2c_driver {
int (*detect)(struct i2c_client *client, struct i2c_board_info *info);
const unsigned short *address_list;
struct list_head clients;
+
+ u32 flags;
};
#define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)
@@ -996,6 +1010,7 @@ u32 i2c_acpi_find_bus_speed(struct device *dev);
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
struct i2c_board_info *info);
struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
+bool i2c_acpi_allow_low_power_probe(struct device *dev);
#else
static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
struct acpi_resource_i2c_serialbus **i2c)
@@ -1015,6 +1030,10 @@ static inline struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle ha
{
return NULL;
}
+static inline bool i2c_acpi_allow_low_power_probe(struct device *dev)
+{
+ return false;
+}
#endif /* CONFIG_ACPI */
#endif /* _LINUX_I2C_H */
--
2.20.1
next prev parent reply other threads:[~2021-01-28 23:32 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 8:15 [PATCH v8 0/6] Support running driver's probe for a device powered off Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 1/6] i2c: Allow an ACPI driver to manage the device's power state during probe Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 2/6] Documentation: ACPI: Document i2c-allow-low-power-probe _DSD property Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 3/6] ACPI: Add a convenience function to tell a device is in low power state Sakari Ailus
[not found] ` <0c2d4728-6e32-ef93-8961-381fe36cfdaa@linux.intel.com>
2020-09-11 13:01 ` Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 4/6] ov5670: Support probe whilst the device is in a " Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 5/6] media: i2c: imx319: Support probe while the device is off Sakari Ailus
2020-09-03 8:15 ` [PATCH v8 6/6] at24: Support probing while off Sakari Ailus
2020-09-09 9:35 ` Bartosz Golaszewski
2020-09-09 11:11 ` Wolfram Sang
2020-09-09 11:56 ` Bartosz Golaszewski
2020-09-09 12:16 ` Sakari Ailus
2020-09-11 12:11 ` Sakari Ailus
2020-10-06 11:20 ` Tomasz Figa
2020-10-06 11:23 ` Tomasz Figa
2020-09-11 12:49 ` [PATCH v8 0/6] Support running driver's probe for a device powered off Luca Ceresoli
2020-09-11 13:01 ` Sakari Ailus
2020-09-14 7:58 ` Luca Ceresoli
[not found] ` <20200914094727.GM26842@paasikivi.fi.intel.com>
2020-09-14 16:49 ` Luca Ceresoli
2020-09-23 11:08 ` Sakari Ailus
2020-09-23 15:37 ` Luca Ceresoli
2020-09-26 12:38 ` Tomasz Figa
2020-09-27 19:39 ` Wolfram Sang
2020-09-27 19:44 ` Tomasz Figa
2020-09-28 14:17 ` Rafael J. Wysocki
2020-09-28 16:49 ` Tomasz Figa
2020-09-28 20:49 ` Sakari Ailus
2020-09-26 12:46 ` Tomasz Figa
2021-01-28 23:27 ` [PATCH v9 1/7] ACPI: scan: Obtain device's desired enumeration power state Sakari Ailus
[not found] ` <CAJZ5v0hdG1W0D5E6GbrTDiAjMyC0mSgb3Z2WEBy3hhb4iJhDNw@mail.gmail.com>
2021-01-29 16:45 ` Sakari Ailus
2021-01-29 16:57 ` Rafael J. Wysocki
2021-01-29 21:22 ` Sakari Ailus
2021-02-01 11:44 ` Rafael J. Wysocki
2021-01-28 23:27 ` Sakari Ailus [this message]
2021-01-28 23:27 ` [PATCH v9 3/7] Documentation: ACPI: Document _PRE object usage for enum " Sakari Ailus
2021-01-28 23:27 ` [PATCH v9 4/7] ACPI: Add a convenience function to tell a device is in low " Sakari Ailus
2021-01-28 23:27 ` [PATCH v9 5/7] ov5670: Support probe whilst the device is in a " Sakari Ailus
2021-01-28 23:27 ` [PATCH v9 6/7] media: i2c: imx319: Support probe while the device is off Sakari Ailus
2021-01-29 2:58 ` Bingbu Cao
2021-01-28 23:27 ` [PATCH v9 7/7] at24: Support probing while off Sakari Ailus
[not found] ` <CAMpxmJVTPgvxOVdTkmt4VjUnGabNBKauKF_DKtnnkV6O0QYTWA@mail.gmail.com>
[not found] ` <20210129121955.GH32460@paasikivi.fi.intel.com>
2021-02-01 8:57 ` Bartosz Golaszewski
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=20210128232729.16064-2-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=bingbu.cao@intel.com \
--cc=chiranjeevi.rapolu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hyungwoo.yang@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rajmohan.mani@intel.com \
--cc=tfiga@chromium.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;
as well as URLs for NNTP newsgroup(s).