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

Commit c82e6d45 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:
  Staging: octeon-ethernet: Fix race freeing transmit buffers.
  Staging: octeon-ethernet: Convert to use net_device_ops.
  MIPS: Cavium: Add CPU hotplugging code.
  MIPS: SMP: Allow suspend and hibernation if CPU hotplug is available
  MIPS: Add arch generic CPU hotplug
  DMA: txx9dmac: use dma_unmap_single if DMA_COMPL_{SRC,DEST}_UNMAP_SINGLE set
  MIPS: Sibyte: Fix build error if CONFIG_SERIAL_SB1250_DUART is undefined.
  MIPS: MIPSsim: Fix build error if MSC01E_INT_BASE is undefined.
  MIPS: Hibernation: Remove SMP TLB and cacheflushing code.
  MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.
  MIPS: bug.h Build fix - include <linux/compiler.h>.
parents c3cb5e19 a620c163

arch/mips/Kconfig

+14 −3
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ config CAVIUM_OCTEON_SIMULATOR 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_CPU_CAVIUM_OCTEON

	help

	  The Octeon simulator is software performance model of the Cavium
@@ -615,6 +616,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_CPU_CAVIUM_OCTEON

	select SWAP_IO_SPACE
@@ -784,8 +786,17 @@ config SYS_HAS_EARLY_PRINTK 
	bool



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	depends on SMP && HOTPLUG && SYS_SUPPORTS_HOTPLUG_CPU

	help

	  Say Y here to allow turning CPUs off and on. CPUs can be

	  controlled through /sys/devices/system/cpu.

	  (Note: power management support will enable this option

	    automatically on SMP systems. )

	  Say N if you want to disable CPU hotplug.



config SYS_SUPPORTS_HOTPLUG_CPU

	bool

	default n



config I8259

	bool
@@ -2136,11 +2147,11 @@ menu "Power management options" 


config ARCH_HIBERNATION_POSSIBLE

	def_bool y

	depends on !SMP

	depends on SYS_SUPPORTS_HOTPLUG_CPU



config ARCH_SUSPEND_POSSIBLE

	def_bool y

	depends on !SMP

	depends on SYS_SUPPORTS_HOTPLUG_CPU



source "kernel/power/Kconfig"

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

+60 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 */

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/hardirq.h>

#include <linux/smp.h>



#include <asm/octeon/octeon.h>

#include <asm/octeon/cvmx-pexp-defs.h>
@@ -501,3 +501,62 @@ asmlinkage void plat_irq_dispatch(void) 
		}

	}

}



#ifdef CONFIG_HOTPLUG_CPU

static int is_irq_enabled_on_cpu(unsigned int irq, unsigned int cpu)

{

       unsigned int isset;

#ifdef CONFIG_SMP

       int coreid = cpu_logical_map(cpu);

#else

	int coreid = cvmx_get_core_num();

#endif

	int bit = (irq < OCTEON_IRQ_WDOG0) ?

		irq - OCTEON_IRQ_WORKQ0 : irq - OCTEON_IRQ_WDOG0;

       if (irq < 64) {

		isset = (cvmx_read_csr(CVMX_CIU_INTX_EN0(coreid * 2)) &

			(1ull << bit)) >> bit;

       } else {

	       isset = (cvmx_read_csr(CVMX_CIU_INTX_EN1(coreid * 2 + 1)) &

			(1ull << bit)) >> bit;

       }

       return isset;

}



void fixup_irqs(void)

