Merge tag 'mips_fixes_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

torvalds · torvalds · commit 26eaed4671af · 2018-11-09T16:21:24.000-06:00
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
diff --git 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
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void arch_dma_alloc(struct device dev, size_t size,`
`50`	`50`	`void *ret;`
`51`	`51`
`52`	`52`	`ret = dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs);`
`53`		`- if (!ret && !(attrs & DMA_ATTR_NON_CONSISTENT)) {`
	`53`	`+ if (ret && !(attrs & DMA_ATTR_NON_CONSISTENT)) {`
`54`	`54`	`dma_cache_wback_inv((unsigned long) ret, size);`
`55`	`55`	`ret = (void *)UNCAC_ADDR(ret);`
`56`	`56`	`}`