diff options
author | 2018-11-09 16:21:24 -0600 | |
---|---|---|
committer | 2018-11-09 16:21:24 -0600 | |
commit | 26eaed4671af3c4108b266504aed1103fb68a378 (patch) | |
tree | 827372d58c98450ec3661f34fe538b5b4cbb0514 | |
parent | Merge tag 's390-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390... (diff) | |
parent | MIPS: Fix `dma_alloc_coherent' returning a non-coherent allocation (diff) | |
download | linux-26eaed4671af3c4108b266504aed1103fb68a378.tar.gz linux-26eaed4671af3c4108b266504aed1103fb68a378.tar.bz2 linux-26eaed4671af3c4108b266504aed1103fb68a378.zip |
Merge tag 'mips_fixes_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Paul Burton:
"A couple of small MIPS fixes for 4.20:
- Extend an array to avoid overruns on some Octeon hardware, fixing a
bug introduced in 4.3.
- Fix a coherent DMA regression for systems without cache-coherent
DMA introduced in the 4.20 merge window"
* tag 'mips_fixes_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: Fix `dma_alloc_coherent' returning a non-coherent allocation
MIPS: OCTEON: fix out of bounds array access on CN68XX
-rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/dma-noncoherent.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c index 75108ec669eb..6c79e8a16a26 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c @@ -67,7 +67,7 @@ void (*cvmx_override_pko_queue_priority) (int pko_port, void (*cvmx_override_ipd_port_setup) (int ipd_port); /* Port count per interface */ -static int interface_port_count[5]; +static int interface_port_count[9]; /** * Return the number of interfaces the chip has. Each interface diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index e6c9485cadcf..cb38461391cb 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c @@ -50,7 +50,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, void *ret; ret = dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs); - if (!ret && !(attrs & DMA_ATTR_NON_CONSISTENT)) { + if (ret && !(attrs & DMA_ATTR_NON_CONSISTENT)) { dma_cache_wback_inv((unsigned long) ret, size); ret = (void *)UNCAC_ADDR(ret); } |