drm/amdgpu: Separate vf2pf work item init from virt data exchange

From Victor Skvortsov
25a90a11036b6fd385ee75536b78659fc481d529 in linux 5.15.y/5.15.71
892deb48269c65376f3eeb5b4c032ff2c2979bd7 in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
index f10abf2..26e2342 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
@@ -2422,6 +2422,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
 
                /* need to do gmc hw init early so we can allocate gpu mem */
                if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {
+                       /* Try to reserve bad pages early */
+                       if (amdgpu_sriov_vf(adev))
+                               amdgpu_virt_exchange_data(adev);
+
                        r = amdgpu_device_vram_scratch_init(adev);
                        if (r) {
                                DRM_ERROR("amdgpu_vram_scratch_init failed %d\n", r);
@@ -2453,7 +2457,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
        }
 
        if (amdgpu_sriov_vf(adev))
-               amdgpu_virt_init_data_exchange(adev);
+               amdgpu_virt_exchange_data(adev);
 
        r = amdgpu_ib_pool_init(adev);
        if (r) {

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.c
index cb37575..0b387cb 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.c
@@ -615,17 +615,35 @@ void amdgpu_virt_fini_data_exchange(struct amdgpu_device *adev)
 
 void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev)
 {
-       uint64_t bp_block_offset = 0;
-       uint32_t bp_block_size = 0;
-       struct amd_sriov_msg_pf2vf_info *pf2vf_v2 = NULL;
-
        adev->virt.fw_reserve.p_pf2vf = NULL;
        adev->virt.fw_reserve.p_vf2pf = NULL;
        adev->virt.vf2pf_update_interval_ms = 0;
 
-       if (adev->mman.fw_vram_usage_va != NULL) {
+       if (adev->bios != NULL) {
                adev->virt.vf2pf_update_interval_ms = 2000;
 
+               adev->virt.fw_reserve.p_pf2vf =
+                       (struct amd_sriov_msg_pf2vf_info_header *)
+                       (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB << 10));
+
+               amdgpu_virt_read_pf2vf_data(adev);
+       }
+
+       if (adev->virt.vf2pf_update_interval_ms != 0) {
+               INIT_DELAYED_WORK(&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item);
+               schedule_delayed_work(&(adev->virt.vf2pf_work), msecs_to_jiffies(adev->virt.vf2pf_update_interval_ms));
+       }
+}
+
+
+void amdgpu_virt_exchange_data(struct amdgpu_device *adev)
+{
+       uint64_t bp_block_offset = 0;
+       uint32_t bp_block_size = 0;
+       struct amd_sriov_msg_pf2vf_info *pf2vf_v2 = NULL;
+
+       if (adev->mman.fw_vram_usage_va != NULL) {
+
                adev->virt.fw_reserve.p_pf2vf =
                        (struct amd_sriov_msg_pf2vf_info_header *)
                        (adev->mman.fw_vram_usage_va + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB << 10));
@@ -656,16 +674,10 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev)
                        (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB << 10));
 
                amdgpu_virt_read_pf2vf_data(adev);
-
-               return;
-       }
-
-       if (adev->virt.vf2pf_update_interval_ms != 0) {
-               INIT_DELAYED_WORK(&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item);
-               schedule_delayed_work(&(adev->virt.vf2pf_work), adev->virt.vf2pf_update_interval_ms);
        }
 }
 
+
 void amdgpu_detect_virtualization(struct amdgpu_device *adev)
 {
        uint32_t reg;

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.h
index 043f69c..46f5a2c 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_virt.h
@@ -308,6 +308,7 @@ int amdgpu_virt_alloc_mm_table(struct amdgpu_device *adev);
 void amdgpu_virt_free_mm_table(struct amdgpu_device *adev);
 void amdgpu_virt_release_ras_err_handler_data(struct amdgpu_device *adev);
 void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev);
+void amdgpu_virt_exchange_data(struct amdgpu_device *adev);
 void amdgpu_virt_fini_data_exchange(struct amdgpu_device *adev);
 void amdgpu_detect_virtualization(struct amdgpu_device *adev);