Commit 534ea58b authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Thomas Bogendoerfer
Browse files

Revert "MIPS: octeon: Remove vestiges of CONFIG_CAVIUM_RESERVE32" 



This reverts commit e98b461b.

We actually have been using the CONFIG_CAVIUM_RESERVE32 and previous patch
defined it in the corresponding Kconfig.

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 3e3114ac

arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c

+17 −4
Original line number Diff line number Diff line
@@ -57,10 +57,23 @@ EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr); 
static cvmx_cmd_queue_result_t __cvmx_cmd_queue_init_state_ptr(void)

{

	char *alloc_name = "cvmx_cmd_queues";

#if defined(CONFIG_CAVIUM_RESERVE32) && CONFIG_CAVIUM_RESERVE32

	extern uint64_t octeon_reserve32_memory;

#endif



	if (likely(__cvmx_cmd_queue_state_ptr))

		return CVMX_CMD_QUEUE_SUCCESS;



#if defined(CONFIG_CAVIUM_RESERVE32) && CONFIG_CAVIUM_RESERVE32

	if (octeon_reserve32_memory)

		__cvmx_cmd_queue_state_ptr =

		    cvmx_bootmem_alloc_named_range(sizeof(*__cvmx_cmd_queue_state_ptr),

						   octeon_reserve32_memory,

						   octeon_reserve32_memory +

						   (CONFIG_CAVIUM_RESERVE32 <<

						    20) - 1, 128, alloc_name);

	else

#endif

		__cvmx_cmd_queue_state_ptr =

		    cvmx_bootmem_alloc_named(sizeof(*__cvmx_cmd_queue_state_ptr),

					    128,

arch/mips/cavium-octeon/setup.c

+37 −1
Original line number Diff line number Diff line
@@ -284,6 +284,11 @@ void octeon_crash_smp_send_stop(void) 


#endif /* CONFIG_KEXEC */



#ifdef CONFIG_CAVIUM_RESERVE32

uint64_t octeon_reserve32_memory;

EXPORT_SYMBOL(octeon_reserve32_memory);

#endif



#ifdef CONFIG_KEXEC

/* crashkernel cmdline parameter is parsed _after_ memory setup

 * we also parse it here (workaround for EHB5200) */
@@ -661,7 +666,9 @@ void __init prom_init(void) 
	int i;

	u64 t;

	int argc;



#ifdef CONFIG_CAVIUM_RESERVE32

	int64_t addr = -1;

#endif

	/*

	 * The bootloader passes a pointer to the boot descriptor in

	 * $a3, this is available as fw_arg3.
@@ -776,6 +783,25 @@ void __init prom_init(void) 
		cvmx_write_csr(CVMX_LED_UDD_DATX(1), 0);

		cvmx_write_csr(CVMX_LED_EN, 1);

	}

#ifdef CONFIG_CAVIUM_RESERVE32

	/*

	 * We need to temporarily allocate all memory in the reserve32

	 * region. This makes sure the kernel doesn't allocate this

	 * memory when it is getting memory from the

	 * bootloader. Later, after the memory allocations are

	 * complete, the reserve32 will be freed.

	 *

	 * Allocate memory for RESERVED32 aligned on 2MB boundary. This

	 * is in case we later use hugetlb entries with it.

	 */

	addr = cvmx_bootmem_phy_named_block_alloc(CONFIG_CAVIUM_RESERVE32 << 20,

						0, 0, 2 << 20,

						"CAVIUM_RESERVE32", 0);

	if (addr < 0)

		pr_err("Failed to allocate CAVIUM_RESERVE32 memory area\n");

	else

		octeon_reserve32_memory = addr;

#endif



#ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2

	if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) {
@@ -1053,6 +1079,16 @@ void __init plat_mem_setup(void) 
	cvmx_bootmem_unlock();

#endif /* CONFIG_CRASH_DUMP */



#ifdef CONFIG_CAVIUM_RESERVE32

	/*

	 * Now that we've allocated the kernel memory it is safe to

	 * free the reserved region. We free it here so that builtin

	 * drivers can use the memory.

	 */

	if (octeon_reserve32_memory)

		cvmx_bootmem_free_named("CAVIUM_RESERVE32");

#endif /* CONFIG_CAVIUM_RESERVE32 */



	if (total == 0)

		panic("Unable to allocate memory from "

		      "cvmx_bootmem_phy_alloc");