From: Sasha Levin <sashal@kernel.org>
To: patches@lists.linux.dev, stable@vger.kernel.org
Cc: Jameson Thies <jthies@google.com>,
Benson Leung <bleung@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>,
abhishekpandit@chromium.org, ukaszb@chromium.org,
akuchynski@chromium.org, chrome-platform@lists.linux.dev
Subject: [PATCH AUTOSEL 6.15 19/80] usb: typec: ucsi: Add poll_cci operation to cros_ec_ucsi
Date: Sun, 3 Aug 2025 20:26:46 -0400 [thread overview]
Message-ID: <20250804002747.3617039-19-sashal@kernel.org> (raw)
In-Reply-To: <20250804002747.3617039-1-sashal@kernel.org>
From: Jameson Thies <jthies@google.com>
[ Upstream commit 300386d117a98961fc1d612d1f1a61997d731b8a ]
cros_ec_ucsi fails to allocate a UCSI instance in it's probe function
because it does not define all operations checked by ucsi_create.
Update cros_ec_ucsi operations to use the same function for read_cci
and poll_cci.
Signed-off-by: Jameson Thies <jthies@google.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20250711202033.2201305-1-jthies@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
LLM Generated explanations, may be completely bogus:
Now I understand the timeline:
1. The cros_ec_ucsi driver was added on 2024-12-31
2. The poll_cci requirement was added on 2025-02-17 (after the
cros_ec_ucsi driver was already in the kernel)
3. This broke the cros_ec_ucsi driver because it didn't have the
poll_cci operation defined
**Backport Status: YES**
This commit fixes a regression where the cros_ec_ucsi driver fails to
allocate a UCSI instance during probe because it lacks the poll_cci
operation that became mandatory in commit 976e7e9bdc77 ("acpi: typec:
ucsi: Introduce a ->poll_cci method").
The commit meets all criteria for stable backporting:
1. **Fixes a real bug**: The driver completely fails to probe without
this fix, preventing ChromeOS EC-based UCSI devices from working at
all. The error occurs in ucsi_create() at
drivers/usb/typec/ucsi/ucsi.c:1933 where it checks for the presence
of all required operations including poll_cci.
2. **Small and contained change**: The fix is minimal - it only adds one
line to the operations structure (`.poll_cci = cros_ucsi_read_cci,`),
reusing the existing read_cci implementation which is appropriate for
this driver.
3. **No side effects**: The change simply allows the driver to pass the
operations validation check. Using the same function for both
read_cci and poll_cci is the correct approach for drivers that don't
have the ACPI-specific sync issues that prompted the poll_cci split.
4. **Fixes a regression**: This is fixing a regression introduced by
commit 976e7e9bdc77, which itself was marked for stable. Any stable
kernel that includes 976e7e9bdc77 but not this fix will have a broken
cros_ec_ucsi driver.
5. **Clear fix relationship**: The commit message clearly identifies the
problem (ucsi_create fails due to missing operation) and the solution
is straightforward.
This should be backported to any stable kernel that includes both:
- commit f1a2241778d9 ("usb: typec: ucsi: Implement ChromeOS UCSI
driver")
- commit 976e7e9bdc77 ("acpi: typec: ucsi: Introduce a ->poll_cci
method")
drivers/usb/typec/ucsi/cros_ec_ucsi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/typec/ucsi/cros_ec_ucsi.c b/drivers/usb/typec/ucsi/cros_ec_ucsi.c
index 4ec1c6d22310..eed2a7d0ebc6 100644
--- a/drivers/usb/typec/ucsi/cros_ec_ucsi.c
+++ b/drivers/usb/typec/ucsi/cros_ec_ucsi.c
@@ -137,6 +137,7 @@ static int cros_ucsi_sync_control(struct ucsi *ucsi, u64 cmd, u32 *cci,
static const struct ucsi_operations cros_ucsi_ops = {
.read_version = cros_ucsi_read_version,
.read_cci = cros_ucsi_read_cci,
+ .poll_cci = cros_ucsi_read_cci,
.read_message_in = cros_ucsi_read_message_in,
.async_control = cros_ucsi_async_control,
.sync_control = cros_ucsi_sync_control,
--
2.39.5
next prev parent reply other threads:[~2025-08-04 0:28 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-04 0:26 [PATCH AUTOSEL 6.15 01/80] usb: xhci: print xhci->xhc_state when queue_command failed Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 02/80] staging: gpib: Add init response codes for new ni-usb-hs+ Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 03/80] platform/x86/amd: pmc: Add Lenovo Yoga 6 13ALC6 to pmc quirk list Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 04/80] cpufreq: CPPC: Mark driver with NEED_UPDATE_LIMITS flag Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 05/80] selftests/futex: Define SYS_futex on 32-bit architectures with 64-bit time_t Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 06/80] usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 07/80] bus: mhi: host: pci_generic: Add Telit FN990B40 modem support Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 08/80] regulator: core: repeat voltage setting request for stepped regulators Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 09/80] bus: mhi: host: pci_generic: Disable runtime PM for QDU100 Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 10/80] usb: xhci: Avoid showing warnings for dying controller Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 11/80] usb: xhci: Set avg_trb_len = 8 for EP0 during Address Device Command Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 12/80] usb: xhci: Avoid showing errors during surprise removal Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 13/80] firmware: qcom: scm: initialize tzmem before marking SCM as available Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 14/80] soc: qcom: rpmh-rsc: Add RSC version 4 support Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 15/80] ACPI: APEI: send SIGBUS to current task if synchronous memory error not recovered Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 16/80] remoteproc: imx_rproc: skip clock enable when M-core is managed by the SCU Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 17/80] binder: Fix selftest page indexing Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 18/80] gpio: loongson-64bit: Extend GPIO irq support Sasha Levin
2025-08-04 0:26 ` Sasha Levin [this message]
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 20/80] usb: typec: tcpm/tcpci_maxim: fix irq wake usage Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 21/80] pmdomain: ti: Select PM_GENERIC_DOMAINS Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 22/80] gpio: wcd934x: check the return value of regmap_update_bits() Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 23/80] cpufreq: Exit governor when failed to start old governor Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 24/80] cpufreq: intel_pstate: Add Granite Rapids support in no-HWP mode Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 25/80] ARM: rockchip: fix kernel hang during smp initialization Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 26/80] PM / devfreq: governor: Replace sscanf() with kstrtoul() in set_freq_store() Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 27/80] EDAC/synopsys: Clear the ECC counters on init Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 28/80] ASoC: soc-dapm: set bias_level if snd_soc_dapm_set_bias_level() was successed Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 29/80] thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when required Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 30/80] tools/nolibc: define time_t in terms of __kernel_old_time_t Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 31/80] iio: adc: ad_sigma_delta: don't overallocate scan buffer Sasha Levin
2025-08-04 0:26 ` [PATCH AUTOSEL 6.15 32/80] gpio: tps65912: check the return value of regmap_update_bits() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 33/80] mfd: tps6594: Add TI TPS652G1 support Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 34/80] ARM: tegra: Use I/O memcpy to write to IRAM Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 35/80] tools/build: Fix s390(x) cross-compilation with clang Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 36/80] selftests: tracing: Use mutex_unlock for testing glob filter Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 37/80] ACPI: PRM: Reduce unnecessary printing to avoid user confusion Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 38/80] firmware: arm_scmi: power_control: Ensure SCMI_SYSPOWER_IDLE is set early during resume Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 39/80] firmware: tegra: Fix IVC dependency problems Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 40/80] pwm: sifive: Fix PWM algorithm and clarify inverted compare behavior Sasha Levin
2025-08-04 10:40 ` Uwe Kleine-König
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 41/80] ALSA: hda: add MODULE_FIRMWARE for cs35l41/cs35l56 Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 42/80] PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 43/80] thermal: sysfs: Return ENODATA instead of EAGAIN for reads Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 44/80] PM: sleep: console: Fix the black screen issue Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 45/80] ACPI: processor: fix acpi_object initialization Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 46/80] mmc: sdhci-msm: Ensure SD card power isn't ON when card removed Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 47/80] ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 48/80] irqchip/renesas-rzv2h: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 49/80] selftests: vDSO: vdso_test_getrandom: Always print TAP header Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 50/80] pps: clients: gpio: fix interrupt handling order in remove path Sasha Levin
2025-08-04 6:55 ` Rodolfo Giometti
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 51/80] reset: brcmstb: Enable reset drivers for ARCH_BCM2835 Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 52/80] ASoC: SDCA: Add flag for unused IRQs Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 53/80] char: misc: Fix improper and inaccurate error code returned by misc_init() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 54/80] mei: bus: Check for still connected devices in mei_cl_bus_dev_release() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 55/80] mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 56/80] platform/chrome: cros_ec_sensorhub: Retries when a sensor is not ready Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 57/80] ALSA: hda: Handle the jack polling always via a work Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 58/80] ALSA: hda: Disable jack polling at shutdown Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 59/80] x86/bugs: Avoid warning when overriding return thunk Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 60/80] ASoC: hdac_hdmi: Rate limit logging on connection and disconnection Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 61/80] ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4 Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 62/80] irqchip/mips-gic: Allow forced affinity Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 63/80] ASoC: SOF: topology: Parse the dapm_widget_tokens in case of DSPless mode Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 64/80] tty: serial: fix print format specifiers Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 65/80] ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 66/80] usb: typec: intel_pmc_mux: Defer probe if SCU IPC isn't present Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 67/80] usb: core: usb_submit_urb: downgrade type check Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 68/80] usb: typec: fusb302: fix scheduling while atomic when using virtio-gpio Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 69/80] usb: dwc3: xilinx: add shutdown callback Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 70/80] pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop() Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 71/80] imx8m-blk-ctrl: set ISI panic write hurry level Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 72/80] soc: qcom: mdt_loader: Actually use the e_phoff Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 73/80] platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 74/80] platform/chrome: cros_ec_typec: Defer probe on missing EC parent Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 75/80] ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 76/80] ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 77/80] ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 78/80] iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 79/80] ASoC: codecs: rt5640: Retry DEVICE_ID verification Sasha Levin
2025-08-04 0:27 ` [PATCH AUTOSEL 6.15 80/80] ASoC: qcom: use drvdata instead of component to keep id Sasha Levin
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=20250804002747.3617039-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=abhishekpandit@chromium.org \
--cc=akuchynski@chromium.org \
--cc=bleung@chromium.org \
--cc=chrome-platform@lists.linux.dev \
--cc=gregkh@linuxfoundation.org \
--cc=jthies@google.com \
--cc=patches@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=ukaszb@chromium.org \
/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