]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "arm64: Revert L1_CACHE_SHIFT back to 6 (64-byte cache line size)"
authorWill Deacon <will.deacon@arm.com>
Tue, 27 Mar 2018 11:04:51 +0000 (12:04 +0100)
committerWill Deacon <will.deacon@arm.com>
Tue, 27 Mar 2018 11:04:51 +0000 (12:04 +0100)
commite93738c8bc64503f4b5e41507dc362e8968e836f
treee2ebead8eb4ed13267839d8710749154d77545d7
parentc9eb97646b06b76968effa7d6adc1e722a98c573
Revert "arm64: Revert L1_CACHE_SHIFT back to 6 (64-byte cache line size)"

This reverts commit 33a72f907319bfef50b212309bcd898a465c06dc.

The internal dma-direct.h API has changed in -next, which collides with
us trying to use it to manage non-coherent DMA devices on systems with
unreasonably large cache writeback granules.

This isn't at all trivial to resolve, so revert our changes for now and
we can revisit this after the merge window. Effectively, this just
restores our behaviour back to that of 4.16.

Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/Kconfig
arch/arm64/include/asm/cache.h
arch/arm64/include/asm/dma-direct.h [deleted file]
arch/arm64/kernel/cpufeature.c
arch/arm64/mm/dma-mapping.c
arch/arm64/mm/init.c