Skip to content

Commit

Permalink
sh: Avoid smp_processor_id() in cache desc paths.
Browse files Browse the repository at this point in the history 
current_cpu_data uses smp_processor_id() in order to find the
corresponding cpu_data. As the cache descs are all currently
identical, just have this look at probed results from the boot
CPU.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Sep 21, 2007
1 parent 2d4a73d commit 7ec9d6f
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions arch/sh/mm/cache-sh4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@ static void __init emit_cache_params(void)
ctrl_inl(CCN_CVR),
ctrl_inl(CCN_PRR));
printk("I-cache : n_ways=%d n_sets=%d way_incr=%d\n",
current_cpu_data.icache.ways,
current_cpu_data.icache.sets,
current_cpu_data.icache.way_incr);
boot_cpu_data.icache.ways,
boot_cpu_data.icache.sets,
boot_cpu_data.icache.way_incr);
printk("I-cache : entry_mask=0x%08x alias_mask=0x%08x n_aliases=%d\n",
current_cpu_data.icache.entry_mask,
current_cpu_data.icache.alias_mask,
current_cpu_data.icache.n_aliases);
boot_cpu_data.icache.entry_mask,
boot_cpu_data.icache.alias_mask,
boot_cpu_data.icache.n_aliases);
printk("D-cache : n_ways=%d n_sets=%d way_incr=%d\n",
current_cpu_data.dcache.ways,
current_cpu_data.dcache.sets,
current_cpu_data.dcache.way_incr);
boot_cpu_data.dcache.ways,
boot_cpu_data.dcache.sets,
boot_cpu_data.dcache.way_incr);
printk("D-cache : entry_mask=0x%08x alias_mask=0x%08x n_aliases=%d\n",
current_cpu_data.dcache.entry_mask,
current_cpu_data.dcache.alias_mask,
current_cpu_data.dcache.n_aliases);
boot_cpu_data.dcache.entry_mask,
boot_cpu_data.dcache.alias_mask,
boot_cpu_data.dcache.n_aliases);

