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

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

Pull Sparc updates from David S. Miller:

 1) Remove the idiotic situation wherein Leon was a special case in all
    of the TLB/cache handling code.

    The worst side effect of this bogosity is that you couldn't build a
    kernel with Leon support enabled (to get better build coverage), and
    test boot it on a non-LEON cpu.

    Leon is, in all core respects, programatically identical to the
    32-bit SRMMU.  Except that they put the TLB registers in a different
    alternate address space location.

    Through code patching (for fast paths) and run time checks, this
    issue is now a thing of the past.

    From Sam Ravnborg.

 2) There was a mis-merge of arch/sparc/Kconfig for one of the
    clockevents changes that went in, causing 32-bit sparc to start
    failing to build.

    I merged in your tree to get those clockevents changes (and added a
    note to the merge commit) then added Stephen Rothwell's fix for the
    merge error.

 3) Software quad floating point emulation was not working properly on
    more recent Niagara chips, because the way the situation is reported
    by the cpu has changed.

    Nobody noticed because gcc emits calls to software emulation
    routines in glibc.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: (25 commits)
  sparc: fix sparc64 build due to leon.h inclusion
  sparc32: remove unused variable in head_32.S
  sparc32,leon: fix leon bootup
  sparc32: Export leon_dma_ops to modules.
  sparc32: support leon + sun in dma_make_coherent()
  sparc32,leon: always support leon in ioport
  sparc32,leon: always include leon_pmc in build
  sparc32: refactor cpu_idle()
  sparc32: srmmu_probe now knows about leon too
  sparc32: drop LEON hack for ASI_M_MMUREGS
  sparc32: introduce run-time patching of srmmu access functions
  sparc32: introduce support for run-time patching for all shared assembler code
  sparc32,leon: fix section mismatch warning
  sparc32,leon: always include leon_smp + leon_mm in build
  sparc32,leon: always include leon_kernel in build
  sparc32,leon: clean up leon.h
  sparc32: handle leon in cpu.c
  sparc32: handle leon in irq_32.c
  sparc32: add support for run-time patching of leon/sun single instructions
  sparc32: introduce sparc32_start_kernel called from head_32.S
  ...
parents 13199a08 e49e6ff5

arch/sparc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ config SPARC32 
	def_bool !64BIT

	select GENERIC_ATOMIC64

	select CLZ_TAB

	select ARCH_USES_GETTIMEOFFSET



config SPARC64

	def_bool 64BIT

arch/sparc/include/asm/asi.h

+0 −4
Original line number Diff line number Diff line
@@ -40,11 +40,7 @@ 
#define ASI_M_UNA01         0x01   /* Same here... */

#define ASI_M_MXCC          0x02   /* Access to TI VIKING MXCC registers */

#define ASI_M_FLUSH_PROBE   0x03   /* Reference MMU Flush/Probe; rw, ss */

#ifndef CONFIG_SPARC_LEON

#define ASI_M_MMUREGS       0x04   /* MMU Registers; rw, ss */

#else

#define ASI_M_MMUREGS       0x19

#endif /* CONFIG_SPARC_LEON */

#define ASI_M_TLBDIAG       0x05   /* MMU TLB only Diagnostics */

#define ASI_M_DIAGS         0x06   /* Reference MMU Diagnostics */

#define ASI_M_IODIAG        0x07   /* MMU I/O TLB only Diagnostics */

arch/sparc/include/asm/asmmacro.h

+22 −0
Original line number Diff line number Diff line
@@ -20,4 +20,26 @@ 
/* All traps low-level code here must end with this macro. */

#define RESTORE_ALL b ret_trap_entry; clr %l6;



/* Support for run-time patching of single instructions.

 * This is used to handle the differences in the ASI for

 * MMUREGS for LEON and SUN.

 *

 * Sample:

 * LEON_PI(lda [%g0] ASI_LEON_MMUREGS, %o0

 * SUN_PI_(lda [%g0] ASI_M_MMUREGS, %o0

 * PI == Patch Instruction

 *

 * For LEON we will use the first variant,

 * and for all other we will use the SUN variant.

 * The order is important.

 */

