dasharo/zephyr
0
0
Fork 0
mirror of https://github.com/Dasharo/zephyr.git synced 2026-03-06 14:57:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

mm_drv: tlb: Fix context save for remapped pages

Browse Source 
In case of remapped reference counter for physical page
is differ to zero, but TLB entry for virtual address equal to
physical address will be disabled. Valid entry will be somewhere
in virtual space where particular physical page is remapped.

Since in adsp_mm_save_context() routine we go through physical
memory range, we need to include these pages in context save loop.

Signed-off-by: Jaroslaw Stelter <Jaroslaw.Stelter@intel.com>
This commit is contained in:
Jaroslaw Stelter
2023-07-05 16:01:13 +02:00
committed by Carles Cufí
parent e256b7d244
commit 0bf467bbcd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
View File

@@ -331,6 +331,7 @@ int sys_mm_drv_unmap_page(void *virt)
{
k_spinlock_key_t key;
uint32_t entry_idx, bank_idx;
uint16_t entry;
uint16_t *tlb_entries = UINT_TO_POINTER(TLB_BASE);
uintptr_t pa;
int ret = 0;
@@ -360,9 +361,11 @@ int sys_mm_drv_unmap_page(void *virt)
sys_cache_data_flush_range(virt, CONFIG_MM_DRV_PAGE_SIZE);
entry_idx = get_tlb_entry_idx(va);
/* Simply clear the enable bit */
tlb_entries[entry_idx] &= ~TLB_ENABLE_BIT;
/* Restore default entry settings */
entry = pa_to_tlb_entry(va) | TLB_EXEC_BIT | TLB_WRITE_BIT;
/* Clear the enable bit */
entry &= ~TLB_ENABLE_BIT;
tlb_entries[entry_idx] = entry;
pa = tlb_entry_to_pa(tlb_entries[entry_idx]);
@@ -723,7 +726,8 @@ static void adsp_mm_save_context(void *storage_buffer)
entry_idx = get_tlb_entry_idx(phys_addr);
entry = pa_to_tlb_entry(phys_addr);
if ((tlb_entries[entry_idx] & TLB_PADDR_MASK) != entry) {
if (((tlb_entries[entry_idx] & TLB_PADDR_MASK) != entry) ||
((tlb_entries[entry_idx] & TLB_ENABLE_BIT) != TLB_ENABLE_BIT)) {
/* this page needs remapping, invalidate cache to avoid stalled data
* all cache data has been flushed before
* do this for pages to remap only