Skip to contentSkip to conversation

PCIe link change improvements

PATCH In review Karol Herbst 3 participants 8 messages Sep 12, 2019 – Sep 17, 2019 5 messages not in the archive

lore
Share & tools
lore
#0 lore raw

cover PCIe link change improvements

everything was taken from nvgpu.

Main reason for adding is to improve stability of the PCIe link changing code as we might want to depend on it for a workaround fixing our infamous runpm issues on recent laptops

Karol Herbst (3):
pci: force disable ASPM before changing the link speed pci/gk104: enable dl_mgr safe mode
pci/gk104: wait for ltssm idle before changing the link

 drm/nouveau/nvkm/subdev/pci/g84.c   |  9 +++++++++
 drm/nouveau/nvkm/subdev/pci/g92.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/g94.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/gf100.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gf106.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gk104.c | 11 +++++++++++
 drm/nouveau/nvkm/subdev/pci/pcie.c  | 14 ++++++++++++++
 drm/nouveau/nvkm/subdev/pci/priv.h  |  2 ++
 8 files changed, 40 insertions(+)
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): 20190912190028.27977-1-kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#2 lore raw

PATCH 1/3 pci: force disable ASPM before changing the link speed

taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/g84.c   |  9 +++++++++
 drm/nouveau/nvkm/subdev/pci/g92.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/g94.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/gf100.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gf106.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gk104.c |  1 +
 drm/nouveau/nvkm/subdev/pci/pcie.c  | 14 ++++++++++++++
 drm/nouveau/nvkm/subdev/pci/priv.h  |  2 ++
 8 files changed, 30 insertions(+)
drm/nouveau/nvkm/subdev/pci/g84.c +9 -0
index 62438d892..353d70d7e 100644
@@ -122,6 +122,14 @@ g84_pci_init(struct nvkm_pci *pci)
 		nvkm_pci_mask(pci, 0x041c, 0x00000060, 0x00000000);
 }
 
