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

Commit e61467e9 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:
  CHAR: Delete old and now unused M48T35 RTC driver for SGI IP27.
  CHAR: Delete old and now unused DS1286 driver.
  MIPS: Sort out CPU type to name translation.
  MIPS: Use the new byteorder headers
  MIPS: Probe for watch registers on cores of all vendors, not just MTI.
  MIPS: Switch FPU emulator trap to BREAK instruction.
  MIPS: SMP: Do not initialize __cpu_number_map/__cpu_logical_map for CPU 0.
  MIPS: Consider value of c0_ebase when computing value of exception base.
  MIPS: Clean up MIPSxx-optimized bitop functions
  MIPS: New feature test macro cpu_has_mips_r
  MIPS: RBTX4927: Add GPIO-LED support
  MIPS: TXx9: Fix RBTX4939 ethernet address initialization
parents c732acd9 09d9327b

arch/mips/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ config SGI_IP22 
	select IP22_CPU_SCACHE

	select IRQ_CPU

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select SGI_HAS_DS1286

	select SGI_HAS_I8042

	select SGI_HAS_INDYDOG

	select SGI_HAS_HAL2
@@ -382,7 +381,6 @@ config SGI_IP28 
	select HW_HAS_EISA

	select I8253

	select I8259

	select SGI_HAS_DS1286

	select SGI_HAS_I8042

	select SGI_HAS_INDYDOG

	select SGI_HAS_HAL2
@@ -893,9 +891,6 @@ config EMMA2RH 
config SERIAL_RM9000

	bool



config SGI_HAS_DS1286

	bool



config SGI_HAS_INDYDOG

	bool

arch/mips/configs/ip22_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -771,7 +771,6 @@ CONFIG_WATCHDOG=y 
CONFIG_INDYDOG=m

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

CONFIG_SGI_DS1286=m

# CONFIG_R3964 is not set

CONFIG_RAW_DRIVER=m

CONFIG_MAX_RAW_DEVS=256

arch/mips/configs/ip27_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -701,7 +701,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_WATCHDOG is not set

CONFIG_HW_RANDOM=m

# CONFIG_RTC is not set

CONFIG_SGI_IP27_RTC=y

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_DRM is not set

arch/mips/configs/ip28_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ CONFIG_CPU_BIG_ENDIAN=y 
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y

CONFIG_IRQ_CPU=y

CONFIG_SWAP_IO_SPACE=y

CONFIG_SGI_HAS_DS1286=y

CONFIG_SGI_HAS_INDYDOG=y

CONFIG_SGI_HAS_SEEQ=y

CONFIG_SGI_HAS_WD93=y
@@ -585,7 +584,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

CONFIG_SGI_DS1286=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

arch/mips/include/asm/bitops.h

+76 −38
Original line number Diff line number Diff line
@@ -558,39 +558,67 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long * 
	__clear_bit(nr, addr);

}



#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)



/*

 * Return the bit position (0..63) of the most significant 1 bit in a word

 * Returns -1 if no 1 bit exists

 */

static inline unsigned long __fls(unsigned long x)

static inline unsigned long __fls(unsigned long word)

{

	int lz;

	int num;



	if (sizeof(x) == 4) {

	if (BITS_PER_LONG == 32 &&

	    __builtin_constant_p(cpu_has_mips_r) && cpu_has_mips_r) {

		__asm__(

		"	.set	push					\n"

		"	.set	mips32					\n"

		"	clz	%0, %1					\n"

		"	.set	pop					\n"

		: "=r" (lz)

		: "r" (x));

		: "=r" (num)

		: "r" (word));



		return 31 - lz;

		return 31 - num;

	}



	BUG_ON(sizeof(x) != 8);



	if (BITS_PER_LONG == 64 &&

	    __builtin_constant_p(cpu_has_mips64) && cpu_has_mips64) {

		__asm__(

		"	.set	push					\n"

		"	.set	mips64					\n"

		"	dclz	%0, %1					\n"

		"	.set	pop					\n"

	: "=r" (lz)

	: "r" (x));

		: "=r" (num)

		: "r" (word));



	return 63 - lz;

		return 63 - num;

	}



	num = BITS_PER_LONG - 1;



#if BITS_PER_LONG == 64

	if (!(word & (~0ul << 32))) {

		num -= 32;

		word <<= 32;

	}

#endif

	if (!(word & (~0ul << (BITS_PER_LONG-16)))) {

		num -= 16;

		word <<= 16;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-8)))) {

		num -= 8;

		word <<= 8;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-4)))) {

		num -= 4;

		word <<= 4;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-2)))) {

		num -= 2;

		word <<= 2;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-1))))

		num -= 1;

	return num;

}



/*
@@ -612,23 +640,43 @@ static inline unsigned long __ffs(unsigned long word) 
 * This is defined the same way as ffs.

 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.

 */

static inline int fls(int word)

static inline int fls(int x)

{

	__asm__("clz %0, %1" : "=r" (word) : "r" (word));

	int r;



	return 32 - word;

}

	if (__builtin_constant_p(cpu_has_mips_r) && cpu_has_mips_r) {

		__asm__("clz %0, %1" : "=r" (x) : "r" (x));



#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64)

static inline int fls64(__u64 word)

{

	__asm__("dclz %0, %1" : "=r" (word) : "r" (word));

		return 32 - x;

	}



	return 64 - word;

	r = 32;

	if (!x)

		return 0;

	if (!(x & 0xffff0000u)) {

		x <<= 16;

		r -= 16;

	}

	if (!(x & 0xff000000u)) {

		x <<= 8;

		r -= 8;

	}

	if (!(x & 0xf0000000u)) {

		x <<= 4;

		r -= 4;

	}

	if (!(x & 0xc0000000u)) {

		x <<= 2;

		r -= 2;

	}

	if (!(x & 0x80000000u)) {

		x <<= 1;

		r -= 1;

	}

	return r;

}

#else



#include <asm-generic/bitops/fls64.h>

#endif



/*

 * ffs - find first bit set.
@@ -646,16 +694,6 @@ static inline int ffs(int word) 
	return fls(word & -word);

}



#else



#include <asm-generic/bitops/__ffs.h>

#include <asm-generic/bitops/__fls.h>

#include <asm-generic/bitops/ffs.h>

#include <asm-generic/bitops/fls.h>

#include <asm-generic/bitops/fls64.h>



#endif /*defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) */



#include <asm-generic/bitops/ffz.h>

#include <asm-generic/bitops/find.h>