mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-08 09:39:40 +00:00
1eb0616c2d
The conversion to the generic kmap_atomic() implementation missed the fact
that xtensa's fixmap works bottom up while all other implementations work
top down. There is no real reason why xtensa needs to work that way.
Cure it by:
- Using the generic fix_to_virt()/virt_to_fix() functions which work top
down
- Adjusting the mapping defines
- Using the generic index calculation for the non cache aliasing case
- Making the cache colour offset reverse so the effective index is correct
While at it, remove the outdated and misleading comment above the fixmap
enum which originates from the initial copy&pasta of this code from i386.
[ Max: Fixed the off by one in the index calculation ]
Fixes: 629ed3f7da ("xtensa/mm/highmem: Switch to generic kmap atomic")
Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Link: https://lore.kernel.org/r/20201116193253.23875-1-jcmvbkbc@gmail.com
84 lines
2.1 KiB
C
84 lines
2.1 KiB
C
/*
|
|
* include/asm-xtensa/highmem.h
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General
|
|
* Public License. See the file "COPYING" in the main directory of
|
|
* this archive for more details.
|
|
*
|
|
* Copyright (C) 2003 - 2005 Tensilica Inc.
|
|
* Copyright (C) 2014 Cadence Design Systems Inc.
|
|
*/
|
|
|
|
#ifndef _XTENSA_HIGHMEM_H
|
|
#define _XTENSA_HIGHMEM_H
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
#include <linux/wait.h>
|
|
#include <linux/pgtable.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/fixmap.h>
|
|
|
|
#define PKMAP_BASE ((FIXADDR_START - \
|
|
(LAST_PKMAP + 1) * PAGE_SIZE) & PMD_MASK)
|
|
#define LAST_PKMAP (PTRS_PER_PTE * DCACHE_N_COLORS)
|
|
#define LAST_PKMAP_MASK (LAST_PKMAP - 1)
|
|
#define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT)
|
|
#define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))
|
|
|
|
#define kmap_prot PAGE_KERNEL_EXEC
|
|
|
|
#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;
|
|
}
|
|
|
|
enum fixed_addresses kmap_local_map_idx(int type, unsigned long pfn);
|
|
#define arch_kmap_local_map_idx kmap_local_map_idx
|
|
|
|
enum fixed_addresses kmap_local_unmap_idx(int type, unsigned long addr);
|
|
#define arch_kmap_local_unmap_idx kmap_local_unmap_idx
|
|
|
|
#endif
|
|
|
|
extern pte_t *pkmap_page_table;
|
|
|
|
static inline void flush_cache_kmaps(void)
|
|
{
|
|
flush_cache_all();
|
|
}
|
|
|
|
#define arch_kmap_local_post_unmap(vaddr) \
|
|
local_flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE)
|
|
|
|
void kmap_init(void);
|
|
|
|
#endif /* CONFIG_HIGHMEM */
|
|
#endif
|