Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit ab2a47bd242d6cdcf6b2b64797f271c6f0a6d338

Authored by Konrad Rzeszutek Wilk
1 parent f4b2f07b2e
Exists in v3.2_SMARCT335xPSP_04.06.00.11 and in 3 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN

xen-swiotlb: Fix wrong panic. 

Propagate the baremetal git commit "swiotlb: fix wrong panic"
(fba99fa38b023224680308a482e12a0eca87e4e1) in the Xen-SWIOTLB version.
wherein swiotlb's map_page wrongly calls panic() when it can't find
a buffer fit for device's dma mask.  It should return an error instead.

Devices with an odd dma mask (i.e.  under 4G) like b44 network card hit
this bug (the system crashes):

http://marc.info/?l=linux-kernel&m=129648943830106&w=2

If xen-swiotlb returns an error, b44 driver can use the own bouncing
mechanism.

CC: stable@kernel.org
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff

drivers/xen/swiotlb-xen.c
Diff comments   View file @ ab2a47b
... ... @@ -293,9 +293,10 @@
293 293 /*
294 294 * Ensure that the address returned is DMA'ble
295 295 */
296   - if (!dma_capable(dev, dev_addr, size))
297   - panic("map_single: bounce buffer is not DMA'ble");
298   -
  296 + if (!dma_capable(dev, dev_addr, size)) {
  297 + swiotlb_tbl_unmap_single(dev, map, size, dir);
  298 + dev_addr = 0;
  299 + }
299 300 return dev_addr;
300 301 }
301 302 EXPORT_SYMBOL_GPL(xen_swiotlb_map_page);