From: Sasha Levin <sashal@kernel.org>
To: patches@lists.linux.dev, stable@vger.kernel.org
Cc: "André Draszik" <andre.draszik@linaro.org>,
"Badhri Jagan Sridharan" <badhri@google.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Sasha Levin" <sashal@kernel.org>,
heikki.krogerus@linux.intel.com, kyletso@google.com,
amitsd@google.com, krzysztof.kozlowski@linaro.org
Subject: [PATCH AUTOSEL 6.16 21/85] usb: typec: tcpm/tcpci_maxim: fix irq wake usage
Date: Sun, 3 Aug 2025 20:22:30 -0400 [thread overview]
Message-ID: <20250804002335.3613254-21-sashal@kernel.org> (raw)
In-Reply-To: <20250804002335.3613254-1-sashal@kernel.org>
From: André Draszik <andre.draszik@linaro.org>
[ Upstream commit 31611223fb34a3e9320cdfc4f4395072a13ea78e ]
This driver calls enable_irq_wake() during probe() unconditionally, and
never issues the required corresponding disable_irq_wake() to disable
hardware interrupt wakeup signals.
Additionally, whether or not a device should wake-up the system is
meant to be a policy decision based on sysfs (.../power/wakeup) in the
first place.
Update the driver to use the standard approach to enable/disable IRQ
wake during the suspend/resume callbacks. This solves both issues
described above.
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20250707-max77759-irq-wake-v1-1-d367f633e4bc@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
LLM Generated explanations, may be completely bogus:
**Backport Status: YES**
This commit should be backported to stable kernel trees for the
following reasons:
1. **Clear Bug Fix**: The commit fixes a resource management bug where
`enable_irq_wake()` is called during probe without a corresponding
`disable_irq_wake()`. This violates the kernel's IRQ wake API usage
requirements, leading to:
- Resource leak in the IRQ subsystem
- Incorrect wake behavior that cannot be controlled via sysfs
- Potential system power management issues
2. **Small and Contained Change**: The fix is minimal and well-
contained:
- Removes the problematic `max_tcpci_init_alert()` function
- Moves IRQ request directly into probe
- Adds proper suspend/resume callbacks with correct
`enable_irq_wake()`/`disable_irq_wake()` pairing
- Total change is about 40 lines of straightforward code
3. **Low Risk of Regression**:
- The change follows established kernel patterns for IRQ wake
handling in PM callbacks
- Similar patterns exist in other USB Type-C drivers (e.g., fusb302.c
uses suspend/resume for IRQ wake)
- The fix only affects power management behavior, not core
functionality
- Uses `device_may_wakeup()` to properly check policy before enabling
wake
4. **Clear Impact on Users**:
- Without this fix, devices cannot properly control wake-on-USB-C
events through sysfs
- The unconditional `enable_irq_wake()` means the device will always
wake the system on USB-C events, regardless of user preference
- This affects power consumption and battery life on systems with USB
Type-C
5. **No Architectural Changes**: The commit:
- Doesn't introduce new features
- Doesn't change any APIs or interfaces
- Simply fixes incorrect usage of existing kernel APIs
- Maintains backward compatibility
The commit message clearly explains the problem and solution, the code
changes are minimal and correct, and it fixes a real bug that affects
system power management behavior. This is exactly the type of fix that
stable kernels should receive.
drivers/usb/typec/tcpm/tcpci_maxim_core.c | 46 +++++++++++++++--------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/tcpm/tcpci_maxim_core.c
index b5a5ed40faea..ff3604be79da 100644
--- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c
+++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c
@@ -421,21 +421,6 @@ static irqreturn_t max_tcpci_isr(int irq, void *dev_id)
return IRQ_WAKE_THREAD;
}
-static int max_tcpci_init_alert(struct max_tcpci_chip *chip, struct i2c_client *client)
-{
- int ret;
-
- ret = devm_request_threaded_irq(chip->dev, client->irq, max_tcpci_isr, max_tcpci_irq,
- (IRQF_TRIGGER_LOW | IRQF_ONESHOT), dev_name(chip->dev),
- chip);
-
- if (ret < 0)
- return ret;
-
- enable_irq_wake(client->irq);
- return 0;
-}
-
static int max_tcpci_start_toggling(struct tcpci *tcpci, struct tcpci_data *tdata,
enum typec_cc_status cc)
{
@@ -532,7 +517,9 @@ static int max_tcpci_probe(struct i2c_client *client)
chip->port = tcpci_get_tcpm_port(chip->tcpci);
- ret = max_tcpci_init_alert(chip, client);
+ ret = devm_request_threaded_irq(&client->dev, client->irq, max_tcpci_isr, max_tcpci_irq,
+ (IRQF_TRIGGER_LOW | IRQF_ONESHOT), dev_name(chip->dev),
+ chip);
if (ret < 0)
return dev_err_probe(&client->dev, ret,
"IRQ initialization failed\n");
@@ -544,6 +531,32 @@ static int max_tcpci_probe(struct i2c_client *client)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
+static int max_tcpci_resume(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ int ret = 0;
+
+ if (client->irq && device_may_wakeup(dev))
+ ret = disable_irq_wake(client->irq);
+
+ return ret;
+}
+
+static int max_tcpci_suspend(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ int ret = 0;
+
+ if (client->irq && device_may_wakeup(dev))
+ ret = enable_irq_wake(client->irq);
+
+ return ret;
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static SIMPLE_DEV_PM_OPS(max_tcpci_pm_ops, max_tcpci_suspend, max_tcpci_resume);
+
static const struct i2c_device_id max_tcpci_id[] = {
{ "maxtcpc" },
{ }
@@ -562,6 +575,7 @@ static struct i2c_driver max_tcpci_i2c_driver = {
.driver = {
.name = "maxtcpc",
.of_match_table = of_match_ptr(max_tcpci_of_match),
+ .pm = &max_tcpci_pm_ops,
},
.probe = max_tcpci_probe,
.id_table = max_tcpci_id,
--
2.39.5
next prev parent reply other threads:[~2025-08-04 0:24 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-04 0:22 [PATCH AUTOSEL 6.16 01/85] usb: xhci: print xhci->xhc_state when queue_command failed Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 02/85] staging: gpib: Add init response codes for new ni-usb-hs+ Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 03/85] selftests/kexec: fix test_kexec_jump build Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 04/85] platform/x86/amd: pmc: Add Lenovo Yoga 6 13ALC6 to pmc quirk list Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 05/85] cpufreq: CPPC: Mark driver with NEED_UPDATE_LIMITS flag Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 06/85] selftests/futex: Define SYS_futex on 32-bit architectures with 64-bit time_t Sasha Levin
2025-08-04 0:22 ` Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 07/85] usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 08/85] bus: mhi: host: pci_generic: Add Telit FN990B40 modem support Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 09/85] regulator: core: repeat voltage setting request for stepped regulators Sasha Levin
2025-08-04 11:36 ` Mark Brown
2025-08-16 13:09 ` Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 10/85] bus: mhi: host: pci_generic: Disable runtime PM for QDU100 Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 11/85] usb: xhci: Avoid showing warnings for dying controller Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 12/85] usb: xhci: Set avg_trb_len = 8 for EP0 during Address Device Command Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 13/85] usb: xhci: Avoid showing errors during surprise removal Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 14/85] firmware: qcom: scm: initialize tzmem before marking SCM as available Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 15/85] soc: qcom: rpmh-rsc: Add RSC version 4 support Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 16/85] ACPI: APEI: send SIGBUS to current task if synchronous memory error not recovered Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 17/85] remoteproc: imx_rproc: skip clock enable when M-core is managed by the SCU Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 18/85] binder: Fix selftest page indexing Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 19/85] gpio: loongson-64bit: Extend GPIO irq support Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 20/85] usb: typec: ucsi: Add poll_cci operation to cros_ec_ucsi Sasha Levin
2025-08-04 0:22 ` Sasha Levin [this message]
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 22/85] pmdomain: ti: Select PM_GENERIC_DOMAINS Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 23/85] gpio: wcd934x: check the return value of regmap_update_bits() Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 24/85] cpufreq: Exit governor when failed to start old governor Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 25/85] cpufreq: intel_pstate: Add Granite Rapids support in no-HWP mode Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 26/85] ARM: rockchip: fix kernel hang during smp initialization Sasha Levin
2025-08-04 0:22 ` Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 27/85] PM / devfreq: governor: Replace sscanf() with kstrtoul() in set_freq_store() Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 28/85] EDAC/synopsys: Clear the ECC counters on init Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 29/85] ASoC: soc-dapm: set bias_level if snd_soc_dapm_set_bias_level() was successed Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 30/85] thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when required Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 31/85] tools/nolibc: define time_t in terms of __kernel_old_time_t Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 32/85] iio: adc: ad_sigma_delta: don't overallocate scan buffer Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 33/85] gpio: tps65912: check the return value of regmap_update_bits() Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 34/85] mfd: tps6594: Add TI TPS652G1 support Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 35/85] ARM: tegra: Use I/O memcpy to write to IRAM Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 36/85] tools/build: Fix s390(x) cross-compilation with clang Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 37/85] selftests: tracing: Use mutex_unlock for testing glob filter Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 38/85] ACPI: PRM: Reduce unnecessary printing to avoid user confusion Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 39/85] firmware: arm_scmi: power_control: Ensure SCMI_SYSPOWER_IDLE is set early during resume Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 40/85] firmware: tegra: Fix IVC dependency problems Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 41/85] pwm: sifive: Fix PWM algorithm and clarify inverted compare behavior Sasha Levin
2025-08-04 0:22 ` Sasha Levin
2025-08-04 10:42 ` Uwe Kleine-König
2025-08-04 10:42 ` Uwe Kleine-König
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 42/85] ALSA: hda: add MODULE_FIRMWARE for cs35l41/cs35l56 Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 43/85] PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit() Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 44/85] thermal: sysfs: Return ENODATA instead of EAGAIN for reads Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 45/85] PM: sleep: console: Fix the black screen issue Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 46/85] ACPI: processor: fix acpi_object initialization Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 47/85] mmc: sdhci-msm: Ensure SD card power isn't ON when card removed Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 48/85] ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 49/85] irqchip/renesas-rzv2h: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND Sasha Levin
2025-08-04 0:22 ` [PATCH AUTOSEL 6.16 50/85] selftests: vDSO: vdso_test_getrandom: Always print TAP header Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 51/85] pps: clients: gpio: fix interrupt handling order in remove path Sasha Levin
2025-08-04 6:55 ` Rodolfo Giometti
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 52/85] reset: brcmstb: Enable reset drivers for ARCH_BCM2835 Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 53/85] ASoC: SDCA: Add flag for unused IRQs Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 54/85] x86/sev/vc: Fix EFI runtime instruction emulation Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 55/85] char: misc: Fix improper and inaccurate error code returned by misc_init() Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 56/85] mei: bus: Check for still connected devices in mei_cl_bus_dev_release() Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 57/85] mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode() Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 58/85] mmc: sdhci-esdhc-imx: Don't change pinctrl in suspend if wakeup source Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 59/85] platform/chrome: cros_ec_sensorhub: Retries when a sensor is not ready Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 60/85] ALSA: hda: Handle the jack polling always via a work Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 61/85] ALSA: hda: Disable jack polling at shutdown Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 62/85] EDAC/ie31200: Enable support for Core i5-14600 and i7-14700 Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 63/85] x86/bugs: Avoid warning when overriding return thunk Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 64/85] x86/bugs: Avoid AUTO after the select step in the retbleed mitigation Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 65/85] ASoC: hdac_hdmi: Rate limit logging on connection and disconnection Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 66/85] ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4 Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 67/85] irqchip/mips-gic: Allow forced affinity Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 68/85] ASoC: SOF: topology: Parse the dapm_widget_tokens in case of DSPless mode Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 69/85] tty: serial: fix print format specifiers Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 70/85] ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime() Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 71/85] usb: typec: intel_pmc_mux: Defer probe if SCU IPC isn't present Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 72/85] usb: core: usb_submit_urb: downgrade type check Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 73/85] usb: typec: fusb302: fix scheduling while atomic when using virtio-gpio Sasha Levin
2025-08-04 18:07 ` Sebastian Reichel
2025-08-16 13:09 ` Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 74/85] usb: dwc3: xilinx: add shutdown callback Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 75/85] pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop() Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 76/85] imx8m-blk-ctrl: set ISI panic write hurry level Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 77/85] soc: qcom: mdt_loader: Actually use the e_phoff Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 78/85] platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 79/85] platform/chrome: cros_ec_typec: Defer probe on missing EC parent Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 80/85] ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 81/85] ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 82/85] ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 83/85] iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 84/85] ASoC: codecs: rt5640: Retry DEVICE_ID verification Sasha Levin
2025-08-04 0:23 ` [PATCH AUTOSEL 6.16 85/85] 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=20250804002335.3613254-21-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=amitsd@google.com \
--cc=andre.draszik@linaro.org \
--cc=badhri@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=kyletso@google.com \
--cc=patches@lists.linux.dev \
--cc=stable@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.