+void
+g84_pcie_force_aspm_off(struct nvkm_pci *pci, bool status)
+{
+	/* L0s and L1 */
+	u32 value = status ? 0x180 : 0x0;
+	nvkm_pci_mask(pci, 0x150, 0x180, value);
+}
+
 int
 g84_pcie_init(struct nvkm_pci *pci)
 {
@@ -147,6 +155,7 @@ g84_pci_func = {
 	.pcie.set_version = g84_pcie_set_version,
 	.pcie.version = g84_pcie_version,
 	.pcie.version_supported = g84_pcie_version_supported,
+	.pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/g92.c +1 -0
index 48874359d..8c35cc89e 100644
@@ -48,6 +48,7 @@ g92_pci_func = {
 	.pcie.set_version = g84_pcie_set_version,
 	.pcie.version = g84_pcie_version,
 	.pcie.version_supported = g92_pcie_version_supported,
+	.pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/g94.c +1 -0
index 09adb37a5..aa152d798 100644
@@ -40,6 +40,7 @@ g94_pci_func = {
 	.pcie.set_version = g84_pcie_set_version,
 	.pcie.version = g84_pcie_version,
 	.pcie.version_supported = g92_pcie_version_supported,
+	.pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gf100.c +1 -0
index 00a5e7d3e..8676480c3 100644
@@ -93,6 +93,7 @@ gf100_pci_func = {
 	.pcie.set_version = gf100_pcie_set_version,
 	.pcie.version = gf100_pcie_version,
 	.pcie.version_supported = g92_pcie_version_supported,
+	.pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gf106.c +1 -0
index 11bf419af..8079ebdd4 100644
@@ -40,6 +40,7 @@ gf106_pci_func = {
 	.pcie.set_version = gf100_pcie_set_version,
 	.pcie.version = gf100_pcie_version,
 	.pcie.version_supported = g92_pcie_version_supported,
+	.pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gk104.c +1 -0
index e68030507..b73922c52 100644
@@ -219,6 +219,7 @@ gk104_pci_func = {
 	.pcie.set_version = gf100_pcie_set_version,
 	.pcie.version = gf100_pcie_version,
 	.pcie.version_supported = gk104_pcie_version_supported,
+	.pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/pcie.c +14 -0
index d71e5db50..354ac4c85 100644
@@ -111,6 +111,14 @@ nvkm_pcie_init(struct nvkm_pci *pci)
 	return 0;
 }
 
+void
+nvkm_pcie_force_aspm_off(struct nvkm_pci *pci, bool status)
+{
+	if (!pci->func->pcie.force_aspm_off)
+		return;
+	pci->func->pcie.force_aspm_off(pci, status);
+}
+
 int
 nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 {
@@ -157,9 +165,15 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 	nvkm_debug(subdev, "set link to %s x%i\n",
 		   nvkm_pcie_speeds[speed], width);
 
+	/* force disable ASPM */
+	nvkm_pcie_force_aspm_off(pci, true);
+
 	ret = pci->func->pcie.set_link(pci, speed, width);
 	if (ret < 0)
 		nvkm_error(subdev, "setting link failed: %i\n", ret);
 
+	/* lift force disable ASPM */
+	nvkm_pcie_force_aspm_off(pci, false);
+
 	return ret;
 }
drm/nouveau/nvkm/subdev/pci/priv.h +2 -0
index 7009aad86..c6a9ef330 100644
@@ -24,6 +24,7 @@ struct nvkm_pci_func {
 		void (*set_version)(struct nvkm_pci *, u8);
 		int (*version)(struct nvkm_pci *);
 		int (*version_supported)(struct nvkm_pci *);
+		void (*force_aspm_off)(struct nvkm_pci *, bool);
 	} pcie;
 };
 
@@ -42,6 +43,7 @@ int g84_pcie_version(struct nvkm_pci *);
 void g84_pcie_set_link_speed(struct nvkm_pci *, enum nvkm_pcie_speed);
 enum nvkm_pcie_speed g84_pcie_cur_speed(struct nvkm_pci *);
 enum nvkm_pcie_speed g84_pcie_max_speed(struct nvkm_pci *);
+void g84_pcie_force_aspm_off(struct nvkm_pci *, bool status);
 int g84_pcie_init(struct nvkm_pci *);
 int g84_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8);
 
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): 20190912190028.27977-2-kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#4 lore raw

Re: [PATCH 1/3] pci: force disable ASPM before changing the link speed

Quoted 124 lines · Karol Herbst

taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/g84.c   |  9 +++++++++
 drm/nouveau/nvkm/subdev/pci/g92.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/g94.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/gf100.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gf106.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gk104.c |  1 +
 drm/nouveau/nvkm/subdev/pci/pcie.c  | 14 ++++++++++++++
 drm/nouveau/nvkm/subdev/pci/priv.h  |  2 ++
 8 files changed, 30 insertions(+)
drm/nouveau/nvkm/subdev/pci/g84.c +9 -0
index 62438d892..353d70d7e 100644
@@ -122,6 +122,14 @@ g84_pci_init(struct nvkm_pci *pci)
                nvkm_pci_mask(pci, 0x041c, 0x00000060, 0x00000000);
 }
 
+void
+g84_pcie_force_aspm_off(struct nvkm_pci *pci, bool status)
+{
+       /* L0s and L1 */
+       u32 value = status ? 0x180 : 0x0;
+       nvkm_pci_mask(pci, 0x150, 0x180, value);
+}
+
 int
 g84_pcie_init(struct nvkm_pci *pci)
 {
@@ -147,6 +155,7 @@ g84_pci_func = {
        .pcie.set_version = g84_pcie_set_version,
        .pcie.version = g84_pcie_version,
        .pcie.version_supported = g84_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/g92.c +1 -0
index 48874359d..8c35cc89e 100644
@@ -48,6 +48,7 @@ g92_pci_func = {
        .pcie.set_version = g84_pcie_set_version,
        .pcie.version = g84_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/g94.c +1 -0
index 09adb37a5..aa152d798 100644
@@ -40,6 +40,7 @@ g94_pci_func = {
        .pcie.set_version = g84_pcie_set_version,
        .pcie.version = g84_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gf100.c +1 -0
index 00a5e7d3e..8676480c3 100644
@@ -93,6 +93,7 @@ gf100_pci_func = {
        .pcie.set_version = gf100_pcie_set_version,
        .pcie.version = gf100_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gf106.c +1 -0
index 11bf419af..8079ebdd4 100644
@@ -40,6 +40,7 @@ gf106_pci_func = {
        .pcie.set_version = gf100_pcie_set_version,
        .pcie.version = gf100_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gk104.c +1 -0
index e68030507..b73922c52 100644
@@ -219,6 +219,7 @@ gk104_pci_func = {
        .pcie.set_version = gf100_pcie_set_version,
        .pcie.version = gf100_pcie_version,
        .pcie.version_supported = gk104_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/pcie.c +8 -0
index d71e5db50..354ac4c85 100644
@@ -111,6 +111,14 @@ nvkm_pcie_init(struct nvkm_pci *pci)
        return 0;
 }
 
+void
+nvkm_pcie_force_aspm_off(struct nvkm_pci *pci, bool status)
+{
+       if (!pci->func->pcie.force_aspm_off)
+               return;
+       pci->func->pcie.force_aspm_off(pci, status);
+}
+
 int
 nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 {
@@ -157,9 +165,15 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
        nvkm_debug(subdev, "set link to %s x%i\n",
                   nvkm_pcie_speeds[speed], width);

drm/nouveau/nvkm/subdev/pci/pcie.c nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width) · line 176

Quoted 10 lines
drm/nouveau/nvkm/subdev/pci/pcie.c +5 -0
 
+       /* force disable ASPM */
+       nvkm_pcie_force_aspm_off(pci, true);
+
        ret = pci->func->pcie.set_link(pci, speed, width);
        if (ret < 0)
                nvkm_error(subdev, "setting link failed: %i\n", ret);
 
+       /* lift force disable ASPM */
+       nvkm_pcie_force_aspm_off(pci, false);

This doesn't do what is says on the box. It's forcibly disabling ASPM, then forcibly enabling it. You should instead restore the settings from before forcing it off, which is what NVGPU actually does too.

Ben.

Quoted 26 lines
drm/nouveau/nvkm/subdev/pci/pcie.c +1 -0
+
        return ret;
 }
drm/nouveau/nvkm/subdev/pci/priv.h +2 -1
index 7009aad86..c6a9ef330 100644
@@ -24,6 +24,7 @@ struct nvkm_pci_func {
                void (*set_version)(struct nvkm_pci *, u8);
                int (*version)(struct nvkm_pci *);
                int (*version_supported)(struct nvkm_pci *);
+               void (*force_aspm_off)(struct nvkm_pci *, bool);
        } pcie;
 };
 
@@ -42,6 +43,7 @@ int g84_pcie_version(struct nvkm_pci *);
 void g84_pcie_set_link_speed(struct nvkm_pci *, enum nvkm_pcie_speed);
 enum nvkm_pcie_speed g84_pcie_cur_speed(struct nvkm_pci *);
 enum nvkm_pcie_speed g84_pcie_max_speed(struct nvkm_pci *);
+void g84_pcie_force_aspm_off(struct nvkm_pci *, bool status);
 int g84_pcie_init(struct nvkm_pci *);
 int g84_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8);
 
--

2.21.0

Quoted 4 lines

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
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): CACAvsv73OSi1ELoERRy0H9qVLaG+6Lu8FQy_L7VNA1w_uKSSJA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#6 lore raw

Re: [PATCH 1/3] pci: force disable ASPM before changing the link speed

Quoted 134 lines · Ben Skeggs
Quoted 132 lines · Karol Herbst

taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/g84.c   |  9 +++++++++
 drm/nouveau/nvkm/subdev/pci/g92.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/g94.c   |  1 +
 drm/nouveau/nvkm/subdev/pci/gf100.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gf106.c |  1 +
 drm/nouveau/nvkm/subdev/pci/gk104.c |  1 +
 drm/nouveau/nvkm/subdev/pci/pcie.c  | 14 ++++++++++++++
 drm/nouveau/nvkm/subdev/pci/priv.h  |  2 ++
 8 files changed, 30 insertions(+)
drm/nouveau/nvkm/subdev/pci/g84.c +9 -0
index 62438d892..353d70d7e 100644
@@ -122,6 +122,14 @@ g84_pci_init(struct nvkm_pci *pci)
                nvkm_pci_mask(pci, 0x041c, 0x00000060, 0x00000000);
 }
 
+void
+g84_pcie_force_aspm_off(struct nvkm_pci *pci, bool status)
+{
+       /* L0s and L1 */
+       u32 value = status ? 0x180 : 0x0;
+       nvkm_pci_mask(pci, 0x150, 0x180, value);
+}
+
 int
 g84_pcie_init(struct nvkm_pci *pci)
 {
@@ -147,6 +155,7 @@ g84_pci_func = {
        .pcie.set_version = g84_pcie_set_version,
        .pcie.version = g84_pcie_version,
        .pcie.version_supported = g84_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/g92.c +1 -0
index 48874359d..8c35cc89e 100644
@@ -48,6 +48,7 @@ g92_pci_func = {
        .pcie.set_version = g84_pcie_set_version,
        .pcie.version = g84_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/g94.c +1 -0
index 09adb37a5..aa152d798 100644
@@ -40,6 +40,7 @@ g94_pci_func = {
        .pcie.set_version = g84_pcie_set_version,
        .pcie.version = g84_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gf100.c +1 -0
index 00a5e7d3e..8676480c3 100644
@@ -93,6 +93,7 @@ gf100_pci_func = {
        .pcie.set_version = gf100_pcie_set_version,
        .pcie.version = gf100_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gf106.c +1 -0
index 11bf419af..8079ebdd4 100644
@@ -40,6 +40,7 @@ gf106_pci_func = {
        .pcie.set_version = gf100_pcie_set_version,
        .pcie.version = gf100_pcie_version,
        .pcie.version_supported = g92_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/gk104.c +1 -0
index e68030507..b73922c52 100644
@@ -219,6 +219,7 @@ gk104_pci_func = {
        .pcie.set_version = gf100_pcie_set_version,
        .pcie.version = gf100_pcie_version,
        .pcie.version_supported = gk104_pcie_version_supported,
+       .pcie.force_aspm_off = g84_pcie_force_aspm_off,
 };
 
 int
drm/nouveau/nvkm/subdev/pci/pcie.c +11 -0
index d71e5db50..354ac4c85 100644
@@ -111,6 +111,14 @@ nvkm_pcie_init(struct nvkm_pci *pci)
        return 0;
 }
 
+void
+nvkm_pcie_force_aspm_off(struct nvkm_pci *pci, bool status)
+{
+       if (!pci->func->pcie.force_aspm_off)
+               return;
+       pci->func->pcie.force_aspm_off(pci, status);
+}
+
 int
 nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 {
@@ -157,9 +165,15 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
        nvkm_debug(subdev, "set link to %s x%i\n",
                   nvkm_pcie_speeds[speed], width);
 
+       /* force disable ASPM */
+       nvkm_pcie_force_aspm_off(pci, true);
+
        ret = pci->func->pcie.set_link(pci, speed, width);
        if (ret < 0)
                nvkm_error(subdev, "setting link failed: %i\n", ret);
 
Quoted 9 lines

drm/nouveau/nvkm/subdev/pci/pcie.c nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width) · line 176

Quoted 2 lines
drm/nouveau/nvkm/subdev/pci/pcie.c +2 -0
+       /* lift force disable ASPM */
+       nvkm_pcie_force_aspm_off(pci, false);

This doesn't do what is says on the box. It's forcibly disabling ASPM, then forcibly enabling it. You should instead restore the settings from before forcing it off, which is what NVGPU actually does too.

Ben.

ohh, somehow I missed that.

Quoted 23 lines
Quoted 23 lines
drm/nouveau/nvkm/subdev/pci/pcie.c +1 -0
+
        return ret;
 }
drm/nouveau/nvkm/subdev/pci/priv.h +2 -0
index 7009aad86..c6a9ef330 100644
@@ -24,6 +24,7 @@ struct nvkm_pci_func {
                void (*set_version)(struct nvkm_pci *, u8);
                int (*version)(struct nvkm_pci *);
                int (*version_supported)(struct nvkm_pci *);
+               void (*force_aspm_off)(struct nvkm_pci *, bool);
        } pcie;
 };
 
@@ -42,6 +43,7 @@ int g84_pcie_version(struct nvkm_pci *);
 void g84_pcie_set_link_speed(struct nvkm_pci *, enum nvkm_pcie_speed);
 enum nvkm_pcie_speed g84_pcie_cur_speed(struct nvkm_pci *);
 enum nvkm_pcie_speed g84_pcie_max_speed(struct nvkm_pci *);
+void g84_pcie_force_aspm_off(struct nvkm_pci *, bool status);
 int g84_pcie_init(struct nvkm_pci *);
 int g84_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8);
 
Quoted 7 lines
Quoted 7 lines

--
2.21.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

#7 lore raw

PATCH 2/3 pci/gk104: enable dl_mgr safe mode

In reply to a message not in the archive

no idea why and what it does, taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/gk104.c | 3 +++
 1 file changed, 3 insertions(+)
drm/nouveau/nvkm/subdev/pci/gk104.c +3 -0
index b73922c52..6aeb07fe4 100644
@@ -184,6 +184,7 @@ gk104_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 	struct nvkm_subdev *subdev = &pci->subdev;
 	enum nvkm_pcie_speed lnk_ctl_speed = gk104_pcie_lnkctl_speed(pci);
 	enum nvkm_pcie_speed lnk_cap_speed = gk104_pcie_cap_speed(pci);
+	u32 old_dl_mgr;
 
 	if (speed > lnk_cap_speed) {
 		speed = lnk_cap_speed;
@@ -197,7 +198,9 @@ gk104_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)
 			  " lnkctl speed\n");
 	}
 
+	old_dl_mgr = nvkm_mask(subdev->device, 0x8b8c0, 0x4, 0x4);
 	gk104_pcie_set_link_speed(pci, speed);
+	nvkm_wr32(subdev->device, 0x8b8c0, old_dl_mgr);
 	return 0;
 }
 
Signature · 6 lines
2.21.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
#8 lore raw

PATCH 3/3 pci/gk104: wait for ltssm idle before changing the link

In reply to a message not in the archive

taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/gk104.c | 7 +++++++
 1 file changed, 7 insertions(+)
drm/nouveau/nvkm/subdev/pci/gk104.c +7 -0
index 6aeb07fe4..2d1fa67eb 100644
@@ -23,6 +23,8 @@
  */
 #include "priv.h"
 
+#include <subdev/timer.h>
+
 static int
 gk104_pcie_version_supported(struct nvkm_pci *pci)
 {
@@ -142,6 +144,11 @@ gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum nvkm_pcie_speed speed)
 		break;
 	}
 
+	/* wait for ltssm idle */
+	nvkm_msec(device, 200,
+		if ((nvkm_rd32(device, 0x8c040) & 0x1f) == 0)
+			break;
+	);
 	nvkm_mask(device, 0x8c040, 0xc0000, mask_value);
 	nvkm_mask(device, 0x8c040, 0x1, 0x1);
 }
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): 20190912190028.27977-4-kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#10 lore raw

