Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ace: mm: tlb: Ignore unmapping error in driver initalization #78612

Merged
merged 2 commits into from
Oct 15, 2024
+19 −3
Merged

ace: mm: tlb: Ignore unmapping error in driver initalization #78612

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457afee
ace: mm: tlb: Ignore unmappig error in driver initalization
softwarecki Sep 18, 2024
eba0eb7
ace: mm: tlb: Check tlb translation enabled before flushing cache
softwarecki Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ static int sys_mm_drv_unmap_page_wflush(void *virt, bool flush_data)
k_spinlock_key_t key;
uint32_t entry_idx, bank_idx;
uint16_t *tlb_entries = UINT_TO_POINTER(TLB_BASE);
uint16_t entry;
uintptr_t pa;
int ret = 0;

Expand All @@ -359,6 +360,17 @@ static int sys_mm_drv_unmap_page_wflush(void *virt, bool flush_data)

key = k_spin_lock(&tlb_lock);

entry_idx = get_tlb_entry_idx(va);
entry = tlb_entries[entry_idx];

/* Check if the translation is enabled in the TLB entry.
* Attempt to flush the cache of an inactive address will result in a cpu exception.
*/
if (!(entry & TLB_ENABLE_BIT)) {
ret = -EFAULT;
goto out_unlock;
}

/*
* Flush the cache to make sure the backing physical page
* has the latest data.
Expand All @@ -371,8 +383,7 @@ static int sys_mm_drv_unmap_page_wflush(void *virt, bool flush_data)
#endif
}

entry_idx = get_tlb_entry_idx(va);
pa = tlb_entry_to_pa(tlb_entries[entry_idx]);
pa = tlb_entry_to_pa(entry);

/* Restore default entry settings with cleared the enable bit. */
tlb_entries[entry_idx] = 0;
Expand All @@ -395,6 +406,7 @@ static int sys_mm_drv_unmap_page_wflush(void *virt, bool flush_data)
}
}

out_unlock:
k_spin_unlock(&tlb_lock, key);

out:
Expand Down Expand Up @@ -478,7 +490,11 @@ static int sys_mm_drv_unmap_region_initial(void *virt_in, size_t size)

softwarecki marked this conversation as resolved.
Show resolved Hide resolved
int ret2 = sys_mm_drv_unmap_page_wflush(va, false);

if (ret2 != 0) {
/* -EFAULT means that this page is not mapped.
* This is not an error since we want to unmap all virtual memory without knowing
* which pages are mapped.
*/
if (ret2 != 0 && ret2 != -EFAULT) {
__ASSERT(false, "cannot unmap %p\n", va);

ret = ret2;
Expand Down
Loading