if (!__flush_dcache_segment_fn)
panic("unknown number of cache ways\n");
Expand All @@ -79,10 +79,10 @@ static void __init emit_cache_params(void)
*/
void __init p3_cache_init(void)
{
compute_alias(&current_cpu_data.icache);
compute_alias(&current_cpu_data.dcache);
compute_alias(&boot_cpu_data.icache);
compute_alias(&boot_cpu_data.dcache);

switch (current_cpu_data.dcache.ways) {
switch (boot_cpu_data.dcache.ways) {
case 1:
__flush_dcache_segment_fn = __flush_dcache_segment_1way;
break;
Expand Down Expand Up @@ -187,13 +187,13 @@ void flush_cache_sigtramp(unsigned long addr)
: "m" (__m(v)));

index = CACHE_IC_ADDRESS_ARRAY |
(v & current_cpu_data.icache.entry_mask);
(v & boot_cpu_data.icache.entry_mask);

local_irq_save(flags);
jump_to_P2();

for (i = 0; i < current_cpu_data.icache.ways;
i++, index += current_cpu_data.icache.way_incr)
for (i = 0; i < boot_cpu_data.icache.ways;
i++, index += boot_cpu_data.icache.way_incr)
ctrl_outl(0, index); /* Clear out Valid-bit */

back_to_P1();
Expand All @@ -210,7 +210,7 @@ static inline void flush_cache_4096(unsigned long start,
* All types of SH-4 require PC to be in P2 to operate on the I-cache.
* Some types of SH-4 require PC to be in P2 to operate on the D-cache.
*/
if ((current_cpu_data.flags & CPU_HAS_P2_FLUSH_BUG) ||
if ((boot_cpu_data.flags & CPU_HAS_P2_FLUSH_BUG) ||
(start < CACHE_OC_ADDRESS_ARRAY))
exec_offset = 0x20000000;

Expand All @@ -232,7 +232,7 @@ void flush_dcache_page(struct page *page)
int i, n;

/* Loop all the D-cache */
n = current_cpu_data.dcache.n_aliases;
n = boot_cpu_data.dcache.n_aliases;
for (i = 0; i < n; i++, addr += 4096)
flush_cache_4096(addr, phys);
}
Expand Down Expand Up @@ -264,7 +264,7 @@ static inline void flush_icache_all(void)

void flush_dcache_all(void)
{
(*__flush_dcache_segment_fn)(0UL, current_cpu_data.dcache.way_size);
(*__flush_dcache_segment_fn)(0UL, boot_cpu_data.dcache.way_size);
wmb();
}

Expand All @@ -278,8 +278,8 @@ static void __flush_cache_mm(struct mm_struct *mm, unsigned long start,
unsigned long end)
{
unsigned long d = 0, p = start & PAGE_MASK;
unsigned long alias_mask = current_cpu_data.dcache.alias_mask;
unsigned long n_aliases = current_cpu_data.dcache.n_aliases;
unsigned long alias_mask = boot_cpu_data.dcache.alias_mask;
unsigned long n_aliases = boot_cpu_data.dcache.n_aliases;
unsigned long select_bit;
unsigned long all_aliases_mask;
unsigned long addr_offset;
Expand Down Expand Up @@ -366,7 +366,7 @@ void flush_cache_mm(struct mm_struct *mm)
* If cache is only 4k-per-way, there are never any 'aliases'. Since
* the cache is physically tagged, the data can just be left in there.
*/
if (current_cpu_data.dcache.n_aliases == 0)
if (boot_cpu_data.dcache.n_aliases == 0)
return;

/*
Expand Down Expand Up @@ -403,7 +403,7 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long address,
unsigned long phys = pfn << PAGE_SHIFT;
unsigned int alias_mask;

alias_mask = current_cpu_data.dcache.alias_mask;
alias_mask = boot_cpu_data.dcache.alias_mask;

/* We only need to flush D-cache when we have alias */
if ((address^phys) & alias_mask) {
Expand All @@ -417,7 +417,7 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long address,
phys);
}

alias_mask = current_cpu_data.icache.alias_mask;
alias_mask = boot_cpu_data.icache.alias_mask;
if (vma->vm_flags & VM_EXEC) {
/*
* Evict entries from the portion of the cache from which code
Expand Down Expand Up @@ -449,7 +449,7 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
* If cache is only 4k-per-way, there are never any 'aliases'. Since
* the cache is physically tagged, the data can just be left in there.
*/
if (current_cpu_data.dcache.n_aliases == 0)
if (boot_cpu_data.dcache.n_aliases == 0)
return;

/*
Expand Down Expand Up @@ -510,7 +510,7 @@ static void __flush_cache_4096(unsigned long addr, unsigned long phys,
unsigned long a, ea, p;
unsigned long temp_pc;

dcache = &current_cpu_data.dcache;
dcache = &boot_cpu_data.dcache;
/* Write this way for better assembly. */
way_count = dcache->ways;
way_incr = dcache->way_incr;
Expand Down Expand Up @@ -585,7 +585,7 @@ static void __flush_dcache_segment_1way(unsigned long start,
base_addr = ((base_addr >> 16) << 16);
base_addr |= start;

dcache = &current_cpu_data.dcache;
dcache = &boot_cpu_data.dcache;
linesz = dcache->linesz;
way_incr = dcache->way_incr;
way_size = dcache->way_size;
Expand Down Expand Up @@ -627,7 +627,7 @@ static void __flush_dcache_segment_2way(unsigned long start,
base_addr = ((base_addr >> 16) << 16);
base_addr |= start;

dcache = &current_cpu_data.dcache;
dcache = &boot_cpu_data.dcache;
linesz = dcache->linesz;
way_incr = dcache->way_incr;
way_size = dcache->way_size;
Expand Down Expand Up @@ -686,7 +686,7 @@ static void __flush_dcache_segment_4way(unsigned long start,
base_addr = ((base_addr >> 16) << 16);
base_addr |= start;

dcache = &current_cpu_data.dcache;
dcache = &boot_cpu_data.dcache;
linesz = dcache->linesz;
way_incr = dcache->way_incr;
way_size = dcache->way_size;
Expand Down

0 comments on commit 7ec9d6f

Please sign in to comment.