Merge USB 4.20-rc8 mergepoint into usb-next

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 22a12ab5a5e9..375c77e8d52f 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -309,7 +309,12 @@ int dma_direct_supported(struct device *dev, u64 mask)
 
         min_mask = min_t(u64, min_mask, (max_pfn - 1) << PAGE_SHIFT);
 
-        return mask >= phys_to_dma(dev, min_mask);
+        /*
+         * This check needs to be against the actual bit mask value, so
+         * use __phys_to_dma() here so that the SME encryption mask isn't
+         * part of the check.
+         */
+        return mask >= __phys_to_dma(dev, min_mask);
 }
 
 int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)