#define LEON_PI(...)				\

662:	__VA_ARGS__



#define SUN_PI_(...)				\

	.section .leon_1insn_patch, "ax";	\

	.word 662b;				\

	__VA_ARGS__;				\

	.previous



#endif /* !(_SPARC_ASMMACRO_H) */

arch/sparc/include/asm/dma-mapping.h

+7 −2
Original line number Diff line number Diff line
@@ -12,13 +12,18 @@ extern int dma_supported(struct device *dev, u64 mask); 
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



extern struct dma_map_ops *dma_ops, pci32_dma_ops;

extern struct dma_map_ops *dma_ops;

extern struct dma_map_ops *leon_dma_ops;

extern struct dma_map_ops pci32_dma_ops;



extern struct bus_type pci_bus_type;



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)

	if (dev->bus == &pci_bus_type)

	if (sparc_cpu_model == sparc_leon)

		return leon_dma_ops;

	else if (dev->bus == &pci_bus_type)

		return &pci32_dma_ops;

#endif

	return dma_ops;

arch/sparc/include/asm/leon.h

+3 −79
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#ifndef LEON_H_INCLUDE

#define LEON_H_INCLUDE



#ifdef CONFIG_SPARC_LEON



/* mmu register access, ASI_LEON_MMUREGS */

#define LEON_CNR_CTRL		0x000

#define LEON_CNR_CTXP		0x100
@@ -62,15 +60,6 @@ 


#ifndef __ASSEMBLY__



/* do a virtual address read without cache */

static inline unsigned long leon_readnobuffer_reg(unsigned long paddr)

{

	unsigned long retval;

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

			     "=r"(retval) : "r"(paddr), "i"(ASI_LEON_NOCACHE));

	return retval;

}



/* do a physical address bypass write, i.e. for 0x80000000 */

static inline void leon_store_reg(unsigned long paddr, unsigned long value)

{
@@ -87,47 +76,16 @@ static inline unsigned long leon_load_reg(unsigned long paddr) 
	return retval;

}



static inline void leon_srmmu_disabletlb(void)

{

	unsigned int retval;

	__asm__ __volatile__("lda [%%g0] %2, %0\n\t" : "=r"(retval) : "r"(0),

			     "i"(ASI_LEON_MMUREGS));

	retval |= LEON_CNR_CTRL_TLBDIS;

	__asm__ __volatile__("sta %0, [%%g0] %2\n\t" : : "r"(retval), "r"(0),

			     "i"(ASI_LEON_MMUREGS) : "memory");

}



static inline void leon_srmmu_enabletlb(void)

{

	unsigned int retval;

	__asm__ __volatile__("lda [%%g0] %2, %0\n\t" : "=r"(retval) : "r"(0),

			     "i"(ASI_LEON_MMUREGS));

	retval = retval & ~LEON_CNR_CTRL_TLBDIS;

	__asm__ __volatile__("sta %0, [%%g0] %2\n\t" : : "r"(retval), "r"(0),

			     "i"(ASI_LEON_MMUREGS) : "memory");

}



/* macro access for leon_load_reg() and leon_store_reg() */

#define LEON3_BYPASS_LOAD_PA(x)	    (leon_load_reg((unsigned long)(x)))

#define LEON3_BYPASS_STORE_PA(x, v) (leon_store_reg((unsigned long)(x), (unsigned long)(v)))

#define LEON3_BYPASS_ANDIN_PA(x, v) LEON3_BYPASS_STORE_PA(x, LEON3_BYPASS_LOAD_PA(x) & v)

#define LEON3_BYPASS_ORIN_PA(x, v)  LEON3_BYPASS_STORE_PA(x, LEON3_BYPASS_LOAD_PA(x) | v)

