[Nouveau] [PATCH 4/5] pci: save the boot pcie link speed

[Karol Herbst]

Signed-off-by: Karol Herbst <kher...@redhat.com>
---
 drm/nouveau/include/nvkm/subdev/pci.h |  5 +++--
 drm/nouveau/nvkm/subdev/pci/base.c    |  7 +++++--
 drm/nouveau/nvkm/subdev/pci/pcie.c    | 15 +++++++++++----
 drm/nouveau/nvkm/subdev/pci/priv.h    |  1 +
 4 files changed, 20 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..b6ebee6f 100644
--- a/drm/nouveau/nvkm/subdev/pci/base.c
+++ b/drm/nouveau/nvkm/subdev/pci/base.c
@@ -100,6 +100,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 +195,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 eb405dea..727b5d6a 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,8 +112,8 @@ 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;
 }
@@ -146,8 +153,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..dc3ae3cd 100644
--- a/drm/nouveau/nvkm/subdev/pci/priv.h
+++ b/drm/nouveau/nvkm/subdev/pci/priv.h
@@ -60,5 +60,6 @@ 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 *);
 #endif
-- 
2.20.1

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau