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

Commit 8492101e authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

Merge branch 'stable/for-linus-5.2' into devel/for-linus-5.2 

* stable/for-linus-5.2:
  swiotlb: fix phys_addr_t overflow warning
parents 4aa095ea 9c106119

drivers/xen/swiotlb-xen.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, 


	map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir,

				     attrs);

	if (map == DMA_MAPPING_ERROR)

	if (map == (phys_addr_t)DMA_MAPPING_ERROR)

		return DMA_MAPPING_ERROR;



	dev_addr = xen_phys_to_bus(map);

kernel/dma/swiotlb.c

+2 −2
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, 
	if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit())

		dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes), total %lu (slots), used %lu (slots)\n",

			 size, io_tlb_nslabs, tmp_io_tlb_used);

	return DMA_MAPPING_ERROR;

	return (phys_addr_t)DMA_MAPPING_ERROR;

found:

	io_tlb_used += nslots;

	spin_unlock_irqrestore(&io_tlb_lock, flags);
@@ -658,7 +658,7 @@ bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr, 
	/* Oh well, have to allocate and map a bounce buffer. */

	*phys = swiotlb_tbl_map_single(dev, __phys_to_dma(dev, io_tlb_start),

			*phys, size, dir, attrs);

	if (*phys == DMA_MAPPING_ERROR)

	if (*phys == (phys_addr_t)DMA_MAPPING_ERROR)

		return false;



	/* Ensure that the address returned is DMA'ble */