Re: [PATCH 3/3] pci/gk104: wait for ltssm idle before changing the link

Quoted 22 lines · Karol Herbst

taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/gk104.c | 7 +++++++
 1 file changed, 7 insertions(+)
drm/nouveau/nvkm/subdev/pci/gk104.c +2 -0
index 6aeb07fe4..2d1fa67eb 100644
@@ -23,6 +23,8 @@
  */
 #include "priv.h"
 
+#include <subdev/timer.h>
+
 static int
 gk104_pcie_version_supported(struct nvkm_pci *pci)
 {

drm/nouveau/nvkm/subdev/pci/gk104.c gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum nvkm_pcie_speed speed) · line 151

Quoted 8 lines
drm/nouveau/nvkm/subdev/pci/gk104.c +5 -0
@@ -142,6 +144,11 @@ gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum nvkm_pcie_speed speed)
                break;
        }
 
+       /* wait for ltssm idle */
+       nvkm_msec(device, 200,
+               if ((nvkm_rd32(device, 0x8c040) & 0x1f) == 0)
+                       break;
+       );

What if it doesn't idle? Should you still do the below things?

Quoted 10 lines
drm/nouveau/nvkm/subdev/pci/gk104.c +0 -1
        nvkm_mask(device, 0x8c040, 0xc0000, mask_value);
        nvkm_mask(device, 0x8c040, 0x1, 0x1);
 }
