On Tue, May 07, 2019 at 10:12:45PM +0200, Karol Herbst wrote:
> Apperantly things go south if we suspend the device with a different PCIE
> link speed set than it got booted with. Fixes runtime suspend on my gp107.
>
> This all looks like some bug inside the pci subsystem and I would prefer a
> fix there instead of nouveau, but maybe there is no real nice way of doing
> that outside of drivers?
I agree it would be nice to fix this in the PCI core if that's
feasible.
It looks like this driver changes the PCIe link speed using some
device-specific mechanism. When we suspend, we put the device in
D3cold, so it loses all its state. When we resume, the link probably
comes up at the boot speed because nothing did that device-specific
magic to change it, so you probably end up with the link being slow
but the driver thinking it's configured to be fast, and maybe that
combination doesn't work.
If it requires something device-specific to change that link speed, I
don't know how to put that in the PCI core. But maybe I'm missing
something?
Per the PCIe spec (r4.0, sec 1.2):
Initialization – During hardware initialization, each PCI Express
Link is set up following a negotiation of Lane widths and frequency
of operation by the two agents at each end of the Link. No firmware
or operating system software is involved.
I have been assuming that this means device-specific link speed
management is out of spec, but it seems pretty common that devices
don't come up by themselves at the fastest possible link speed. So
maybe the spec just intends that devices can operate at *some* valid
speed.
> v2: squashed together patch 4 and 5
>
> Signed-off-by: Karol Herbst <kherbst@xxxxxxxxxx>
> Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
> ---
> drm/nouveau/include/nvkm/subdev/pci.h | 5 +++--
> drm/nouveau/nvkm/subdev/pci/base.c | 9 +++++++--
> drm/nouveau/nvkm/subdev/pci/pcie.c | 24 ++++++++++++++++++++----
> drm/nouveau/nvkm/subdev/pci/priv.h | 2 ++
> 4 files changed, 32 insertions(+), 8 deletions(-)
>
> diff --git a/drm/nouveau/include/nvkm/subdev/pci.h b/drm/nouveau/include/nvkm/subdev/pci.h
> index 1fdf3098..b23793a2 100644
> --- a/drm/nouveau/include/nvkm/subdev/pci.h
> +++ b/drm/nouveau/include/nvkm/subdev/pci.h
> @@ -26,8 +26,9 @@ struct nvkm_pci {
> } agp;
>
> struct {
> - enum nvkm_pcie_speed speed;
> - u8 width;
> + enum nvkm_pcie_speed cur_speed;
> + enum nvkm_pcie_speed def_speed;
> + u8 cur_width;
> } pcie;
>
> bool msi;
> diff --git a/drm/nouveau/nvkm/subdev/pci/base.c b/drm/nouveau/nvkm/subdev/pci/base.c
> index ee2431a7..d9fb5a83 100644
> --- a/drm/nouveau/nvkm/subdev/pci/base.c
> +++ b/drm/nouveau/nvkm/subdev/pci/base.c
> @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend)
>
> if (pci->agp.bridge)
> nvkm_agp_fini(pci);
> + else if (pci_is_pcie(pci->pdev))
> + nvkm_pcie_fini(pci);
>
> return 0;
> }
> @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev)
> struct nvkm_pci *pci = nvkm_pci(subdev);
> if (pci->agp.bridge)
> nvkm_agp_preinit(pci);
> + else if (pci_is_pcie(pci->pdev))
> + nvkm_pcie_preinit(pci);
> return 0;
> }
>
> @@ -193,8 +197,9 @@ nvkm_pci_new_(const struct nvkm_pci_func *func, struct nvkm_device *device,
> pci->func = func;
> pci->pdev = device->func->pci(device)->pdev;
> pci->irq = -1;
> - pci->pcie.speed = -1;
> - pci->pcie.width = -1;
> + pci->pcie.cur_speed = -1;
> + pci->pcie.def_speed = -1;
> + pci->pcie.cur_width = -1;
>
> if (device->type == NVKM_DEVICE_AGP)
> nvkm_agp_ctor(pci);
> diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c
> index 70ccbe0d..731dd30e 100644
> --- a/drm/nouveau/nvkm/subdev/pci/pcie.c
> +++ b/drm/nouveau/nvkm/subdev/pci/pcie.c
> @@ -85,6 +85,13 @@ nvkm_pcie_oneinit(struct nvkm_pci *pci)
> return 0;
> }
>
> +int
> +nvkm_pcie_preinit(struct nvkm_pci *pci)
> +{
> + pci->pcie.def_speed = nvkm_pcie_get_speed(pci);
> + return 0;
> +}
> +
> int
> nvkm_pcie_init(struct nvkm_pci *pci)
> {
> @@ -105,12 +112,21 @@ nvkm_pcie_init(struct nvkm_pci *pci)
> if (pci->func->pcie.init)
> pci->func->pcie.init(pci);
>
> - if (pci->pcie.speed != -1)
> - nvkm_pcie_set_link(pci, pci->pcie.speed, pci->pcie.width);
> + if (pci->pcie.cur_speed != -1)
> + nvkm_pcie_set_link(pci, pci->pcie.cur_speed,
> + pci->pcie.cur_width);
>
> return 0;
> }
>
> +int
> +nvkm_pcie_fini(struct nvkm_pci *pci)
> +{
> + if (!IS_ERR_VALUE(pci->pcie.def_speed))
> + return nvkm_pcie_set_link(pci, pci->pcie.def_speed, 16);
> + return 0;
> +}
> +
> int
> nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
> {
> @@ -146,8 +162,8 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
> speed = max_speed;
> }
>
> - pci->pcie.speed = speed;
> - pci->pcie.width = width;
> + pci->pcie.cur_speed = speed;
> + pci->pcie.cur_width = width;
>
> if (speed == cur_speed) {
> nvkm_debug(subdev, "requested matches current speed\n");
> diff --git a/drm/nouveau/nvkm/subdev/pci/priv.h b/drm/nouveau/nvkm/subdev/pci/priv.h
> index a0d4c007..e7744671 100644
> --- a/drm/nouveau/nvkm/subdev/pci/priv.h
> +++ b/drm/nouveau/nvkm/subdev/pci/priv.h
> @@ -60,5 +60,7 @@ enum nvkm_pcie_speed gk104_pcie_max_speed(struct nvkm_pci *);
> int gk104_pcie_version_supported(struct nvkm_pci *);
>
> int nvkm_pcie_oneinit(struct nvkm_pci *);
> +int nvkm_pcie_preinit(struct nvkm_pci *);
> int nvkm_pcie_init(struct nvkm_pci *);
> +int nvkm_pcie_fini(struct nvkm_pci *);
> #endif
> --
> 2.21.0
>
