Commit c7a30aa8 authored by Halil Pasic's avatar Halil Pasic Committed by Will Deacon
Browse files

FROMGIT: s390/pv: fix the forcing of the swiotlb



Since commit 903cd0f3 ("swiotlb: Use is_swiotlb_force_bounce for
swiotlb data bouncing") if code sets swiotlb_force it needs to do so
before the swiotlb is initialised. Otherwise
io_tlb_default_mem->force_bounce will not get set to true, and devices
that use (the default) swiotlb will not bounce despite switolb_force
having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new
requirement.

This change addresses what turned out to be a fragility in
commit 64e1f0c5 ("s390/mm: force swiotlb for protected
virtualization"), which ain't exactly broken in its original context,
but could give us some more headache if people backport the broken
change and forget this fix.

Signed-off-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Fixes: 903cd0f3 ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes: 64e1f0c5 ("s390/mm: force swiotlb for protected virtualization")
Cc: stable@vger.kernel.org #5.3+
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad@kernel.org>
(cherry picked from commit 93ebb682 swiotlb/devel/for-linus-5.15)
Signed-off-by: default avatarWill Deacon <willdeacon@google.com>
Bug: 190591509
Change-Id: I0cb7cec859f8c6d7221ccd5bf652d4def4c87092
parent ac329b33
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment