Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbf1c139 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 80282a3d 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent abc4ede1

drivers/infiniband/hw/usnic/usnic_uiom.c

+4 −4
Original line number Diff line number Diff line
@@ -281,8 +281,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				size = pa_end - pa_start + PAGE_SIZE;

				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",

					va_start, &pa_start, size, flags);

				err = iommu_map_atomic(pd->domain, va_start,

						       pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

							size, flags);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);
@@ -298,8 +298,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				size = pa - pa_start + PAGE_SIZE;

				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",

					va_start, &pa_start, size, flags);

				err = iommu_map_atomic(pd->domain, va_start,

						       pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

						size, flags);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);