{

       int irq;



	for (irq = OCTEON_IRQ_SW0; irq <= OCTEON_IRQ_TIMER; irq++)

		octeon_irq_core_disable_local(irq);



	for (irq = OCTEON_IRQ_WORKQ0; irq <= OCTEON_IRQ_GPIO15; irq++) {

		if (is_irq_enabled_on_cpu(irq, smp_processor_id())) {

			/* ciu irq migrates to next cpu */

			octeon_irq_chip_ciu0.disable(irq);

			octeon_irq_ciu0_set_affinity(irq, &cpu_online_map);

		}

	}



#if 0

	for (irq = OCTEON_IRQ_MBOX0; irq <= OCTEON_IRQ_MBOX1; irq++)

		octeon_irq_mailbox_mask(irq);

#endif

	for (irq = OCTEON_IRQ_UART0; irq <= OCTEON_IRQ_BOOTDMA; irq++) {

		if (is_irq_enabled_on_cpu(irq, smp_processor_id())) {

			/* ciu irq migrates to next cpu */

			octeon_irq_chip_ciu0.disable(irq);

			octeon_irq_ciu0_set_affinity(irq, &cpu_online_map);

		}

	}



	for (irq = OCTEON_IRQ_UART2; irq <= OCTEON_IRQ_RESERVED135; irq++) {

		if (is_irq_enabled_on_cpu(irq, smp_processor_id())) {

			/* ciu irq migrates to next cpu */

			octeon_irq_chip_ciu1.disable(irq);

			octeon_irq_ciu1_set_affinity(irq, &cpu_online_map);

		}

	}

}



#endif /* CONFIG_HOTPLUG_CPU */

arch/mips/cavium-octeon/octeon_boot.h

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/*

 * (C) Copyright 2004, 2005 Cavium Networks

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation; either version 2 of

 * the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,

 * MA 02111-1307 USA

 */



#ifndef __OCTEON_BOOT_H__

#define __OCTEON_BOOT_H__



#include <linux/types.h>



struct boot_init_vector {

	uint32_t stack_addr;

	uint32_t code_addr;

	uint32_t app_start_func_addr;

	uint32_t k0_val;

	uint32_t flags;

	uint32_t boot_info_addr;

	uint32_t pad;

	uint32_t pad2;

};



/* similar to bootloader's linux_app_boot_info but without global data */

struct linux_app_boot_info {

	uint32_t labi_signature;

	uint32_t start_core0_addr;

	uint32_t avail_coremask;

	uint32_t pci_console_active;

	uint32_t icache_prefetch_disable;

	uint32_t InitTLBStart_addr;

	uint32_t start_app_addr;

	uint32_t cur_exception_base;

	uint32_t no_mark_private_data;

	uint32_t compact_flash_common_base_addr;

	uint32_t compact_flash_attribute_base_addr;

	uint32_t led_display_base_addr;

};



/* If not to copy a lot of bootloader's structures

   here is only offset of requested member */

#define AVAIL_COREMASK_OFFSET_IN_LINUX_APP_BOOT_BLOCK    0x765c



/* hardcoded in bootloader */

#define  LABI_ADDR_IN_BOOTLOADER                         0x700



#define LINUX_APP_BOOT_BLOCK_NAME "linux-app-boot"



#define LABI_SIGNATURE 0xAABBCCDD



/*  from uboot-headers/octeon_mem_map.h */

#define EXCEPTION_BASE_INCR     (4 * 1024)

			       /* Increment size for exception base addresses (4k minimum) */

#define EXCEPTION_BASE_BASE     0

#define BOOTLOADER_PRIV_DATA_BASE       (EXCEPTION_BASE_BASE + 0x800)

#define BOOTLOADER_BOOT_VECTOR          (BOOTLOADER_PRIV_DATA_BASE)



#endif /* __OCTEON_BOOT_H__ */

arch/mips/cavium-octeon/setup.c

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

#include <linux/irq.h>

#include <linux/serial.h>

#include <linux/smp.h>

#include <linux/types.h>

#include <linux/string.h>	/* for memset */

#include <linux/tty.h>

arch/mips/cavium-octeon/smp.c

+233 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *

 * Copyright (C) 2004-2008 Cavium Networks

 */

#include <linux/cpu.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/smp.h>
@@ -19,10 +20,16 @@ 


#include <asm/octeon/octeon.h>



#include "octeon_boot.h"



volatile unsigned long octeon_processor_boot = 0xff;

volatile unsigned long octeon_processor_sp;

volatile unsigned long octeon_processor_gp;



#ifdef CONFIG_HOTPLUG_CPU

static unsigned int InitTLBStart_addr;

#endif



static irqreturn_t mailbox_interrupt(int irq, void *dev_id)

{

	const int coreid = cvmx_get_core_num();
@@ -67,8 +74,28 @@ static inline void octeon_send_ipi_mask(cpumask_t mask, unsigned int action) 
}



