mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 04:33:26 +02:00
Merge branch 'stable/for-linus-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb updates from Konrad Rzeszutek Wilk: "Two memory encryption related patches (SWIOTLB is enabled by default for AMD-SEV): - Add support for alignment so that NVME can properly work - Keep track of requested DMA buffers length, as underlaying hardware devices can trip SWIOTLB to bounce too much and crash the kernel And a tiny fix to use proper APIs in drivers" * 'stable/for-linus-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: Validate bounce size in the sync/unmap path nvme-pci: set min_align_mask swiotlb: respect min_align_mask swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single swiotlb: refactor swiotlb_tbl_map_single swiotlb: clean up swiotlb_tbl_unmap_single swiotlb: factor out a nr_slots helper swiotlb: factor out an io_tlb_offset helper swiotlb: add a IO_TLB_SIZE define driver core: add a min_align_mask field to struct device_dma_parameters sdhci: stop poking into swiotlb internals
This commit is contained in:
@@ -20,7 +20,6 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/scatterlist.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <linux/swiotlb.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/of.h>
|
||||
@@ -4582,12 +4581,8 @@ int sdhci_setup_host(struct sdhci_host *host)
|
||||
mmc->max_segs = SDHCI_MAX_SEGS;
|
||||
} else if (host->flags & SDHCI_USE_SDMA) {
|
||||
mmc->max_segs = 1;
|
||||
if (swiotlb_max_segment()) {
|
||||
unsigned int max_req_size = (1 << IO_TLB_SHIFT) *
|
||||
IO_TLB_SEGSIZE;
|
||||
mmc->max_req_size = min(mmc->max_req_size,
|
||||
max_req_size);
|
||||
}
|
||||
mmc->max_req_size = min_t(size_t, mmc->max_req_size,
|
||||
dma_max_mapping_size(mmc_dev(mmc)));
|
||||
} else { /* PIO */
|
||||
mmc->max_segs = SDHCI_MAX_SEGS;
|
||||
}
|
||||
|
Reference in New Issue
Block a user