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

Commit 5456bd26 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Octeon: Simplify code by assuming CONFIG_64BIT is always set. 



No 32-bit kernels supported on Octeon.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4fe64af7

arch/mips/cavium-octeon/octeon-memcpy.S

+0 −27
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ 
/*

 * Only on the 64-bit kernel we can made use of 64-bit registers.

 */

#ifdef CONFIG_64BIT

#define USE_DOUBLE

#endif



#ifdef USE_DOUBLE



#define LOAD   ld

#define LOADL  ldl
@@ -119,26 +114,6 @@ 
#define t6	$14

#define t7	$15



#else



#define LOAD   lw

#define LOADL  lwl

#define LOADR  lwr

#define STOREL swl

#define STORER swr

#define STORE  sw

#define ADD    addu

#define SUB    subu

#define SRL    srl

#define SLL    sll

#define SRA    sra

#define SLLV   sllv

#define SRLV   srlv

#define NBYTES 4

#define LOG_NBYTES 2



#endif /* USE_DOUBLE */



#ifdef CONFIG_CPU_LITTLE_ENDIAN

#define LDFIRST LOADR

#define LDREST  LOADL
@@ -395,12 +370,10 @@ EXC( sb t0, N(dst), s_exc_p1) 


	COPY_BYTE(0)

	COPY_BYTE(1)

#ifdef USE_DOUBLE

	COPY_BYTE(2)

	COPY_BYTE(3)

	COPY_BYTE(4)

	COPY_BYTE(5)

#endif

EXC(	lb	t0, NBYTES-2(src), l_exc)

	SUB	len, len, 1

	jr	ra

arch/mips/cavium-octeon/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -666,16 +666,10 @@ void __init plat_mem_setup(void) 
	cvmx_bootmem_lock();

	while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX)

		&& (total < MAX_MEMORY)) {

#ifdef CONFIG_64BIT

		memory = cvmx_bootmem_phy_alloc(mem_alloc_size,

						__pa_symbol(&__init_end), -1,

						0x100000,

						CVMX_BOOTMEM_FLAG_NO_LOCKING);

#else

		memory = cvmx_bootmem_phy_alloc(mem_alloc_size, 0, 512 << 20,

						0x100000,

						CVMX_BOOTMEM_FLAG_NO_LOCKING);

#endif

		if (memory >= 0) {

			u64 size = mem_alloc_size;