Move pcie port method to register access block.
Signed-off-by: Lijo Lazar <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 ++----
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 --
.../gpu/drm/amd/amdgpu/amdgpu_reg_access.c | 21 +++++++++++++++++++
.../gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 9 ++++++++
drivers/gpu/drm/amd/amdgpu/nv.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/si.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/soc21.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/soc24.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 4 ++--
9 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 29d0f9a756b3..9678fddb8ad4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -898,8 +898,6 @@ struct amdgpu_device {
spinlock_t pcie_idx_lock;
amdgpu_rreg_t pcie_rreg;
amdgpu_wreg_t pcie_wreg;
- amdgpu_rreg_t pciep_rreg;
- amdgpu_wreg_t pciep_wreg;
amdgpu_rreg_ext_t pcie_rreg_ext;
amdgpu_wreg_ext_t pcie_wreg_ext;
amdgpu_rreg64_t pcie_rreg64;
@@ -1294,8 +1292,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
#define WREG32_XCC(reg, v, inst) amdgpu_device_xcc_wreg(adev, (reg), (v), 0,
inst)
#define RREG32_PCIE(reg) adev->pcie_rreg(adev, (reg))
#define WREG32_PCIE(reg, v) adev->pcie_wreg(adev, (reg), (v))
-#define RREG32_PCIE_PORT(reg) adev->pciep_rreg(adev, (reg))
-#define WREG32_PCIE_PORT(reg, v) adev->pciep_wreg(adev, (reg), (v))
+#define RREG32_PCIE_PORT(reg) amdgpu_reg_pciep_rd32(adev, (reg))
+#define WREG32_PCIE_PORT(reg, v) amdgpu_reg_pciep_wr32(adev, (reg), (v))
#define RREG32_PCIE_EXT(reg) adev->pcie_rreg_ext(adev, (reg))
#define WREG32_PCIE_EXT(reg, v) adev->pcie_wreg_ext(adev, (reg), (v))
#define RREG64_PCIE(reg) adev->pcie_rreg64(adev, (reg))
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 247565abcf67..88e2cc27dbea 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3813,8 +3813,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
adev->pcie_wreg = &amdgpu_invalid_wreg;
adev->pcie_rreg_ext = &amdgpu_invalid_rreg_ext;
adev->pcie_wreg_ext = &amdgpu_invalid_wreg_ext;
- adev->pciep_rreg = &amdgpu_invalid_rreg;
- adev->pciep_wreg = &amdgpu_invalid_wreg;
adev->pcie_rreg64 = &amdgpu_invalid_rreg64;
adev->pcie_wreg64 = &amdgpu_invalid_wreg64;
adev->pcie_rreg64_ext = &amdgpu_invalid_rreg64_ext;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
index 563b155b15c6..175fdfc5229b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
@@ -58,6 +58,9 @@ void amdgpu_reg_access_init(struct amdgpu_device *adev)
spin_lock_init(&adev->reg.audio_endpt.lock);
adev->reg.audio_endpt.rreg = NULL;
adev->reg.audio_endpt.wreg = NULL;
+
+ adev->reg.pcie.port_rreg = NULL;
+ adev->reg.pcie.port_wreg = NULL;
}
uint32_t amdgpu_reg_smc_rd32(struct amdgpu_device *adev, uint32_t reg)
@@ -179,6 +182,24 @@ void amdgpu_reg_audio_endpt_wr32(struct amdgpu_device
*adev, uint32_t block,
adev->reg.audio_endpt.wreg(adev, block, reg, v);
}
+uint32_t amdgpu_reg_pciep_rd32(struct amdgpu_device *adev, uint32_t reg)
+{
+ if (!adev->reg.pcie.port_rreg) {
+ dev_err_once(adev->dev, "PCIEP register read not supported\n");
+ return 0;
+ }
+ return adev->reg.pcie.port_rreg(adev, reg);
+}
+
+void amdgpu_reg_pciep_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t
v)
+{
+ if (!adev->reg.pcie.port_wreg) {
+ dev_err_once(adev->dev, "PCIEP register write not supported\n");
+ return;
+ }
+ adev->reg.pcie.port_wreg(adev, reg, v);
+}
+
/*
* register access helper functions.
*/
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
index e19b7a531906..eb449dbb8fd4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
@@ -49,6 +49,11 @@ struct amdgpu_reg_ind_blk {
amdgpu_block_wreg_t wreg;
};
+struct amdgpu_reg_pcie_ind {
+ amdgpu_rreg_t port_rreg;
+ amdgpu_wreg_t port_wreg;
+};
+
struct amdgpu_reg_access {
struct amdgpu_reg_ind smc;
struct amdgpu_reg_ind uvd_ctx;
@@ -56,6 +61,7 @@ struct amdgpu_reg_access {
struct amdgpu_reg_ind gc_cac;
struct amdgpu_reg_ind se_cac;
struct amdgpu_reg_ind_blk audio_endpt;
+ struct amdgpu_reg_pcie_ind pcie;
};
void amdgpu_reg_access_init(struct amdgpu_device *adev);
@@ -75,6 +81,9 @@ uint32_t amdgpu_reg_audio_endpt_rd32(struct amdgpu_device
*adev, uint32_t block,
uint32_t reg);
void amdgpu_reg_audio_endpt_wr32(struct amdgpu_device *adev, uint32_t block,
uint32_t reg, uint32_t v);
+uint32_t amdgpu_reg_pciep_rd32(struct amdgpu_device *adev, uint32_t reg);
+void amdgpu_reg_pciep_wr32(struct amdgpu_device *adev, uint32_t reg,
+ uint32_t v);
typedef uint32_t (*amdgpu_rreg_ext_t)(struct amdgpu_device *, uint64_t);
typedef void (*amdgpu_wreg_ext_t)(struct amdgpu_device *, uint64_t, uint32_t);
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index dd8a85679f8f..b3abf6554386 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -639,8 +639,8 @@ static int nv_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->pcie_wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
- adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
- adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
+ adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
+ adev->reg.pcie.port_wreg = &amdgpu_device_pcie_port_wreg;
adev->reg.didt.rreg = &nv_didt_rreg;
adev->reg.didt.wreg = &nv_didt_wreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index bf9ad3ce4c65..a517c6cd0711 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -2041,8 +2041,8 @@ static int si_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->reg.smc.wreg = si_smc_wreg;
adev->pcie_rreg = &si_pcie_rreg;
adev->pcie_wreg = &si_pcie_wreg;
- adev->pciep_rreg = &si_pciep_rreg;
- adev->pciep_wreg = &si_pciep_wreg;
+ adev->reg.pcie.port_rreg = &si_pciep_rreg;
+ adev->reg.pcie.port_wreg = &si_pciep_wreg;
adev->reg.uvd_ctx.rreg = &si_uvd_ctx_rreg;
adev->reg.uvd_ctx.wreg = &si_uvd_ctx_wreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c
b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 4048c8dfdd4b..968d9be033d8 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -586,8 +586,8 @@ static int soc21_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->pcie_wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
- adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
- adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
+ adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
+ adev->reg.pcie.port_wreg = &amdgpu_device_pcie_port_wreg;
adev->reg.didt.rreg = &soc21_didt_rreg;
adev->reg.didt.wreg = &soc21_didt_wreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c
b/drivers/gpu/drm/amd/amdgpu/soc24.c
index 11e0264617d8..7c59d9b0a541 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc24.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc24.c
@@ -366,8 +366,8 @@ static int soc24_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->pcie_wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
- adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
- adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
+ adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
+ adev->reg.pcie.port_wreg = &amdgpu_device_pcie_port_wreg;
adev->asic_funcs = &soc24_asic_funcs;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
index 0be52dba6a26..8c808a6d08a5 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
@@ -256,8 +256,8 @@ static int soc_v1_0_common_early_init(struct
amdgpu_ip_block *ip_block)
adev->pcie_wreg_ext = &amdgpu_device_indirect_wreg_ext;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
- adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
- adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
+ adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
+ adev->reg.pcie.port_wreg = &amdgpu_device_pcie_port_wreg;
adev->pcie_rreg64_ext = &amdgpu_device_indirect_rreg64_ext;
adev->pcie_wreg64_ext = &amdgpu_device_indirect_wreg64_ext;
--
2.49.0
