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

Commit 8504b503 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: support aliasing cache in kmap 



Define ARCH_PKMAP_COLORING and provide corresponding macro definitions
on cores with aliasing data cache.

Instead of single last_pkmap_nr maintain an array last_pkmap_nr_arr of
pkmap counters for each page color. Make sure that kmap maps physical
page at virtual address with color matching its physical address.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 32544d9c

arch/xtensa/include/asm/highmem.h

+38 −2
Original line number Original line Diff line number Diff line
@@ -12,19 +12,55 @@ 
#ifndef _XTENSA_HIGHMEM_H

#ifndef _XTENSA_HIGHMEM_H

#define _XTENSA_HIGHMEM_H

#define _XTENSA_HIGHMEM_H





#include <linux/wait.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <asm/fixmap.h>

#include <asm/fixmap.h>

#include <asm/kmap_types.h>

#include <asm/kmap_types.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>





#define PKMAP_BASE		(FIXADDR_START - PMD_SIZE)

#define PKMAP_BASE		((FIXADDR_START - \

#define LAST_PKMAP		PTRS_PER_PTE

				  (LAST_PKMAP + 1) * PAGE_SIZE) & PMD_MASK)

#define LAST_PKMAP		(PTRS_PER_PTE * DCACHE_N_COLORS)

#define LAST_PKMAP_MASK		(LAST_PKMAP - 1)

#define LAST_PKMAP_MASK		(LAST_PKMAP - 1)

#define PKMAP_NR(virt)		(((virt) - PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_NR(virt)		(((virt) - PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)		(PKMAP_BASE + ((nr) << PAGE_SHIFT))

#define PKMAP_ADDR(nr)		(PKMAP_BASE + ((nr) << PAGE_SHIFT))





#define kmap_prot		PAGE_KERNEL

#define kmap_prot		PAGE_KERNEL





#if DCACHE_WAY_SIZE > PAGE_SIZE

#define get_pkmap_color get_pkmap_color

static inline int get_pkmap_color(struct page *page)

{

	return DCACHE_ALIAS(page_to_phys(page));

}



extern unsigned int last_pkmap_nr_arr[];



static inline unsigned int get_next_pkmap_nr(unsigned int color)

{

	last_pkmap_nr_arr[color] =

		(last_pkmap_nr_arr[color] + DCACHE_N_COLORS) & LAST_PKMAP_MASK;

	return last_pkmap_nr_arr[color] + color;

}



static inline int no_more_pkmaps(unsigned int pkmap_nr, unsigned int color)

{

	return pkmap_nr < DCACHE_N_COLORS;

}



static inline int get_pkmap_entries_count(unsigned int color)

{

	return LAST_PKMAP / DCACHE_N_COLORS;

}



extern wait_queue_head_t pkmap_map_wait_arr[];



static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)

{

	return pkmap_map_wait_arr + color;

}

#endif



extern pte_t *pkmap_page_table;

extern pte_t *pkmap_page_table;





void *kmap_high(struct page *page);

void *kmap_high(struct page *page);

arch/xtensa/mm/highmem.c

+18 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,23 @@ 




static pte_t *kmap_pte;

static pte_t *kmap_pte;





#if DCACHE_WAY_SIZE > PAGE_SIZE

unsigned int last_pkmap_nr_arr[DCACHE_N_COLORS];

wait_queue_head_t pkmap_map_wait_arr[DCACHE_N_COLORS];



static void __init kmap_waitqueues_init(void)

{

	unsigned int i;



	for (i = 0; i < ARRAY_SIZE(pkmap_map_wait_arr); ++i)

		init_waitqueue_head(pkmap_map_wait_arr + i);

}

#else

static inline void kmap_waitqueues_init(void)

{

}

#endif



static inline enum fixed_addresses kmap_idx(int type, unsigned long color)

static inline enum fixed_addresses kmap_idx(int type, unsigned long color)

{

{

	return (type + KM_TYPE_NR * smp_processor_id()) * DCACHE_N_COLORS +

	return (type + KM_TYPE_NR * smp_processor_id()) * DCACHE_N_COLORS +
@@ -72,4 +89,5 @@ void __init kmap_init(void) 
	/* cache the first kmap pte */

	/* cache the first kmap pte */

	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);

	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);

	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);

	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);

	kmap_waitqueues_init();

}
 
}