Commit 5d83d666 authored by David S. Miller's avatar David S. Miller

sparc32: Move cache and TLB flushes over to method ops.

This eliminated most of the remaining users of btfixup.

There are some complications because of the special cases we
have for sun4d, leon, and some flavors of viking.

It was found that there are no cases where a flush_page_for_dma
method was not hooked up to something, so the "noflush" iommu
methods were removed.

Add some documentation to the viking_sun4d_smp_ops to describe exactly
the hardware bug which causes us to need special TLB flushing on
sun4d.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b25e74b1
#ifndef _SPARC_CACHEFLUSH_H #ifndef _SPARC_CACHEFLUSH_H
#define _SPARC_CACHEFLUSH_H #define _SPARC_CACHEFLUSH_H
#include <linux/mm.h> /* Common for other includes */ #include <asm/cachetlb_32.h>
// #include <linux/kernel.h> from pgalloc.h
// #include <linux/sched.h> from pgalloc.h #define flush_cache_all() \
sparc32_cachetlb_ops->cache_all()
// #include <asm/page.h> #define flush_cache_mm(mm) \
#include <asm/btfixup.h> sparc32_cachetlb_ops->cache_mm(mm)
#define flush_cache_dup_mm(mm) \
/* sparc32_cachetlb_ops->cache_mm(mm)
* Fine grained cache flushing. #define flush_cache_range(vma,start,end) \
*/ sparc32_cachetlb_ops->cache_range(vma, start, end)
#ifdef CONFIG_SMP #define flush_cache_page(vma,addr,pfn) \
sparc32_cachetlb_ops->cache_page(vma, addr)
BTFIXUPDEF_CALL(void, local_flush_cache_all, void)
BTFIXUPDEF_CALL(void, local_flush_cache_mm, struct mm_struct *)
BTFIXUPDEF_CALL(void, local_flush_cache_range, struct vm_area_struct *, unsigned long, unsigned long)
BTFIXUPDEF_CALL(void, local_flush_cache_page, struct vm_area_struct *, unsigned long)
#define local_flush_cache_all() BTFIXUP_CALL(local_flush_cache_all)()
#define local_flush_cache_mm(mm) BTFIXUP_CALL(local_flush_cache_mm)(mm)
#define local_flush_cache_range(vma,start,end) BTFIXUP_CALL(local_flush_cache_range)(vma,start,end)
#define local_flush_cache_page(vma,addr) BTFIXUP_CALL(local_flush_cache_page)(vma,addr)
BTFIXUPDEF_CALL(void, local_flush_page_to_ram, unsigned long)
BTFIXUPDEF_CALL(void, local_flush_sig_insns, struct mm_struct *, unsigned long)
#define local_flush_page_to_ram(addr) BTFIXUP_CALL(local_flush_page_to_ram)(addr)
#define local_flush_sig_insns(mm,insn_addr) BTFIXUP_CALL(local_flush_sig_insns)(mm,insn_addr)
extern void smp_flush_cache_all(void);
extern void smp_flush_cache_mm(struct mm_struct *mm);
extern void smp_flush_cache_range(struct vm_area_struct *vma,
unsigned long start,
unsigned long end);
extern void smp_flush_cache_page(struct vm_area_struct *vma, unsigned long page);
extern void smp_flush_page_to_ram(unsigned long page);
extern void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr);
#endif /* CONFIG_SMP */
BTFIXUPDEF_CALL(void, flush_cache_all, void)
BTFIXUPDEF_CALL(void, flush_cache_mm, struct mm_struct *)
BTFIXUPDEF_CALL(void, flush_cache_range, struct vm_area_struct *, unsigned long, unsigned long)
BTFIXUPDEF_CALL(void, flush_cache_page, struct vm_area_struct *, unsigned long)
#define flush_cache_all() BTFIXUP_CALL(flush_cache_all)()
#define flush_cache_mm(mm) BTFIXUP_CALL(flush_cache_mm)(mm)
#define flush_cache_dup_mm(mm) BTFIXUP_CALL(flush_cache_mm)(mm)
#define flush_cache_range(vma,start,end) BTFIXUP_CALL(flush_cache_range)(vma,start,end)
#define flush_cache_page(vma,addr,pfn) BTFIXUP_CALL(flush_cache_page)(vma,addr)
#define flush_icache_range(start, end) do { } while (0) #define flush_icache_range(start, end) do { } while (0)
#define flush_icache_page(vma, pg) do { } while (0) #define flush_icache_page(vma, pg) do { } while (0)
...@@ -67,11 +29,12 @@ BTFIXUPDEF_CALL(void, flush_cache_page, struct vm_area_struct *, unsigned long) ...@@ -67,11 +29,12 @@ BTFIXUPDEF_CALL(void, flush_cache_page, struct vm_area_struct *, unsigned long)
memcpy(dst, src, len); \ memcpy(dst, src, len); \
} while (0) } while (0)
BTFIXUPDEF_CALL(void, __flush_page_to_ram, unsigned long) #define __flush_page_to_ram(addr) \
BTFIXUPDEF_CALL(void, flush_sig_insns, struct mm_struct *, unsigned long) sparc32_cachetlb_ops->page_to_ram(addr)
#define flush_sig_insns(mm,insn_addr) \
#define __flush_page_to_ram(addr) BTFIXUP_CALL(__flush_page_to_ram)(addr) sparc32_cachetlb_ops->sig_insns(mm, insn_addr)
#define flush_sig_insns(mm,insn_addr) BTFIXUP_CALL(flush_sig_insns)(mm,insn_addr) #define flush_page_for_dma(addr) \
sparc32_cachetlb_ops->page_for_dma(addr)
extern void sparc_flush_page_to_ram(struct page *page); extern void sparc_flush_page_to_ram(struct page *page);
......
#ifndef _SPARC_CACHETLB_H
#define _SPARC_CACHETLB_H
struct mm_struct;
struct vm_area_struct;
struct sparc32_cachetlb_ops {
void (*cache_all)(void);
void (*cache_mm)(struct mm_struct *);
void (*cache_range)(struct vm_area_struct *, unsigned long,
unsigned long);
void (*cache_page)(struct vm_area_struct *, unsigned long);
void (*tlb_all)(void);
void (*tlb_mm)(struct mm_struct *);
void (*tlb_range)(struct vm_area_struct *, unsigned long,
unsigned long);
void (*tlb_page)(struct vm_area_struct *, unsigned long);
void (*page_to_ram)(unsigned long);
void (*sig_insns)(struct mm_struct *, unsigned long);
void (*page_for_dma)(unsigned long);
};
extern const struct sparc32_cachetlb_ops *sparc32_cachetlb_ops;
#ifdef CONFIG_SMP
extern const struct sparc32_cachetlb_ops *local_ops;
#endif
#endif /* SPARC_CACHETLB_H */
#ifndef _SPARC_TLBFLUSH_H #ifndef _SPARC_TLBFLUSH_H
#define _SPARC_TLBFLUSH_H #define _SPARC_TLBFLUSH_H
#include <linux/mm.h> #include <asm/cachetlb_32.h>
// #include <asm/processor.h>
#define flush_tlb_all() \
/* sparc32_cachetlb_ops->tlb_all()
* TLB flushing: #define flush_tlb_mm(mm) \
* sparc32_cachetlb_ops->tlb_mm(mm)
* - flush_tlb() flushes the current mm struct TLBs XXX Exists? #define flush_tlb_range(vma, start, end) \
* - flush_tlb_all() flushes all processes TLBs sparc32_cachetlb_ops->tlb_range(vma, start, end)
* - flush_tlb_mm(mm) flushes the specified mm context TLB's #define flush_tlb_page(vma, addr) \
* - flush_tlb_page(vma, vmaddr) flushes one page sparc32_cachetlb_ops->tlb_page(vma, addr)
* - flush_tlb_range(vma, start, end) flushes a range of pages
* - flush_tlb_kernel_range(start, end) flushes a range of kernel pages
*/
#ifdef CONFIG_SMP
BTFIXUPDEF_CALL(void, local_flush_tlb_all, void)
BTFIXUPDEF_CALL(void, local_flush_tlb_mm, struct mm_struct *)
BTFIXUPDEF_CALL(void, local_flush_tlb_range, struct vm_area_struct *, unsigned long, unsigned long)
BTFIXUPDEF_CALL(void, local_flush_tlb_page, struct vm_area_struct *, unsigned long)
#define local_flush_tlb_all() BTFIXUP_CALL(local_flush_tlb_all)()
#define local_flush_tlb_mm(mm) BTFIXUP_CALL(local_flush_tlb_mm)(mm)
#define local_flush_tlb_range(vma,start,end) BTFIXUP_CALL(local_flush_tlb_range)(vma,start,end)
#define local_flush_tlb_page(vma,addr) BTFIXUP_CALL(local_flush_tlb_page)(vma,addr)
extern void smp_flush_tlb_all(void);
extern void smp_flush_tlb_mm(struct mm_struct *mm);
extern void smp_flush_tlb_range(struct vm_area_struct *vma,
unsigned long start,
unsigned long end);
extern void smp_flush_tlb_page(struct vm_area_struct *mm, unsigned long page);
#endif /* CONFIG_SMP */
BTFIXUPDEF_CALL(void, flush_tlb_all, void)
BTFIXUPDEF_CALL(void, flush_tlb_mm, struct mm_struct *)
BTFIXUPDEF_CALL(void, flush_tlb_range, struct vm_area_struct *, unsigned long, unsigned long)
BTFIXUPDEF_CALL(void, flush_tlb_page, struct vm_area_struct *, unsigned long)
#define flush_tlb_all() BTFIXUP_CALL(flush_tlb_all)()
#define flush_tlb_mm(mm) BTFIXUP_CALL(flush_tlb_mm)(mm)
#define flush_tlb_range(vma,start,end) BTFIXUP_CALL(flush_tlb_range)(vma,start,end)
#define flush_tlb_page(vma,addr) BTFIXUP_CALL(flush_tlb_page)(vma,addr)
// #define flush_tlb() flush_tlb_mm(current->active_mm) /* XXX Sure? */
/* /*
* This is a kludge, until I know better. --zaitcev XXX * This is a kludge, until I know better. --zaitcev XXX
......
...@@ -427,7 +427,7 @@ void __init leon_init_timers(void) ...@@ -427,7 +427,7 @@ void __init leon_init_timers(void)
*/ */
local_irq_save(flags); local_irq_save(flags);
patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */ patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */
local_flush_cache_all(); local_ops->cache_all();
local_irq_restore(flags); local_irq_restore(flags);
} }
#endif #endif
......
...@@ -75,8 +75,8 @@ void __cpuinit leon_callin(void) ...@@ -75,8 +75,8 @@ void __cpuinit leon_callin(void)
{ {
int cpuid = hard_smpleon_processor_id(); int cpuid = hard_smpleon_processor_id();
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
leon_configure_cache_smp(); leon_configure_cache_smp();
notify_cpu_starting(cpuid); notify_cpu_starting(cpuid);
...@@ -87,8 +87,8 @@ void __cpuinit leon_callin(void) ...@@ -87,8 +87,8 @@ void __cpuinit leon_callin(void)
calibrate_delay(); calibrate_delay();
smp_store_cpu_info(cpuid); smp_store_cpu_info(cpuid);
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
/* /*
* Unblock the master CPU _only_ when the scheduler state * Unblock the master CPU _only_ when the scheduler state
...@@ -99,8 +99,8 @@ void __cpuinit leon_callin(void) ...@@ -99,8 +99,8 @@ void __cpuinit leon_callin(void)
*/ */
do_swap(&cpu_callin_map[cpuid], 1); do_swap(&cpu_callin_map[cpuid], 1);
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
/* Fix idle thread fields. */ /* Fix idle thread fields. */
__asm__ __volatile__("ld [%0], %%g6\n\t" : : "r"(&current_set[cpuid]) __asm__ __volatile__("ld [%0], %%g6\n\t" : : "r"(&current_set[cpuid])
...@@ -143,8 +143,8 @@ void __init leon_configure_cache_smp(void) ...@@ -143,8 +143,8 @@ void __init leon_configure_cache_smp(void)
} }
} }
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
} }
void leon_smp_setbroadcast(unsigned int mask) void leon_smp_setbroadcast(unsigned int mask)
...@@ -199,7 +199,7 @@ void __init leon_boot_cpus(void) ...@@ -199,7 +199,7 @@ void __init leon_boot_cpus(void)
leon_smp_setbroadcast(1 << LEON3_IRQ_TICKER); leon_smp_setbroadcast(1 << LEON3_IRQ_TICKER);
leon_configure_cache_smp(); leon_configure_cache_smp();
local_flush_cache_all(); local_ops->cache_all();
} }
...@@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i) ...@@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i)
/* whirrr, whirrr, whirrrrrrrrr... */ /* whirrr, whirrr, whirrrrrrrrr... */
printk(KERN_INFO "Starting CPU %d : (irqmp: 0x%x)\n", (unsigned int)i, printk(KERN_INFO "Starting CPU %d : (irqmp: 0x%x)\n", (unsigned int)i,
(unsigned int)&leon3_irqctrl_regs->mpstatus); (unsigned int)&leon3_irqctrl_regs->mpstatus);
local_flush_cache_all(); local_ops->cache_all();
/* Make sure all IRQs are of from the start for this new CPU */ /* Make sure all IRQs are of from the start for this new CPU */
LEON_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[i], 0); LEON_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[i], 0);
...@@ -251,7 +251,7 @@ int __cpuinit leon_boot_one_cpu(int i) ...@@ -251,7 +251,7 @@ int __cpuinit leon_boot_one_cpu(int i)
leon_enable_irq_cpu(leon_ipi_irq, i); leon_enable_irq_cpu(leon_ipi_irq, i);
} }
local_flush_cache_all(); local_ops->cache_all();
return 0; return 0;
} }
...@@ -271,7 +271,7 @@ void __init leon_smp_done(void) ...@@ -271,7 +271,7 @@ void __init leon_smp_done(void)
} }
} }
*prev = first; *prev = first;
local_flush_cache_all(); local_ops->cache_all();
/* Free unneeded trap tables */ /* Free unneeded trap tables */
if (!cpu_present(1)) { if (!cpu_present(1)) {
...@@ -337,7 +337,7 @@ static void __init leon_ipi_init(void) ...@@ -337,7 +337,7 @@ static void __init leon_ipi_init(void)
local_irq_save(flags); local_irq_save(flags);
trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (leon_ipi_irq - 1)]; trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (leon_ipi_irq - 1)];
trap_table->inst_three += smpleon_ipi - real_irq_entry; trap_table->inst_three += smpleon_ipi - real_irq_entry;
local_flush_cache_all(); local_ops->cache_all();
local_irq_restore(flags); local_irq_restore(flags);
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
......
...@@ -171,128 +171,6 @@ void smp_call_function_interrupt(void) ...@@ -171,128 +171,6 @@ void smp_call_function_interrupt(void)
irq_exit(); irq_exit();
} }
void smp_flush_cache_all(void)
{
xc0((smpfunc_t) BTFIXUP_CALL(local_flush_cache_all));
local_flush_cache_all();
}
void smp_flush_tlb_all(void)
{
xc0((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_all));
local_flush_tlb_all();
}
void smp_flush_cache_mm(struct mm_struct *mm)
{
if(mm->context != NO_CONTEXT) {
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask))
xc1((smpfunc_t) BTFIXUP_CALL(local_flush_cache_mm), (unsigned long) mm);
local_flush_cache_mm(mm);
}
}
void smp_flush_tlb_mm(struct mm_struct *mm)
{
if(mm->context != NO_CONTEXT) {
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask)) {
xc1((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_mm), (unsigned long) mm);
if(atomic_read(&mm->mm_users) == 1 && current->active_mm == mm)
cpumask_copy(mm_cpumask(mm),
cpumask_of(smp_processor_id()));
}
local_flush_tlb_mm(mm);
}
}
void smp_flush_cache_range(struct vm_area_struct *vma, unsigned long start,
unsigned long end)
{
struct mm_struct *mm = vma->vm_mm;
if (mm->context != NO_CONTEXT) {
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask))
xc3((smpfunc_t) BTFIXUP_CALL(local_flush_cache_range), (unsigned long) vma, start, end);
local_flush_cache_range(vma, start, end);
}
}
void smp_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
unsigned long end)
{
struct mm_struct *mm = vma->vm_mm;
if (mm->context != NO_CONTEXT) {
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask))
xc3((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_range), (unsigned long) vma, start, end);
local_flush_tlb_range(vma, start, end);
}
}
void smp_flush_cache_page(struct vm_area_struct *vma, unsigned long page)
{
struct mm_struct *mm = vma->vm_mm;
if(mm->context != NO_CONTEXT) {
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask))
xc2((smpfunc_t) BTFIXUP_CALL(local_flush_cache_page), (unsigned long) vma, page);
local_flush_cache_page(vma, page);
}
}
void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
{
struct mm_struct *mm = vma->vm_mm;
if(mm->context != NO_CONTEXT) {
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask))
xc2((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_page), (unsigned long) vma, page);
local_flush_tlb_page(vma, page);
}
}
void smp_flush_page_to_ram(unsigned long page)
{
/* Current theory is that those who call this are the one's
* who have just dirtied their cache with the pages contents
* in kernel space, therefore we only run this on local cpu.
*
* XXX This experiment failed, research further... -DaveM
*/
#if 1
xc1((smpfunc_t) BTFIXUP_CALL(local_flush_page_to_ram), page);
#endif
local_flush_page_to_ram(page);
}
void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr)
{
cpumask_t cpu_mask;
cpumask_copy(&cpu_mask, mm_cpumask(mm));
cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
if (!cpumask_empty(&cpu_mask))
xc2((smpfunc_t) BTFIXUP_CALL(local_flush_sig_insns), (unsigned long) mm, insn_addr);
local_flush_sig_insns(mm, insn_addr);
}
int setup_profiling_timer(unsigned int multiplier) int setup_profiling_timer(unsigned int multiplier)
{ {
return -EINVAL; return -EINVAL;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <asm/sbi.h> #include <asm/sbi.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/oplib.h>
#include "kernel.h" #include "kernel.h"
#include "irq.h" #include "irq.h"
...@@ -411,7 +412,7 @@ static void __init sun4d_fixup_trap_table(void) ...@@ -411,7 +412,7 @@ static void __init sun4d_fixup_trap_table(void)
trap_table->inst_two = lvl14_save[1]; trap_table->inst_two = lvl14_save[1];
trap_table->inst_three = lvl14_save[2]; trap_table->inst_three = lvl14_save[2];
trap_table->inst_four = lvl14_save[3]; trap_table->inst_four = lvl14_save[3];
local_flush_cache_all(); local_ops->cache_all();
local_irq_restore(flags); local_irq_restore(flags);
#endif #endif
} }
......
...@@ -10,12 +10,14 @@ ...@@ -10,12 +10,14 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/profile.h> #include <linux/profile.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/sched.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/oplib.h>
#include <asm/sbi.h> #include <asm/sbi.h>
#include <asm/mmu.h> #include <asm/mmu.h>
...@@ -60,8 +62,8 @@ void __cpuinit smp4d_callin(void) ...@@ -60,8 +62,8 @@ void __cpuinit smp4d_callin(void)
/* Enable level15 interrupt, disable level14 interrupt for now */ /* Enable level15 interrupt, disable level14 interrupt for now */
cc_set_imsk((cc_get_imsk() & ~0x8000) | 0x4000); cc_set_imsk((cc_get_imsk() & ~0x8000) | 0x4000);
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
notify_cpu_starting(cpuid); notify_cpu_starting(cpuid);
/* /*
...@@ -75,13 +77,13 @@ void __cpuinit smp4d_callin(void) ...@@ -75,13 +77,13 @@ void __cpuinit smp4d_callin(void)
calibrate_delay(); calibrate_delay();
smp_store_cpu_info(cpuid); smp_store_cpu_info(cpuid);
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
/* Allow master to continue. */ /* Allow master to continue. */
sun4d_swap((unsigned long *)&cpu_callin_map[cpuid], 1); sun4d_swap((unsigned long *)&cpu_callin_map[cpuid], 1);
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
while ((unsigned long)current_set[cpuid] < PAGE_OFFSET) while ((unsigned long)current_set[cpuid] < PAGE_OFFSET)
barrier(); barrier();
...@@ -101,8 +103,8 @@ void __cpuinit smp4d_callin(void) ...@@ -101,8 +103,8 @@ void __cpuinit smp4d_callin(void)
atomic_inc(&init_mm.mm_count); atomic_inc(&init_mm.mm_count);
current->active_mm = &init_mm; current->active_mm = &init_mm;
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
local_irq_enable(); /* We don't allow PIL 14 yet */ local_irq_enable(); /* We don't allow PIL 14 yet */
...@@ -124,7 +126,7 @@ void __init smp4d_boot_cpus(void) ...@@ -124,7 +126,7 @@ void __init smp4d_boot_cpus(void)
smp4d_ipi_init(); smp4d_ipi_init();
if (boot_cpu_id) if (boot_cpu_id)
current_set[0] = NULL; current_set[0] = NULL;
local_flush_cache_all(); local_ops->cache_all();
} }
int __cpuinit smp4d_boot_one_cpu(int i) int __cpuinit smp4d_boot_one_cpu(int i)
...@@ -150,7 +152,7 @@ int __cpuinit smp4d_boot_one_cpu(int i) ...@@ -150,7 +152,7 @@ int __cpuinit smp4d_boot_one_cpu(int i)
/* whirrr, whirrr, whirrrrrrrrr... */ /* whirrr, whirrr, whirrrrrrrrr... */
printk(KERN_INFO "Starting CPU %d at %p\n", i, entry); printk(KERN_INFO "Starting CPU %d at %p\n", i, entry);
local_flush_cache_all(); local_ops->cache_all();
prom_startcpu(cpu_node, prom_startcpu(cpu_node,
&smp_penguin_ctable, 0, (char *)entry); &smp_penguin_ctable, 0, (char *)entry);
...@@ -168,7 +170,7 @@ int __cpuinit smp4d_boot_one_cpu(int i) ...@@ -168,7 +170,7 @@ int __cpuinit smp4d_boot_one_cpu(int i)
return -ENODEV; return -ENODEV;
} }
local_flush_cache_all(); local_ops->cache_all();
return 0; return 0;
} }
...@@ -185,7 +187,7 @@ void __init smp4d_smp_done(void) ...@@ -185,7 +187,7 @@ void __init smp4d_smp_done(void)
prev = &cpu_data(i).next; prev = &cpu_data(i).next;
} }
*prev = first; *prev = first;
local_flush_cache_all(); local_ops->cache_all();
/* Ok, they are spinning and ready to go. */ /* Ok, they are spinning and ready to go. */
smp_processors_ready = 1; smp_processors_ready = 1;
......
...@@ -431,7 +431,7 @@ static void __init sun4m_init_timers(void) ...@@ -431,7 +431,7 @@ static void __init sun4m_init_timers(void)
trap_table->inst_two = lvl14_save[1]; trap_table->inst_two = lvl14_save[1];
trap_table->inst_three = lvl14_save[2]; trap_table->inst_three = lvl14_save[2];
trap_table->inst_four = lvl14_save[3]; trap_table->inst_four = lvl14_save[3];
local_flush_cache_all(); local_ops->cache_all();
local_irq_restore(flags); local_irq_restore(flags);
} }
#endif #endif
......
...@@ -8,12 +8,14 @@ ...@@ -8,12 +8,14 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/profile.h> #include <linux/profile.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/sched.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/oplib.h>
#include "irq.h" #include "irq.h"
#include "kernel.h" #include "kernel.h"
...@@ -38,8 +40,8 @@ void __cpuinit smp4m_callin(void) ...@@ -38,8 +40,8 @@ void __cpuinit smp4m_callin(void)
{ {
int cpuid = hard_smp_processor_id(); int cpuid = hard_smp_processor_id();
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
notify_cpu_starting(cpuid); notify_cpu_starting(cpuid);
...@@ -48,8 +50,8 @@ void __cpuinit smp4m_callin(void) ...@@ -48,8 +50,8 @@ void __cpuinit smp4m_callin(void)
calibrate_delay(); calibrate_delay();
smp_store_cpu_info(cpuid); smp_store_cpu_info(cpuid);
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
/* /*
* Unblock the master CPU _only_ when the scheduler state * Unblock the master CPU _only_ when the scheduler state
...@@ -61,8 +63,8 @@ void __cpuinit smp4m_callin(void) ...@@ -61,8 +63,8 @@ void __cpuinit smp4m_callin(void)
swap_ulong(&cpu_callin_map[cpuid], 1); swap_ulong(&cpu_callin_map[cpuid], 1);
/* XXX: What's up with all the flushes? */ /* XXX: What's up with all the flushes? */
local_flush_cache_all(); local_ops->cache_all();
local_flush_tlb_all(); local_ops->tlb_all();
/* Fix idle thread fields. */ /* Fix idle thread fields. */
__asm__ __volatile__("ld [%0], %%g6\n\t" __asm__ __volatile__("ld [%0], %%g6\n\t"
...@@ -88,7 +90,7 @@ void __init smp4m_boot_cpus(void) ...@@ -88,7 +90,7 @@ void __init smp4m_boot_cpus(void)
{ {
smp4m_ipi_init(); smp4m_ipi_init();
sun4m_unmask_profile_irq(); sun4m_unmask_profile_irq();
local_flush_cache_all(); local_ops->cache_all();
} }
int __cpuinit smp4m_boot_one_cpu(int i) int __cpuinit smp4m_boot_one_cpu(int i)
...@@ -117,7 +119,7 @@ int __cpuinit smp4m_boot_one_cpu(int i) ...@@ -117,7 +119,7 @@ int __cpuinit smp4m_boot_one_cpu(int i)
/* whirrr, whirrr, whirrrrrrrrr... */ /* whirrr, whirrr, whirrrrrrrrr... */
printk(KERN_INFO "Starting CPU %d at %p\n", i, entry); printk(KERN_INFO "Starting CPU %d at %p\n", i, entry);
local_flush_cache_all(); local_ops->cache_all();
prom_startcpu(cpu_node, &smp_penguin_ctable, 0, (char *)entry); prom_startcpu(cpu_node, &smp_penguin_ctable, 0, (char *)entry);
/* wheee... it's going... */ /* wheee... it's going... */
...@@ -132,7 +134,7 @@ int __cpuinit smp4m_boot_one_cpu(int i) ...@@ -132,7 +134,7 @@ int __cpuinit smp4m_boot_one_cpu(int i)
return -ENODEV; return -ENODEV;
} }
local_flush_cache_all(); local_ops->cache_all();
return 0; return 0;
} }
...@@ -149,7 +151,7 @@ void __init smp4m_smp_done(void) ...@@ -149,7 +151,7 @@ void __init smp4m_smp_done(void)
prev = &cpu_data(i).next; prev = &cpu_data(i).next;
} }
*prev = first; *prev = first;
local_flush_cache_all(); local_ops->cache_all();
/* Ok, they are spinning and ready to go. */ /* Ok, they are spinning and ready to go. */
} }
......
...@@ -38,7 +38,6 @@ static char insn_s[] __initdata = "Fixup s %p doesn't refer to an OR at %p[%08x] ...@@ -38,7 +38,6 @@ static char insn_s[] __initdata = "Fixup s %p doesn't refer to an OR at %p[%08x]
static char insn_h[] __initdata = "Fixup h %p doesn't refer to a SETHI at %p[%08x]\n"; static char insn_h[] __initdata = "Fixup h %p doesn't refer to a SETHI at %p[%08x]\n";
static char insn_a[] __initdata = "Fixup a %p doesn't refer to a SETHI nor OR at %p[%08x]\n"; static char insn_a[] __initdata = "Fixup a %p doesn't refer to a SETHI nor OR at %p[%08x]\n";
static char insn_i[] __initdata = "Fixup i %p doesn't refer to a valid instruction at %p[%08x]\n"; static char insn_i[] __initdata = "Fixup i %p doesn't refer to a valid instruction at %p[%08x]\n";
static char fca_und[] __initdata = "flush_cache_all undefined in btfixup()\n";
static char wrong_setaddr[] __initdata = "Garbled CALL/INT patch at %p[%08x,%08x,%08x]=%08x\n"; static char wrong_setaddr[] __initdata = "Garbled CALL/INT patch at %p[%08x,%08x,%08x]=%08x\n";
#ifdef BTFIXUP_OPTIMIZE_OTHER #ifdef BTFIXUP_OPTIMIZE_OTHER
...@@ -75,7 +74,6 @@ void __init btfixup(void) ...@@ -75,7 +74,6 @@ void __init btfixup(void)
unsigned insn; unsigned insn;
unsigned *addr; unsigned *addr;
int fmangled = 0; int fmangled = 0;
void (*flush_cacheall)(void);
if (!visited) { if (!visited) {
visited++; visited++;
...@@ -311,13 +309,8 @@ void __init btfixup(void) ...@@ -311,13 +309,8 @@ void __init btfixup(void)
p = q + count; p = q + count;
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
flush_cacheall = (void (*)(void))BTFIXUPVAL_CALL(local_flush_cache_all); local_ops->cache_all();
#else #else
flush_cacheall = (void (*)(void))BTFIXUPVAL_CALL(flush_cache_all); sparc32_cachetlb_ops->cache_all();
#endif #endif
if (!flush_cacheall) {
prom_printf(fca_und);
prom_halt();
}
(*flush_cacheall)();
} }
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
/* srmmu.c */ /* srmmu.c */
extern int viking_mxcc_present; extern int viking_mxcc_present;
BTFIXUPDEF_CALL(void, flush_page_for_dma, unsigned long)
#define flush_page_for_dma(page) BTFIXUP_CALL(flush_page_for_dma)(page)
extern int flush_page_for_dma_global; extern int flush_page_for_dma_global;
static int viking_flush; static int viking_flush;
/* viking.S */ /* viking.S */
...@@ -216,11 +214,6 @@ static u32 iommu_get_scsi_one(struct device *dev, char *vaddr, unsigned int len) ...@@ -216,11 +214,6 @@ static u32 iommu_get_scsi_one(struct device *dev, char *vaddr, unsigned int len)
return busa + off; return busa + off;
} }
static __u32 iommu_get_scsi_one_noflush(struct device *dev, char *vaddr, unsigned long len)
{
return iommu_get_scsi_one(dev, vaddr, len);
}
static __u32 iommu_get_scsi_one_gflush(struct device *dev, char *vaddr, unsigned long len) static __u32 iommu_get_scsi_one_gflush(struct device *dev, char *vaddr, unsigned long len)
{ {
flush_page_for_dma(0); flush_page_for_dma(0);
...@@ -238,19 +231,6 @@ static __u32 iommu_get_scsi_one_pflush(struct device *dev, char *vaddr, unsigned ...@@ -238,19 +231,6 @@ static __u32 iommu_get_scsi_one_pflush(struct device *dev, char *vaddr, unsigned
return iommu_get_scsi_one(dev, vaddr, len); return iommu_get_scsi_one(dev, vaddr, len);
} }
static void iommu_get_scsi_sgl_noflush(struct device *dev, struct scatterlist *sg, int sz)
{
int n;
while (sz != 0) {
--sz;
n = (sg->length + sg->offset + PAGE_SIZE-1) >> PAGE_SHIFT;
sg->dma_address = iommu_get_one(dev, sg_page(sg), n) + sg->offset;
sg->dma_length = sg->length;
sg = sg_next(sg);
}
}
static void iommu_get_scsi_sgl_gflush(struct device *dev, struct scatterlist *sg, int sz) static void iommu_get_scsi_sgl_gflush(struct device *dev, struct scatterlist *sg, int sz)
{ {
int n; int n;
...@@ -426,17 +406,6 @@ static void iommu_unmap_dma_area(struct device *dev, unsigned long busa, int len ...@@ -426,17 +406,6 @@ static void iommu_unmap_dma_area(struct device *dev, unsigned long busa, int len
} }
#endif #endif
static const struct sparc32_dma_ops iommu_dma_noflush_ops = {
.get_scsi_one = iommu_get_scsi_one_noflush,
.get_scsi_sgl = iommu_get_scsi_sgl_noflush,
.release_scsi_one = iommu_release_scsi_one,
.release_scsi_sgl = iommu_release_scsi_sgl,
#ifdef CONFIG_SBUS
.map_dma_area = iommu_map_dma_area,
.unmap_dma_area = iommu_unmap_dma_area,
#endif
};
static const struct sparc32_dma_ops iommu_dma_gflush_ops = { static const struct sparc32_dma_ops iommu_dma_gflush_ops = {
.get_scsi_one = iommu_get_scsi_one_gflush, .get_scsi_one = iommu_get_scsi_one_gflush,
.get_scsi_sgl = iommu_get_scsi_sgl_gflush, .get_scsi_sgl = iommu_get_scsi_sgl_gflush,
...@@ -461,12 +430,7 @@ static const struct sparc32_dma_ops iommu_dma_pflush_ops = { ...@@ -461,12 +430,7 @@ static const struct sparc32_dma_ops iommu_dma_pflush_ops = {
void __init ld_mmu_iommu(void) void __init ld_mmu_iommu(void)
{ {
viking_flush = (BTFIXUPVAL_CALL(flush_page_for_dma) == (unsigned long)viking_flush_page); if (flush_page_for_dma_global) {
if (!BTFIXUPVAL_CALL(flush_page_for_dma)) {
/* IO coherent chip */
sparc32_dma_ops = &iommu_dma_noflush_ops;
} else if (flush_page_for_dma_global) {
/* flush_page_for_dma flushes everything, no matter of what page is it */ /* flush_page_for_dma flushes everything, no matter of what page is it */
sparc32_dma_ops = &iommu_dma_gflush_ops; sparc32_dma_ops = &iommu_dma_gflush_ops;
} else { } else {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment