From: Hans de Goede <hdegoede@redhat.com>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Mark Gross <markgross@kernel.org>,
Andy Shevchenko <andy@infradead.org>,
Wolfram Sang <wsa@the-dreams.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Daniel Scally <djrscally@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>, Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Kate Hsuan <hpa@redhat.com>,
linux-media@vger.kernel.org, linux-clk@vger.kernel.org
Subject: [PATCH v6 13/15] media: ipu3-cio2: Defer probing until the PMIC is fully setup
Date: Thu, 25 Nov 2021 17:54:10 +0100 [thread overview]
Message-ID: <20211125165412.535063-14-hdegoede@redhat.com> (raw)
In-Reply-To: <20211125165412.535063-1-hdegoede@redhat.com>
On devices where things are not fully describe in devicetree (1)
and where the code thus falls back to calling cio2_bridge_init(),
the i2c-clients for any VCMs also need to be instantiated manually.
The VCM can be probed by its driver as soon as the code instantiates
the i2c-client and this probing must not happen before the PMIC is
fully setup.
Make cio2_bridge_init() return -EPROBE_DEFER when the PMIC is not
fully-setup, deferring the probe of the ipu3-cio2 driver.
This is a preparation patch for adding VCM enumeration support to
the ipu3-cio2-bridge code.
1) Through embedding of devicetree info in the ACPI tables
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/media/pci/intel/ipu3/cio2-bridge.c | 37 ++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c
index 1cbbcbf4e157..460ef7f78234 100644
--- a/drivers/media/pci/intel/ipu3/cio2-bridge.c
+++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c
@@ -308,6 +308,40 @@ static int cio2_bridge_connect_sensors(struct cio2_bridge *bridge,
return ret;
}
+/*
+ * The VCM cannot be probed until the PMIC is completely setup. We cannot rely
+ * on -EPROBE_DEFER for this, since the consumer<->supplier relations between
+ * the VCM and regulators/clks are not described in ACPI, instead they are
+ * passed as board-data to the PMIC drivers. Since -PROBE_DEFER does not work
+ * for the clks/regulators the VCM i2c-clients must not be instantiated until
+ * the PMIC is fully setup.
+ *
+ * The sensor/VCM ACPI device has an ACPI _DEP on the PMIC, check this using the
+ * acpi_dev_ready_for_enumeration() helper, like the i2c-core-acpi code does
+ * for the sensors.
+ */
+int cio2_bridge_sensors_are_ready(void)
+{
+ struct acpi_device *adev;
+ bool ready = true;
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(cio2_supported_sensors); i++) {
+ const struct cio2_sensor_config *cfg =
+ &cio2_supported_sensors[i];
+
+ for_each_acpi_dev_match(adev, cfg->hid, NULL, -1) {
+ if (!adev->status.enabled)
+ continue;
+
+ if (!acpi_dev_ready_for_enumeration(adev))
+ ready = false;
+ }
+ }
+
+ return ready;
+}
+
int cio2_bridge_init(struct pci_dev *cio2)
{
struct device *dev = &cio2->dev;
@@ -316,6 +350,9 @@ int cio2_bridge_init(struct pci_dev *cio2)
unsigned int i;
int ret;
+ if (!cio2_bridge_sensors_are_ready())
+ return -EPROBE_DEFER;
+
bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);
if (!bridge)
return -ENOMEM;
--
2.33.1
next prev parent reply other threads:[~2021-11-25 16:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-25 16:53 [PATCH v6 00/15] Add support for X86/ACPI camera sensor/PMIC setup with clk and regulator platform data Hans de Goede
2021-11-25 16:53 ` [PATCH v6 01/15] ACPI: delay enumeration of devices with a _DEP pointing to an INT3472 device Hans de Goede
2021-11-25 16:53 ` [PATCH v6 02/15] i2c: acpi: Use acpi_dev_ready_for_enumeration() helper Hans de Goede
2021-11-26 7:16 ` Mika Westerberg
2021-11-25 16:54 ` [PATCH v6 03/15] i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function Hans de Goede
2021-11-25 17:22 ` Andy Shevchenko
2021-11-26 11:19 ` Hans de Goede
2021-11-26 7:18 ` Mika Westerberg
2021-11-27 22:49 ` Wolfram Sang
2021-11-25 16:54 ` [PATCH v6 04/15] platform_data: Add linux/platform_data/tps68470.h file Hans de Goede
2021-11-25 16:54 ` [PATCH v6 05/15] regulator: Introduce tps68470-regulator driver Hans de Goede
2021-11-25 23:32 ` Laurent Pinchart
2021-11-26 11:22 ` Hans de Goede
2021-11-27 23:38 ` Laurent Pinchart
2021-11-29 12:08 ` Mark Brown
2021-11-29 15:35 ` Laurent Pinchart
2021-11-25 16:54 ` [PATCH v6 06/15] clk: Introduce clk-tps68470 driver Hans de Goede
2021-11-25 16:54 ` [PATCH v6 07/15] platform/x86: int3472: Enable I2c daisy chain Hans de Goede
2021-11-25 23:39 ` Laurent Pinchart
2021-11-26 11:30 ` Hans de Goede
2021-11-26 11:39 ` Daniel Scally
2021-11-26 11:45 ` Hans de Goede
2021-11-26 11:56 ` Daniel Scally
2021-12-03 10:21 ` Hans de Goede
2021-11-25 16:54 ` [PATCH v6 08/15] platform/x86: int3472: Split into 2 drivers Hans de Goede
2021-11-25 16:54 ` [PATCH v6 09/15] platform/x86: int3472: Add get_sensor_adev_and_name() helper Hans de Goede
2021-11-25 16:54 ` [PATCH v6 10/15] platform/x86: int3472: Pass tps68470_clk_platform_data to the tps68470-regulator MFD-cell Hans de Goede
2021-11-25 16:54 ` [PATCH v6 11/15] platform/x86: int3472: Pass tps68470_regulator_platform_data " Hans de Goede
2021-11-25 16:54 ` [PATCH v6 12/15] platform/x86: int3472: Deal with probe ordering issues Hans de Goede
2021-11-25 16:54 ` Hans de Goede [this message]
2021-11-25 21:31 ` [PATCH v6 13/15] media: ipu3-cio2: Defer probing until the PMIC is fully setup kernel test robot
2021-11-26 11:01 ` Hans de Goede
2021-11-25 16:54 ` [PATCH v6 14/15] media: ipu3-cio2: Call cio2_bridge_init() before anything else Hans de Goede
2021-11-25 16:54 ` [PATCH v6 15/15] media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs Hans de Goede
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=20211125165412.535063-14-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=andy@infradead.org \
--cc=broonie@kernel.org \
--cc=djrscally@gmail.com \
--cc=hpa@redhat.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=lenb@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=mchehab@kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=mturquette@baylibre.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sakari.ailus@linux.intel.com \
--cc=sboyd@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;
as well as URLs for NNTP newsgroup(s).