Commit 0c7fc30f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sparc fixes from David Miller:

 1) Fix section mismatches in some builds, from Paul Gortmaker.

 2) Need to count huge zero page mappings when doing TSB sizing, from
    Mike Kravetz.

 3) Fix handing of cpu_possible_mask when nr_cpus module option is
    specified, from Atish Patra.

 4) Don't allocate irq stacks until nr_irqs has been processed, also
    from Atish Patra.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix non-SMP build.
  sparc64: Fix irq stack bootmem allocation.
  sparc64: Fix cpu_possible_mask if nr_cpus is set
  sparc64 mm: Fix more TSB sizing issues
  sparc64: fix section mismatch in find_numa_latencies_for_group
parents bb6bbc7c 2a0100d7

arch/sparc/include/asm/page_64.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define HPAGE_MASK		(~(HPAGE_SIZE - 1UL))

#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

#define REAL_HPAGE_PER_HPAGE	(_AC(1,UL) << (HPAGE_SHIFT - REAL_HPAGE_SHIFT))

#endif



#ifndef __ASSEMBLY__

arch/sparc/include/asm/smp_64.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask); 
int hard_smp_processor_id(void);

#define raw_smp_processor_id() (current_thread_info()->cpu)



void smp_fill_in_cpu_possible_map(void);

void smp_fill_in_sib_core_maps(void);

void cpu_play_dead(void);
@@ -72,6 +73,7 @@ void __cpu_die(unsigned int cpu); 
#define smp_fill_in_sib_core_maps() do { } while (0)

#define smp_fetch_global_regs() do { } while (0)

#define smp_fetch_global_pmu() do { } while (0)

#define smp_fill_in_cpu_possible_map() do { } while (0)



#endif /* !(CONFIG_SMP) */

arch/sparc/kernel/setup_64.c

+26 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/initrd.h>

#include <linux/module.h>

#include <linux/start_kernel.h>

#include <linux/bootmem.h>



#include <asm/io.h>

#include <asm/processor.h>
@@ -50,6 +51,8 @@ 
#include <asm/elf.h>

#include <asm/mdesc.h>

#include <asm/cacheflush.h>

#include <asm/dma.h>

#include <asm/irq.h>



#ifdef CONFIG_IP_PNP

#include <net/ipconfig.h>
@@ -590,6 +593,22 @@ static void __init init_sparc64_elf_hwcap(void) 
		pause_patch();

}



void __init alloc_irqstack_bootmem(void)

{

	unsigned int i, node;



	for_each_possible_cpu(i) {

		node = cpu_to_node(i);



		softirq_stack[i] = __alloc_bootmem_node(NODE_DATA(node),

							THREAD_SIZE,

							THREAD_SIZE, 0);

		hardirq_stack[i] = __alloc_bootmem_node(NODE_DATA(node),

							THREAD_SIZE,

							THREAD_SIZE, 0);

	}

}



void __init setup_arch(char **cmdline_p)

{

	/* Initialize PROM console and command line. */
@@ -650,6 +669,13 @@ void __init setup_arch(char **cmdline_p) 


	paging_init();

	init_sparc64_elf_hwcap();

	smp_fill_in_cpu_possible_map();

	/*

	 * Once the OF device tree and MDESC have been setup and nr_cpus has

	 * been parsed, we know the list of possible cpus.  Therefore we can

	 * allocate the IRQ stacks.

	 */

	alloc_irqstack_bootmem();

}



extern int stop_a_enabled;

arch/sparc/kernel/smp_64.c

+14 −0
Original line number Diff line number Diff line
@@ -1227,6 +1227,20 @@ void __init smp_setup_processor_id(void) 
		xcall_deliver_impl = hypervisor_xcall_deliver;

}



void __init smp_fill_in_cpu_possible_map(void)

{

	int possible_cpus = num_possible_cpus();

	int i;



	if (possible_cpus > nr_cpu_ids)

		possible_cpus = nr_cpu_ids;



	for (i = 0; i < possible_cpus; i++)

		set_cpu_possible(i, true);

	for (; i < NR_CPUS; i++)

		set_cpu_possible(i, false);

}



void smp_fill_in_sib_core_maps(void)

{

	unsigned int i;

arch/sparc/mm/fault_64.c

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ good_area: 
		tsb_grow(mm, MM_TSB_BASE, mm_rss);

#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)

	mm_rss = mm->context.hugetlb_pte_count + mm->context.thp_pte_count;

	mm_rss *= REAL_HPAGE_PER_HPAGE;

	if (unlikely(mm_rss >

		     mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit)) {

		if (mm->context.tsb_block[MM_TSB_HUGE].tsb)

CRA Git | Maintained and supported by SUSTech CRA and CCSE