* [PATCH] drm/amdgpu: correct gpu clock counter query on cyan skilfish
@ 2023-09-21 5:54 Lang Yu
2023-09-21 5:54 ` Lang Yu
0 siblings, 1 reply; 4+ messages in thread
From: Lang Yu @ 2023-09-21 5:54 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Aaron Liu, Yifan Zhang, Lang Yu, stable
Cayn skilfish uses SMUIO v11.0.8 offset.
Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Cc: <stable@vger.kernel.org> # v5.15+
---
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 1d671c330475..c16ca611886b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -102,6 +102,11 @@
#define mmGCR_GENERAL_CNTL_Sienna_Cichlid 0x1580
#define mmGCR_GENERAL_CNTL_Sienna_Cichlid_BASE_IDX 0
+#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish 0x0105
+#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish_BASE_IDX 1
+#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish 0x0106
+#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish_BASE_IDX 1
+
#define mmGOLDEN_TSC_COUNT_UPPER_Vangogh 0x0025
#define mmGOLDEN_TSC_COUNT_UPPER_Vangogh_BASE_IDX 1
#define mmGOLDEN_TSC_COUNT_LOWER_Vangogh 0x0026
@@ -7313,6 +7318,22 @@ static uint64_t gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev)
uint64_t clock, clock_lo, clock_hi, hi_check;
switch (adev->ip_versions[GC_HWIP][0]) {
+ case IP_VERSION(10, 1, 3):
+ case IP_VERSION(10, 1, 4):
+ preempt_disable();
+ clock_hi = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
+ clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
+ hi_check = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
+ /* The SMUIO TSC clock frequency is 100MHz, which sets 32-bit carry over
+ * roughly every 42 seconds.
+ */
+ if (hi_check != clock_hi) {
+ clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
+ clock_hi = hi_check;
+ }
+ preempt_enable();
+ clock = clock_lo | (clock_hi << 32ULL);
+ break;
case IP_VERSION(10, 3, 1):
case IP_VERSION(10, 3, 3):
case IP_VERSION(10, 3, 7):
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] drm/amdgpu: correct gpu clock counter query on cyan skilfish
2023-09-21 5:54 [PATCH] drm/amdgpu: correct gpu clock counter query on cyan skilfish Lang Yu
@ 2023-09-21 5:54 ` Lang Yu
2023-09-21 6:05 ` Lang Yu
0 siblings, 1 reply; 4+ messages in thread
From: Lang Yu @ 2023-09-21 5:54 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Aaron Liu, Yifan Zhang, Lang Yu, stable
Cayn skilfish uses SMUIO v11.0.8 offset.
Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Cc: <stable@vger.kernel.org> # v5.15+
---
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 1d671c330475..c16ca611886b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -102,6 +102,11 @@
#define mmGCR_GENERAL_CNTL_Sienna_Cichlid 0x1580
#define mmGCR_GENERAL_CNTL_Sienna_Cichlid_BASE_IDX 0
+#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish 0x0105
+#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish_BASE_IDX 1
+#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish 0x0106
+#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish_BASE_IDX 1
+
#define mmGOLDEN_TSC_COUNT_UPPER_Vangogh 0x0025
#define mmGOLDEN_TSC_COUNT_UPPER_Vangogh_BASE_IDX 1
#define mmGOLDEN_TSC_COUNT_LOWER_Vangogh 0x0026
@@ -7313,6 +7318,22 @@ static uint64_t gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev)
uint64_t clock, clock_lo, clock_hi, hi_check;
switch (adev->ip_versions[GC_HWIP][0]) {
+ case IP_VERSION(10, 1, 3):
+ case IP_VERSION(10, 1, 4):
+ preempt_disable();
+ clock_hi = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
+ clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
+ hi_check = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
+ /* The SMUIO TSC clock frequency is 100MHz, which sets 32-bit carry over
+ * roughly every 42 seconds.
+ */
+ if (hi_check != clock_hi) {
+ clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
+ clock_hi = hi_check;
+ }
+ preempt_enable();
+ clock = clock_lo | (clock_hi << 32ULL);
+ break;
case IP_VERSION(10, 3, 1):
case IP_VERSION(10, 3, 3):
case IP_VERSION(10, 3, 7):
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu: correct gpu clock counter query on cyan skilfish
2023-09-21 5:54 ` Lang Yu
@ 2023-09-21 6:05 ` Lang Yu
2023-09-21 6:11 ` Liu, Aaron
0 siblings, 1 reply; 4+ messages in thread
From: Lang Yu @ 2023-09-21 6:05 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Aaron Liu, Yifan Zhang, stable
O 09/21/ , Lang Yu wrote:
Sorry for sending this patch twice. Please ignore this one.
Regards,
Lang
> Cayn skilfish uses SMUIO v11.0.8 offset.
>
> Signed-off-by: Lang Yu <Lang.Yu@amd.com>
> Cc: <stable@vger.kernel.org> # v5.15+
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 1d671c330475..c16ca611886b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -102,6 +102,11 @@
> #define mmGCR_GENERAL_CNTL_Sienna_Cichlid 0x1580
> #define mmGCR_GENERAL_CNTL_Sienna_Cichlid_BASE_IDX 0
>
> +#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish 0x0105
> +#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish_BASE_IDX 1
> +#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish 0x0106
> +#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish_BASE_IDX 1
> +
> #define mmGOLDEN_TSC_COUNT_UPPER_Vangogh 0x0025
> #define mmGOLDEN_TSC_COUNT_UPPER_Vangogh_BASE_IDX 1
> #define mmGOLDEN_TSC_COUNT_LOWER_Vangogh 0x0026
> @@ -7313,6 +7318,22 @@ static uint64_t gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev)
> uint64_t clock, clock_lo, clock_hi, hi_check;
>
> switch (adev->ip_versions[GC_HWIP][0]) {
> + case IP_VERSION(10, 1, 3):
> + case IP_VERSION(10, 1, 4):
> + preempt_disable();
> + clock_hi = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
> + clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
> + hi_check = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
> + /* The SMUIO TSC clock frequency is 100MHz, which sets 32-bit carry over
> + * roughly every 42 seconds.
> + */
> + if (hi_check != clock_hi) {
> + clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0, mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
> + clock_hi = hi_check;
> + }
> + preempt_enable();
> + clock = clock_lo | (clock_hi << 32ULL);
> + break;
> case IP_VERSION(10, 3, 1):
> case IP_VERSION(10, 3, 3):
> case IP_VERSION(10, 3, 7):
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH] drm/amdgpu: correct gpu clock counter query on cyan skilfish
2023-09-21 6:05 ` Lang Yu
@ 2023-09-21 6:11 ` Liu, Aaron
0 siblings, 0 replies; 4+ messages in thread
From: Liu, Aaron @ 2023-09-21 6:11 UTC (permalink / raw)
To: Yu, Lang, amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander, Zhang, Yifan, stable@vger.kernel.org
[AMD Official Use Only - General]
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
> -----Original Message-----
> From: Yu, Lang <Lang.Yu@amd.com>
> Sent: Thursday, September 21, 2023 2:06 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liu, Aaron
> <Aaron.Liu@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com>;
> stable@vger.kernel.org
> Subject: Re: [PATCH] drm/amdgpu: correct gpu clock counter query on cyan
> skilfish
>
> O 09/21/ , Lang Yu wrote:
>
> Sorry for sending this patch twice. Please ignore this one.
>
> Regards,
> Lang
>
> > Cayn skilfish uses SMUIO v11.0.8 offset.
> >
> > Signed-off-by: Lang Yu <Lang.Yu@amd.com>
> > Cc: <stable@vger.kernel.org> # v5.15+
> > ---
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 21 +++++++++++++++++++++
> > 1 file changed, 21 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > index 1d671c330475..c16ca611886b 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > @@ -102,6 +102,11 @@
> > #define mmGCR_GENERAL_CNTL_Sienna_Cichlid
> 0x1580
> > #define mmGCR_GENERAL_CNTL_Sienna_Cichlid_BASE_IDX 0
> >
> > +#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish 0x0105
> > +#define mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish_BASE_IDX 1
> > +#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish 0x0106
> > +#define mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish_BASE_IDX 1
> > +
> > #define mmGOLDEN_TSC_COUNT_UPPER_Vangogh 0x0025
> > #define mmGOLDEN_TSC_COUNT_UPPER_Vangogh_BASE_IDX 1
> > #define mmGOLDEN_TSC_COUNT_LOWER_Vangogh 0x0026
> > @@ -7313,6 +7318,22 @@ static uint64_t
> gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev)
> > uint64_t clock, clock_lo, clock_hi, hi_check;
> >
> > switch (adev->ip_versions[GC_HWIP][0]) {
> > + case IP_VERSION(10, 1, 3):
> > + case IP_VERSION(10, 1, 4):
> > + preempt_disable();
> > + clock_hi = RREG32_SOC15_NO_KIQ(SMUIO, 0,
> mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
> > + clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0,
> mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
> > + hi_check = RREG32_SOC15_NO_KIQ(SMUIO, 0,
> mmGOLDEN_TSC_COUNT_UPPER_Cyan_Skillfish);
> > + /* The SMUIO TSC clock frequency is 100MHz, which sets 32-bit
> carry over
> > + * roughly every 42 seconds.
> > + */
> > + if (hi_check != clock_hi) {
> > + clock_lo = RREG32_SOC15_NO_KIQ(SMUIO, 0,
> mmGOLDEN_TSC_COUNT_LOWER_Cyan_Skillfish);
> > + clock_hi = hi_check;
> > + }
> > + preempt_enable();
> > + clock = clock_lo | (clock_hi << 32ULL);
> > + break;
> > case IP_VERSION(10, 3, 1):
> > case IP_VERSION(10, 3, 3):
> > case IP_VERSION(10, 3, 7):
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-21 19:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-21 5:54 [PATCH] drm/amdgpu: correct gpu clock counter query on cyan skilfish Lang Yu
2023-09-21 5:54 ` Lang Yu
2023-09-21 6:05 ` Lang Yu
2023-09-21 6:11 ` Liu, Aaron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox