* [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0
@ 2023-03-02 17:27 Mario Limonciello
2023-03-02 17:38 ` Alex Deucher
2023-03-02 20:16 ` Thomas Glanzmann
0 siblings, 2 replies; 4+ messages in thread
From: Mario Limonciello @ 2023-03-02 17:27 UTC (permalink / raw)
To: amd-gfx; +Cc: Thomas Glanzmann, Mario Limonciello, Basavaraj Natikar
The same strapping initialization issue that happened on NBIO 7.5.1
appears to be happening on NBIO 7.3.0.
Apply the same fix to 7.3.0 as well.
Note: This workaround relies upon the integrated GPU being enabled
in BIOS. If the integrated GPU is disabled in BIOS a different
workaround will be required.
Reported-by: Thomas Glanzmann <thomas@glanzmann.de>
Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Link: https://lore.kernel.org/linux-usb/Y%2Fz9GdHjPyF2rNG3@glanzmann.de/T/#u
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
index 4b0d563c6522c..4ef1fa4603c8e 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
@@ -382,11 +382,6 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
if (def != data)
WREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regBIF1_PCIE_MST_CTRL_3), data);
break;
- case IP_VERSION(7, 5, 1):
- data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);
- data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
- WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
- fallthrough;
default:
def = data = RREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regPCIE_CONFIG_CNTL));
data = REG_SET_FIELD(data, PCIE_CONFIG_CNTL,
@@ -399,6 +394,15 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
break;
}
+ switch (adev->ip_versions[NBIO_HWIP][0]) {
+ case IP_VERSION(7, 3, 0):
+ case IP_VERSION(7, 5, 1):
+ data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);
+ data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
+ WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
+ break;
+ }
+
if (amdgpu_sriov_vf(adev))
adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
regBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0
2023-03-02 17:27 [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0 Mario Limonciello
@ 2023-03-02 17:38 ` Alex Deucher
2023-03-02 20:16 ` Thomas Glanzmann
1 sibling, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2023-03-02 17:38 UTC (permalink / raw)
To: Mario Limonciello; +Cc: Thomas Glanzmann, amd-gfx, Basavaraj Natikar
On Thu, Mar 2, 2023 at 12:28 PM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> The same strapping initialization issue that happened on NBIO 7.5.1
> appears to be happening on NBIO 7.3.0.
> Apply the same fix to 7.3.0 as well.
>
> Note: This workaround relies upon the integrated GPU being enabled
> in BIOS. If the integrated GPU is disabled in BIOS a different
> workaround will be required.
>
> Reported-by: Thomas Glanzmann <thomas@glanzmann.de>
> Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
> Link: https://lore.kernel.org/linux-usb/Y%2Fz9GdHjPyF2rNG3@glanzmann.de/T/#u
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> index 4b0d563c6522c..4ef1fa4603c8e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> @@ -382,11 +382,6 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
> if (def != data)
> WREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regBIF1_PCIE_MST_CTRL_3), data);
> break;
> - case IP_VERSION(7, 5, 1):
> - data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);
> - data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
> - WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
> - fallthrough;
> default:
> def = data = RREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regPCIE_CONFIG_CNTL));
> data = REG_SET_FIELD(data, PCIE_CONFIG_CNTL,
> @@ -399,6 +394,15 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
> break;
> }
>
> + switch (adev->ip_versions[NBIO_HWIP][0]) {
> + case IP_VERSION(7, 3, 0):
> + case IP_VERSION(7, 5, 1):
> + data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);
> + data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
> + WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
> + break;
> + }
> +
> if (amdgpu_sriov_vf(adev))
> adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
> regBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0
2023-03-02 17:27 [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0 Mario Limonciello
2023-03-02 17:38 ` Alex Deucher
@ 2023-03-02 20:16 ` Thomas Glanzmann
2023-03-02 20:21 ` Limonciello, Mario
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Glanzmann @ 2023-03-02 20:16 UTC (permalink / raw)
To: Mario Limonciello; +Cc: amd-gfx, Basavaraj Natikar
Hello Mario,
* Mario Limonciello <mario.limonciello@amd.com> [2023-03-02 18:27]:
> The same strapping initialization issue that happened on NBIO 7.5.1
> appears to be happening on NBIO 7.3.0.
> Apply the same fix to 7.3.0 as well.
> Note: This workaround relies upon the integrated GPU being enabled
> in BIOS. If the integrated GPU is disabled in BIOS a different
> workaround will be required.
> Reported-by: Thomas Glanzmann <thomas@glanzmann.de>
> Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
> Link: https://lore.kernel.org/linux-usb/Y%2Fz9GdHjPyF2rNG3@glanzmann.de/T/#u
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Tested-by: Thomas Glanzmann <thomas@glanzmann.de>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> index 4b0d563c6522c..4ef1fa4603c8e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> @@ -382,11 +382,6 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
> if (def != data)
> WREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regBIF1_PCIE_MST_CTRL_3), data);
> break;
> - case IP_VERSION(7, 5, 1):
> - data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);
> - data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
> - WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
> - fallthrough;
> default:
> def = data = RREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regPCIE_CONFIG_CNTL));
> data = REG_SET_FIELD(data, PCIE_CONFIG_CNTL,
> @@ -399,6 +394,15 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
> break;
> }
My tree did not have the above hunk, so I only applied the second hunk.
I replugged by mouse keyboard several times and I have no longer any
issues.
Find output of dmesg; lsusb; lspci; dmidecode; lscpu here:
https://tg.st/u/498cb495b307353870e4dbba901a9c7aa58b89d918f54fc73f014f9a4778cc2a.txt
> + switch (adev->ip_versions[NBIO_HWIP][0]) {
> + case IP_VERSION(7, 3, 0):
> + case IP_VERSION(7, 5, 1):
> + data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);
> + data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
> + WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
> + break;
> + }
> +
> if (amdgpu_sriov_vf(adev))
> adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
> regBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
Thank you for the workaround.
Cheers,
Thomas
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0
2023-03-02 20:16 ` Thomas Glanzmann
@ 2023-03-02 20:21 ` Limonciello, Mario
0 siblings, 0 replies; 4+ messages in thread
From: Limonciello, Mario @ 2023-03-02 20:21 UTC (permalink / raw)
To: Thomas Glanzmann; +Cc: amd-gfx, Natikar, Basavaraj
[Public]
> -----Original Message-----
> From: Thomas Glanzmann <thomas@glanzmann.de>
> Sent: Thursday, March 2, 2023 14:17
> To: Limonciello, Mario <Mario.Limonciello@amd.com>
> Cc: amd-gfx@lists.freedesktop.org; Natikar, Basavaraj
> <Basavaraj.Natikar@amd.com>
> Subject: Re: [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0
>
> Hello Mario,
>
> * Mario Limonciello <mario.limonciello@amd.com> [2023-03-02 18:27]:
> > The same strapping initialization issue that happened on NBIO 7.5.1
> > appears to be happening on NBIO 7.3.0.
> > Apply the same fix to 7.3.0 as well.
>
> > Note: This workaround relies upon the integrated GPU being enabled
> > in BIOS. If the integrated GPU is disabled in BIOS a different
> > workaround will be required.
>
> > Reported-by: Thomas Glanzmann <thomas@glanzmann.de>
> > Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
> > Link: https://lore.kernel.org/linux-
> usb/Y%2Fz9GdHjPyF2rNG3@glanzmann.de/T/#u
> > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>
> Tested-by: Thomas Glanzmann <thomas@glanzmann.de>
>
> > ---
> > drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 14 +++++++++-----
> > 1 file changed, 9 insertions(+), 5 deletions(-)
>
> > diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> > index 4b0d563c6522c..4ef1fa4603c8e 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
> > @@ -382,11 +382,6 @@ static void nbio_v7_2_init_registers(struct
> amdgpu_device *adev)
> > if (def != data)
> > WREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0,
> regBIF1_PCIE_MST_CTRL_3), data);
> > break;
> > - case IP_VERSION(7, 5, 1):
> > - data = RREG32_SOC15(NBIO, 0,
> regRCC_DEV2_EPF0_STRAP2);
> > - data &=
> ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
> > - WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2,
> data);
> > - fallthrough;
> > default:
> > def = data = RREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO,
> 0, regPCIE_CONFIG_CNTL));
> > data = REG_SET_FIELD(data, PCIE_CONFIG_CNTL,
> > @@ -399,6 +394,15 @@ static void nbio_v7_2_init_registers(struct
> amdgpu_device *adev)
> > break;
> > }
>
> My tree did not have the above hunk, so I only applied the second hunk.
Yeah this hunk it changes is on it's way to 6.3 right now. I think with the good
test results we probably want to take this back to stable as well when they
both land.
>
> I replugged by mouse keyboard several times and I have no longer any
> issues.
>
> Find output of dmesg; lsusb; lspci; dmidecode; lscpu here:
>
> https://tg.st/u/498cb495b307353870e4dbba901a9c7aa58b89d918f54fc73f014f
> 9a4778cc2a.txt
>
> > + switch (adev->ip_versions[NBIO_HWIP][0]) {
> > + case IP_VERSION(7, 3, 0):
> > + case IP_VERSION(7, 5, 1):
> > + data = RREG32_SOC15(NBIO, 0,
> regRCC_DEV2_EPF0_STRAP2);
> > + data &=
> ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;
> > + WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2,
> data);
> > + break;
> > + }
> > +
> > if (amdgpu_sriov_vf(adev))
> > adev->rmmio_remap.reg_offset =
> SOC15_REG_OFFSET(NBIO, 0,
> >
> regBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
>
> Thank you for the workaround.
Sure, thanks for reporting it.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-02 22:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-02 17:27 [PATCH] drm/amd: Fix initialization mistake for NBIO 7.3.0 Mario Limonciello
2023-03-02 17:38 ` Alex Deucher
2023-03-02 20:16 ` Thomas Glanzmann
2023-03-02 20:21 ` Limonciello, Mario
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.