@@ -14,23 +14,4 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)
return __pfn_to_phys(dma_to_pfn(dev, dev_addr)) + offset;
}
-static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
-{
- u64 limit, mask;
-
- if (!dev->dma_mask)
- return 0;
-
- mask = *dev->dma_mask;
-
- limit = (mask + 1) & ~mask;
- if (limit && size > limit)
- return 0;
-
- if ((addr | (addr + size - 1)) & ~mask)
- return 0;
-
- return 1;
-}
-
#endif /* ASM_ARM_DMA_DIRECT_H */
@@ -2,14 +2,6 @@
#ifndef _MIPS_DMA_DIRECT_H
#define _MIPS_DMA_DIRECT_H 1
-static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
-{
- if (!dev->dma_mask)
- return false;
-
- return addr + size - 1 <= *dev->dma_mask;
-}
-
dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);
phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);
@@ -2,15 +2,6 @@
#ifndef ASM_POWERPC_DMA_DIRECT_H
#define ASM_POWERPC_DMA_DIRECT_H 1
-static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
-{
- if (!dev->dma_mask)
- return false;
-
- return addr + size - 1 <=
- min_not_zero(*dev->dma_mask, dev->bus_dma_mask);
-}
-
static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)
{
if (!dev)
@@ -24,6 +24,7 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)
return paddr + ((phys_addr_t)dev->dma_pfn_offset << PAGE_SHIFT);
}
+#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */
static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
{
@@ -38,7 +39,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
return end <= min_not_zero(*dev->dma_mask, dev->bus_dma_mask);
}
-#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */
#ifdef CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED
bool force_dma_unencrypted(struct device *dev);
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * * * If you do send a fix, please include this trailer: * * Reported-by: "kernelci.org bot" <bot@kernelci.org> * * * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * next/master bisection: boot on peach-pi Summary: Start: 5d1131b4d61e Add linux-next specific files for 20191119 Details: https://kernelci.org/boot/id/5dd3cc9559b5147f05cf54d1 Plain log: https://storage.kernelci.org//next/master/next-20191119/arm/exynos_defconfig/gcc-8/lab-collabora/boot-exynos5800-peach-pi.txt HTML log: https://storage.kernelci.org//next/master/next-20191119/arm/exynos_defconfig/gcc-8/lab-collabora/boot-exynos5800-peach-pi.html Result: b037b220e71d dma-direct: unify the dma_capable definitions Checks: revert: PASS verify: PASS Parameters: Tree: next URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Branch: master Target: peach-pi CPU arch: arm Lab: lab-collabora Compiler: gcc-8 Config: exynos_defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit b037b220e71dcbb34cb710e00ffad2ec025b9163 Author: Christoph Hellwig <hch@lst.de> Date: Tue Nov 12 17:06:04 2019 +0100 dma-direct: unify the dma_capable definitions Currently each architectures that wants to override dma_to_phys and phys_to_dma also has to provide dma_capable. But there isn't really any good reason for that. powerpc and mips just have copies of the generic one minus the latests fix, and the arm one was the inspiration for said fix, but misses the bus_dma_mask handling. Make all architectures use the generic version instead. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [af42d3466bdc8f39806b26f593604fdc54140bcb] Linux 5.4-rc8 git bisect good af42d3466bdc8f39806b26f593604fdc54140bcb # bad: [5d1131b4d61e52e5702e0fa4bcbec81ac7d6ef52] Add linux-next specific files for 20191119 git bisect bad 5d1131b4d61e52e5702e0fa4bcbec81ac7d6ef52 # bad: [c5e9a8e6d8139cfdabb7774c9a39c5589b8d45d0] Merge remote-tracking branch 'crypto/master' git bisect bad c5e9a8e6d8139cfdabb7774c9a39c5589b8d45d0 # bad: [cefecf6f6be345ac0e5c4f878e4d29787918adfb] Merge remote-tracking branch 'pstore/for-next/pstore' git bisect bad cefecf6f6be345ac0e5c4f878e4d29787918adfb # bad: [7b46e62e776e6a55199625b511d42518e4b98d8f] Merge remote-tracking branch 'reset/reset/next' git bisect bad 7b46e62e776e6a55199625b511d42518e4b98d8f # good: [5f1f15283419ded3e16617ac0b79abc6f2b73bba] Merge tag 'omap-for-v5.5/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt git bisect good 5f1f15283419ded3e16617ac0b79abc6f2b73bba # good: [e1351090dd4a172fb26317ae6fa846ab13c50199] ARM: Document merges git bisect good e1351090dd4a172fb26317ae6fa846ab13c50199 # bad: [9050eefca89eb3853d600a61e249fc9fdd8ba332] Merge remote-tracking branch 'arm/for-next' git bisect bad 9050eefca89eb3853d600a61e249fc9fdd8ba332 # good: [0632e899eb046db54d3b1c993811e0b1b7b90b04] Merge remote-tracking branch 'spdx/spdx-linus' git bisect good 0632e899eb046db54d3b1c993811e0b1b7b90b04 # bad: [13fb7b3bb3e314cadfe6dec3132aac31d06950b5] Merge remote-tracking branch 'dma-mapping/for-next' git bisect bad 13fb7b3bb3e314cadfe6dec3132aac31d06950b5 # good: [0241ea8cae19b49fc1b1459f7bbe9a77f4f9cc89] modpost: free ns_deps_buf.p after writing ns_deps files git bisect good 0241ea8cae19b49fc1b1459f7bbe9a77f4f9cc89 # good: [e380a0394c36a3a878c858418d5dd7f5f195b6fc] x86/PCI: sta2x11: use default DMA address translation git bisect good e380a0394c36a3a878c858418d5dd7f5f195b6fc # good: [fcbb8461fd2376ba3782b5b8bd440c929b8e4980] kbuild: remove header compile test git bisect good fcbb8461fd2376ba3782b5b8bd440c929b8e4980 # bad: [e4d2bda544c7df90abed8aaa099b5daf1870bcf8] dma-direct: avoid a forward declaration for phys_to_dma git bisect bad e4d2bda544c7df90abed8aaa099b5daf1870bcf8 # bad: [b037b220e71dcbb34cb710e00ffad2ec025b9163] dma-direct: unify the dma_capable definitions git bisect bad b037b220e71dcbb34cb710e00ffad2ec025b9163 # good: [9f0e56e96c7b2039edb4bda64410216c6e9fe93f] dma-mapping: drop the dev argument to arch_sync_dma_for_* git bisect good 9f0e56e96c7b2039edb4bda64410216c6e9fe93f # first bad commit: [b037b220e71dcbb34cb710e00ffad2ec025b9163] dma-direct: unify the dma_capable definitions -------------------------------------------------------------------------------