Re: [PATCH v2 4/8] drm/amdgpu: rename doorbell variables
On 14/02/2023 19:27, Christian König wrote:
Am 14.02.23 um 17:15 schrieb Shashank Sharma:
From: Alex Deucher
This patch:
- renames the adev->doorbell.base to adev->doorbell.doorbell_aper_base
- renames the adev->doorbell.size to adev->doorbell.doorbell_aper_size
- moves the adev->doorbell.ptr to adev->mman.doorbell_aper_base_kaddr
rest of the changes are just to accommodate these variable name changes.
V2: Mered 2 patches into this one doorbell clean-up patch.
Cc: Alex Deucher
Cc: Christian Koenig
Signed-off-by: Alex Deucher
Signed-off-by: Shashank Sharma
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 34 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 5 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 4 +--
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 58689b2a2d1c..0493c64e9d0a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -106,13 +106,13 @@ static void amdgpu_doorbell_get_kfd_info(struct
amdgpu_device *adev,
* not initialized as AMDGPU manages the whole
* doorbell space.
*/
- *aperture_base = adev->doorbell.base;
+ *aperture_base = adev->doorbell.doorbell_aper_base;
*aperture_size = 0;
*start_offset = 0;
- } else if (adev->doorbell.size > adev->doorbell.num_doorbells *
+ } else if (adev->doorbell.doorbell_aper_size >
adev->doorbell.num_doorbells *
sizeof(u32)) {
- *aperture_base = adev->doorbell.base;
- *aperture_size = adev->doorbell.size;
+ *aperture_base = adev->doorbell.doorbell_aper_base;
+ *aperture_size = adev->doorbell.doorbell_aper_size;
Well that now looks a bit duplicated and you completely remove
doorbell_aper_base_kaddr later on, right?
Christian.
Yeah, I still kept it as this cleanup is a bit peculiar and not easy to
follow on review, but your right, lets keep it cleaner.
I will take remove doorbell_aper_base_kaddr.
- Shashank
*start_offset = adev->doorbell.num_doorbells * sizeof(u32);
} else {
*aperture_base = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 45588b7919fe..43c1b67c2778 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -597,7 +597,7 @@ u32 amdgpu_mm_rdoorbell(struct amdgpu_device
*adev, u32 index)
return 0;
if (index < adev->doorbell.num_doorbells) {
- return readl(adev->doorbell.ptr + index);
+ return readl(adev->mman.doorbell_aper_base_kaddr + index);
} else {
DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n",
index);
return 0;
@@ -620,7 +620,7 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device
*adev, u32 index, u32 v)
return;
if (index < adev->doorbell.num_doorbells) {
- writel(v, adev->doorbell.ptr + index);
+ writel(v, adev->mman.doorbell_aper_base_kaddr + index);
} else {
DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n",
index);
}
@@ -641,7 +641,7 @@ u64 amdgpu_mm_rdoorbell64(struct amdgpu_device
*adev, u32 index)
return 0;
if (index < adev->doorbell.num_doorbells) {
- return atomic64_read((atomic64_t *)(adev->doorbell.ptr +
index));
+ return atomic64_read((atomic64_t
*)(adev->mman.doorbell_aper_base_kaddr + index));
} else {
DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n",
index);
return 0;
@@ -664,7 +664,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device
*adev, u32 index, u64 v)
return;
if (index < adev->doorbell.num_doorbells) {
- atomic64_set((atomic64_t *)(adev->doorbell.ptr + index), v);
+ atomic64_set((atomic64_t
*)(adev->mman.doorbell_aper_base_kaddr + index), v);
} else {
DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n",
index);
}
@@ -1035,10 +1035,10 @@ static int amdgpu_device_doorbell_init(struct
amdgpu_device *adev)
/* No doorbell on SI hardware generation */
if (adev->asic_type < CHIP_BONAIRE) {
- adev->doorbell.base = 0;
- adev->doorbell.size = 0;
+ adev->doorbell.doorbell_aper_base = 0;
+ adev->doorbell.doorbell_aper_size = 0;
Re: [PATCH v2 4/8] drm/amdgpu: rename doorbell variables
Am 14.02.23 um 17:15 schrieb Shashank Sharma:
From: Alex Deucher
This patch:
- renames the adev->doorbell.base to adev->doorbell.doorbell_aper_base
- renames the adev->doorbell.size to adev->doorbell.doorbell_aper_size
- moves the adev->doorbell.ptr to adev->mman.doorbell_aper_base_kaddr
rest of the changes are just to accommodate these variable name changes.
V2: Mered 2 patches into this one doorbell clean-up patch.
Cc: Alex Deucher
Cc: Christian Koenig
Signed-off-by: Alex Deucher
Signed-off-by: Shashank Sharma
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 34 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 5 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c| 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 4 +--
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 58689b2a2d1c..0493c64e9d0a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -106,13 +106,13 @@ static void amdgpu_doorbell_get_kfd_info(struct
amdgpu_device *adev,
* not initialized as AMDGPU manages the whole
* doorbell space.
*/
- *aperture_base = adev->doorbell.base;
+ *aperture_base = adev->doorbell.doorbell_aper_base;
*aperture_size = 0;
*start_offset = 0;
- } else if (adev->doorbell.size > adev->doorbell.num_doorbells *
+ } else if (adev->doorbell.doorbell_aper_size >
adev->doorbell.num_doorbells *
sizeof(u32)) {
- *aperture_base = adev->doorbell.base;
- *aperture_size = adev->doorbell.size;
+ *aperture_base = adev->doorbell.doorbell_aper_base;
+ *aperture_size = adev->doorbell.doorbell_aper_size;
Well that now looks a bit duplicated and you completely remove
doorbell_aper_base_kaddr later on, right?
Christian.
*start_offset = adev->doorbell.num_doorbells * sizeof(u32);
} else {
*aperture_base = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 45588b7919fe..43c1b67c2778 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -597,7 +597,7 @@ u32 amdgpu_mm_rdoorbell(struct amdgpu_device *adev, u32
index)
return 0;
if (index < adev->doorbell.num_doorbells) {
- return readl(adev->doorbell.ptr + index);
+ return readl(adev->mman.doorbell_aper_base_kaddr + index);
} else {
DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n", index);
return 0;
@@ -620,7 +620,7 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32
index, u32 v)
return;
if (index < adev->doorbell.num_doorbells) {
- writel(v, adev->doorbell.ptr + index);
+ writel(v, adev->mman.doorbell_aper_base_kaddr + index);
} else {
DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n", index);
}
@@ -641,7 +641,7 @@ u64 amdgpu_mm_rdoorbell64(struct amdgpu_device *adev, u32
index)
return 0;
if (index < adev->doorbell.num_doorbells) {
- return atomic64_read((atomic64_t *)(adev->doorbell.ptr +
index));
+ return atomic64_read((atomic64_t
*)(adev->mman.doorbell_aper_base_kaddr + index));
} else {
DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n", index);
return 0;
@@ -664,7 +664,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32
index, u64 v)
return;
if (index < adev->doorbell.num_doorbells) {
- atomic64_set((atomic64_t *)(adev->doorbell.ptr + index), v);
+ atomic64_set((atomic64_t *)(adev->mman.doorbell_aper_base_kaddr
+ index), v);
} else {
DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n", index);
}
@@ -1035,10 +1035,10 @@ static int amdgpu_device_doorbell_init(struct
amdgpu_device *adev)
/* No doorbell on SI hardware generation */
if (adev->asic_type < CHIP_BONAIRE) {
- adev->doorbell.base = 0;
- adev->doorbell.size = 0;
+ adev->doorbell.doorbell_aper_base = 0;
+ adev->doorbell.doorbell_aper_size = 0;
[PATCH v2 4/8] drm/amdgpu: rename doorbell variables
From: Alex Deucher
This patch:
- renames the adev->doorbell.base to adev->doorbell.doorbell_aper_base
- renames the adev->doorbell.size to adev->doorbell.doorbell_aper_size
- moves the adev->doorbell.ptr to adev->mman.doorbell_aper_base_kaddr
rest of the changes are just to accommodate these variable name changes.
V2: Mered 2 patches into this one doorbell clean-up patch.
Cc: Alex Deucher
Cc: Christian Koenig
Signed-off-by: Alex Deucher
Signed-off-by: Shashank Sharma
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 34 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 5 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c| 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 4 +--
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 4 +--
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 58689b2a2d1c..0493c64e9d0a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -106,13 +106,13 @@ static void amdgpu_doorbell_get_kfd_info(struct
amdgpu_device *adev,
* not initialized as AMDGPU manages the whole
* doorbell space.
*/
- *aperture_base = adev->doorbell.base;
+ *aperture_base = adev->doorbell.doorbell_aper_base;
*aperture_size = 0;
*start_offset = 0;
- } else if (adev->doorbell.size > adev->doorbell.num_doorbells *
+ } else if (adev->doorbell.doorbell_aper_size >
adev->doorbell.num_doorbells *
sizeof(u32)) {
- *aperture_base = adev->doorbell.base;
- *aperture_size = adev->doorbell.size;
+ *aperture_base = adev->doorbell.doorbell_aper_base;
+ *aperture_size = adev->doorbell.doorbell_aper_size;
*start_offset = adev->doorbell.num_doorbells * sizeof(u32);
} else {
*aperture_base = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 45588b7919fe..43c1b67c2778 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -597,7 +597,7 @@ u32 amdgpu_mm_rdoorbell(struct amdgpu_device *adev, u32
index)
return 0;
if (index < adev->doorbell.num_doorbells) {
- return readl(adev->doorbell.ptr + index);
+ return readl(adev->mman.doorbell_aper_base_kaddr + index);
} else {
DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n", index);
return 0;
@@ -620,7 +620,7 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32
index, u32 v)
return;
if (index < adev->doorbell.num_doorbells) {
- writel(v, adev->doorbell.ptr + index);
+ writel(v, adev->mman.doorbell_aper_base_kaddr + index);
} else {
DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n", index);
}
@@ -641,7 +641,7 @@ u64 amdgpu_mm_rdoorbell64(struct amdgpu_device *adev, u32
index)
return 0;
if (index < adev->doorbell.num_doorbells) {
- return atomic64_read((atomic64_t *)(adev->doorbell.ptr +
index));
+ return atomic64_read((atomic64_t
*)(adev->mman.doorbell_aper_base_kaddr + index));
} else {
DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n", index);
return 0;
@@ -664,7 +664,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32
index, u64 v)
return;
if (index < adev->doorbell.num_doorbells) {
- atomic64_set((atomic64_t *)(adev->doorbell.ptr + index), v);
+ atomic64_set((atomic64_t *)(adev->mman.doorbell_aper_base_kaddr
+ index), v);
} else {
DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n", index);
}
@@ -1035,10 +1035,10 @@ static int amdgpu_device_doorbell_init(struct
amdgpu_device *adev)
/* No doorbell on SI hardware generation */
if (adev->asic_type < CHIP_BONAIRE) {
- adev->doorbell.base = 0;
- adev->doorbell.size = 0;
+ adev->doorbell.doorbell_aper_base = 0;
+ adev->doorbell.doorbell_aper_size = 0;
adev->doorbell.num_doorbells = 0;
- adev->doorbell.ptr = NULL;
+ adev->mman.doorbell_aper_base_kaddr = NULL;