#define LEON_BYPASS_LOAD_PA(x)      leon_load_reg((unsigned long)(x))

#define LEON_BYPASS_STORE_PA(x, v)  leon_store_reg((unsigned long)(x), (unsigned long)(v))

#define LEON_REGLOAD_PA(x)          leon_load_reg((unsigned long)(x)+LEON_PREGS)

#define LEON_REGSTORE_PA(x, v)      leon_store_reg((unsigned long)(x)+LEON_PREGS, (unsigned long)(v))

#define LEON_REGSTORE_OR_PA(x, v)   LEON_REGSTORE_PA(x, LEON_REGLOAD_PA(x) | (unsigned long)(v))

#define LEON_REGSTORE_AND_PA(x, v)  LEON_REGSTORE_PA(x, LEON_REGLOAD_PA(x) & (unsigned long)(v))



/* macro access for leon_readnobuffer_reg() */

#define LEON_BYPASSCACHE_LOAD_VA(x) leon_readnobuffer_reg((unsigned long)(x))



extern void leon_init(void);

extern void leon_switch_mm(void);

extern void leon_init_IRQ(void);



extern unsigned long last_valid_pfn;



static inline unsigned long sparc_leon3_get_dcachecfg(void)

{

	unsigned int retval;
@@ -230,9 +188,6 @@ static inline int sparc_leon3_cpuid(void) 
#error cannot determine LEON_PAGE_SIZE_LEON

#endif



#define PAGE_MIN_SHIFT   (12)

#define PAGE_MIN_SIZE    (1UL << PAGE_MIN_SHIFT)



#define LEON3_XCCR_SETS_MASK  0x07000000UL

#define LEON3_XCCR_SSIZE_MASK 0x00f00000UL
@@ -242,7 +197,7 @@ static inline int sparc_leon3_cpuid(void) 
#ifndef __ASSEMBLY__

struct vm_area_struct;



extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr);

extern unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);

extern void leon_flush_icache_all(void);

extern void leon_flush_dcache_all(void);

extern void leon_flush_cache_all(void);
@@ -258,15 +213,7 @@ struct leon3_cacheregs { 
	unsigned long dccr;	/* 0x0c - Data Cache Configuration Register */

};



/* struct that hold LEON2 cache configuration register

 * & configuration register

 */

struct leon2_cacheregs {

	unsigned long ccr, cfg;

};



#ifdef __KERNEL__



#include <linux/irq.h>

#include <linux/interrupt.h>



struct device_node;
@@ -292,24 +239,15 @@ extern void leon_smp_done(void); 
extern void leon_boot_cpus(void);

extern int leon_boot_one_cpu(int i, struct task_struct *);

void leon_init_smp(void);

extern void cpu_idle(void);

extern void init_IRQ(void);

extern void cpu_panic(void);

extern int __leon_processor_id(void);

void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu);

extern irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused);



extern unsigned int real_irq_entry[];

extern unsigned int smpleon_ipi[];

extern unsigned int patchme_maybe_smp_msg[];

extern unsigned int t_nmi[], linux_trap_ipi15_leon[];

extern unsigned int linux_trap_ipi15_sun4m[];

extern unsigned int linux_trap_ipi15_leon[];

extern int leon_ipi_irq;



#endif /* CONFIG_SMP */



#endif /* __KERNEL__ */



#endif /* __ASSEMBLY__ */



/* macros used in leon_mm.c */
@@ -317,18 +255,4 @@ extern int leon_ipi_irq; 
#define _pfn_valid(pfn)	 ((pfn < last_valid_pfn) && (pfn >= PFN(phys_base)))

#define _SRMMU_PTE_PMASK_LEON 0xffffffff



#else /* defined(CONFIG_SPARC_LEON) */



/* nop definitions for !LEON case */

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

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

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

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

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

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

#define leon_boot_one_cpu(i, t) 1

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



#endif /* !defined(CONFIG_SPARC_LEON) */



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE