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

Commit 46056be7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Outline udelay and fix a few issues.
  MIPS: ioctl.h: Fix headers_check warnings
  MIPS: Cobalt: PCI bus is always required to obtain the board ID
  MIPS: Kconfig: Remove "Support for" from Cavium system type
  MIPS: Sibyte: Honor CONFIG_CMDLINE
  SSB: BCM47xx: Export ssb_watchdog_timer_set
parents 5284c6b9 5636919b

arch/mips/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ config MIPS_COBALT 
	select IRQ_CPU

	select IRQ_GT641XX

	select PCI_GT64XXX_PCI0

	select PCI

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -593,7 +594,7 @@ config WR_PPMC 
	  board, which is based on GT64120 bridge chip.



config CAVIUM_OCTEON_SIMULATOR

	bool "Support for the Cavium Networks Octeon Simulator"

	bool "Cavium Networks Octeon Simulator"

	select CEVT_R4K

	select 64BIT_PHYS_ADDR

	select DMA_COHERENT
@@ -607,7 +608,7 @@ config CAVIUM_OCTEON_SIMULATOR 
	  hardware.



config CAVIUM_OCTEON_REFERENCE_BOARD

	bool "Support for the Cavium Networks Octeon reference board"

	bool "Cavium Networks Octeon reference board"

	select CEVT_R4K

	select 64BIT_PHYS_ADDR

	select DMA_COHERENT

arch/mips/include/asm/cpu-info.h

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ struct cache_desc { 
#define MIPS_CACHE_PINDEX	0x00000020	/* Physically indexed cache */



struct cpuinfo_mips {

	unsigned long		udelay_val;

	unsigned long		asid_cache;

	unsigned int		udelay_val;

	unsigned int		asid_cache;



	/*

	 * Capability and feature descriptor structure for MIPS CPU

arch/mips/include/asm/delay.h

+5 −87
Original line number Diff line number Diff line
@@ -11,94 +11,12 @@ 
#ifndef _ASM_DELAY_H

#define _ASM_DELAY_H



#include <linux/param.h>

#include <linux/smp.h>

extern void __delay(unsigned int loops);

extern void __ndelay(unsigned int ns);

extern void __udelay(unsigned int us);



#include <asm/compiler.h>

#include <asm/war.h>



static inline void __delay(unsigned long loops)

{

	if (sizeof(long) == 4)

		__asm__ __volatile__ (

		"	.set	noreorder				\n"

		"	.align	3					\n"

		"1:	bnez	%0, 1b					\n"

		"	subu	%0, 1					\n"

		"	.set	reorder					\n"

		: "=r" (loops)

		: "0" (loops));

	else if (sizeof(long) == 8 && !DADDI_WAR)

		__asm__ __volatile__ (

		"	.set	noreorder				\n"

		"	.align	3					\n"

		"1:	bnez	%0, 1b					\n"

		"	dsubu	%0, 1					\n"

		"	.set	reorder					\n"

		: "=r" (loops)

		: "0" (loops));

	else if (sizeof(long) == 8 && DADDI_WAR)

		__asm__ __volatile__ (

		"	.set	noreorder				\n"

		"	.align	3					\n"

		"1:	bnez	%0, 1b					\n"

		"	dsubu	%0, %2					\n"

		"	.set	reorder					\n"

		: "=r" (loops)

		: "0" (loops), "r" (1));

}





/*

 * Division by multiplication: you don't have to worry about

 * loss of precision.

 *

 * Use only for very small delays ( < 1 msec).  Should probably use a

 * lookup table, really, as the multiplications take much too long with

 * short delays.  This is a "reasonable" implementation, though (and the

 * first constant multiplications gets optimized away if the delay is

 * a constant)

 */



static inline void __udelay(unsigned long usecs, unsigned long lpj)

{

	unsigned long hi, lo;



	/*

	 * The rates of 128 is rounded wrongly by the catchall case

	 * for 64-bit.  Excessive precission?  Probably ...

	 */

#if defined(CONFIG_64BIT) && (HZ == 128)

	usecs *= 0x0008637bd05af6c7UL;		/* 2**64 / (1000000 / HZ) */

#elif defined(CONFIG_64BIT)

	usecs *= (0x8000000000000000UL / (500000 / HZ));

#else /* 32-bit junk follows here */

	usecs *= (unsigned long) (((0x8000000000000000ULL / (500000 / HZ)) +

	                           0x80000000ULL) >> 32);

#endif



	if (sizeof(long) == 4)

		__asm__("multu\t%2, %3"

		: "=h" (usecs), "=l" (lo)

		: "r" (usecs), "r" (lpj)

		: GCC_REG_ACCUM);

	else if (sizeof(long) == 8 && !R4000_WAR)

		__asm__("dmultu\t%2, %3"

		: "=h" (usecs), "=l" (lo)

		: "r" (usecs), "r" (lpj)

		: GCC_REG_ACCUM);

	else if (sizeof(long) == 8 && R4000_WAR)

		__asm__("dmultu\t%3, %4\n\tmfhi\t%0"

		: "=r" (usecs), "=h" (hi), "=l" (lo)

		: "r" (usecs), "r" (lpj)

		: GCC_REG_ACCUM);



	__delay(usecs);

}



#define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val



#define udelay(usecs) __udelay((usecs), __udelay_val)

#define ndelay(ns) __udelay(ns)

#define udelay(us) __udelay(us)



/* make sure "usecs *= ..." in udelay do not overflow. */

#if HZ >= 1000

arch/mips/include/asm/ioctl.h

+4 −0
Original line number Diff line number Diff line
@@ -60,12 +60,16 @@ 
	 ((nr)   << _IOC_NRSHIFT) | \

	 ((size) << _IOC_SIZESHIFT))



#ifdef __KERNEL__

/* provoke compile error for invalid uses of size argument */

extern unsigned int __invalid_size_argument_for_IOC;

#define _IOC_TYPECHECK(t) \

	((sizeof(t) == sizeof(t[1]) && \

	  sizeof(t) < (1 << _IOC_SIZEBITS)) ? \

	  sizeof(t) : __invalid_size_argument_for_IOC)

#else

#define _IOC_TYPECHECK(t)	(sizeof(t))

#endif



/* used to create numbers */

#define _IO(type, nr)		_IOC(_IOC_NONE, (type), (nr), 0)

arch/mips/kernel/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	seq_printf(m, fmt, __cpu_name[n],

	                           (version >> 4) & 0x0f, version & 0x0f,

	                           (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);

	seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",

	seq_printf(m, "BogoMIPS\t\t: %u.%02u\n",

	              cpu_data[n].udelay_val / (500000/HZ),

	              (cpu_data[n].udelay_val / (5000/HZ)) % 100);

	seq_printf(m, "wait instruction\t: %s\n", cpu_wait ? "yes" : "no");