/**

 * Detect available CPUs, populate phys_cpu_present_map

 * Detect available CPUs, populate cpu_possible_map

 */

static void octeon_smp_hotplug_setup(void)

{

#ifdef CONFIG_HOTPLUG_CPU

	uint32_t labi_signature;



	labi_signature =

		cvmx_read64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

					LABI_ADDR_IN_BOOTLOADER +

					offsetof(struct linux_app_boot_info,

						    labi_signature)));

	if (labi_signature != LABI_SIGNATURE)

		pr_err("The bootloader version on this board is incorrect\n");

	InitTLBStart_addr =

		cvmx_read64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

				   LABI_ADDR_IN_BOOTLOADER +

					   offsetof(struct linux_app_boot_info,

						    InitTLBStart_addr)));

#endif

}



static void octeon_smp_setup(void)

{

	const int coreid = cvmx_get_core_num();
@@ -91,6 +118,9 @@ static void octeon_smp_setup(void) 
			cpus++;

		}

	}

	cpu_present_map = cpu_possible_map;



	octeon_smp_hotplug_setup();

}



/**
@@ -128,6 +158,17 @@ static void octeon_init_secondary(void) 
	const int coreid = cvmx_get_core_num();

	union cvmx_ciu_intx_sum0 interrupt_enable;



#ifdef CONFIG_HOTPLUG_CPU

	unsigned int cur_exception_base;



	cur_exception_base = cvmx_read64_uint32(

		CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

			     LABI_ADDR_IN_BOOTLOADER +

			     offsetof(struct linux_app_boot_info,

				      cur_exception_base)));

	/* cur_exception_base is incremented in bootloader after setting */

	write_c0_ebase((unsigned int)(cur_exception_base - EXCEPTION_BASE_INCR));

#endif

	octeon_check_cpu_bist();

	octeon_init_cvmcount();

	/*
@@ -199,6 +240,193 @@ static void octeon_cpus_done(void) 
#endif

}



#ifdef CONFIG_HOTPLUG_CPU



/* State of each CPU. */

DEFINE_PER_CPU(int, cpu_state);



extern void fixup_irqs(void);



static DEFINE_SPINLOCK(smp_reserve_lock);



static int octeon_cpu_disable(void)

{

	unsigned int cpu = smp_processor_id();



	if (cpu == 0)

		return -EBUSY;



	spin_lock(&smp_reserve_lock);



	cpu_clear(cpu, cpu_online_map);

	cpu_clear(cpu, cpu_callin_map);

	local_irq_disable();

	fixup_irqs();

	local_irq_enable();



	flush_cache_all();

	local_flush_tlb_all();



	spin_unlock(&smp_reserve_lock);



	return 0;

}



static void octeon_cpu_die(unsigned int cpu)

{

	int coreid = cpu_logical_map(cpu);

	uint32_t avail_coremask;

	struct cvmx_bootmem_named_block_desc *block_desc;



#ifdef CONFIG_CAVIUM_OCTEON_WATCHDOG

	/* Disable the watchdog */

	cvmx_ciu_wdogx_t ciu_wdog;

	ciu_wdog.u64 = cvmx_read_csr(CVMX_CIU_WDOGX(cpu));

	ciu_wdog.s.mode = 0;

	cvmx_write_csr(CVMX_CIU_WDOGX(cpu), ciu_wdog.u64);

#endif



	while (per_cpu(cpu_state, cpu) != CPU_DEAD)

		cpu_relax();



	/*

	 * This is a bit complicated strategics of getting/settig available

	 * cores mask, copied from bootloader

	 */

	/* LINUX_APP_BOOT_BLOCK is initialized in bootoct binary */

	block_desc = cvmx_bootmem_find_named_block(LINUX_APP_BOOT_BLOCK_NAME);



	if (!block_desc) {

		avail_coremask =

			cvmx_read64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

						   LABI_ADDR_IN_BOOTLOADER +

						   offsetof

						   (struct linux_app_boot_info,

						    avail_coremask)));

	} else {		       /* alternative, already initialized */

	       avail_coremask =

		   cvmx_read64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

						   block_desc->base_addr +

						  AVAIL_COREMASK_OFFSET_IN_LINUX_APP_BOOT_BLOCK));

	}



	avail_coremask |= 1 << coreid;



	/* Setting avail_coremask for bootoct binary */

	if (!block_desc) {

		cvmx_write64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

						LABI_ADDR_IN_BOOTLOADER +

						offsetof(struct linux_app_boot_info,

							 avail_coremask)),

				   avail_coremask);

	} else {

		cvmx_write64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

						block_desc->base_addr +

						AVAIL_COREMASK_OFFSET_IN_LINUX_APP_BOOT_BLOCK),

				   avail_coremask);

	}



	pr_info("Reset core %d. Available Coremask = %x \n", coreid,

		avail_coremask);

	cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid);

	cvmx_write_csr(CVMX_CIU_PP_RST, 0);

}



