firmware: ti_sci: Use system_state to determine polling
Nishanth Menon
maintainerPATCH v2 1/1 firmware: ti_sci: Use system_state to determine polling
Commit b9e8a7d950ff ("firmware: ti_sci: Switch transport to polled mode during system suspend") aims to resolve issues with tisci operations during system suspend operation. However, the system may enter a no_irq stage in various other usage modes, including power-off and restart. To determine if polling mode is appropriate, use the system_state instead.
While at this, drop the unused is_suspending state variable and related helpers.
---
Changes Since V1:
* Fixed up comments from Francesco:
* Fat fingered miss part of the change causing a build break
* Added Fixes, s/Link/Closes
* Picked up Tested-by
Note: there are two reported by, and a closes link - which confuses checkpatch a little, but I am going to assume it is ok.
V1: https://lore.kernel.org/all/[email protected]/
drivers/firmware/ti_sci.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-)
drivers/firmware/ti_sci.c +2 -34
@@ -97,7 +97,6 @@ struct ti_sci_desc {* @node: list head * @host_id: Host ID * @users: Number of users of this instance -* @is_suspending: Flag set to indicate in suspend path. */ struct ti_sci_info {struct device *dev;
@@ -116,7 +115,6 @@ struct ti_sci_info {u8 host_id;/* protected by ti_sci_list_mutex */ int users; -bool is_suspending; };#define cl_to_ti_sci_info (c) container_of(c, struct ti_sci_info, cl)
@@ -418,14 +416,14 @@ static inline int ti_sci_do_xfer(struct ti_sci_info *info, ret =0 ; -if (!info->is_suspending) { +if (system_state <=SYSTEM_RUNNING ) {/* And we wait for the response. */ timeout =msecs_to_jiffies (info->desc->max_rx_timeout_ms);if (!wait_for_completion_timeout (&xfer->done, timeout)) ret = -ETIMEDOUT ; }else {/* -* If we are suspending, we cannot use wait_for_completion_timeout +* If we are !running, we cannot use wait_for_completion_timeout * during noirq phase, so we must manually poll the completion. */ ret = read_poll_timeout_atomic(try_wait_for_completion, done_state,
@@ -3281,35 +3279,6 @@ static int tisci_reboot_handler(struct notifier_block *nb, unsigned long mode,return NOTIFY_BAD ; } -static void ti_sci_set_is_suspending (struct ti_sci_info *info,bool is_suspending) -{ - info->is_suspending = is_suspending; -} - -static int ti_sci_suspend (struct device *dev) -{ -struct ti_sci_info *info =dev_get_drvdata (dev); -/* -* We must switch operation to polled mode now as drivers and the genpd -* layer may make late TI SCI calls to change clock and device states -* from the noirq phase of suspend. -*/ -ti_sci_set_is_suspending (info, true); - -return 0 ; -} - -static int ti_sci_resume (struct device *dev) -{ -struct ti_sci_info *info =dev_get_drvdata (dev); - -ti_sci_set_is_suspending (info, false); - -return 0 ; -} - -static DEFINE_SIMPLE_DEV_PM_OPS(ti_sci_pm_ops, ti_sci_suspend, ti_sci_resume); -/* Description for K2G */ static const struct ti_sci_desc ti_sci_pmmc_k2g_desc = { .default_host_id =2 ,
@@ -3516,7 +3485,6 @@ static struct platform_driver ti_sci_driver = { .driver = { .name = "ti-sci", .of_match_table = of_match_ptr(ti_sci_of_match), - .pm = &ti_sci_pm_ops, }, };module_platform_driver (ti_sci_driver);
Signature · 7 lines
2.40.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Nishanth Menon,
Quoted 8 lines · Nishanth Menon
Commit
b9e8a7d950ff("firmware:ti_sci: Switch transport to polled mode during system suspend") aims to resolve issues with tisci operations during system suspend operation. However, the system may enter ano_irqstage in various other usage modes, including power-off and restart. To determine if polling mode is appropriate, use thesystem_stateinstead.[...]
I have applied the following to branch ti-drivers-soc-next on [1]. Thank you!
[1/1] firmware: ti_sci: Use system_state to determine polling
commit: 9225bcdedf16297a346082e7d23b0e8434aa98ed
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D