lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "RDMA/usnic: use iommu_map_atomic() under spin_lock()"

Browse Source 
This reverts commit 80282a3d10 which is
commit b7e08a5a63a11627601915473c3b569c1f6c6c06 upstream.

It will not build as a pre-requsite commit was reverted as it broke the
Android kernel abi and it was needed for this change.  This change is
not needed for Android systems so it is safe to revert.

Bug: 161946584
Change-Id: I4dabb4a6943fc128fb54c8f7a80a694823c1c5f8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-02-25 15:49:24 +00:00
parent abc4ede193
commit bbf1c13935
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/infiniband/hw/usnic/usnic_uiom.c
View File

@ -281,8 +281,8 @@ iter_chunk:
size = pa_end - pa_start + PAGE_SIZE; size = pa_end - pa_start + PAGE_SIZE;
usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x", usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",
va_start, &pa_start, size, flags); va_start, &pa_start, size, flags);
err = iommu_map_atomic(pd->domain, va_start, err = iommu_map(pd->domain, va_start, pa_start,
pa_start, size, flags); size, flags);
if (err) { if (err) {
usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n", usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
va_start, &pa_start, size, err); va_start, &pa_start, size, err);
@ -298,8 +298,8 @@ iter_chunk:
size = pa - pa_start + PAGE_SIZE; size = pa - pa_start + PAGE_SIZE;
usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n", usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",
va_start, &pa_start, size, flags); va_start, &pa_start, size, flags);
err = iommu_map_atomic(pd->domain, va_start, err = iommu_map(pd->domain, va_start, pa_start,
pa_start, size, flags); size, flags);
if (err) { if (err) {
usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n", usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
va_start, &pa_start, size, err); va_start, &pa_start, size, err);