void play_dead(void)

{

	int coreid = cvmx_get_core_num();



	idle_task_exit();

	octeon_processor_boot = 0xff;

	per_cpu(cpu_state, coreid) = CPU_DEAD;



	while (1)	/* core will be reset here */

		;

}



extern void kernel_entry(unsigned long arg1, ...);



static void start_after_reset(void)

{

	kernel_entry(0, 0, 0);  /* set a2 = 0 for secondary core */

}



int octeon_update_boot_vector(unsigned int cpu)

{



	int coreid = cpu_logical_map(cpu);

	unsigned int avail_coremask;

	struct cvmx_bootmem_named_block_desc *block_desc;

	struct boot_init_vector *boot_vect =

		(struct boot_init_vector *) cvmx_phys_to_ptr(0x0 +

						  BOOTLOADER_BOOT_VECTOR);



	block_desc = cvmx_bootmem_find_named_block(LINUX_APP_BOOT_BLOCK_NAME);



	if (!block_desc) {

		avail_coremask =

			cvmx_read64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

					   LABI_ADDR_IN_BOOTLOADER +

						offsetof(struct linux_app_boot_info,

						avail_coremask)));

	} else {		       /* alternative, already initialized */

	       avail_coremask =

		   cvmx_read64_uint32(CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,

						   block_desc->base_addr +

						   AVAIL_COREMASK_OFFSET_IN_LINUX_APP_BOOT_BLOCK));

	}



	if (!(avail_coremask & (1 << coreid))) {

		/* core not available, assume, that catched by simple-executive */

		cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid);

		cvmx_write_csr(CVMX_CIU_PP_RST, 0);

	}



	boot_vect[coreid].app_start_func_addr =

		(uint32_t) (unsigned long) start_after_reset;

	boot_vect[coreid].code_addr = InitTLBStart_addr;



	CVMX_SYNC;



	cvmx_write_csr(CVMX_CIU_NMI, (1 << coreid) & avail_coremask);



	return 0;

}



static int __cpuinit octeon_cpu_callback(struct notifier_block *nfb,

	unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;



	switch (action) {

	case CPU_UP_PREPARE:

		octeon_update_boot_vector(cpu);

		break;

	case CPU_ONLINE:

		pr_info("Cpu %d online\n", cpu);

		break;

	case CPU_DEAD:

		break;

	}



	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata octeon_cpu_notifier = {

	.notifier_call = octeon_cpu_callback,

};



static int __cpuinit register_cavium_notifier(void)

{

	register_hotcpu_notifier(&octeon_cpu_notifier);



	return 0;

}



late_initcall(register_cavium_notifier);



#endif  /* CONFIG_HOTPLUG_CPU */



struct plat_smp_ops octeon_smp_ops = {

	.send_ipi_single	= octeon_send_ipi_single,

	.send_ipi_mask		= octeon_send_ipi_mask,
@@ -208,4 +436,8 @@ struct plat_smp_ops octeon_smp_ops = { 
	.boot_secondary		= octeon_boot_secondary,

	.smp_setup		= octeon_smp_setup,

	.prepare_cpus		= octeon_prepare_cpus,

#ifdef CONFIG_HOTPLUG_CPU

	.cpu_disable		= octeon_cpu_disable,

	.cpu_die		= octeon_cpu_die,

#endif

};