From: Greg Kroah-Hartman Date: Wed, 13 Jan 2021 09:51:32 +0000 (+0100) Subject: Merge tag 'misc-habanalabs-fixes-2021-01-13' of https://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.15~1920^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02039b172327da1e64beca615500367abf8605c6;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'misc-habanalabs-fixes-2021-01-13' of https://git./linux/kernel/git/ogabbay/linux into char-misc-linus Oded writes: This tag contains the following bug fixes: - Fix the dma address that is passed to dma_mmap_coherent. We passed an address that includes an offset that is needed by our device and that caused dma_mmap_coherent to do an errounous mapping. - Fix the reset process in case failures happen during the reset process. Without this fix, if the user would have asked to perform reset after the previous reset failed he would get a kernel panic - WA to prevent soft lockup BUG during unmap of host memory. In case of tens of thousands of mappings, the unmapping can take a long time that exceeds the soft lockup timeout. This WA adds a small sleep every 32K page unmappings to prevent that. * tag 'misc-habanalabs-fixes-2021-01-13' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux: habanalabs: prevent soft lockup during unmap habanalabs: fix reset process in case of failures habanalabs: fix dma_addr passed to dma_mmap_coherent --- 02039b172327da1e64beca615500367abf8605c6