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

Commit f05f8198 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:
 - Minor updates and fixes to the Octeon ethernet driver in staging
 - A fix to VGA_MAP_MEM() for 64 bit platforms
 - Fix a workaround for 74K/1074K processors
 - The symlink arch/mips/boot/dts/include/dt-bindings was pointing to a
   a file with a name ending in \n.  I think this may have been caused
   by a git bug with with patches sent by email
 - A build fix for VGA console on BCM1480-based systems
 - Fix PCI device access via "/sys/bus/pci/.../resource0" or similar
   work for Alchemy platforms
 - Fix potential data leak on MIPS R5 cores.  This doesn't add proper
   support for any R5 features, just ensures a kernel without such
   support will be secure to run
 - Adding a macros for the CP0 Config5 register to be used by the R5 fix
 - Make get_cycles() actually return something useful where possible
   This also requires a preparatory patch for performance sake
 - Fix a warning about the use of smp_processor_id() in preemptible
   code.  Again this includes a preparatory patch adding the
   infrastructure to be used by the actual patch
 - Finally remove pointless one-line comment

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix invalid symbolic link file
  MIPS: PCI: pci-bcm1480: Include missing vt.h header
  MIPS: Disable usermode switching of the FR bit for MIPS R5 CPUs.
  MIPS: Add MIPS R5 config5 register.
  MIPS: PCI: Use pci_resource_to_user to map pci memory space properly
  MIPS: 74K/1074K: Correct erratum workaround.
  MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks
  MIPS: Remove useless comment about kprobe from arch/mips/Makefile
  MIPS: Fix VGA_MAP_MEM macro.
  MIPS: Reimplement get_cycles().
  MIPS: Optimize current_cpu_type() for better code.
  MIPS: Fix accessing to per-cpu data when flushing the cache
  MIPS: Provide nice way to access boot CPU's data.
  staging: octeon-ethernet: rgmii: enable interrupts that we can handle
  staging: octeon-ethernet: remove skb alloc failure warnings
  staging: octeon-ethernet: make dropped packets to consume NAPI budget
parents e9ff04dd 66b10574

arch/mips/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -288,9 +288,6 @@ endif 
vmlinux.32: vmlinux

	$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@





#obj-$(CONFIG_KPROBES)		+= kprobes.o



#

# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit

# ELF files from 32-bit files by conversion.

arch/mips/alchemy/common/usb.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/syscore_ops.h>

#include <asm/cpu.h>

#include <asm/mach-au1x00/au1000.h>



/* control register offsets */
@@ -358,7 +359,7 @@ static inline int au1200_coherency_bug(void) 
{

#if defined(CONFIG_DMA_COHERENT)

	/* Au1200 AB USB does not support coherent memory */

	if (!(read_c0_prid() & 0xff)) {

	if (!(read_c0_prid() & PRID_REV_MASK)) {

		printk(KERN_INFO "Au1200 USB: this is chip revision AB !!\n");

		printk(KERN_INFO "Au1200 USB: update your board or re-configure"

				 " the kernel\n");

arch/mips/bcm63xx/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -306,14 +306,14 @@ void __init bcm63xx_cpu_init(void) 


	switch (c->cputype) {

	case CPU_BMIPS3300:

		if ((read_c0_prid() & 0xff00) != PRID_IMP_BMIPS3300_ALT)

		if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT)

			__cpu_name[cpu] = "Broadcom BCM6338";

		/* fall-through */

	case CPU_BMIPS32:

		chipid_reg = BCM_6345_PERF_BASE;

		break;

	case CPU_BMIPS4350:

		switch ((read_c0_prid() & 0xff)) {

		switch ((read_c0_prid() & PRID_REV_MASK)) {

		case 0x04:

			chipid_reg = BCM_3368_PERF_BASE;

			break;

arch/mips/cavium-octeon/csrc-octeon.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/smp.h>



#include <asm/cpu-info.h>

#include <asm/cpu-type.h>

#include <asm/time.h>



#include <asm/octeon/octeon.h>

arch/mips/dec/prom/init.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <asm/bootinfo.h>

#include <asm/cpu.h>

#include <asm/cpu-type.h>

#include <asm/processor.h>



#include <asm/dec/prom.h>