The following commit has been merged in the master branch: commit a08f4523243c86fe35dec8c81c5ec50f721004ce Merge: 09162bc32c880a791c6c0668ce0745cf7958f576 efd838fec17bd8756da852a435800a7e6281bfbc Author: Linus Torvalds torvalds@linux-foundation.org Date: Mon Nov 16 14:58:23 2020 -0800
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull vhost fixes from Michael Tsirkin: "Fixes all over the place, most notably vhost scsi IO error fixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost scsi: Add support for LUN resets. vhost scsi: add lun parser helper vhost scsi: fix cmd completion race vhost scsi: alloc cmds per vq instead of session vhost: add helper to check if a vq has been setup vdpasim: fix "mac_pton" undefined error swiotlb: using SIZE_MAX needs limits.h included
diff --combined include/linux/swiotlb.h index 3bb72266a75a,fa5122c6711e..fbdc65782195 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@@ -5,6 -5,7 +5,7 @@@ #include <linux/dma-direction.h> #include <linux/init.h> #include <linux/types.h> + #include <linux/limits.h>
struct device; struct page; @@@ -34,7 -35,6 +35,7 @@@ int swiotlb_init_with_tbl(char *tlb, un extern unsigned long swiotlb_nr_tbl(void); unsigned long swiotlb_size_or_default(void); extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs); +extern int swiotlb_late_init_with_default_size(size_t default_size); extern void __init swiotlb_update_mem_attributes(void);
/* @@@ -45,9 -45,13 +46,9 @@@ enum dma_sync_target SYNC_FOR_DEVICE = 1, };
-extern phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, - dma_addr_t tbl_dma_addr, - phys_addr_t phys, - size_t mapping_size, - size_t alloc_size, - enum dma_data_direction dir, - unsigned long attrs); +phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys, + size_t mapping_size, size_t alloc_size, + enum dma_data_direction dir, unsigned long attrs);
extern void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,