Re: [PATCH 5/5] PCI: mediatek-gen3: Keep PCIe power and clocks if suspend-to-idle

AngeloGioacchino Del Regno
2025-01-03T09:14:48Z

Il 03/01/25 07:00, Jianjun Wang ha scritto:
> If the target system sleep state is suspend-to-idle, the bridge is
> supposed to stay in D0, and the framework will not help to restore its
> configuration space, so keep its power and clocks during suspend.
>
> It's recommended to enable L1ss support, so the link can be changed to
> L1.2 state during suspend.
>
> Signed-off-by: Jianjun Wang <jianjun.wang@mediatek.com>
> ---
> drivers/pci/controller/pcie-mediatek-gen3.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
> index 48f83c2d91f7..11da68910502 100644
> --- a/drivers/pci/controller/pcie-mediatek-gen3.c
> +++ b/drivers/pci/controller/pcie-mediatek-gen3.c
> @@ -1291,6 +1291,19 @@ static int mtk_pcie_suspend_noirq(struct device *dev)
> int err;
> u32 val;
>
> + /*
> + * If the target system sleep state is suspend-to-idle, the bridge is supposed to stay in
> + * D0, and the framework will not help to restore its configuration space, so keep it's
> + * power and clocks during suspend.
> + *
> + * It's recommended to enable L1ss support, so the link can be changed to L1.2 state during
> + * suspend.
> + */
> + if (pm_suspend_default_s2idle()) {

AFAIK, this works only if s2idle is the default system sleep state.

...and besides, for good measure (especially in the event that in the future we
get hotplug support) you should also check if there is any active PCI-Express
device on the controller instance before deciding to leave the controller and
link UP, as PCI-Express controllers may be enabled even if there's no actually
connected device on a PCIe slot (full PCIe, or mPCIe, or M.2).

So, I suggest to:

- Add a `bool suspended` member to `struct mtk_gen3_pcie`, then

static int mtk_pcie_suspend_noirq(struct device *dev)
{
struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);
int err;
u32 val;

val = readl(pcie->base + PCIE_LINK_STATUS_REG);
val &= PCIE_PORT_LINKUP;

if (val && pm_suspend_target_state == PM_SUSPEND_TO_IDLE) {
dev_dbg(....)
return 0;
}

/* Trigger link to L2 state */
err = mtk_pcie_turn_off_link(pcie);
if (err) {
dev_err(pcie->dev, "cannot enter L2 state\n");
return err;
}

pcie->suspended = true;

/* Pull down the PERST# pin */
.... etc etc

and

static int mtk_pcie_resume_noirq(struct device *dev)
{
struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);
int err;

if (!pcie->suspended)
return 0;

err = pcie->soc->power_up .... etc etc

... so you only check if we're going in s2idle in the suspend handler, as
that dictates the value of pcie->suspended :-)

Cheers,
Angelo

> + dev_info(dev, "System enter s2idle state, keep PCIe power and clocks\n");
> + return 0;
> + }
> +
> /* Trigger link to L2 state */
> err = mtk_pcie_turn_off_link(pcie);
> if (err) {
> @@ -1316,6 +1329,11 @@ static int mtk_pcie_resume_noirq(struct device *dev)
> struct mtk_gen3_pcie *pcie = dev_get_drvdata(dev);
> int err;
>
> + if (pm_suspend_default_s2idle()) {
> + dev_info(dev, "System enter s2idle state, no need to reinitialization\n");
> + return 0;
> + }
> +
> err = pcie->soc->power_up(pcie);
> if (err)
> return err;