--

2.21.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
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): CAKb7UviD520oCHJNo-AKZiNBrGy6nbNoMmTdcTDt9MRdFhDY1w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#12 lore raw

Re: [PATCH 3/3] pci/gk104: wait for ltssm idle before changing the link

Quoted 27 lines · Ilia Mirkin
Quoted 25 lines · Karol Herbst

taken from nvgpu

---
 drm/nouveau/nvkm/subdev/pci/gk104.c | 7 +++++++
 1 file changed, 7 insertions(+)
drm/nouveau/nvkm/subdev/pci/gk104.c +2 -0
index 6aeb07fe4..2d1fa67eb 100644
@@ -23,6 +23,8 @@
  */
 #include "priv.h"
 
+#include <subdev/timer.h>
+
 static int
 gk104_pcie_version_supported(struct nvkm_pci *pci)
 {
@@ -142,6 +144,11 @@ gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum nvkm_pcie_speed speed)
                break;
        }
 
Quoted 8 lines

drm/nouveau/nvkm/subdev/pci/gk104.c gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum nvkm_pcie_speed speed) · line 151

Quoted 5 lines
drm/nouveau/nvkm/subdev/pci/gk104.c +5 -0
+       /* wait for ltssm idle */
+       nvkm_msec(device, 200,
+               if ((nvkm_rd32(device, 0x8c040) & 0x1f) == 0)
+                       break;
+       );

What if it doesn't idle? Should you still do the below things?

ohh, good point. I totally didn't think about that. nvgpu aborts the operation of course and we should do the same.

Quoted 10 lines
Quoted 10 lines
drm/nouveau/nvkm/subdev/pci/gk104.c +0 -1
        nvkm_mask(device, 0x8c040, 0xc0000, mask_value);
        nvkm_mask(device, 0x8c040, 0x1, 0x1);
 }
--

2.21.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau