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

Commit 2459c609 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) Setup the core/threads/sockets bitmaps correctly so that 'lscpus'
    and friends operate properly.  Frtom Chris Hyser.

 2) The bit that normally means "Cached Virtually" on sun4v systems,
    actually changes meaning in M7 and later chips.  Fix from Khalid
    Aziz.

 3) One some PCI-E systems we need to probe different OF properties to
    fill in the PCI slot information properly, from Eric Snowberg.

 4) Kill an extraneous memset after kzalloc(), from Christophe Jaillet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE
  sparc64: pci slots information is not populated in sysfs
  sparc: kernel: GRPCI2: Remove a useless memset
  sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly
parents fec345ba 494e5b6f

arch/sparc/include/asm/cpudata_64.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ typedef struct { 
	unsigned int	icache_line_size;

	unsigned int	ecache_size;

	unsigned int	ecache_line_size;

	int		core_id;

	unsigned short	sock_id;

	unsigned short	core_id;

	int		proc_id;

} cpuinfo_sparc;

arch/sparc/include/asm/pgtable_64.h

+21 −1
Original line number Diff line number Diff line
@@ -308,12 +308,26 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot) 
	"	sllx		%1, 32, %1\n"

	"	or		%0, %1, %0\n"

	"	.previous\n"

	"	.section	.sun_m7_2insn_patch, \"ax\"\n"

	"	.word		661b\n"

	"	sethi		%%uhi(%4), %1\n"

	"	sethi		%%hi(%4), %0\n"

	"	.word		662b\n"

	"	or		%1, %%ulo(%4), %1\n"

	"	or		%0, %%lo(%4), %0\n"

	"	.word		663b\n"

	"	sllx		%1, 32, %1\n"

	"	or		%0, %1, %0\n"

	"	.previous\n"

	: "=r" (mask), "=r" (tmp)

	: "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U |

	       _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U |

	       _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4U),

	  "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |

	       _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V |

	       _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V),

	  "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |

	       _PAGE_CP_4V | _PAGE_E_4V |

	       _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V));



	return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask));
@@ -342,9 +356,15 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot) 
	"	andn		%0, %4, %0\n"

	"	or		%0, %5, %0\n"

	"	.previous\n"

	"	.section	.sun_m7_2insn_patch, \"ax\"\n"

	"	.word		661b\n"

	"	andn		%0, %6, %0\n"

	"	or		%0, %5, %0\n"

	"	.previous\n"

	: "=r" (val)

	: "0" (val), "i" (_PAGE_CP_4U | _PAGE_CV_4U), "i" (_PAGE_E_4U),

	             "i" (_PAGE_CP_4V | _PAGE_CV_4V), "i" (_PAGE_E_4V));

	             "i" (_PAGE_CP_4V | _PAGE_CV_4V), "i" (_PAGE_E_4V),

	             "i" (_PAGE_CP_4V));



	return __pgprot(val);

}

arch/sparc/include/asm/topology_64.h

+2 −1
Original line number Diff line number Diff line
@@ -40,11 +40,12 @@ static inline int pcibus_to_node(struct pci_bus *pbus) 
#ifdef CONFIG_SMP

#define topology_physical_package_id(cpu)	(cpu_data(cpu).proc_id)

#define topology_core_id(cpu)			(cpu_data(cpu).core_id)

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_core_cpumask(cpu)		(&cpu_core_sib_map[cpu])

#define topology_thread_cpumask(cpu)		(&per_cpu(cpu_sibling_map, cpu))

#endif /* CONFIG_SMP */



extern cpumask_t cpu_core_map[NR_CPUS];

extern cpumask_t cpu_core_sib_map[NR_CPUS];

static inline const struct cpumask *cpu_coregroup_mask(int cpu)

{

        return &cpu_core_map[cpu];

arch/sparc/include/asm/trap_block.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ struct sun4v_2insn_patch_entry { 
};

extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,

	__sun4v_2insn_patch_end;

extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,

	__sun_m7_2insn_patch_end;





#endif /* !(__ASSEMBLY__) */

arch/sparc/kernel/entry.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *, 
			     struct sun4v_1insn_patch_entry *);

void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,

			     struct sun4v_2insn_patch_entry *);

void sun_m7_patch_2insn_range(struct sun4v_2insn_patch_entry *,

			     struct sun4v_2insn_patch_entry *);

extern unsigned int dcache_parity_tl1_occurred;

extern unsigned int icache_parity_tl1_occurred;