Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeb8eede authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS updates from Ralf Baechle:
 "A number of fixes all across the MIPS tree.  No area is particularly
  standing out and things have cooled down quite nicely for a release."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Function tracer: Fix broken function tracing
  mips: Move __virt_addr_valid() to a place for MIPS 64
  MIPS: Netlogic: Fix UP compilation on XLR
  MIPS: AR71xx: Fix AR71XX_PCI_MEM_SIZE
  MIPS: AR724x: Fix AR724X_PCI_MEM_SIZE
  MIPS: Lantiq: Fix cp0_perfcount_irq mapping
  MIPS: DSP: Fix DSP mask for registers.
  MIPS: Fix build failure by adding definition of pfn_pmd().
  MIPS: Octeon: Fix warning.
  MIPS: delay.c: Check BITS_PER_LONG instead of __SIZEOF_LONG__
  MIPS: PNX833x: Fix comment.
  MIPS: Add struct p_format to union mips_instruction.
  MIPS: Export <asm/break.h>.
  MIPS: BCM47xx: Enable SSB prerequisite SSB_DRIVER_PCICORE.
  MIPS: BCM47xx: Select GPIOLIB for BCMA on bcm47xx platform
  MIPS: vpe.c: Fix null pointer dereference in print arguments.
parents 04c2eee5 58b69401

arch/mips/bcm47xx/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -8,8 +8,10 @@ config BCM47XX_SSB 
	select SSB_DRIVER_EXTIF

	select SSB_DRIVER_EXTIF

	select SSB_EMBEDDED

	select SSB_EMBEDDED

	select SSB_B43_PCI_BRIDGE if PCI

	select SSB_B43_PCI_BRIDGE if PCI

	select SSB_DRIVER_PCICORE if PCI

	select SSB_PCICORE_HOSTMODE if PCI

	select SSB_PCICORE_HOSTMODE if PCI

	select SSB_DRIVER_GPIO

	select SSB_DRIVER_GPIO

	select GPIOLIB

	default y

	default y

	help

	help

	 Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.

	 Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.
@@ -25,6 +27,7 @@ config BCM47XX_BCMA 
	select BCMA_HOST_PCI if PCI

	select BCMA_HOST_PCI if PCI

	select BCMA_DRIVER_PCI_HOSTMODE if PCI

	select BCMA_DRIVER_PCI_HOSTMODE if PCI

	select BCMA_DRIVER_GPIO

	select BCMA_DRIVER_GPIO

	select GPIOLIB

	default y

	default y

	help

	help

	 Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.

	 Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.

arch/mips/cavium-octeon/executive/cvmx-l2c.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
 * measurement, and debugging facilities.

 * measurement, and debugging facilities.

 */

 */





#include <linux/compiler.h>

#include <linux/irqflags.h>

#include <linux/irqflags.h>

#include <asm/octeon/cvmx.h>

#include <asm/octeon/cvmx.h>

#include <asm/octeon/cvmx-l2c.h>

#include <asm/octeon/cvmx-l2c.h>
@@ -285,22 +286,22 @@ uint64_t cvmx_l2c_read_perf(uint32_t counter) 
 */

 */

static void fault_in(uint64_t addr, int len)

static void fault_in(uint64_t addr, int len)

{

{

	volatile char *ptr;

	char *ptr;

	volatile char dummy;



	/*

	/*

	 * Adjust addr and length so we get all cache lines even for

	 * Adjust addr and length so we get all cache lines even for

	 * small ranges spanning two cache lines.

	 * small ranges spanning two cache lines.

	 */

	 */

	len += addr & CVMX_CACHE_LINE_MASK;

	len += addr & CVMX_CACHE_LINE_MASK;

	addr &= ~CVMX_CACHE_LINE_MASK;

	addr &= ~CVMX_CACHE_LINE_MASK;

	ptr = (volatile char *)cvmx_phys_to_ptr(addr);

	ptr = cvmx_phys_to_ptr(addr);

	/*

	/*

	 * Invalidate L1 cache to make sure all loads result in data

	 * Invalidate L1 cache to make sure all loads result in data

	 * being in L2.

	 * being in L2.

	 */

	 */

	CVMX_DCACHE_INVALIDATE;

	CVMX_DCACHE_INVALIDATE;

	while (len > 0) {

	while (len > 0) {

		dummy += *ptr;

		ACCESS_ONCE(*ptr);

		len -= CVMX_CACHE_LINE_SIZE;

		len -= CVMX_CACHE_LINE_SIZE;

		ptr += CVMX_CACHE_LINE_SIZE;

		ptr += CVMX_CACHE_LINE_SIZE;

	}

	}

arch/mips/include/asm/dsp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <asm/mipsregs.h>

#include <asm/mipsregs.h>





#define DSP_DEFAULT	0x00000000

#define DSP_DEFAULT	0x00000000

#define DSP_MASK	0x3ff

#define DSP_MASK	0x3f





#define __enable_dsp_hazard()						\

#define __enable_dsp_hazard()						\

do {									\

do {									\

arch/mips/include/asm/inst.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -353,6 +353,7 @@ union mips_instruction { 
	struct u_format u_format;

	struct u_format u_format;

	struct c_format c_format;

	struct c_format c_format;

	struct r_format r_format;

	struct r_format r_format;

	struct p_format p_format;

	struct f_format f_format;

	struct f_format f_format;

	struct ma_format ma_format;

	struct ma_format ma_format;

	struct b_format b_format;

	struct b_format b_format;

arch/mips/include/asm/mach-pnx833x/war.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,4 +21,4 @@ 
#define R10000_LLSC_WAR			0

#define R10000_LLSC_WAR			0

#define MIPS34K_MISSED_ITLB_WAR		0

#define MIPS34K_MISSED_ITLB_WAR		0





#endif /* __ASM_MIPS_MACH_PNX8550_WAR_H */
 
#endif /* __ASM_MIPS_MACH_PNX833X_WAR_H */