mainline inclusion
from mainline-v5.12-rc1
commit 68e11a60
category: bugfix
bugzilla: 174002
CVE:NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=68e11a6086b10e1a88d2b2c8432299f595db748d

----------------------------------------------------------------------

    Move the HIP06 related code to the hw v1 source file for HEM.

    Link: https://lore.kernel.org/r/1621589395-2435-6-git-send-email-liweihang@huawei.c
om
Signed-off-by: NXi Wang <wangxi11@huawei.com>
Signed-off-by: NWeihang Li <liweihang@huawei.com>
Signed-off-by: NJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: NChunZhi Hu <huchunzhi@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>