Re: [PATCH 2/2] firmware/psci: Set pm_set_resume/suspend_via_firmware() on qcom

[Sudeep Holla]

On Mon, Jan 08, 2024 at 04:47:05PM +0100, Konrad Dybcio wrote:
> On 3.01.2024 10:44, Sudeep Holla wrote:
> >
> > But I don't like the Qualcomm specific changes.
>
> Is that because of the matching table, or due to the slightly more
> convoluted way of suspending the platform through CPU_SUSPEND?
>

I would say both. I don't like this to be Qualcomm platform specific
feature. Also advertising absence of system suspend on those platforms
as presence of some special system suspend. It simply is not system
suspend. The sysfs hides/abstracts and provides s2idle even when user
request s2r on such platforms.

We should advertise it as s2idle. I would do something like below patch,
just a rough idea, not compiled or tested. This avoids any misleading
or confusion IMO.

However I am interested in knowing which are these drivers that rely on
the pm_suspend_global_flags ? The reason I ask the x86 ACPI doesn't set
the flags for s2idle. Also the core code explicitly calls
pm_set_suspend_no_platform() in suspend_devices_and_enter(). What you
want conflicts with both the above observations. I would like to involve
Rafael and check what is the correct/expected way to use those flags.

Regards,
Sudeep

--->8
diff --git i/drivers/firmware/psci/psci.c w/drivers/firmware/psci/psci.c
index 0e622aa5ad58..b2559ae7668a 100644
--- i/drivers/firmware/psci/psci.c
+++ w/drivers/firmware/psci/psci.c
@@ -505,26 +505,42 @@ static int psci_system_suspend(unsigned long unused)
        return psci_to_linux_errno(err);
 }

-static int psci_system_suspend_enter(suspend_state_t state)
+static int psci_system_idle_prepare_late(void)
 {
        pm_set_resume_via_firmware();
+       return 0;
+}
+#define psci_system_system_prepare_late        psci_system_idle_prepare_late
+
+static int psci_system_suspend_enter(suspend_state_t state)
+{
+       psci_system_system_prepare_late();

        return cpu_suspend(0, psci_system_suspend);
 }

-static int psci_system_suspend_begin(suspend_state_t state)
+static int psci_system_idle_begin(void)
 {
        pm_set_suspend_via_firmware();
-
        return 0;
 }

+static int psci_system_suspend_begin(suspend_state_t state)
+{
+       return psci_system_idle_begin();
+}
+
 static const struct platform_suspend_ops psci_suspend_ops = {
        .valid          = suspend_valid_only_mem,
        .enter          = psci_system_suspend_enter,
        .begin          = psci_system_suspend_begin,
 };

+static const struct platform_s2idle_ops psci_s2idle_ops = {
+       .begin = psci_system_idle_begin,
+       .prepare_late = psci_system_idle_prepare_late,
+};
+
 static void __init psci_init_system_reset2(void)
 {
        int ret;
@@ -546,6 +562,8 @@ static void __init psci_init_system_suspend(void)

        if (ret != PSCI_RET_NOT_SUPPORTED)
                suspend_set_ops(&psci_suspend_ops);
+
+       s2idle_set_ops(&psci_s2idle_ops);
 }

 static void __init psci_init_cpu_suspend(void)