Move pcie indirect access 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 | 37 -------------------
.../gpu/drm/amd/amdgpu/amdgpu_reg_access.c | 30 ++++++++++++---
.../gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 4 ++
drivers/gpu/drm/amd/amdgpu/cik.c | 4 +-
drivers/gpu/drm/amd/amdgpu/nv.c | 4 +-
drivers/gpu/drm/amd/amdgpu/si.c | 4 +-
drivers/gpu/drm/amd/amdgpu/soc15.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 +-
drivers/gpu/drm/amd/amdgpu/vi.c | 4 +-
12 files changed, 47 insertions(+), 62 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 9678fddb8ad4..5c54042d6fdb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -896,8 +896,6 @@ struct amdgpu_device {
struct amdgpu_reg_access reg;
/* protects concurrent PCIE register access */
spinlock_t pcie_idx_lock;
- amdgpu_rreg_t pcie_rreg;
- amdgpu_wreg_t pcie_wreg;
amdgpu_rreg_ext_t pcie_rreg_ext;
amdgpu_wreg_ext_t pcie_wreg_ext;
amdgpu_rreg64_t pcie_rreg64;
@@ -1290,8 +1288,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
#define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
#define RREG32_XCC(reg, inst) amdgpu_device_xcc_rreg(adev, (reg), 0, inst)
#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(reg) amdgpu_reg_pcie_rd32(adev, (reg))
+#define WREG32_PCIE(reg, v) amdgpu_reg_pcie_wr32(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))
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 88e2cc27dbea..862cda9aacac 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -858,23 +858,6 @@ u32 amdgpu_device_get_rev_id(struct amdgpu_device *adev)
return adev->nbio.funcs->get_rev_id(adev);
}
-/**
- * amdgpu_invalid_rreg - dummy reg read function
- *
- * @adev: amdgpu_device pointer
- * @reg: offset of register
- *
- * Dummy register read function. Used for register blocks
- * that certain asics don't have (all asics).
- * Returns the value in the register.
- */
-static uint32_t amdgpu_invalid_rreg(struct amdgpu_device *adev, uint32_t reg)
-{
- dev_err(adev->dev, "Invalid callback to read register 0x%04X\n", reg);
- BUG();
- return 0;
-}
-
static uint32_t amdgpu_invalid_rreg_ext(struct amdgpu_device *adev, uint64_t
reg)
{
dev_err(adev->dev, "Invalid callback to read register 0x%llX\n", reg);
@@ -882,24 +865,6 @@ static uint32_t amdgpu_invalid_rreg_ext(struct
amdgpu_device *adev, uint64_t reg
return 0;
}
-/**
- * amdgpu_invalid_wreg - dummy reg write function
- *
- * @adev: amdgpu_device pointer
- * @reg: offset of register
- * @v: value to write to the register
- *
- * Dummy register read function. Used for register blocks
- * that certain asics don't have (all asics).
- */
-static void amdgpu_invalid_wreg(struct amdgpu_device *adev, uint32_t reg,
uint32_t v)
-{
- dev_err(adev->dev,
- "Invalid callback to write register 0x%04X with 0x%08X\n", reg,
- v);
- BUG();
-}
-
static void amdgpu_invalid_wreg_ext(struct amdgpu_device *adev, uint64_t reg,
uint32_t v)
{
dev_err(adev->dev,
@@ -3809,8 +3774,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
amdgpu_reg_access_init(adev);
- adev->pcie_rreg = &amdgpu_invalid_rreg;
- adev->pcie_wreg = &amdgpu_invalid_wreg;
adev->pcie_rreg_ext = &amdgpu_invalid_rreg_ext;
adev->pcie_wreg_ext = &amdgpu_invalid_wreg_ext;
adev->pcie_rreg64 = &amdgpu_invalid_rreg64;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
index 175fdfc5229b..11ba235ee143 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
@@ -59,6 +59,8 @@ void amdgpu_reg_access_init(struct amdgpu_device *adev)
adev->reg.audio_endpt.rreg = NULL;
adev->reg.audio_endpt.wreg = NULL;
+ adev->reg.pcie.rreg = NULL;
+ adev->reg.pcie.wreg = NULL;
adev->reg.pcie.port_rreg = NULL;
adev->reg.pcie.port_wreg = NULL;
}
@@ -182,6 +184,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_pcie_rd32(struct amdgpu_device *adev, uint32_t reg)
+{
+ if (!adev->reg.pcie.rreg) {
+ dev_err_once(adev->dev, "PCIE register read not supported\n");
+ return 0;
+ }
+ return adev->reg.pcie.rreg(adev, reg);
+}
+
+void amdgpu_reg_pcie_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
+{
+ if (!adev->reg.pcie.wreg) {
+ dev_err_once(adev->dev, "PCIE register write not supported\n");
+ return;
+ }
+ adev->reg.pcie.wreg(adev, reg, v);
+}
+
uint32_t amdgpu_reg_pciep_rd32(struct amdgpu_device *adev, uint32_t reg)
{
if (!adev->reg.pcie.port_rreg) {
@@ -231,7 +251,7 @@ uint32_t amdgpu_device_rreg(struct amdgpu_device *adev,
uint32_t reg,
ret = readl(((void __iomem *)adev->rmmio) + (reg * 4));
}
} else {
- ret = adev->pcie_rreg(adev, reg * 4);
+ ret = amdgpu_reg_pcie_rd32(adev, reg * 4);
}
trace_amdgpu_device_rreg(adev->pdev->device, reg, ret);
@@ -296,7 +316,7 @@ uint32_t amdgpu_device_xcc_rreg(struct amdgpu_device *adev,
uint32_t reg,
ret = readl(((void __iomem *)adev->rmmio) + (reg * 4));
}
} else {
- ret = adev->pcie_rreg(adev, reg * 4);
+ ret = amdgpu_reg_pcie_rd32(adev, reg * 4);
}
return ret;
@@ -354,7 +374,7 @@ void amdgpu_device_wreg(struct amdgpu_device *adev,
uint32_t reg, uint32_t v,
writel(v, ((void __iomem *)adev->rmmio) + (reg * 4));
}
} else {
- adev->pcie_wreg(adev, reg * 4, v);
+ amdgpu_reg_pcie_wr32(adev, reg * 4, v);
}
trace_amdgpu_device_wreg(adev->pdev->device, reg, v);
@@ -381,7 +401,7 @@ void amdgpu_mm_wreg_mmio_rlc(struct amdgpu_device *adev,
uint32_t reg,
if (adev->gfx.rlc.funcs->is_rlcg_access_range(adev, reg))
return amdgpu_sriov_wreg(adev, reg, v, 0, 0, xcc_id);
} else if ((reg * 4) >= adev->rmmio_size) {
- adev->pcie_wreg(adev, reg * 4, v);
+ amdgpu_reg_pcie_wr32(adev, reg * 4, v);
} else {
writel(v, ((void __iomem *)adev->rmmio) + (reg * 4));
}
@@ -422,7 +442,7 @@ void amdgpu_device_xcc_wreg(struct amdgpu_device *adev,
uint32_t reg,
writel(v, ((void __iomem *)adev->rmmio) + (reg * 4));
}
} else {
- adev->pcie_wreg(adev, reg * 4, v);
+ amdgpu_reg_pcie_wr32(adev, reg * 4, v);
}
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
index eb449dbb8fd4..8a83eb36945b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
@@ -50,6 +50,8 @@ struct amdgpu_reg_ind_blk {
};
struct amdgpu_reg_pcie_ind {
+ amdgpu_rreg_t rreg;
+ amdgpu_wreg_t wreg;
amdgpu_rreg_t port_rreg;
amdgpu_wreg_t port_wreg;
};
@@ -81,6 +83,8 @@ 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_pcie_rd32(struct amdgpu_device *adev, uint32_t reg);
+void amdgpu_reg_pcie_wr32(struct amdgpu_device *adev, 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);
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 90c9a2e1cf5b..a4461574f881 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1986,8 +1986,8 @@ static int cik_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->reg.smc.rreg = cik_smc_rreg;
adev->reg.smc.wreg = cik_smc_wreg;
- adev->pcie_rreg = &cik_pcie_rreg;
- adev->pcie_wreg = &cik_pcie_wreg;
+ adev->reg.pcie.rreg = &cik_pcie_rreg;
+ adev->reg.pcie.wreg = &cik_pcie_wreg;
adev->reg.uvd_ctx.rreg = &cik_uvd_ctx_rreg;
adev->reg.uvd_ctx.wreg = &cik_uvd_ctx_wreg;
adev->reg.didt.rreg = &cik_didt_rreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index b3abf6554386..302c56630bd8 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -635,8 +635,8 @@ static int nv_common_early_init(struct amdgpu_ip_block
*ip_block)
struct amdgpu_device *adev = ip_block->adev;
adev->nbio.funcs->set_reg_remap(adev);
- adev->pcie_rreg = &amdgpu_device_indirect_rreg;
- adev->pcie_wreg = &amdgpu_device_indirect_wreg;
+ adev->reg.pcie.rreg = &amdgpu_device_indirect_rreg;
+ adev->reg.pcie.wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index a517c6cd0711..4aadb7a19a2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -2039,8 +2039,8 @@ static int si_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->reg.smc.rreg = si_smc_rreg;
adev->reg.smc.wreg = si_smc_wreg;
- adev->pcie_rreg = &si_pcie_rreg;
- adev->pcie_wreg = &si_pcie_wreg;
+ adev->reg.pcie.rreg = &si_pcie_rreg;
+ adev->reg.pcie.wreg = &si_pcie_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;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c
b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 64e47435d9e1..33955b625bbb 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -961,8 +961,8 @@ static int soc15_common_early_init(struct amdgpu_ip_block
*ip_block)
struct amdgpu_device *adev = ip_block->adev;
adev->nbio.funcs->set_reg_remap(adev);
- adev->pcie_rreg = &amdgpu_device_indirect_rreg;
- adev->pcie_wreg = &amdgpu_device_indirect_wreg;
+ adev->reg.pcie.rreg = &amdgpu_device_indirect_rreg;
+ adev->reg.pcie.wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg_ext = &amdgpu_device_indirect_rreg_ext;
adev->pcie_wreg_ext = &amdgpu_device_indirect_wreg_ext;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c
b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 968d9be033d8..3695fd951aa4 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -582,8 +582,8 @@ static int soc21_common_early_init(struct amdgpu_ip_block
*ip_block)
struct amdgpu_device *adev = ip_block->adev;
adev->nbio.funcs->set_reg_remap(adev);
- adev->pcie_rreg = &amdgpu_device_indirect_rreg;
- adev->pcie_wreg = &amdgpu_device_indirect_wreg;
+ adev->reg.pcie.rreg = &amdgpu_device_indirect_rreg;
+ adev->reg.pcie.wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c
b/drivers/gpu/drm/amd/amdgpu/soc24.c
index 7c59d9b0a541..2b2b8737ec5e 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc24.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc24.c
@@ -362,8 +362,8 @@ static int soc24_common_early_init(struct amdgpu_ip_block
*ip_block)
struct amdgpu_device *adev = ip_block->adev;
adev->nbio.funcs->set_reg_remap(adev);
- adev->pcie_rreg = &amdgpu_device_indirect_rreg;
- adev->pcie_wreg = &amdgpu_device_indirect_wreg;
+ adev->reg.pcie.rreg = &amdgpu_device_indirect_rreg;
+ adev->reg.pcie.wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
adev->reg.pcie.port_rreg = &amdgpu_device_pcie_port_rreg;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
index 8c808a6d08a5..d0bc844a5ba6 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
@@ -250,8 +250,8 @@ static int soc_v1_0_common_early_init(struct
amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
- adev->pcie_rreg = &amdgpu_device_indirect_rreg;
- adev->pcie_wreg = &amdgpu_device_indirect_wreg;
+ adev->reg.pcie.rreg = &amdgpu_device_indirect_rreg;
+ adev->reg.pcie.wreg = &amdgpu_device_indirect_wreg;
adev->pcie_rreg_ext = &amdgpu_device_indirect_rreg_ext;
adev->pcie_wreg_ext = &amdgpu_device_indirect_wreg_ext;
adev->pcie_rreg64 = &amdgpu_device_indirect_rreg64;
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index b8b6e1ea0d52..7d1f9a25b109 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1460,8 +1460,8 @@ static int vi_common_early_init(struct amdgpu_ip_block
*ip_block)
adev->reg.smc.rreg = vi_smc_rreg;
adev->reg.smc.wreg = vi_smc_wreg;
}
- adev->pcie_rreg = &vi_pcie_rreg;
- adev->pcie_wreg = &vi_pcie_wreg;
+ adev->reg.pcie.rreg = &vi_pcie_rreg;
+ adev->reg.pcie.wreg = &vi_pcie_wreg;
adev->reg.uvd_ctx.rreg = &vi_uvd_ctx_rreg;
adev->reg.uvd_ctx.wreg = &vi_uvd_ctx_wreg;
adev->reg.didt.rreg = &vi_didt_rreg;
--
2.49.0
