From fd11a4d8435361fe7da243dad1cc15cf17585a30 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 7 Dec 2021 09:07:06 +0100 Subject: [PATCH] drop some amdgpu patches from 5.10.y queue They were breaking the build --- ...mdgpu-add-amdgpu_amdkfd_resume_iommu.patch | 51 --------------- ...-init-iommu-after-amdkfd-device-init.patch | 54 ---------------- ...e-iommu_resume-before-ip-init-resume.patch | 57 ----------------- ...re-when-iommu-is-disabled-in-picasso.patch | 48 -------------- ...ate-kfd_iommu_resume-from-kfd_resume.patch | 64 ------------------- queue-5.10/series | 5 -- 6 files changed, 279 deletions(-) delete mode 100644 queue-5.10/drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch delete mode 100644 queue-5.10/drm-amdgpu-init-iommu-after-amdkfd-device-init.patch delete mode 100644 queue-5.10/drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch delete mode 100644 queue-5.10/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch delete mode 100644 queue-5.10/drm-amdkfd-separate-kfd_iommu_resume-from-kfd_resume.patch diff --git a/queue-5.10/drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch b/queue-5.10/drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch deleted file mode 100644 index 3b945389f49..00000000000 --- a/queue-5.10/drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8066008482e533e91934bee49765bf8b4a7c40db Mon Sep 17 00:00:00 2001 -From: James Zhu -Date: Tue, 7 Sep 2021 11:27:31 -0400 -Subject: drm/amdgpu: add amdgpu_amdkfd_resume_iommu - -From: James Zhu - -commit 8066008482e533e91934bee49765bf8b4a7c40db upstream. - -Add amdgpu_amdkfd_resume_iommu for amdgpu. - -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277 -Signed-off-by: James Zhu -Reviewed-by: Felix Kuehling -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 10 ++++++++++ - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + - 2 files changed, 11 insertions(+) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c -@@ -194,6 +194,16 @@ void amdgpu_amdkfd_suspend(struct amdgpu - kgd2kfd_suspend(adev->kfd.dev, run_pm); - } - -+int amdgpu_amdkfd_resume_iommu(struct amdgpu_device *adev) -+{ -+ int r = 0; -+ -+ if (adev->kfd.dev) -+ r = kgd2kfd_resume_iommu(adev->kfd.dev); -+ -+ return r; -+} -+ - int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool run_pm) - { - int r = 0; ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h -@@ -126,6 +126,7 @@ int amdgpu_amdkfd_init(void); - void amdgpu_amdkfd_fini(void); - - void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool run_pm); -+int amdgpu_amdkfd_resume_iommu(struct amdgpu_device *adev); - int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool run_pm); - void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev, - const void *ih_ring_entry); diff --git a/queue-5.10/drm-amdgpu-init-iommu-after-amdkfd-device-init.patch b/queue-5.10/drm-amdgpu-init-iommu-after-amdkfd-device-init.patch deleted file mode 100644 index 6ed8f2476dc..00000000000 --- a/queue-5.10/drm-amdgpu-init-iommu-after-amdkfd-device-init.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 714d9e4574d54596973ee3b0624ee4a16264d700 Mon Sep 17 00:00:00 2001 -From: Yifan Zhang -Date: Tue, 28 Sep 2021 15:42:35 +0800 -Subject: drm/amdgpu: init iommu after amdkfd device init - -From: Yifan Zhang - -commit 714d9e4574d54596973ee3b0624ee4a16264d700 upstream. - -This patch is to fix clinfo failure in Raven/Picasso: - -Number of platforms: 1 - Platform Profile: FULL_PROFILE - Platform Version: OpenCL 2.2 AMD-APP (3364.0) - Platform Name: AMD Accelerated Parallel Processing - Platform Vendor: Advanced Micro Devices, Inc. - Platform Extensions: cl_khr_icd cl_amd_event_callback - - Platform Name: AMD Accelerated Parallel Processing Number of devices: 0 - -Signed-off-by: Yifan Zhang -Reviewed-by: James Zhu -Tested-by: James Zhu -Acked-by: Felix Kuehling -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -2220,10 +2220,6 @@ static int amdgpu_device_ip_init(struct - if (r) - goto init_failed; - -- r = amdgpu_amdkfd_resume_iommu(adev); -- if (r) -- goto init_failed; -- - r = amdgpu_device_ip_hw_init_phase1(adev); - if (r) - goto init_failed; -@@ -2259,6 +2255,10 @@ static int amdgpu_device_ip_init(struct - amdgpu_xgmi_add_device(adev); - amdgpu_amdkfd_device_init(adev); - -+ r = amdgpu_amdkfd_resume_iommu(adev); -+ if (r) -+ goto init_failed; -+ - amdgpu_fru_get_product_info(adev); - - init_failed: diff --git a/queue-5.10/drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch b/queue-5.10/drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch deleted file mode 100644 index 80a74e27c03..00000000000 --- a/queue-5.10/drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f02abeb0779700c308e661a412451b38962b8a0b Mon Sep 17 00:00:00 2001 -From: James Zhu -Date: Tue, 7 Sep 2021 11:32:22 -0400 -Subject: drm/amdgpu: move iommu_resume before ip init/resume - -From: James Zhu - -commit f02abeb0779700c308e661a412451b38962b8a0b upstream. - -Separate iommu_resume from kfd_resume, and move it before -other amdgpu ip init/resume. - -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277 -Signed-off-by: James Zhu -Reviewed-by: Felix Kuehling -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -2220,6 +2220,10 @@ static int amdgpu_device_ip_init(struct - if (r) - goto init_failed; - -+ r = amdgpu_amdkfd_resume_iommu(adev); -+ if (r) -+ goto init_failed; -+ - r = amdgpu_device_ip_hw_init_phase1(adev); - if (r) - goto init_failed; -@@ -2913,6 +2917,10 @@ static int amdgpu_device_ip_resume(struc - { - int r; - -+ r = amdgpu_amdkfd_resume_iommu(adev); -+ if (r) -+ return r; -+ - r = amdgpu_device_ip_resume_phase1(adev); - if (r) - return r; -@@ -4296,6 +4304,10 @@ static int amdgpu_do_asic_reset(struct a - - if (!r) { - dev_info(tmp_adev->dev, "GPU reset succeeded, trying to resume\n"); -+ r = amdgpu_amdkfd_resume_iommu(tmp_adev); -+ if (r) -+ goto out; -+ - r = amdgpu_device_ip_resume_phase1(tmp_adev); - if (r) - goto out; diff --git a/queue-5.10/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch b/queue-5.10/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch deleted file mode 100644 index 212c1f408e2..00000000000 --- a/queue-5.10/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch +++ /dev/null @@ -1,48 +0,0 @@ -From afd18180c07026f94a80ff024acef5f4159084a4 Mon Sep 17 00:00:00 2001 -From: Yifan Zhang -Date: Mon, 11 Oct 2021 20:37:01 +0800 -Subject: drm/amdkfd: fix boot failure when iommu is disabled in Picasso. - -From: Yifan Zhang - -commit afd18180c07026f94a80ff024acef5f4159084a4 upstream. - -When IOMMU disabled in sbios and kfd in iommuv2 path, iommuv2 -init will fail. But this failure should not block amdgpu driver init. - -Reported-by: youling -Tested-by: youling -Signed-off-by: Yifan Zhang -Reviewed-by: James Zhu -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ---- - drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 +++ - 2 files changed, 3 insertions(+), 4 deletions(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -2255,10 +2255,6 @@ static int amdgpu_device_ip_init(struct - amdgpu_xgmi_add_device(adev); - amdgpu_amdkfd_device_init(adev); - -- r = amdgpu_amdkfd_resume_iommu(adev); -- if (r) -- goto init_failed; -- - amdgpu_fru_get_product_info(adev); - - init_failed: ---- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c -@@ -751,6 +751,9 @@ bool kgd2kfd_device_init(struct kfd_dev - - kfd_cwsr_init(kfd); - -+ if(kgd2kfd_resume_iommu(kfd)) -+ goto device_iommu_error; -+ - if (kfd_resume(kfd)) - goto kfd_resume_error; - diff --git a/queue-5.10/drm-amdkfd-separate-kfd_iommu_resume-from-kfd_resume.patch b/queue-5.10/drm-amdkfd-separate-kfd_iommu_resume-from-kfd_resume.patch deleted file mode 100644 index 51e7d767399..00000000000 --- a/queue-5.10/drm-amdkfd-separate-kfd_iommu_resume-from-kfd_resume.patch +++ /dev/null @@ -1,64 +0,0 @@ -From fefc01f042f44ede373ee66773b8238dd8fdcb55 Mon Sep 17 00:00:00 2001 -From: James Zhu -Date: Tue, 7 Sep 2021 11:13:02 -0400 -Subject: drm/amdkfd: separate kfd_iommu_resume from kfd_resume - -From: James Zhu - -commit fefc01f042f44ede373ee66773b8238dd8fdcb55 upstream. - -Separate kfd_iommu_resume from kfd_resume for fine-tuning -of amdgpu device init/resume/reset/recovery sequence. - -v2: squash in fix for !CONFIG_HSA_AMD - -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277 -Signed-off-by: James Zhu -Reviewed-by: Felix Kuehling -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + - drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 ++++++++---- - 2 files changed, 9 insertions(+), 4 deletions(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h -@@ -262,6 +262,7 @@ bool kgd2kfd_device_init(struct kfd_dev - const struct kgd2kfd_shared_resources *gpu_resources); - void kgd2kfd_device_exit(struct kfd_dev *kfd); - void kgd2kfd_suspend(struct kfd_dev *kfd, bool run_pm); -+int kgd2kfd_resume_iommu(struct kfd_dev *kfd); - int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm); - int kgd2kfd_pre_reset(struct kfd_dev *kfd); - int kgd2kfd_post_reset(struct kfd_dev *kfd); ---- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c -@@ -896,17 +896,21 @@ int kgd2kfd_resume(struct kfd_dev *kfd, - return ret; - } - --static int kfd_resume(struct kfd_dev *kfd) -+int kgd2kfd_resume_iommu(struct kfd_dev *kfd) - { - int err = 0; - - err = kfd_iommu_resume(kfd); -- if (err) { -+ if (err) - dev_err(kfd_device, - "Failed to resume IOMMU for device %x:%x\n", - kfd->pdev->vendor, kfd->pdev->device); -- return err; -- } -+ return err; -+} -+ -+static int kfd_resume(struct kfd_dev *kfd) -+{ -+ int err = 0; - - err = kfd->dqm->ops.start(kfd->dqm); - if (err) { diff --git a/queue-5.10/series b/queue-5.10/series index a1eec32623e..9a9a2528e01 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -45,11 +45,6 @@ kvm-x86-use-a-stable-condition-around-all-vt-d-pi-paths.patch kvm-arm64-avoid-setting-the-upper-32-bits-of-tcr_el2-and-cptr_el2-to-1.patch kvm-x86-use-vcpu-arch.walk_mmu-for-kvm_mmu_invlpg.patch tracing-histograms-string-compares-should-not-care-about-signed-values.patch -drm-amdkfd-separate-kfd_iommu_resume-from-kfd_resume.patch -drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch -drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch -drm-amdgpu-init-iommu-after-amdkfd-device-init.patch -drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch wireguard-selftests-increase-default-dmesg-log-size.patch wireguard-allowedips-add-missing-__rcu-annotation-to-satisfy-sparse.patch wireguard-selftests-actually-test-for-routing-loops.patch -- 2.47.2