pci: enable pcie link changes for pascal
PATCH 1/4 pci: enable pcie link changes for pascal
--- drm/nouveau/nvkm/subdev/pci/gk104.c | 8 ++++---- drm/nouveau/nvkm/subdev/pci/gp100.c | 10 ++++++++++ drm/nouveau/nvkm/subdev/pci/priv.h | 5 +++++ 3 files changed, 19 insertions(+), 4 deletions(-)
drm/nouveau/nvkm/subdev/pci/gk104.c +4 -4
@@ -23,7 +23,7 @@*/ #include "priv.h" -static int +int gk104_pcie_version_supported (struct nvkm_pci *pci) {return (nvkm_rd32 (pci->subdev.device,0x8c1c0 ) &0x4 ) ==0x4 ?2 :1 ;
@@ -108,7 +108,7 @@ gk104_pcie_lnkctl_speed(struct nvkm_pci *pci)return -1 ; } -static enum nvkm_pcie_speed +enum nvkm_pcie_speed gk104_pcie_max_speed (struct nvkm_pci *pci) {u32 max_speed =nvkm_rd32 (pci->subdev.device,0x8c1c0 ) &0x300000 ;
@@ -146,7 +146,7 @@ gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum nvkm_pcie_speed speed)nvkm_mask (device,0x8c040 ,0x1 ,0x1 ); } -static int +int gk104_pcie_init (struct nvkm_pci * pci) {enum nvkm_pcie_speed lnkctl_speed, max_speed, cap_speed;
@@ -178,7 +178,7 @@ gk104_pcie_init(struct nvkm_pci * pci)return 0 ; } -static int +int gk104_pcie_set_link (struct nvkm_pci *pci,enum nvkm_pcie_speed speed,u8 width) {struct nvkm_subdev *subdev = &pci->subdev;
drm/nouveau/nvkm/subdev/pci/gp100.c +10 -0
@@ -35,6 +35,16 @@ gp100_pci_func = { .wr08 = nv40_pci_wr08, .wr32 = nv40_pci_wr32, .msi_rearm = gp100_pci_msi_rearm, + + .pcie.init = gk104_pcie_init, + .pcie.set_link = gk104_pcie_set_link, + + .pcie.max_speed = gk104_pcie_max_speed, + .pcie.cur_speed = g84_pcie_cur_speed, + + .pcie.set_version = gf100_pcie_set_version, + .pcie.version = gf100_pcie_version, + .pcie.version_supported = gk104_pcie_version_supported, };int
drm/nouveau/nvkm/subdev/pci/priv.h +5 -0
@@ -54,6 +54,11 @@ int gf100_pcie_cap_speed(struct nvkm_pci *);int gf100_pcie_init (struct nvkm_pci *);int gf100_pcie_set_link (struct nvkm_pci *,enum nvkm_pcie_speed ,u8 ); +int gk104_pcie_init (struct nvkm_pci *); +int gk104_pcie_set_link (struct nvkm_pci *,enum nvkm_pcie_speed ,u8 width); +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_init (struct nvkm_pci *);#endif
Signature · 6 lines
2.21.0 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
A message that is not in the archive (sent off-list or not yet received): 20190813091957.4812-1-kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
PATCH 2/4 pci: add nvkm_pcie_get_speed
v2: fixed compilation error
--- drm/nouveau/include/nvkm/subdev/pci.h | 1 + drm/nouveau/nvkm/subdev/pci/pcie.c | 8 ++++++++ 2 files changed, 9 insertions(+)
drm/nouveau/include/nvkm/subdev/pci.h +1 -0
@@ -53,4 +53,5 @@ int gp100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);/* pcie functions */ int nvkm_pcie_set_link (struct nvkm_pci *,enum nvkm_pcie_speed ,u8 width); +enum nvkm_pcie_speed nvkm_pcie_get_speed (struct nvkm_pci *);#endif
drm/nouveau/nvkm/subdev/pci/pcie.c +8 -0
@@ -163,3 +163,11 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)return ret; } + +enum nvkm_pcie_speed +nvkm_pcie_get_speed (struct nvkm_pci *pci) +{ +if (!pci || !pci_is_pcie (pci->pdev) || !pci->func->pcie.cur_speed) +return -ENODEV ; +return pci->func->pcie.cur_speed (pci); +}
Signature · 6 lines
2.21.0 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 3/4 pci: save the boot pcie link speed and restore it on fini
In reply to a message not in the archiveApperantly 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?
v2: squashed together patch 4 and 5
v3: only restore pcie speed on machines with runpm
add NvRunpmWorkaround config option to disable the workaround
--- drm/nouveau/include/nvkm/core/device.h | 2 ++ drm/nouveau/include/nvkm/subdev/pci.h | 8 ++++-- drm/nouveau/nouveau_drm.c | 1 + drm/nouveau/nvkm/subdev/clk/base.c | 2 +- drm/nouveau/nvkm/subdev/pci/base.c | 9 ++++-- drm/nouveau/nvkm/subdev/pci/pcie.c | 38 ++++++++++++++++++++++---- drm/nouveau/nvkm/subdev/pci/priv.h | 2 ++ 7 files changed, 51 insertions(+), 11 deletions(-)
drm/nouveau/include/nvkm/core/device.h +2 -0
@@ -125,6 +125,8 @@ struct nvkm_device {u8 chiprev;u32 crystal; +bool has_runpm; +struct {struct notifier_block nb; } acpi;
drm/nouveau/include/nvkm/subdev/pci.h +5 -3
@@ -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;
@@ -52,6 +53,7 @@ int gk104_pci_new(struct nvkm_device *, int, struct nvkm_pci **);int gp100_pci_new (struct nvkm_device *,int ,struct nvkm_pci **);/* pcie functions */ -int nvkm_pcie_set_link (struct nvkm_pci *,enum nvkm_pcie_speed ,u8 width); +int nvkm_pcie_set_link (struct nvkm_pci *,enum nvkm_pcie_speed ,u8 width, +bool save);enum nvkm_pcie_speed nvkm_pcie_get_speed (struct nvkm_pci *);#endif
drm/nouveau/nouveau_drm.c +1 -0
@@ -676,6 +676,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,if (nouveau_atomic) driver_pci.driver_features |=DRIVER_ATOMIC ; + device->has_runpm =nouveau_pmops_runtime (); drm_dev =drm_dev_alloc (&driver_pci, &pdev->dev);if (IS_ERR (drm_dev)) {
drm/nouveau/nvkm/subdev/clk/base.c +1 -1
@@ -277,7 +277,7 @@ nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei)nvkm_debug (subdev,"setting performance state %d\n" , pstatei); clk->pstate = pstatei; -nvkm_pcie_set_link (pci, pstate->pcie_speed, pstate->pcie_width); +nvkm_pcie_set_link (pci, pstate->pcie_speed, pstate->pcie_width, true);if (fb && fb->ram && fb->ram->func->calc) {struct nvkm_ram *ram = fb->ram;
drm/nouveau/nvkm/subdev/pci/base.c +7 -2
@@ -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);
drm/nouveau/nvkm/subdev/pci/pcie.c +33 -5
@@ -23,6 +23,8 @@*/ #include "priv.h" +#include <core/option.h> +static char *nvkm_pcie_speeds[] = {"2.5GT/s" ,"5.0GT/s" ,
@@ -85,6 +87,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,14 +114,31 @@ 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, false); + +return 0 ; +} + +int +nvkm_pcie_fini (struct nvkm_pci *pci) +{ +struct nvkm_device *device = pci->subdev.device; +if (!device->has_runpm) +return 0 ; + +if (!nvkm_boolopt (device->cfgopt,"NvRunpmWorkaround" , true)) +return 0 ; +if (!IS_ERR_VALUE (pci->pcie.def_speed)) +return nvkm_pcie_set_link (pci, pci->pcie.def_speed,16 , false);return 0 ; }int -nvkm_pcie_set_link (struct nvkm_pci *pci,enum nvkm_pcie_speed speed,u8 width) +nvkm_pcie_set_link (struct nvkm_pci *pci,enum nvkm_pcie_speed speed,u8 width, +bool save) {struct nvkm_subdev *subdev = &pci->subdev;enum nvkm_pcie_speed cur_speed, max_speed;
@@ -146,8 +172,10 @@ 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; +if (save) { + pci->pcie.cur_speed = speed; + pci->pcie.cur_width = width; + }if (speed == cur_speed) {nvkm_debug (subdev,"requested matches current speed\n" );
drm/nouveau/nvkm/subdev/pci/priv.h +2 -0
@@ -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
Signature · 6 lines
2.21.0 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 4/4 drm: abort runtime suspend if we hit an error
In reply to a message not in the archive--- drm/nouveau/nouveau_drm.c | 5 +++++ 1 file changed, 5 insertions(+)
drm/nouveau/nouveau_drm.c +5 -0
@@ -911,6 +911,7 @@ nouveau_pmops_runtime_suspend(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct nouveau_drm *drm =nouveau_drm (drm_dev);int ret;if (!nouveau_pmops_runtime ()) {
@@ -920,6 +921,10 @@ nouveau_pmops_runtime_suspend(struct device *dev)nouveau_switcheroo_optimus_dsm (); ret =nouveau_do_suspend (drm_dev, true); +if (ret) { +NV_ERROR (drm,"suspend failed with: %d\n" , ret); +return ret; + }pci_save_state (pdev);pci_disable_device (pdev);pci_ignore_hotplug (pdev);
Signature · 6 lines
2.21.0 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau