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

Commit c4a1745a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (230 commits)
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix 2 bugs in huge page support.
  [SPARC64]: CONFIG_BLK_DEV_RAM fix
  [SPARC64]: Optimized TSB table initialization.
  [SPARC64]: Allow CONFIG_MEMORY_HOTPLUG to build.
  [SPARC64]: Use SLAB caches for TSB tables.
  [SPARC64]: Don't kill the page allocator when growing a TSB.
  [SPARC64]: Randomize mm->mmap_base when PF_RANDOMIZE is set.
  [SPARC64]: Increase top of 32-bit process stack.
  [SPARC64]: Top-down address space allocation for 32-bit tasks.
  [SPARC64] bbc_i2c: Fix cpu check and add missing module license.
  [SPARC64]: Fix and re-enable dynamic TSB sizing.
  [SUNSU]: Fix missing spinlock initialization.
  [TG3]: Do not try to access NIC_SRAM_DATA_SIG on Sun parts.
  [SPARC64]: First cut at VIS simulator for Niagara.
  [SPARC64]: Fix system type in /proc/cpuinfo and remove bogus OBP check.
  [SPARC64]: Add SMT scheduling support for Niagara.
  [SPARC64]: Fix 32-bit truncation which broke sparsemem.
  [SPARC64]: Move over to sparsemem.
  [SPARC64]: Fix new context version SMP handling.
  ...
parents 88dcb911 ac0eb3eb

arch/sparc/kernel/ioport.c

+15 −25
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static void _sparc_free_io(struct resource *res) 
	unsigned long plen;



	plen = res->end - res->start + 1;

	if ((plen & (PAGE_SIZE-1)) != 0) BUG();

	BUG_ON((plen & (PAGE_SIZE-1)) != 0);

	sparc_unmapiorange(res->start, plen);

	release_resource(res);

}
@@ -512,8 +512,7 @@ void pci_free_consistent(struct pci_dev *pdev, size_t n, void *p, dma_addr_t ba) 
dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size,

    int direction)

{

	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	/* IIep is write-through, not flushing. */

	return virt_to_phys(ptr);

}
@@ -528,8 +527,7 @@ dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, 
void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t ba, size_t size,

    int direction)

{

	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	if (direction != PCI_DMA_TODEVICE) {

		mmu_inval_dma_area((unsigned long)phys_to_virt(ba),

		    (size + PAGE_SIZE-1) & PAGE_MASK);
@@ -542,8 +540,7 @@ void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t ba, size_t size, 
dma_addr_t pci_map_page(struct pci_dev *hwdev, struct page *page,

			unsigned long offset, size_t size, int direction)

{

	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	/* IIep is write-through, not flushing. */

	return page_to_phys(page) + offset;

}
@@ -551,8 +548,7 @@ dma_addr_t pci_map_page(struct pci_dev *hwdev, struct page *page, 
void pci_unmap_page(struct pci_dev *hwdev,

			dma_addr_t dma_address, size_t size, int direction)

{

	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	/* mmu_inval_dma_area XXX */

}
@@ -576,11 +572,10 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, 
{

	int n;



	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	/* IIep is write-through, not flushing. */

	for (n = 0; n < nents; n++) {

		if (page_address(sg->page) == NULL) BUG();

		BUG_ON(page_address(sg->page) == NULL);

		sg->dvma_address = virt_to_phys(page_address(sg->page));

		sg->dvma_length = sg->length;

		sg++;
@@ -597,11 +592,10 @@ void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, 
{

	int n;



	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	if (direction != PCI_DMA_TODEVICE) {

		for (n = 0; n < nents; n++) {

			if (page_address(sg->page) == NULL) BUG();

			BUG_ON(page_address(sg->page) == NULL);

			mmu_inval_dma_area(

			    (unsigned long) page_address(sg->page),

			    (sg->length + PAGE_SIZE-1) & PAGE_MASK);
@@ -622,8 +616,7 @@ void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, 
 */

void pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t ba, size_t size, int direction)

{

	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	if (direction != PCI_DMA_TODEVICE) {

		mmu_inval_dma_area((unsigned long)phys_to_virt(ba),

		    (size + PAGE_SIZE-1) & PAGE_MASK);
@@ -632,8 +625,7 @@ void pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t ba, size_t si 


void pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t ba, size_t size, int direction)

{

	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	if (direction != PCI_DMA_TODEVICE) {

		mmu_inval_dma_area((unsigned long)phys_to_virt(ba),

		    (size + PAGE_SIZE-1) & PAGE_MASK);
@@ -650,11 +642,10 @@ void pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg, int 
{

	int n;



	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	if (direction != PCI_DMA_TODEVICE) {

		for (n = 0; n < nents; n++) {

			if (page_address(sg->page) == NULL) BUG();

			BUG_ON(page_address(sg->page) == NULL);

			mmu_inval_dma_area(

			    (unsigned long) page_address(sg->page),

			    (sg->length + PAGE_SIZE-1) & PAGE_MASK);
@@ -667,11 +658,10 @@ void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg, i 
{

	int n;



	if (direction == PCI_DMA_NONE)

		BUG();

	BUG_ON(direction == PCI_DMA_NONE);

	if (direction != PCI_DMA_TODEVICE) {

		for (n = 0; n < nents; n++) {

			if (page_address(sg->page) == NULL) BUG();

			BUG_ON(page_address(sg->page) == NULL);

			mmu_inval_dma_area(

			    (unsigned long) page_address(sg->page),

			    (sg->length + PAGE_SIZE-1) & PAGE_MASK);

arch/sparc64/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -186,6 +186,15 @@ endchoice 


endmenu



config ARCH_SPARSEMEM_ENABLE

	def_bool y



config ARCH_SPARSEMEM_DEFAULT

	def_bool y



config LARGE_ALLOCS

	def_bool y



source "mm/Kconfig"



config GENERIC_ISA_DMA
@@ -350,6 +359,15 @@ config SOLARIS_EMUL 


endmenu



config SCHED_SMT

	bool "SMT (Hyperthreading) scheduler support"

	depends on SMP

	default y

	help

	  SMT scheduler support improves the CPU scheduler's decision making

	  when dealing with UltraSPARC cpus at a cost of slightly increased

	  overhead in some places. If unsure say N here.



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

arch/sparc64/defconfig

+14 −11
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc2

# Tue Feb  7 17:47:18 2006

# Linux kernel version: 2.6.16

# Mon Mar 20 01:23:21 2006

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -115,14 +115,20 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y 
CONFIG_HUGETLB_PAGE_SIZE_4MB=y

# CONFIG_HUGETLB_PAGE_SIZE_512K is not set

# CONFIG_HUGETLB_PAGE_SIZE_64K is not set

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_DEFAULT=y

CONFIG_LARGE_ALLOCS=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_FLATMEM_MANUAL is not set

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_SBUS=y

CONFIG_SBUSCHAR=y
@@ -655,6 +661,7 @@ CONFIG_SERIAL_SUNCORE=y 
CONFIG_SERIAL_SUNSU=y

CONFIG_SERIAL_SUNSU_CONSOLE=y

CONFIG_SERIAL_SUNSAB=m

CONFIG_SERIAL_SUNHV=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set
@@ -1116,11 +1123,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_INFINIBAND is not set



#

# SN Devices

#



#

# EDAC - error detection and reporting (RAS)

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

arch/sparc64/kernel/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ obj-y := process.o setup.o cpu.o idprom.o \ 
		   traps.o devices.o auxio.o una_asm.o \

		   irq.o ptrace.o time.o sys_sparc.o signal.o \

		   unaligned.o central.o pci.o starfire.o semaphore.o \

		   power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o

		   power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \

		   visemul.o



obj-$(CONFIG_PCI)	 += ebus.o isa.o pci_common.o pci_iommu.o \

			    pci_psycho.o pci_sabre.o pci_schizo.o

			    pci_psycho.o pci_sabre.o pci_schizo.o \

			    pci_sun4v.o pci_sun4v_asm.o

obj-$(CONFIG_SMP)	 += smp.o trampoline.o

obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o

obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o
@@ -38,5 +40,5 @@ else 
  CMODEL_CFLAG := -m64 -mcmodel=medlow

endif



head.o: head.S ttable.S itlb_base.S dtlb_base.S dtlb_backend.S dtlb_prot.S \

head.o: head.S ttable.S itlb_miss.S dtlb_miss.S ktlb.S tsb.S \

	etrap.S rtrap.S winfixup.S entry.S

arch/sparc64/kernel/binfmt_aout32.c

+5 −9
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/system.h>

#include <asm/uaccess.h>

#include <asm/pgalloc.h>

#include <asm/mmu_context.h>



static int load_aout32_binary(struct linux_binprm *, struct pt_regs * regs);

static int load_aout32_library(struct file*);
@@ -238,6 +239,8 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
		(current->mm->start_data = N_DATADDR(ex));

	current->mm->brk = ex.a_bss +

		(current->mm->start_brk = N_BSSADDR(ex));

	current->mm->free_area_cache = current->mm->mmap_base;

	current->mm->cached_hole_size = 0;



	current->mm->mmap = NULL;

	compute_creds(bprm);
@@ -329,15 +332,8 @@ beyond_if: 


	current->mm->start_stack =

		(unsigned long) create_aout32_tables((char __user *)bprm->p, bprm);

	if (!(orig_thr_flags & _TIF_32BIT)) {

		unsigned long pgd_cache = get_pgd_cache(current->mm->pgd);



		__asm__ __volatile__("stxa\t%0, [%1] %2\n\t"

				     "membar #Sync"

				     : /* no outputs */

				     : "r" (pgd_cache),

				       "r" (TSB_REG), "i" (ASI_DMMU));

	}

	tsb_context_switch(current->mm);



	start_thread32(regs, ex.a_entry, current->mm->start_stack);

	if (current->ptrace & PT_PTRACED)

		send_sig(SIGTRAP, current, 0);