From: James Zhu <jamesz@amd.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: James Zhu <James.Zhu@amd.com>,
stable@vger.kernel.org, jzhums@gmail.com,
alexander.deucher@amd.com, kolAflash@kolahilft.de,
Yifan Zhang <yifan1.zhang@amd.com>,
youling <youling257@gmail.com>
Subject: Re: [PATCH 6/6] drm/amdkfd: fix boot failure when iommu is disabled in Picasso.
Date: Fri, 10 Dec 2021 09:46:08 -0500 [thread overview]
Message-ID: <56c017a9-8def-4f1c-5c4e-f4977da0c3d7@amd.com> (raw)
In-Reply-To: <YbNluFUESYFvuWO6@kroah.com>
On 2021-12-10 9:35 a.m., Greg Kroah-Hartman wrote:
> On Fri, Dec 10, 2021 at 09:14:30AM -0500, James Zhu wrote:
>> On 2021-12-10 8:33 a.m., Greg Kroah-Hartman wrote:
>>> On Thu, Dec 09, 2021 at 05:09:56PM -0500, James Zhu wrote:
>>>> From: Yifan Zhang <yifan1.zhang@amd.com>
>>>>
>>>> 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 <youling257@gmail.com>
>>>> Tested-by: youling <youling257@gmail.com>
>>>> Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
>>>> Reviewed-by: James Zhu <James.Zhu@amd.com>
>>>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>>>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>>> Signed-off-by: James Zhu <James.Zhu@amd.com>
>>>> ---
>>>> 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(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>> index 488e574f5da1..f262c4e7a48a 100644
>>>> --- 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_device *adev)
>>>> 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/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>>> index 1204dae85797..b35f0af71f00 100644
>>>> --- 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,
>>>> kfd_cwsr_init(kfd);
>>>> + if (kgd2kfd_resume_iommu(kfd))
>>>> + goto device_iommu_error;
>>>> +
>>>> if (kfd_resume(kfd))
>>>> goto kfd_resume_error;
>>>> --
>>>> 2.25.1
>>>>
>>> Like I said last time, do not change the backport unless you HAVE to.
>>> You did it here again for no good reason :(
>> [JZ] Yes, I should add more explanation next time.
>>
>> Backport conflict fix to remove svm_migrate_init((struct amdgpu_device
>> *)kfd->kgd);
>>
>> new AMD svm feature has not been added for 5.10 So it is safe to remove it.
> No, I am talking about the fact that you fixed up a coding style fix in
> this backport that is not in the original commit in Linus's tree.
[JZ] I see. this fix is not necessary. Do you want me to send v2 with
this unnecessary coding style fix dropping for backport?
next prev parent reply other threads:[~2021-12-10 14:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 22:09 [PATCH 0/6] Bug:211277 fix backport for 5.10 stable James Zhu
2021-12-09 22:09 ` [PATCH 1/6] drm/amd/amdkfd: adjust dummy functions' placement James Zhu
2021-12-09 22:09 ` [PATCH 2/6] drm/amdkfd: separate kfd_iommu_resume from kfd_resume James Zhu
2021-12-09 22:09 ` [PATCH 3/6] drm/amdgpu: add amdgpu_amdkfd_resume_iommu James Zhu
2021-12-09 22:09 ` [PATCH 4/6] drm/amdgpu: move iommu_resume before ip init/resume James Zhu
2021-12-09 22:09 ` [PATCH 5/6] drm/amdgpu: init iommu after amdkfd device init James Zhu
2021-12-09 22:09 ` [PATCH 6/6] drm/amdkfd: fix boot failure when iommu is disabled in Picasso James Zhu
2021-12-10 13:33 ` Greg Kroah-Hartman
2021-12-10 14:14 ` James Zhu
2021-12-10 14:35 ` Greg Kroah-Hartman
2021-12-10 14:46 ` James Zhu [this message]
2021-12-10 15:12 ` Greg Kroah-Hartman
2021-12-10 15:33 ` James Zhu
2021-12-10 6:33 ` [PATCH 0/6] Bug:211277 fix backport for 5.10 stable Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56c017a9-8def-4f1c-5c4e-f4977da0c3d7@amd.com \
--to=jamesz@amd.com \
--cc=James.Zhu@amd.com \
--cc=alexander.deucher@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=jzhums@gmail.com \
--cc=kolAflash@kolahilft.de \
--cc=stable@vger.kernel.org \
--cc=yifan1.zhang@amd.com \
--cc=youling257@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.