Make ip block operations for asic symmetric by making using of the
.early_fini() hook, which will undo work done by the .late_init() hook.
1) introduce xxx_common_early_fini() for nv/soc15/soc21/soc24.
2) move `enable_doorbell_selfring_aperture(adev, false)` from .hw_init()
into .early_fini().
3) call xgpu_nv_mailbox_put_irq() for nv.c to avoid possible resource
leakage.
4) use flags to track irq reference count usage.
Signed-off-by: Jiang Liu <ge...@linux.alibaba.com>
---
drivers/gpu/drm/amd/amdgpu/nv.c | 14 +++++++++++-
drivers/gpu/drm/amd/amdgpu/soc15.c | 22 +++++++++++--------
drivers/gpu/drm/amd/amdgpu/soc21.c | 35 ++++++++++++++++++++----------
drivers/gpu/drm/amd/amdgpu/soc24.c | 17 +++++++++++----
4 files changed, 63 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 4e8f9af1e2be..f87b9c835774 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -973,6 +973,18 @@ static int nv_common_late_init(struct amdgpu_ip_block
*ip_block)
return 0;
}
+static int nv_common_early_fini(struct amdgpu_ip_block *ip_block)
+{
+ struct amdgpu_device *adev = ip_block->adev;
+
+ adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
+
+ if (amdgpu_sriov_vf(adev))
+ xgpu_nv_mailbox_put_irq(adev);
+
+ return 0;
+}
+
static int nv_common_sw_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
@@ -1024,7 +1036,6 @@ static int nv_common_hw_fini(struct amdgpu_ip_block
*ip_block)
* selfring doorbell.
*/
adev->nbio.funcs->enable_doorbell_aperture(adev, false);
- adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
return 0;
}
@@ -1110,6 +1121,7 @@ static const struct amd_ip_funcs nv_common_ip_funcs = {
.name = "nv_common",
.early_init = nv_common_early_init,
.late_init = nv_common_late_init,
+ .early_fini = nv_common_early_fini,
.sw_init = nv_common_sw_init,
.sw_fini = nv_common_sw_fini,
.hw_init = nv_common_hw_init,
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c
b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 1dca7d7c813c..e084430f8998 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1217,6 +1217,18 @@ static int soc15_common_late_init(struct amdgpu_ip_block
*ip_block)
return 0;
}
+static int soc15_common_early_fini(struct amdgpu_ip_block *ip_block)
+{
+ struct amdgpu_device *adev = ip_block->adev;
+
+ adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
+
+ if (amdgpu_sriov_vf(adev))
+ xgpu_ai_mailbox_put_irq(adev);
+
+ return 0;
+}
+
static int soc15_common_sw_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
@@ -1288,16 +1300,7 @@ static int soc15_common_hw_fini(struct amdgpu_ip_block
*ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
- /* Disable the doorbell aperture and selfring doorbell aperture
- * separately in hw_fini because soc15_enable_doorbell_aperture
- * has been removed and there is no need to delay disabling
- * selfring doorbell.
- */
adev->nbio.funcs->enable_doorbell_aperture(adev, false);
- adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
-
- if (amdgpu_sriov_vf(adev))
- xgpu_ai_mailbox_put_irq(adev);
return 0;
}
@@ -1476,6 +1479,7 @@ static const struct amd_ip_funcs soc15_common_ip_funcs = {
.name = "soc15_common",
.early_init = soc15_common_early_init,
.late_init = soc15_common_late_init,
+ .early_fini = soc15_common_early_fini,
.sw_init = soc15_common_sw_init,
.sw_fini = soc15_common_sw_fini,
.hw_init = soc15_common_hw_init,
diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c
b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 03b9bcb8eb6d..5a6da83c938a 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -796,6 +796,7 @@ static int soc21_common_early_init(struct amdgpu_ip_block
*ip_block)
static int soc21_common_late_init(struct amdgpu_ip_block *ip_block)
{
+ int r;
struct amdgpu_device *adev = ip_block->adev;
if (amdgpu_sriov_vf(adev)) {
@@ -816,12 +817,16 @@ static int soc21_common_late_init(struct amdgpu_ip_block
*ip_block)
}
} else {
if (adev->nbio.ras &&
- adev->nbio.ras_err_event_athub_irq.funcs)
+ adev->nbio.ras_err_event_athub_irq.funcs) {
/* don't need to fail gpu late init
* if enabling athub_err_event interrupt failed
* nbio v4_3 only support fatal error hanlding
* just enable the interrupt directly */
- amdgpu_irq_get(adev,
&adev->nbio.ras_err_event_athub_irq, 0);
+ r = amdgpu_irq_get(adev,
&adev->nbio.ras_err_event_athub_irq, 0);
+ if (r)
+ return r;
+ amdgpu_ip_block_set_marker(ip_block,
AMDGPU_MARKER_IRQ0);
+ }
}
/* Enable selfring doorbell aperture late because doorbell BAR
@@ -832,6 +837,22 @@ static int soc21_common_late_init(struct amdgpu_ip_block
*ip_block)
return 0;
}
+static int soc21_common_early_fini(struct amdgpu_ip_block *ip_block)
+{
+ struct amdgpu_device *adev = ip_block->adev;
+
+ adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
+
+ if (amdgpu_sriov_vf(adev)) {
+ xgpu_nv_mailbox_put_irq(adev);
+ } else {
+ if (amdgpu_ip_block_test_and_clear_marker(ip_block,
AMDGPU_MARKER_IRQ0))
+ amdgpu_irq_put(adev,
&adev->nbio.ras_err_event_athub_irq, 0);
+ }
+
+ return 0;
+}
+
static int soc21_common_sw_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
@@ -877,15 +898,6 @@ static int soc21_common_hw_fini(struct amdgpu_ip_block
*ip_block)
* selfring doorbell.
*/
adev->nbio.funcs->enable_doorbell_aperture(adev, false);
- adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
-
- if (amdgpu_sriov_vf(adev)) {
- xgpu_nv_mailbox_put_irq(adev);
- } else {
- if (adev->nbio.ras &&
- adev->nbio.ras_err_event_athub_irq.funcs)
- amdgpu_irq_put(adev,
&adev->nbio.ras_err_event_athub_irq, 0);
- }
return 0;
}
@@ -1000,6 +1012,7 @@ static const struct amd_ip_funcs soc21_common_ip_funcs = {
.name = "soc21_common",
.early_init = soc21_common_early_init,
.late_init = soc21_common_late_init,
+ .early_fini = soc21_common_early_fini,
.sw_init = soc21_common_sw_init,
.sw_fini = soc21_common_sw_fini,
.hw_init = soc21_common_hw_init,
diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c
b/drivers/gpu/drm/amd/amdgpu/soc24.c
index b20dc81dc257..5a4a04834ecb 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc24.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc24.c
@@ -455,6 +455,18 @@ static int soc24_common_late_init(struct amdgpu_ip_block
*ip_block)
return 0;
}
+static int soc24_common_early_fini(struct amdgpu_ip_block *ip_block)
+{
+ struct amdgpu_device *adev = ip_block->adev;
+
+ adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
+
+ if (amdgpu_sriov_vf(adev))
+ xgpu_nv_mailbox_put_irq(adev);
+
+ return 0;
+}
+
static int soc24_common_sw_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
@@ -504,10 +516,6 @@ static int soc24_common_hw_fini(struct amdgpu_ip_block
*ip_block)
* selfring doorbell.
*/
adev->nbio.funcs->enable_doorbell_aperture(adev, false);
- adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
-
- if (amdgpu_sriov_vf(adev))
- xgpu_nv_mailbox_put_irq(adev);
return 0;
}
@@ -590,6 +598,7 @@ static const struct amd_ip_funcs soc24_common_ip_funcs = {
.name = "soc24_common",
.early_init = soc24_common_early_init,
.late_init = soc24_common_late_init,
+ .early_fini = soc24_common_early_fini,
.sw_init = soc24_common_sw_init,
.sw_fini = soc24_common_sw_fini,
.hw_init = soc24_common_hw_init,
--
2.43.5
